archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Meaningful shortnames for RSPEAK messages.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-15 07:35:03 -04:00
parent 1d37262a16
commit a141f021d5
6 changed files with 479 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

286
actions.c
View file

@ -42,7 +42,7 @@ static int attack(FILE *input, long verb, token_t obj)
}
}
if (obj == BIRD) {
spk=ARB_137;
spk=UNHAPPY_BIRD;
if (game.closed)
{
RSPEAK(spk);
@ -50,7 +50,7 @@ static int attack(FILE *input, long verb, token_t obj)
}
DSTROY(BIRD);
game.prop[BIRD]=0;
spk=ARB_45;
spk=BIRD_DEAD;
}
if (obj == VEND) {
PSPEAK(VEND,game.prop[VEND]+2);
@ -58,17 +58,17 @@ static int attack(FILE *input, long verb, token_t obj)
return GO_CLEAROBJ;
}
if (obj == 0)spk=ARB_44;
if (obj == CLAM || obj == OYSTER)spk=ARB_150;
if (obj == SNAKE)spk=ARB_46;
if (obj == DWARF)spk=ARB_49;
if (obj == 0)spk=NO_TARGET;
if (obj == CLAM || obj == OYSTER)spk=SHELL_IMPERVIOUS;
if (obj == SNAKE)spk=SNAKE_WARNING;
if (obj == DWARF)spk=BARE_HANDS_QUERY;
if (obj == DWARF && game.closed) return GO_DWARFWAKE;
if (obj == DRAGON)spk=ARB_167;
if (obj == TROLL)spk=ARB_157;
if (obj == OGRE)spk=ARB_203;
if (obj == DRAGON)spk=ALREADY_DEAD;
if (obj == TROLL)spk=ROCKY_TROLL;
if (obj == OGRE)spk=OGRE_DOFGE;
if (obj == OGRE && i > 0) {
RSPEAK(spk);
RSPEAK(ARB_6);
RSPEAK(KNIFE_THROWN);
DSTROY(OGRE);
int k=0;
for (i=1; i < PIRATE; i++) {
@ -82,13 +82,13 @@ static int attack(FILE *input, long verb, token_t obj)
RSPEAK(spk);
return GO_CLEAROBJ;
}
if (obj == BEAR)spk=ARB_165+(game.prop[BEAR]+1)/2;
if (obj == BEAR)spk=BEAR_HANDS+(game.prop[BEAR]+1)/2;
if (obj != DRAGON || game.prop[DRAGON] != 0) {RSPEAK(spk); return GO_CLEAROBJ;}
/* Fun stuff for dragon. If he insists on attacking it, win!
* Set game.prop to dead, move dragon to central loc (still
* fixed), move rug there (not fixed), and move him there,
* too. Then do a null motion to get new description. */
RSPEAK(ARB_49);
RSPEAK(BARE_HANDS_QUERY);
GETIN(input,&WD1,&WD1X,&WD2,&WD2X);
if (WD1 != MAKEWD(25) && WD1 != MAKEWD(250519))
return GO_CHECKFOO;
@ -115,15 +115,15 @@ static int bigwords(long foo)
* word zips the eggs back to the giant room (unless already there). */
{
int k=VOCAB(foo,3);
int spk=ARB_42;
int spk=NOTHING_HAPPENS;
if (game.foobar != 1-k) {
if (game.foobar != 0)spk=ARB_151;
if (game.foobar != 0)spk=START_OVER;
RSPEAK(spk);
return GO_CLEAROBJ;
} else {
game.foobar=k;
if (k != 4) {
RSPEAK(ARB_54);
RSPEAK(OK_MAN);
return GO_CLEAROBJ;
}
game.foobar=0;
@ -150,10 +150,10 @@ static int bivalve(token_t verb, token_t obj)
{
int spk, k=0;
if (obj == OYSTER)k=1;
spk=ARB_124+k;
if (TOTING(obj))spk=ARB_120+k;
if (!TOTING(TRIDNT))spk=ARB_122+k;
if (verb == LOCK)spk=ARB_61;
spk=PEARL_FALLS+k;
if (TOTING(obj))spk=DROP_CLAM+k;
if (!TOTING(TRIDNT))spk=CLAM_OPENER+k;
if (verb == LOCK)spk=HUH_MAN;
if (spk == 124) {
DSTROY(CLAM);
DROP(OYSTER,game.loc);
@ -168,7 +168,7 @@ static int blast(void)
{
if (game.prop[ROD2] < 0 || !game.closed)
{
RSPEAK(ARB_67);
RSPEAK(REQUIRES_DYNAMITE);
return GO_CLEAROBJ;
}
game.bonus=133;
@ -185,15 +185,15 @@ static int vbreak(token_t verb, token_t obj)
/* Break. Only works for mirror in repository and, of course, the vase. */
{
int spk = ACTSPK[verb];
if (obj == MIRROR)spk=ARB_148;
if (obj == MIRROR)spk=TOO_FAR;
if (obj == VASE && game.prop[VASE] == 0) {
if (TOTING(VASE))DROP(VASE,game.loc);
game.prop[VASE]=2;
game.fixed[VASE]= -1;
spk=ARB_198;
spk=BREAK_VASE;
} else {
if (obj == MIRROR && game.closed) {
RSPEAK(ARB_197);
RSPEAK(BREAK_MIRROR);
return GO_DWARFWAKE;
}
}
@ -206,7 +206,7 @@ static int brief(void)
{
game.abbnum=10000;
game.detail=3;
RSPEAK(ARB_156);
RSPEAK(BRIEF_CONFIRM);
return GO_CLEAROBJ;
}
@ -225,18 +225,18 @@ static int carry(token_t verb, token_t obj)
obj=game.atloc[game.loc];
}
if (TOTING(obj)) {RSPEAK(ARB_24); return GO_CLEAROBJ;}
spk=ARB_25;
if (obj == PLANT && game.prop[PLANT] <= 0)spk=ARB_115;
if (obj == BEAR && game.prop[BEAR] == 1)spk=ARB_169;
if (obj == CHAIN && game.prop[BEAR] != 0)spk=ARB_170;
if (obj == URN)spk=ARB_215;
if (obj == CAVITY)spk=ARB_217;
if (obj == BLOOD)spk=ARB_239;
if (obj == RUG && game.prop[RUG] == 2)spk=ARB_222;
if (obj == SIGN)spk=ARB_196;
if (TOTING(obj)) {RSPEAK(ALREADY_CARRYING); return GO_CLEAROBJ;}
spk=YOU_JOKING;
if (obj == PLANT && game.prop[PLANT] <= 0)spk=DEEP_ROOTS;
if (obj == BEAR && game.prop[BEAR] == 1)spk=BEAR_CHAINED;
if (obj == CHAIN && game.prop[BEAR] != 0)spk=STILL_LOCKED;
if (obj == URN)spk=URN_NOBUDGE;
if (obj == CAVITY)spk=DOUGHNUT_HOLES;
if (obj == BLOOD)spk=FEW_DROPS;
if (obj == RUG && game.prop[RUG] == 2)spk=RUG_HOVERS;
if (obj == SIGN)spk=HAND_PASSTHROUGH;
if (obj == MESSAG) {
RSPEAK(ARB_190);
RSPEAK(REMOVE_MESSAGE);
DSTROY(MESSAG);
return GO_CLEAROBJ;
}
@ -248,15 +248,15 @@ static int carry(token_t verb, token_t obj)
if (!HERE(BOTTLE) || LIQUID() != obj) {
if (TOTING(BOTTLE) && game.prop[BOTTLE] == 1)
return(fill(verb, BOTTLE));
if (game.prop[BOTTLE] != 1)spk=ARB_105;
if (!TOTING(BOTTLE))spk=ARB_104;
if (game.prop[BOTTLE] != 1)spk=BOTTLE_FULL;
if (!TOTING(BOTTLE))spk=NO_CONTAINER;
RSPEAK(spk);
return GO_CLEAROBJ;
}
obj = BOTTLE;
}
spk=ARB_92;
spk=CARRY_LIMIT;
if (game.holdng >= INVLIMIT) {
RSPEAK(spk);
return GO_CLEAROBJ;
@ -264,11 +264,11 @@ static int carry(token_t verb, token_t obj)
else if (obj == BIRD && game.prop[BIRD] != 1 && -1-game.prop[BIRD] != 1) {
if (game.prop[BIRD] == 2) {
DSTROY(BIRD);
RSPEAK(ARB_238);
RSPEAK(BIRD_CRAP);
return GO_CLEAROBJ;
}
if (!TOTING(CAGE))spk=ARB_27;
if (TOTING(ROD))spk=ARB_26;
if (!TOTING(CAGE))spk=CANNOT_CARRY;
if (TOTING(ROD))spk=BIRD_EVADES;
if (spk/2 == 13) { /* FIXME: Arithmetic on message number */
RSPEAK(spk);
return GO_CLEAROBJ;
@ -284,7 +284,7 @@ static int carry(token_t verb, token_t obj)
game.prop[obj]=0;
game.prop[CAVITY]=1;
}
RSPEAK(ARB_54);
RSPEAK(OK_MAN);
return GO_CLEAROBJ;
}
@ -293,19 +293,19 @@ static int chain(token_t verb)
{
int spk;
if (verb != LOCK) {
spk=ARB_171;
if (game.prop[BEAR] == 0)spk=ARB_41;
if (game.prop[CHAIN] == 0)spk=ARB_37;
if (spk != ARB_171) {RSPEAK(spk); return GO_CLEAROBJ;}
spk=CHAIN_UNLOCKED;
if (game.prop[BEAR] == 0)spk=BEAR_BLOCKS;
if (game.prop[CHAIN] == 0)spk=ALREADY_UNLOCKED;
if (spk != CHAIN_UNLOCKED) {RSPEAK(spk); return GO_CLEAROBJ;}
game.prop[CHAIN]=0;
game.fixed[CHAIN]=0;
if (game.prop[BEAR] != 3)game.prop[BEAR]=2;
game.fixed[BEAR]=2-game.prop[BEAR];
} else {
spk=ARB_172;
if (game.prop[CHAIN] != 0)spk=ARB_34;
if (game.loc != PLAC[CHAIN])spk=ARB_173;
if (spk != ARB_172) {RSPEAK(spk); return GO_CLEAROBJ;}
spk=CHAIN_LOCKED;
if (game.prop[CHAIN] != 0)spk=ALREADY_LOCKED;
if (game.loc != PLAC[CHAIN])spk=NO_LOCKSITE;
if (spk != CHAIN_LOCKED) {RSPEAK(spk); return GO_CLEAROBJ;}
game.prop[CHAIN]=2;
if (TOTING(CHAIN))DROP(CHAIN,game.loc);
game.fixed[CHAIN]= -1;
@ -324,21 +324,21 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
if (!TOTING(obj)) {RSPEAK(spk); return GO_CLEAROBJ;}
if (obj == BIRD && HERE(SNAKE)) {
RSPEAK(ARB_30);
RSPEAK(BIRD_ATTACKS);
if (game.closed) return GO_DWARFWAKE;
DSTROY(SNAKE);
/* Set game.prop for use by travel options */
game.prop[SNAKE]=1;
} else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) {
RSPEAK(ARB_218);
RSPEAK(GEM_FITS);
game.prop[obj]=1;
game.prop[CAVITY]=0;
if (HERE(RUG) && ((obj == EMRALD && game.prop[RUG] != 2) || (obj == RUBY &&
game.prop[RUG] == 2))) {
spk=ARB_219;
if (TOTING(RUG))spk=ARB_220;
if (obj == RUBY)spk=ARB_221;
spk=RUG_RISES;
if (TOTING(RUG))spk=RUG_WIGGLES;
if (obj == RUBY)spk=RUG_SETTLES;
RSPEAK(spk);
if (spk != 220) {
int k = 2-game.prop[RUG];
@ -353,12 +353,12 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
PSPEAK(BATTER,0);
return GO_CLEAROBJ;
} else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
RSPEAK(ARB_154);
RSPEAK(BIRD_BURNT);
DSTROY(BIRD);
game.prop[BIRD]=0;
return GO_CLEAROBJ;
} else if (obj == BEAR && AT(TROLL)) {
RSPEAK(ARB_163);
RSPEAK(TROLL_SCAMPERS);
MOVE(TROLL,0);
MOVE(TROLL+NOBJECTS,0);
MOVE(TROLL2,PLAC[TROLL]);
@ -366,7 +366,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
JUGGLE(CHASM);
game.prop[TROLL]=2;
} else if (obj != VASE || game.loc == PLAC[PILLOW]) {
RSPEAK(ARB_54);
RSPEAK(OK_MAN);
} else {
game.prop[VASE]=2;
if (AT(PILLOW))game.prop[VASE]=0;
@ -394,17 +394,17 @@ static int drink(token_t verb, token_t obj)
if (obj == 0 && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
return GO_UNKNOWN;
if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=ARB_110;
if (obj != 0 && obj != WATER)spk=RIDICULOUS_ATTEMPT;
if (spk != 110 && LIQUID() == WATER && HERE(BOTTLE)) {
game.prop[BOTTLE]=1;
game.place[WATER]=0;
spk=ARB_74;
spk=BOTTLE_EMPTY;
}
} else {
DSTROY(BLOOD);
game.prop[DRAGON]=2;
OBJSND[BIRD]=OBJSND[BIRD]+3;
spk=ARB_240;
spk=HEAD_BUZZES;
}
RSPEAK(spk);
return GO_CLEAROBJ;
@ -419,15 +419,15 @@ static int eat(token_t verb, token_t obj)
if (!HERE(FOOD))
return GO_UNKNOWN;
DSTROY(FOOD);
spk=ARB_72;
spk=THANKS_DELICIOUS;
} else {
if (obj == FOOD) {
DSTROY(FOOD);
spk=ARB_72;
spk=THANKS_DELICIOUS;
}
if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
OGRE)spk=ARB_71;
OGRE)spk=LOST_APPETITE;
}
RSPEAK(spk);
return GO_CLEAROBJ;
@ -445,15 +445,15 @@ static int extinguish(token_t verb, int obj)
if (obj == URN) {
game.prop[URN]=game.prop[URN]/2;
spk=ARB_210;
spk=URN_DARK;
}
else if (obj == LAMP) {
game.prop[LAMP]=0;
RSPEAK(ARB_40);
spk = DARK(game.loc) ? ARB_16 : ARB_0;
RSPEAK(LAMP_OFF);
spk = DARK(game.loc) ? PITCH_DARK : ARB_0;
}
else if (obj == DRAGON || obj == VOLCAN)
spk=ARB_146;
spk=BEYOND_POWER;
RSPEAK(spk);
return GO_CLEAROBJ;
}
@ -464,41 +464,41 @@ static int feed(token_t verb, token_t obj)
{
int spk = ACTSPK[verb];
if (obj == BIRD) {
RSPEAK(ARB_100);
RSPEAK(BIRD_PINING);
return GO_CLEAROBJ;
}
else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
spk=ARB_102;
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=ARB_110;
if (obj == TROLL)spk=ARB_182;
spk=NOTHING_EDIBLE;
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=RIDICULOUS_ATTEMPT;
if (obj == TROLL)spk=TROLL_VICES;
if (obj == SNAKE && !game.closed && HERE(BIRD)) {
DSTROY(BIRD);
game.prop[BIRD]=0;
spk = ARB_101;
spk = BIRD_DEVOURED;
}
}
else if (obj == DWARF) {
if (HERE(FOOD)) {
game.dflag += 2;
spk = ARB_103;
spk = REALLY_MAD;
}
}
else if (obj == BEAR) {
if (game.prop[BEAR] == 0)spk=ARB_102;
if (game.prop[BEAR] == 3)spk=ARB_110;
if (game.prop[BEAR] == 0)spk=NOTHING_EDIBLE;
if (game.prop[BEAR] == 3)spk=RIDICULOUS_ATTEMPT;
if (HERE(FOOD)) {
DSTROY(FOOD);
game.prop[BEAR]=1;
game.fixed[AXE]=0;
game.prop[AXE]=0;
spk=ARB_168;
spk=BEAR_TAMED;
}
}
else if (obj == OGRE) {
if (HERE(FOOD))
spk=ARB_202;
spk=OGRE_FULL;
} else {
spk=ARB_14;
spk=AM_GAME;
}
RSPEAK(spk);
return GO_CLEAROBJ;
@ -511,27 +511,27 @@ int fill(token_t verb, token_t obj)
int k;
int spk = ACTSPK[verb];
if (obj == VASE) {
spk=ARB_29;
if (LIQLOC(game.loc) == 0)spk=ARB_144;
spk=ARENT_CARRYING;
if (LIQLOC(game.loc) == 0)spk=FILL_INVALID;
if (LIQLOC(game.loc) == 0 || !TOTING(VASE)) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
RSPEAK(ARB_145);
RSPEAK(SHATTER_VASE);
game.prop[VASE]=2;
game.fixed[VASE]= -1;
return(discard(verb, obj, true));
}
else if (obj == URN) {
spk=ARB_213;
spk=FULL_URN;
if (game.prop[URN] != 0) {RSPEAK(spk); return GO_CLEAROBJ;}
spk=ARB_144;
spk=FILL_INVALID;
k=LIQUID();
if (k == 0 || !HERE(BOTTLE)) {RSPEAK(spk); return GO_CLEAROBJ;}
game.place[k]=0;
game.prop[BOTTLE]=1;
if (k == OIL)game.prop[URN]=1;
spk=ARB_211+game.prop[URN];
spk=WATER_URN+game.prop[URN];
RSPEAK(spk);
return GO_CLEAROBJ;
}
@ -541,20 +541,20 @@ int fill(token_t verb, token_t obj)
}
else if (obj == 0 && !HERE(BOTTLE))
return GO_UNKNOWN;
spk=ARB_107;
spk=BOTTLED_WATER;
if (LIQLOC(game.loc) == 0)
spk=ARB_106;
spk=NO_LIQUID;
if (HERE(URN) && game.prop[URN] != 0)
spk=ARB_214;
spk=URN_NOPOUR;
if (LIQUID() != 0)
spk=ARB_105;
spk=BOTTLE_FULL;
if (spk == 107) {
game.prop[BOTTLE]=MOD(COND[game.loc],4)/2*2;
k=LIQUID();
if (TOTING(BOTTLE))
game.place[k]= -1;
if (k == OIL)
spk=ARB_108;
spk=BOTTLED_OIL;
}
RSPEAK(spk);
return GO_CLEAROBJ;
@ -568,9 +568,9 @@ static int find(token_t verb, token_t obj)
(LIQUID() == obj && AT(BOTTLE)) ||
obj == LIQLOC(game.loc) ||
(obj == DWARF && ATDWRF(game.loc) > 0))
spk=ARB_94;
if (game.closed)spk=ARB_138;
if (TOTING(obj))spk=ARB_24;
spk=YOU_HAVEIT;
if (game.closed)spk=NEEDED_NEreplace;
if (TOTING(obj))spk=ALREADY_CARRYING;
RSPEAK(spk);
return GO_CLEAROBJ;
}
@ -580,8 +580,8 @@ static int fly(token_t verb, token_t obj)
{
int spk = ACTSPK[verb];
if (obj == INTRANSITIVE) {
if (game.prop[RUG] != 2)spk=ARB_224;
if (!HERE(RUG))spk=ARB_225;
if (game.prop[RUG] != 2)spk=RUG_NOTHING2;
if (!HERE(RUG))spk=FLAP_ARMS;
if (spk/2 == 112) {
RSPEAK(spk);
return GO_CLEAROBJ;
@ -593,13 +593,13 @@ static int fly(token_t verb, token_t obj)
RSPEAK(spk);
return GO_CLEAROBJ;
}
spk=ARB_223;
spk=RUG_NOTHING1;
if (game.prop[RUG] != 2) {RSPEAK(spk); return GO_CLEAROBJ;}
game.oldlc2=game.oldloc;
game.oldloc=game.loc;
game.newloc=game.place[RUG]+game.fixed[RUG]-game.loc;
spk=ARB_226;
if (game.prop[SAPPH] >= 0)spk=ARB_227;
spk=RUG_GOES;
if (game.prop[SAPPH] >= 0)spk=RUG_RETURNS;
RSPEAK(spk);
return GO_TERMINATE;
}
@ -608,19 +608,19 @@ static int inven(token_t obj)
/* Inventory. If object, treat same as find. Else report on current burden. */
{
int i;
int spk=ARB_98;
int spk=NO_CARRY;
for (i=1; i<=NOBJECTS; i++) {
if (i == BEAR || !TOTING(i))
continue;
if (spk == 98)
RSPEAK(ARB_99);
RSPEAK(NOW_HOLDING);
game.blklin=false;
PSPEAK(i,-1);
game.blklin=true;
spk=ARB_0;
}
if (TOTING(BEAR))
spk=ARB_141;
spk=TAME_BEAR;
RSPEAK(spk);
return GO_CLEAROBJ;
}
@ -636,10 +636,10 @@ int light(token_t verb, token_t obj)
}
if (obj == URN) {
spk=ARB_38;
spk=URN_EMPTY;
if (game.prop[URN] == 0)
{RSPEAK(spk); return GO_CLEAROBJ;}
spk=ARB_209;
spk=URN_LIT;
game.prop[URN]=2;
RSPEAK(spk);
return GO_CLEAROBJ;
@ -649,13 +649,13 @@ int light(token_t verb, token_t obj)
RSPEAK(spk);
return GO_CLEAROBJ;
}
spk=ARB_184;
spk=LAMP_OUT;
if (game.limit < 0) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
game.prop[LAMP]=1;
RSPEAK(ARB_39);
RSPEAK(LAMP_ON);
if (game.wzdark)
return GO_TOP;
else
@ -667,7 +667,7 @@ static int listen(void)
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */
{
int i, k;
int spk=ARB_228;
int spk=ALL_SILENT;
k=LOCSND[game.loc];
if (k != 0) {
RSPEAK(labs(k));
@ -692,7 +692,7 @@ static int lock(token_t verb, token_t obj)
{
int spk = ACTSPK[verb];
if (obj == INTRANSITIVE) {
spk=ARB_28;
spk=NOTHING_LOCKED;
if (HERE(CLAM))obj=CLAM;
if (HERE(OYSTER))obj=OYSTER;
if (AT(DOOR))obj=DOOR;
@ -706,21 +706,21 @@ static int lock(token_t verb, token_t obj)
* and for chain. */
if (obj == CLAM || obj == OYSTER)
return bivalve(verb, obj);
if (obj == DOOR)spk=ARB_111;
if (obj == DOOR && game.prop[DOOR] == 1)spk=ARB_54;
if (obj == CAGE)spk=ARB_32;
if (obj == KEYS)spk=ARB_55;
if (obj == DOOR)spk=RUSTY_DOOR;
if (obj == DOOR && game.prop[DOOR] == 1)spk=OK_MAN;
if (obj == CAGE)spk=NO_LOCK;
if (obj == KEYS)spk=CANNOT_UNLOCK;
if (obj == GRATE || obj == CHAIN) {
spk=ARB_31;
spk=NO_KEYS;
if (HERE(KEYS)) {
if (obj == CHAIN)
return chain(verb);
if (game.closng) {
spk=ARB_130;
spk=EXIT_CLOSED;
if (!game.panic)game.clock2=15;
game.panic=true;
} else {
spk=ARB_34+game.prop[GRATE]; /* FIXME: Arithmetic on message number */
spk=ALREADY_LOCKED+game.prop[GRATE]; /* FIXME: Arithmetic on message number */
game.prop[GRATE]=1;
if (verb == LOCK)game.prop[GRATE]=0;
spk=spk+2*game.prop[GRATE];
@ -739,17 +739,17 @@ static int pour(token_t verb, token_t obj)
if (obj == BOTTLE || obj == 0)obj=LIQUID();
if (obj == 0) return GO_UNKNOWN;
if (!TOTING(obj)) {RSPEAK(spk); return GO_CLEAROBJ;}
spk=ARB_78;
spk=CANT_POUR;
if (obj != OIL && obj != WATER) {RSPEAK(spk); return GO_CLEAROBJ;}
if (HERE(URN) && game.prop[URN] == 0)
return fill(verb, URN);
game.prop[BOTTLE]=1;
game.place[obj]=0;
spk=ARB_77;
spk=GROUND_WET;
if (!(AT(PLANT) || AT(DOOR)))
{RSPEAK(spk); return GO_CLEAROBJ;}
if (!AT(DOOR)) {
spk=ARB_112;
spk=SHAKING_LEAVES;
if (obj != WATER) {RSPEAK(spk); return GO_CLEAROBJ;}
PSPEAK(PLANT,game.prop[PLANT]+3);
game.prop[PLANT]=MOD(game.prop[PLANT]+1,3);
@ -758,7 +758,7 @@ static int pour(token_t verb, token_t obj)
} else {
game.prop[DOOR]=0;
if (obj == OIL)game.prop[DOOR]=1;
spk=ARB_113+game.prop[DOOR];
spk=RUSTED_HINGES+game.prop[DOOR];
RSPEAK(spk);
return GO_CLEAROBJ;
}
@ -767,7 +767,7 @@ static int pour(token_t verb, token_t obj)
static int quit(FILE *input)
/* Quit. Intransitive only. Verify intent and exit if that's what he wants. */
{
if (YES(input,ARB_22,ARB_54,ARB_54))
if (YES(input,REALLY_QUIT,OK_MAN,OK_MAN))
score(1);
return GO_CLEAROBJ;
}
@ -787,7 +787,7 @@ static int read(FILE *input, token_t verb, token_t obj)
if (DARK(game.loc)) {
SETPRM(1,WD1,WD1X);
RSPEAK(ARB_256);
RSPEAK(NO_SEE);
return GO_CLEAROBJ;
}
if (OBJTXT[obj] == 0 || game.prop[obj] < 0) {
@ -795,7 +795,7 @@ static int read(FILE *input, token_t verb, token_t obj)
return GO_CLEAROBJ;
}
if (obj == OYSTER && !game.clshnt) {
game.clshnt=YES(input,ARB_192,ARB_193,ARB_54);
game.clshnt=YES(input,CLUE_QUERY,WAYOUT_CLUE,OK_MAN);
return GO_CLEAROBJ;
}
PSPEAK(obj,OBJTXT[obj]+game.prop[obj]);
@ -806,7 +806,7 @@ static int reservoir(void)
/* Z'ZZZ (word gets recomputed at startup; different each game). */
{
if (!AT(RESER) && game.loc != game.fixed[RESER]-1) {
RSPEAK(ARB_75);
RSPEAK(RUB_NOGO);
return GO_CLEAROBJ;
} else {
PSPEAK(RESER,game.prop[RESER]+1);
@ -814,7 +814,7 @@ static int reservoir(void)
if (AT(RESER)) return GO_CLEAROBJ;
game.oldlc2=game.loc;
game.newloc=0;
RSPEAK(ARB_241);
RSPEAK(NOT_BRIGHT);
return GO_TERMINATE;
}
}
@ -824,14 +824,14 @@ static int rub(token_t verb, token_t obj)
{
int spk = ACTSPK[verb];
if (obj != LAMP)
spk=ARB_76;
spk=PECULIAR_NOTHING;
if (obj == URN && game.prop[URN] == 2) {
DSTROY(URN);
DROP(AMBER,game.loc);
game.prop[AMBER]=1;
--game.tally;
DROP(CAVITY,game.loc);
spk=ARB_216;
spk=URN_GENIES;
}
RSPEAK(spk);
return GO_CLEAROBJ;
@ -851,7 +851,7 @@ static int say(void)
WD2=0;
return GO_LOOKUP;
}
RSPEAK(ARB_258);
RSPEAK(OKEY_DOKEY);
return GO_CLEAROBJ;
}
@ -876,7 +876,7 @@ static int throw(FILE *cmdin, long verb, token_t obj)
return GO_CLEAROBJ;
}
if (obj >= 50 && obj <= MAXTRS && AT(TROLL)) {
spk=ARB_159;
spk=TROLL_SATISFIED;
/* Snarf a treasure for the troll. */
DROP(obj,0);
MOVE(TROLL,0);
@ -897,20 +897,20 @@ static int throw(FILE *cmdin, long verb, token_t obj)
int i=ATDWRF(game.loc);
if (i <= 0) {
if (AT(DRAGON) && game.prop[DRAGON] == 0) {
spk=ARB_152;
spk=DRAGON_SCALES;
return throw_support(spk);
}
if (AT(TROLL)) {
spk=ARB_158;
spk=TROLL_RETURNS;
return throw_support(spk);
}
if (AT(OGRE)) {
spk=ARB_203;
spk=OGRE_DOFGE;
return throw_support(spk);
}
if (HERE(BEAR) && game.prop[BEAR] == 0) {
/* This'll teach him to throw the axe at the bear! */
spk=ARB_164;
spk=AXE_LOST;
DROP(AXE,game.loc);
game.fixed[AXE]= -1;
game.prop[AXE]=1;
@ -921,14 +921,14 @@ static int throw(FILE *cmdin, long verb, token_t obj)
}
if (randrange(NDWARVES+1) < game.dflag) {
spk=ARB_48;
spk=DWARF_DODGES;
return throw_support(spk);
}
game.dseen[i]=false;
game.dloc[i]=0;
spk=ARB_47;
spk=KILLED_DWARF;
++game.dkill;
if (game.dkill == 1)spk=ARB_149;
if (game.dkill == 1)spk=DWARF_SMOKE;
return throw_support(spk);
}
@ -948,7 +948,7 @@ static int wake(token_t verb, token_t obj)
RSPEAK(ACTSPK[verb]);
return GO_CLEAROBJ;
}
RSPEAK(ARB_199);
RSPEAK(PROD_DWARF);
return GO_DWARFWAKE;
}
@ -956,19 +956,19 @@ static int wave(token_t verb, token_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */
{
int spk = ACTSPK[verb];
if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))spk=ARB_29;
if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))spk=ARENT_CARRYING;
if (obj != ROD ||
!TOTING(obj) ||
(!HERE(BIRD) && (game.closng || !AT(FISSUR)))) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
if (HERE(BIRD))spk=ARB_206+MOD(game.prop[BIRD],2);
if (HERE(BIRD))spk=FREE_FLY+MOD(game.prop[BIRD],2);
if (spk == 206 && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
DROP(JADE,game.loc);
game.prop[JADE]=0;
--game.tally;
spk=ARB_208;
spk=NECKLACE_FLY;
RSPEAK(spk);
return GO_CLEAROBJ;
} else {
@ -1024,7 +1024,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
}
else if (obj == KNIFE && game.knfloc == game.loc) {
game.knfloc= -1;
spk=ARB_116;
spk=KNIVES_VANISH;
RSPEAK(spk);
return GO_CLEAROBJ;
}
@ -1036,7 +1036,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
/* FALL THROUGH */;
else {
SETPRM(1,WD1,WD1X);
RSPEAK(ARB_256);
RSPEAK(NO_SEE);
return GO_CLEAROBJ;
}
@ -1058,7 +1058,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
case 1: /* DROP */ return GO_UNKNOWN;
case 2: /* SAY */ return GO_UNKNOWN;
case 3: /* UNLOC */ return lock(verb, INTRANSITIVE);
case 4: /* NOTHI */ {RSPEAK(ARB_54); return(GO_CLEAROBJ);}
case 4: /* NOTHI */ {RSPEAK(OK_MAN); return(GO_CLEAROBJ);}
case 5: /* LOCK */ return lock(verb, INTRANSITIVE);
case 6: /* LIGHT */ return light(verb, INTRANSITIVE);
case 7: /* EXTIN */ return extinguish(verb, INTRANSITIVE);
@ -1099,7 +1099,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
case 1: /* DROP */ return discard(verb, obj, false);
case 2: /* SAY */ return say();
case 3: /* UNLOC */ return lock(verb, obj);
case 4: /* NOTHI */ {RSPEAK(ARB_54); return(GO_CLEAROBJ);}
case 4: /* NOTHI */ {RSPEAK(OK_MAN); return(GO_CLEAROBJ);}
case 5: /* LOCK */ return lock(verb, obj);
case 6: /* LIGHT */ return light(verb, obj);
case 7: /* EXTI */ return extinguish(verb, obj);
@ -1134,7 +1134,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
SETPRM(1,WD1,WD1X);
RSPEAK(ARB_255);
RSPEAK(WHAT_DO);
return GO_CHECKHINT;
default:
BUG(99);