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

kicking shop food to tame dog (trunk only)

Browse Source 
From a bug report, kicking unpaid
food in a shop at a tameable monster resulting in taming the monster
without charging for the used-up food.  This forces kicked objects that
are owned by shops to be put on the shop bill and flagged as unpaid, which
is normally reserved for carried items but makes kicked ones behave like
thrown ones.  (If they land inside the shop without breaking, they're
removed from the bill.)  So kicking food to make a pet now results in the
item being moved from the shop's unpaid bill to its used-up bill, same as
for thrown food.  Although the latter kept billing consistent, it lacked
shop billing feedback; this fixes that too.
This commit is contained in:
nethack.rankin
2007-03-27 03:35:31 +00:00
parent ae9c10ea07
commit 4409f48369
4 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dokick.c
View File

@@ -402,7 +402,7 @@ kick_object(x, y)
xchar x, y;
{
int range;
register struct monst *mon, *shkp;
struct monst *mon, *shkp = 0;
struct trap *trap;
char bhitroom;
boolean costly, isgold, slide = FALSE;
@@ -471,8 +471,9 @@ xchar x, y;
if(!ZAP_POS(levl[x+u.dx][y+u.dy].typ) || closed_door(x+u.dx, y+u.dy))
range = 1;
costly = ((shkp = shop_keeper(*in_rooms(x, y, SHOPBASE))) &&
costly_spot(x, y));
costly = (!(kickobj->no_charge && !Has_contents(kickobj)) &&
(shkp = shop_keeper(*in_rooms(x, y, SHOPBASE))) != 0 &&
costly_spot(x, y));
isgold = (kickobj->oclass == COIN_CLASS);
if (IS_ROCK(levl[x][y].typ) || closed_door(x, y)) {
@@ -573,6 +574,7 @@ xchar x, y;
pline("Whee! %s %s across the %s.", Doname2(kickobj),
otense(kickobj, "slide"), surface(x,y));
if (costly && !isgold) addtobill(kickobj, FALSE, FALSE, TRUE);
obj_extract_self(kickobj);
(void) snuff_candle(kickobj);
newsym(x, y);
@@ -592,16 +594,9 @@ xchar x, y;
return(1);
}
/* the object might have fallen down a hole */
if (kickobj->where == OBJ_MIGRATING) {
if (costly) {
if(isgold)
costly_gold(x, y, kickobj->quan);
else (void)stolen_value(kickobj, x, y,
(boolean)shkp->mpeaceful, FALSE);
}
return 1;
}
/* the object might have fallen down a hole;
ship_object() will have taken care of shop billing */
if (kickobj->where == OBJ_MIGRATING) return 1;
bhitroom = *in_rooms(bhitpos.x, bhitpos.y, SHOPBASE);
if (costly && (!costly_spot(bhitpos.x, bhitpos.y) ||
@@ -613,12 +608,14 @@ xchar x, y;
}
if(flooreffects(kickobj,bhitpos.x,bhitpos.y,"fall")) return(1);
if (kickobj->unpaid) subfrombill(kickobj, shkp);
place_object(kickobj, bhitpos.x, bhitpos.y);
stackobj(kickobj);
newsym(kickobj->ox, kickobj->oy);
return(1);
}
/* cause of death if kicking kills kicker */
STATIC_OVL char *
kickstr(buf)
char *buf;
@@ -1379,9 +1376,7 @@ 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);
if (otmp->owornmask) remove_worn_item(otmp, TRUE);
/* some things break rather than ship */
if (breaktest(otmp)) {