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

from <Someone>: #rub touchstone

Browse Source 
<Someone>'s message said this was committed, but the cvs repository
didn't reflect his changes.

> Subject: patch: #rub touchstone
> Date: Wed, 20 Feb 2002 23:33:27 -0800
> <email deleted>
>
> Implement <Someone>'s suggestion.
>
> - allow the #rub command to apply to gray stones
> - update various doc & help files to reflect the change
>
> Committed to CVS.
This commit is contained in:
nethack.rankin
2002-02-24 03:19:20 +00:00
parent 3ae126c83f
commit 4bc3561a96
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dat/hh
View File

@@ -92,7 +92,7 @@ M-n name name an item or type of object
M-o offer offer a sacrifice to the gods M-o offer offer a sacrifice to the gods
M-p pray pray to the gods for help M-p pray pray to the gods for help
M-q quit stop playing M-q quit stop playing
M-r rub rub a lamp M-r rub rub a lamp or a stone
M-s sit sit down M-s sit sit down
M-t turn turn undead M-t turn turn undead
M-u untrap untrap something M-u untrap untrap something

2
doc/Guidebook.mn
View File

@@ -692,7 +692,7 @@ Quit the program without saving your game.
.lp #ride .lp #ride
Ride (or stop riding) a monster. Ride (or stop riding) a monster.
.lp #rub .lp #rub
Rub a lamp. Rub a lamp or a stone.
.lp #sit .lp #sit
Sit down. Sit down.
.lp #turn .lp #turn

2
doc/Guidebook.tex
View File

@@ -923,7 +923,7 @@ Quit the program without saving your game.
Ride (or stop riding) a monster. Ride (or stop riding) a monster.
%.lp %.lp
\item[\tb{\#rub}] \item[\tb{\#rub}]
Rub a lamp. Rub a lamp or a stone.
%.lp %.lp
\item[\tb{\#sit}] \item[\tb{\#sit}]
Sit down. Sit down.

13
src/apply.c
View File

@@ -1146,13 +1146,24 @@ light_cocktail(obj)
begin_burn(obj, FALSE); begin_burn(obj, FALSE);
} }
static NEARDATA const char cuddly[] = { TOOL_CLASS, 0 }; static NEARDATA const char cuddly[] = { TOOL_CLASS, GEM_CLASS, 0 };
int int
dorub() dorub()
{ {
struct obj *obj = getobj(cuddly, "rub"); struct obj *obj = getobj(cuddly, "rub");
if (obj && obj->oclass == GEM_CLASS) {
if (obj->otyp == FLINT || obj->otyp == LUCKSTONE ||
obj->otyp == LOADSTONE || obj->otyp == TOUCHSTONE) {
use_stone(obj);
return 1;
} else {
pline("Sorry, I don't know how to use that.");
return 0;
}
}
if(!obj || (obj != uwep && !wield_tool(obj))) return 0; if(!obj || (obj != uwep && !wield_tool(obj))) return 0;
/* now uwep is obj */ /* now uwep is obj */

2
src/cmd.c
View File

@@ -1390,7 +1390,7 @@ struct ext_func_tab extcmdlist[] = {
#ifdef STEED #ifdef STEED
{"ride", "ride (or stop riding) a monster", doride, FALSE}, {"ride", "ride (or stop riding) a monster", doride, FALSE},
#endif #endif
{"rub", "rub a lamp", dorub, FALSE}, {"rub", "rub a lamp or a stone", dorub, FALSE},
{"sit", "sit down", dosit, FALSE}, {"sit", "sit down", dosit, FALSE},
{"turn", "turn undead", doturn, TRUE}, {"turn", "turn undead", doturn, TRUE},
{"twoweapon", "toggle two-weapon combat", dotwoweapon, FALSE}, {"twoweapon", "toggle two-weapon combat", dotwoweapon, FALSE},

9
src/invent.c
View File

@@ -817,9 +817,12 @@ register const char *let,*word;
|| (!strcmp(word, "tin") && || (!strcmp(word, "tin") &&
(otyp != CORPSE || !tinnable(otmp))) (otyp != CORPSE || !tinnable(otmp)))
|| (!strcmp(word, "rub") && || (!strcmp(word, "rub") &&
(otmp->oclass == TOOL_CLASS && ((otmp->oclass == TOOL_CLASS &&
otyp != OIL_LAMP && otyp != MAGIC_LAMP && otyp != OIL_LAMP && otyp != MAGIC_LAMP &&
otyp != BRASS_LANTERN)) otyp != BRASS_LANTERN) ||
(otmp->oclass == GEM_CLASS &&
otyp != LUCKSTONE && otyp != LOADSTONE &&
otyp != TOUCHSTONE && otyp != FLINT)))
|| ((!strcmp(word, "use or apply") || || ((!strcmp(word, "use or apply") ||
!strcmp(word, "untrap with")) && !strcmp(word, "untrap with")) &&
/* Picks, axes, pole-weapons, bullwhips */ /* Picks, axes, pole-weapons, bullwhips */