nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

container_impact_dmg

Browse Source 
A post-3.4.3 change made the contents of thrown (or dropped while
levitating) containers subject to breakage, but it had sequence issues.
When something was thrown from outside a shop (or from its doorway or
entry spot) and arrived inside, the shopkeeper was taking possession too
soon, charging the hero for any broken contents, and then going ballistic
(summoning kops and attacking) because the hero was outside the shop while
owing money.  We need to break contents before shk claims ownership, which
turned out to be trickier than it sounds since it has to occur after any
item-hits-floor message if such feedback is given.

    Also, clear the container's contents-known flag when contents break.
Conceivably it should stay set when there is only one item, since hearing
something break could only be that item, but this resets container->cknown
unconditionally if anything inside breaks.
This commit is contained in:
nethack.rankin
2012-05-05 23:26:26 +00:00
parent 07f6cd66d4
commit 669c2ab560
4 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/dokick.c
View File

@@ -373,22 +373,24 @@ register struct obj *gold;
/* container is kicked, dropped, thrown or otherwise impacted by player.
* Assumes container is on floor. Checks contents for possible damage. */
void
container_impact_dmg(obj)
container_impact_dmg(obj, x, y)
struct obj *obj;
xchar x, y; /* coordinates where object was before the impact, not after */
{
struct monst *shkp;
struct obj *otmp, *otmp2;
long loss = 0L;
boolean costly, insider;
xchar x = obj->ox, y = obj->oy;
boolean costly, insider, frominv;
/* only consider normal containers */
if (!Is_container(obj) || Is_mbag(obj)) return;
if (!Is_container(obj) || !Has_contents(obj) || Is_mbag(obj)) return;
costly = ((shkp = shop_keeper(*in_rooms(x, y, SHOPBASE))) &&
costly_spot(x, y));
insider = (*u.ushops && inside_shop(u.ux, u.uy) &&
*in_rooms(x, y, SHOPBASE) == *u.ushops);
/* if dropped or thrown, shop ownership flags are set on this obj */
frominv = (obj != kickedobj);
for (otmp = obj->cobj; otmp; otmp = otmp2) {
const char *result = (char *)0;
@@ -408,15 +410,19 @@ struct obj *obj;
if (otmp->otyp == EGG && otmp->spe && otmp->corpsenm >= LOW_PM)
change_luck(-1);
You_hear("a muffled %s.", result);
if (costly)
if (costly) {
if (frominv && !otmp->unpaid) otmp->no_charge = 1;
loss += stolen_value(otmp, x, y,
(boolean)shkp->mpeaceful, TRUE);
if (otmp->quan > 1L)
}
if (otmp->quan > 1L) {
useup(otmp);
else {
} else {
obj_extract_self(otmp);
obfree(otmp, (struct obj *) 0);
}
/* contents of this container are no longer known */
obj->cknown = 0;
}
}
if (costly && loss) {
@@ -559,7 +565,7 @@ xchar x, y;
boolean otrp = kickedobj->otrapped;
if (range < 2) pline("THUD!");
container_impact_dmg(kickedobj);
container_impact_dmg(kickedobj, x, y);
if (kickedobj->olocked) {
if (!rn2(5) || (martial() && !rn2(2))) {
You("break open the lock!");