sync changes since last snapshot

This commit is contained in:
cohrs
2002-01-07 02:12:04 +00:00
parent 7218689e70
commit c77073be31
51 changed files with 581 additions and 286 deletions

View File

@@ -431,6 +431,11 @@ xchar x, y;
result = "cracking";
}
if (result) {
if (otmp->otyp == MIRROR)
change_luck(-2);
/* eggs laid by you */
if (otmp->otyp == EGG && otmp->spe && otmp->corpsenm >= LOW_PM)
change_luck(-5);
You_hear("a muffled %s.",result);
if(costly) loss += stolen_value(otmp, x, y,
(boolean)shkp->mpeaceful, TRUE);
@@ -512,7 +517,7 @@ xchar x, y;
return(!rn2(3) || martial());
}
if (kickobj->quan > 1L && !isgold) (void) splitobj(kickobj, 1L);
if (kickobj->quan > 1L && !isgold) kickobj = splitobj(kickobj, 1L);
if (slide && !Blind)
pline("Whee! %s slide%s across the %s.", Doname2(kickobj),
@@ -1267,6 +1272,10 @@ boolean shop_floor_obj;
otmp->no_charge = 0;
}
if (otmp == uwep) setuwep((struct obj *)0);
if (otmp == uquiver) setuqwep((struct obj *)0);
if (otmp == uswapwep) setuswapwep((struct obj *)0);
add_to_migration(otmp);
otmp->ox = cc.x;
otmp->oy = cc.y;