Skip to content

Commit 7032ea4

Browse files
MarcCoteMarcCote
committed
Testing more games
1 parent a96a473 commit 7032ea4

File tree

6 files changed

+46
-19
lines changed

6 files changed

+46
-19
lines changed

‎frotz/src/games/lurking.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2525

2626
// The Lurking Horror: http://ifdb.tads.org/viewgame?id=jhbd0kja1t57uop
2727

28-
const zword lurking_special_ram_addrs[6] = {
28+
const zword lurking_special_ram_addrs[11] = {
29+
883, // Cut line with axe
30+
756, // knock on door
31+
859, // Read page, click on more
32+
813, // Throw axe at cord
33+
1047, // Lower ladder (alt. 1163, 1333)
2934
11251, // Microwave timer
35+
11235, // press up/down button
3036
961, // Microwave setting
3137
1145, // Cleaning up junk
3238
4889, // Drinking coke
@@ -40,7 +46,7 @@ const char *lurking_intro[] = { "sit on chair\n",
4046
"password uhlersoth\n" };
4147

4248
zword* lurking_ram_addrs(int *n) {
43-
*n = 6;
49+
*n = 11;
4450
return lurking_special_ram_addrs;
4551
}
4652

‎frotz/src/games/moonlit.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
Copyright (C) 2018 Microsoft Corporation
33
44
This program is free software; you can redistribute it and/or
@@ -103,11 +103,11 @@ int moonlit_ignore_attr_clr(zword obj_num, zword attr_idx) {
103103
}
104104

105105
void moonlit_clean_world_objs(zobject* objs) {
106-
int i;
107-
char mask;
108-
mask = ~(1 << 7) & ~1;
109-
// Clear attr 24 & 31
110-
for (i=1; i<=moonlit_get_num_world_objs(); ++i) {
111-
objs[i].attr[3] &= mask;
112-
}
106+
// int i;
107+
// char mask;
108+
// mask = ~(1 << 7) & ~1;
109+
// // Clear attr 24 & 31
110+
// for (i=1; i<=moonlit_get_num_world_objs(); ++i) {
111+
// objs[i].attr[3] &= mask;
112+
// }
113113
}

‎frotz/src/games/murdac.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
Copyright (C) 2018 Microsoft Corporation
33
44
This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2424

2525
// Monsters of Murdac: http://ifdb.tads.org/viewgame?id=q36lh5np0q9nak28
2626

27-
const zword murdac_special_ram_addrs[9] = {
27+
const zword murdac_special_ram_addrs[10] = {
2828
3909, // Blow shawm; Also 525
2929
3587, // Tracks state of door. Also 3626
3030
4659, // Tracks throwing plank, rod.
@@ -34,10 +34,11 @@ const zword murdac_special_ram_addrs[9] = {
3434
3042, // Tracks lion health
3535
2548, // Fill bowl, look
3636
3365, // Prick dummy, exodus
37+
6387, // Running away from the poltergeist.
3738
};
3839

3940
zword* murdac_ram_addrs(int *n) {
40-
*n = 9;
41+
*n = 10;
4142
return murdac_special_ram_addrs;
4243
}
4344

‎frotz/src/games/night.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2424

2525
// Night at the Computer Center: http://ifdb.tads.org/viewgame?id=ydhwa11st460g9u3
2626

27+
const zword night_special_ram_addrs[1] = {
28+
6837, // listen
29+
};
30+
2731
zword* night_ram_addrs(int *n) {
28-
*n = 0;
29-
return NULL;
32+
*n = 1;
33+
return night_special_ram_addrs;
3034
}
3135

3236
char** night_intro_actions(int *n) {

‎jericho/game_info.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
"name": "night",
317317
"rom": "night.z5",
318318
"seed" : 0,
319-
"walkthrough" : "ne/s/e/open box/pull hose/take light/w/n/w/d/d/e/s/e/open door/s/listen/n/w/n/w/u/e/s/push fountain/open panel/turn on light/go panel/go panel/e/z/z/follow mouse/follow mouse/follow mouse/follow mouse/follow mouse/get printer/ask gnome about prinout/w/x sign/w/w/w/e/e/w/u/n/w/u/e/sw/click ftp/click if-archive/click designers_manual/click lpr/take manual/ne/w/d/e/s/d/z/z/z/z/z/follow mouse/follow mouse/follow mouse/follow mouse/follow mouse/follow mouse/give manual/take printer/w/w/w/e/e/w/u/n/w/u/e/sw/put printer on table",
319+
"walkthrough" : "ne/s/e/open box/pull hose/take light/w/n/w/d/d/e/s/e/open door/s/listen/n/w/n/w/u/e/s/push fountain/open panel/turn on light/go panel/go panel/e/z/z/follow mouse/follow mouse/follow mouse/follow mouse/follow mouse/get printer/ask gnome about printer/w/x sign/w/w/w/e/e/w/u/n/w/u/e/sw/click ftp/click if-archive/click designers_manual/click lpr/take manual/ne/w/d/e/s/d/z/z/z/z/z/follow mouse/follow mouse/follow mouse/follow mouse/follow mouse/follow mouse/give manual/take printer/w/w/w/e/e/w/u/n/w/u/e/sw/put printer on table",
320320
"grammar" : "allhints;allpuzzle/puzzles;awake/awaken/wake;awake/awaken/wake up;bother/curses/darn/drat;brief/normal;carry/get/hold/take inventory;carry/get/hold/take off;carry/get/hold/take out;close/cover/shut up;damn/fuck/shit/sod;die/q/quit;dive/swim;exit/out/outside/stand;full/fullscore;full/fullscore score;go/leave/run/walk;hear/listen;help;hint/hints;hints off;hints on;hop/jump/skip;i/inv/inventory;i/inv/inventory tall;i/inv/inventory wide;in/inside/cross/enter;l/look;long/verbose;nap/sleep;no;noscript/unscript;notify off;notify on;nouns/pronouns;objects;off;on;places;pray;restart;restore;review;save;score;script;script off;script on;short/superbrie;sing;smell/sniff;sorry;stand/carry/get/hold/take up;think;verify;version;wait/z;wave;xyzzy;y/yes;adjust/set OBJ;attach/fasten/fix/tie OBJ;attack/break/crack/destroy/fight/hit/kill/murder/punch/smash/thump/torture/wreck OBJ;awake/awaken/wake OBJ;awake/awaken/wake OBJ up;awake/awaken/wake up OBJ;blow OBJ;bother/curses/darn/drat OBJ;burn/light OBJ;buy/purchase OBJ;carry/get/hold/take OBJ;carry/get/hold/take off OBJ;chase/follow/pursue/trail OBJ;chase/follow/pursue/trail after OBJ;check/describe/examine/watch/x OBJ;chop/cut/prune/slice OBJ;clean/dust/polish/rub/scrub/shine/sweep/wipe OBJ;clear/move/press/push/shift OBJ;click OBJ;click on OBJ;climb/scale OBJ;climb/scale over OBJ;climb/scale up OBJ;close/cover/shut OBJ;cross/enter/go/leave/run/walk OBJ;damn/fuck/shit/sod OBJ;dig OBJ;discard/drop/throw OBJ;disrobe/doff/shed/remove OBJ;don/wear OBJ;drag/pull OBJ;drink/sip/swallow OBJ;drink/sip/swallow at OBJ;drink/sip/swallow from OBJ;eat OBJ;embrace/hug/kiss OBJ;empty OBJ;empty OBJ out;empty out OBJ;feel/fondle/grope/touch OBJ;fill OBJ;go/leave/run/walk through OBJ;go/leave/run/walk/carry/get/hold/take into OBJ;hear/listen OBJ;hear/listen to OBJ;hop/jump/skip over OBJ;l/look at OBJ;l/look behind OBJ;l/look in OBJ;l/look inside OBJ;l/look into OBJ;l/look through OBJ;l/look under OBJ;lie/sit/go/leave/run/walk inside OBJ;lie/sit/go/leave/run/walk/carry/get/hold/take in OBJ;lie/sit/stand/carry/get/hold/take on OBJ;open/uncover/undo/unwrap OBJ;peel OBJ;peel off OBJ;pick OBJ up;pick up OBJ;put OBJ down;put down OBJ;put on OBJ;read OBJ;rotate/screw/turn/twist/unscrew OBJ;search OBJ;smell/sniff OBJ;squash/squeeze OBJ;swing OBJ;swing on OBJ;switch OBJ;switch/rotate/screw/turn/twist/unscrew OBJ off;switch/rotate/screw/turn/twist/unscrew OBJ on;switch/rotate/screw/turn/twist/unscrew on OBJ;switch/rotate/screw/turn/twist/unscrew/close/cover/shut off OBJ;taste OBJ;unfold OBJ;wave OBJ;adjust/set OBJ to OBJ;ask OBJ for OBJ;attach/fasten/fix/tie OBJ to OBJ;burn/light OBJ with OBJ;carry/get/hold/take OBJ off OBJ;clear/move/press/push/shift OBJ OBJ;clear/move/press/push/shift/transfer OBJ to OBJ;click OBJ on OBJ;dig OBJ with OBJ;discard/drop/throw OBJ against OBJ;discard/drop/throw OBJ at OBJ;discard/drop/throw OBJ down OBJ;discard/drop/throw/insert/put OBJ in OBJ;discard/drop/throw/insert/put OBJ into OBJ;discard/drop/throw/put OBJ on OBJ;discard/drop/throw/put OBJ onto OBJ;display/present/show OBJ OBJ;display/present/show OBJ to OBJ;empty OBJ into OBJ;empty OBJ on OBJ;empty OBJ onto OBJ;empty OBJ to OBJ;feed/give/offer/pay OBJ OBJ;feed/give/offer/pay OBJ to OBJ;feed/give/offer/pay over OBJ to OBJ;lock OBJ with OBJ;put OBJ inside OBJ;remove/carry/get/hold/take OBJ from OBJ;unlock/open/uncover/undo/unwrap OBJ with OBJ;",
321321
"max_word_length" : 9
322322
}

‎tools/test_games.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,24 @@
373373
109: "take paper", # Not needed to complete the game.
374374
110: "take paper with pole", # Not needed to complete the game.
375375
},
376-
377-
376+
"ludicorp.z5": {
377+
7: "smell car", # Not needed to complete the game.
378+
50: "open door", # (it is locked) Not needed to complete the game.
379+
140: "shoot window", # (glass is bulletproof) Not needed to complete the game.
380+
239: "play arcade", # (you died) Not needed to complete the game.
381+
241: "play pool", # (no ball nor cues) Not needed to complete the game.
382+
255: "w", # (outer airlock door blocks your way) Not needed to complete the game.
383+
},
384+
"lurking.z3": {
385+
"noop": ["z"]
386+
},
387+
"moonlit.z5": {},
388+
"murdac.z5": {},
389+
"night.z5": {
390+
37: "get printer", # Not needed to complete the game.
391+
38: "ask gnome about printer", # Not needed to complete the game.
392+
"noop": ["z"]
393+
},
378394
}
379395

380396

@@ -533,7 +549,7 @@ def parse_args():
533549

534550
if not env._world_changed():
535551
# if last_hash == env.get_world_state_hash():
536-
if cmd.split(" ")[0] not in {"look", "x", "search", "examine", "i", "inventory"}:
552+
if cmd.split(" ")[0] not in {"look", "l", "x", "search", "examine", "i", "inventory"}:
537553

538554
print(colored(f'{i}. [{cmd}]: world hash hasn\'t changed.\n"""\n{obs}\n"""', 'red'))
539555

0 commit comments

Comments
 (0)