Eliminate erode_obj() and other erosion.

Now all erosion that isn't fire-based goes through `rust_dmg()`
2015-02-24 15:20:01 -05:00
parent 4e05b9a1ec
commit 04a0331ccc
10 changed files with 73 additions and 196 deletions
--- a/src/wield.c
+++ b/src/wield.c
@@ -597,131 +597,6 @@ untwoweapon()
 	return;
 }

-/* Maybe rust (or corrode, burn, rot) object.
- * Returns TRUE if something happened. */
-boolean
-erode_obj(target, type, fade_scrolls, for_dip)
-struct obj *target;		/* object (e.g. weapon or armor) to erode */
-int type;
-boolean fade_scrolls;
-boolean for_dip;
-{
-	static NEARDATA const char * const action[] = { "smoulder", "rust", "rot", "corrode" };
-	static NEARDATA const char * const msg[] =  { "burnt", "rusty", "rotten", "corroded" };
-	boolean vulnerable = FALSE;
-	boolean grprot = FALSE;
-	boolean is_primary = TRUE;
-	int erosion;
-	int dmgtyp = AD_ACID;
-	struct monst *victim;
-	boolean vismon, visobj, chill;
-	boolean ret = FALSE;
-	boolean already_affected = FALSE;
-
-	if (!target)
-	    return FALSE;
-	victim = carried(target) ? &youmonst :
-	    mcarried(target) ? target->ocarry : (struct monst *)0;
-	vismon = victim && (victim != &youmonst) && canseemon(victim);
-	visobj = !victim && cansee(bhitpos.x, bhitpos.y); /* assume thrown */
-
-	switch(type) {
-	case 0: vulnerable = is_flammable(target);
-	    dmgtyp = AD_FIRE;
-	    break;
-	case 1: vulnerable = is_rustprone(target);
-	    dmgtyp = AD_RUST;
-	    grprot = TRUE;
-	    if (target->lamplit) {
-		already_affected = snuff_lit(target);
-		if (already_affected) ret = TRUE;
-	    }
-	    break;
-	case 2: vulnerable = is_rottable(target);
-	    dmgtyp = AD_DCAY;
-	    is_primary = FALSE;
-	    break;
-	case 3: vulnerable = is_corrodeable(target);
-	    dmgtyp = AD_ACID;
-	    grprot = TRUE;
-	    is_primary = FALSE;
-	    break;
-	}
-	erosion = is_primary ? target->oeroded : target->oeroded2;
-
-	if (target->greased && grprot) {
-	    grease_protect(target,(char *)0,victim);
-	    ret = TRUE;
-	} else if (target->oclass == SCROLL_CLASS && (type == 1 || type == 3)) {
-	    if(fade_scrolls && target->otyp != SCR_BLANK_PAPER
-#ifdef MAIL
-	    && target->otyp != SCR_MAIL
-#endif
-					)
-	    {
-		if (!Blind) {
-		    if ((victim == &youmonst) || vismon || visobj)
-			pline("%s.", Yobjnam2(target, "fade"));
-		}
-		target->otyp = SCR_BLANK_PAPER;
-		target->spe = 0;
-		ret = TRUE;
-	    }
-	} else if (target->oartifact && arti_immune(target, dmgtyp)) {
-	    if (flags.verbose && (dmgtyp != AD_FIRE)) {
-		if (victim == &youmonst)
-		    pline("%s.", Yobjnam2(target, "sizzle"));
-	    }
-	    /* no damage to object */
-	} else if (target->oartifact && (type == 1) &&
-		/* cold and fire provide partial protection against rust */
-		((chill = arti_immune(target, AD_COLD)) != 0 ||
-		 arti_immune(target, AD_FIRE)) &&
-		/* once rusted, the chance for further rusting goes up */
-		rn2(2 * (MAX_ERODE + 1 - erosion))) {
-	    if (flags.verbose && target->oclass == WEAPON_CLASS) {
-		if (victim == &youmonst || vismon || visobj)
-		    pline("%s some water.",
-			  Yobjnam2(target, chill ? "freeze" : "boil"));
-	    }
-	    /* no damage to object */
-	} else if (target->oerodeproof || !vulnerable) {
-	    /* no message if dipping or not carried */
-	    if (for_dip) {
-		/* assumes that for_dip implies player action */
-		if (!Blind) target->rknown = 0;
-	    } else if (victim == &youmonst || vismon) {
-		if (flags.verbose || (vulnerable && !target->rknown))
-		    pline("%s not %s.", Yobjnam2(target, "are"),
-			  already_affected ? "harmed" : "affected");
-		if (vulnerable) target->rknown = 1;
-	    }
-	} else if (erosion < MAX_ERODE) {
-	    if (victim == &youmonst || vismon || visobj) {
-		pline("%s%s!", Yobjnam2(target, action[type]),
-		    erosion+1 == MAX_ERODE ? " completely" :
-		    erosion ? " further" : "");
-		target->rknown = 1;	/* it's obviously not erode-proof */
-	    }
-	    if (is_primary)
-		target->oeroded++;
-	    else
-		target->oeroded2++;
-	    ret = TRUE;
-	} else {
-	    if (flags.verbose && !for_dip) {
-		if (victim == &youmonst)
-		    pline("%s completely %s.",
-			Yobjnam2(target, Blind ? "feel" : "look"), msg[type]);
-		else if (vismon || visobj)
-		    pline("%s completely %s.",
-			Yobjnam2(target, "look"), msg[type]);
-	    }
-	}
-
-	return ret;
-}
-
 int
 chwepon(otmp, amount)
 register struct obj *otmp;