Noop check: partyfoul + add option to skip z_read_char

Author: MarcCote

frotz/src/games/partyfoul.c

@@ -24,30 +24,31 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Party Foul - http://ifdb.tads.org/viewgame?id=cqwq699i9qiqdju
 
-const zword partyfoul_special_ram_addrs[3] = {
+const zword partyfoul_special_ram_addrs[4] = {
   17509,  // Spread peanut butter on frank (alt. 17755, 19428, 21423, 47829)
   1923, // plug the toaster
+  2259, // plug the hair dryer
   28036, // Waiting for your husband to be prepared to leave the party (alt. 28037, 32186)
 };
 
-const char *partyfoul_intro[] = { "\n",
-                                  "no\n" };
+const char *partyfoul_intro[] = { "\n", "no\n", "\n" };
 
 zword* partyfoul_ram_addrs(int *n) {
-    *n = 3;
+    *n = 4;
     return partyfoul_special_ram_addrs;
 }
 
 char** partyfoul_intro_actions(int *n) {
-  *n = 2;
+  *n = 3;
+  skip_z_read_char = TRUE;
   return partyfoul_intro;
 }
 
 char* partyfoul_clean_observation(char* obs) {
   char* pch;
-  pch = strstr(obs, ">  ");
+  pch = strstr(obs, "> ");
   if (pch != NULL) {
-    *(pch-2) = '\0';
+    *(pch-1) = '\0';
   }
   return obs + strspn(obs, "\n ");  // Skip leading newlines and whitespaces.
 }
@@ -108,4 +109,18 @@ int partyfoul_ignore_attr_clr(zword obj_num, zword attr_idx) {
 }
 
 void partyfoul_clean_world_objs(zobject* objs) {
+  for (int i=1; i<=partyfoul_get_num_world_objs(); ++i) {
+      clear_attr(&objs[i], 29);
+      clear_attr(&objs[i], 30);
+  }
+
+  clear_attr(&objs[124], 21);
+
+  objs[49].parent = 0;
+  objs[67].parent = 0;
+  objs[84].parent = 0;
+  objs[85].parent = 0;
+  objs[86].parent = 0;
+  objs[95].parent = 0;
+  objs[100].parent = 0;
 }

frotz/src/interface/frotz_interface.c

@@ -73,6 +73,7 @@ extern int getRngCounter();
 extern void setRng(long, int, int);
 
 zbyte next_opcode;
+bool skip_z_read_char = FALSE;
 int last_ret_pc = -1;
 int desired_seed = 0;
 int ROM_IDX = 0;
@@ -103,7 +104,7 @@ void zstep() {
 // Run the Z-Machine until it requires user input
 void run_free() {
   // Opcode 228 (z_read) and 246 (z_read_char) indicate need for user input
-  while (next_opcode != 228 && next_opcode != 246 && emulator_halted <= 0) {
+  while (next_opcode != 228 && (next_opcode != 246 || skip_z_read_char) && emulator_halted <= 0) {
     zstep();
   }
 }

frotz/src/interface/frotz_interface.h

@@ -53,6 +53,8 @@ extern void getRAM(unsigned char *ram);
 
 int filter_candidate_actions(char *candidate_actions, char *valid_actions, char *hashes);
 
+extern bool skip_z_read_char;
+
 extern char world[256 + 8192];  // Upper + lower screens.
 
 extern int tw_max_score;

jericho/game_info.py

@@ -334,7 +334,7 @@
     "name": "partyfoul",
     "rom": "partyfoul.z8",
     "seed" : 0,
-    "walkthrough" : "l/give drink to frank/look at frank/look at ron/w/z/take purse/e/n/take jar/put jar in purse/w/l/take knife/put knife in purse/e/l/take peanut butter/s/w/take knife/spread peanut butter on frank/e/n/open door/l/open closet/take hair dryer/plug hair dryer into wall/turn on hair dryer/turn on space heater/drop hair dryer/e/nw/plug toaster into wall/turn on toaster/e/z/z/l/take napkin/s/order drink/take celery/wipe celery with napkin/put celery in purse/n/take peanut butter/w/take knife/put peanut butter on celery/put raisins on celery/give celery to barb/z/z/z",
+    "walkthrough" : "give drink to frank/look at frank/look at ron/w/take purse/e/n/take jar/w/take knife/put knife in purse/e/take peanut butter/s/w/take knife/spread peanut butter on frank/put jar into purse/e/n/open door/open closet/take hair dryer/plug hair dryer into wall/turn on hair dryer/turn on space heater/drop hair dryer/e/nw/plug toaster into wall/z/z/turn on toaster/e/z/z/take napkin/s/order drink/take celery/wipe celery with napkin/put celery in purse/n/w/take knife/put peanut butter on celery/put raisins on celery/give celery to barb",
     "grammar" : "awake/awaken/wake;awake/awaken/wake up;blow my nose;blow nose;blow your nose;bother/curses/darn/drat;carry/hold/take inventory;chuckle/laugh;cringe/swear/pout/sigh;damn/fuck/shit;exit/leave/out/stand;get out/off/up;go/run/walk;hocus pocus;hop/jump/skip;i/inv/inventory;info/about/hints/hint/help;l/look;listen;long/verbose;magic word;magic words;magic/pocus/hocus/abracadab/plough/frotz/plover/sneeze/xyzzy;nap/sleep;no;normal/brief;notify;notify off;notify on;pray;pronouns/nouns;q/quit;remember;restart;restore;save;score;short/superbrie;sing;smell/sniff;sorry;stand up;stomp/yell/scream/answer/say/shout/speak;think;think harder;transcrip/script;transcrip/script off;transcrip/script on;tutorial mode;tutorial mode off;tutorial mode on;tutorial off;tutorial on;verify;version;wait/z;wave;y/yes;yawn;awake/awaken/wake OBJ;awake/awaken/wake OBJ up;awake/awaken/wake up OBJ;burn/light OBJ;buy/purchase OBJ;carry/hold/take off OBJ;chop/cut/prune/slice OBJ;clean/dust/polish/rub/scrub/shine/sweep/wipe OBJ;climb/scale OBJ;climb/scale up/over OBJ;close/cover/shut OBJ;close/cover/shut up OBJ;converse with OBJ;create/make OBJ;create/make a OBJ;create/make the OBJ;cross/enter/go/run/walk OBJ;discard/drop/throw OBJ;disconnec/unplug OBJ;disrobe/doff/shed/remove OBJ;don/wear OBJ;drag/pull OBJ;drink/sip/swallow OBJ;dry OBJ;eat OBJ;embrace/hug/kiss OBJ;feel/touch OBJ;flirt with OBJ;get in/into/on/onto OBJ;get off OBJ;get/carry/hold/take OBJ;go/run/walk into/in/inside/through OBJ;hear OBJ;kick/throttle/smother/attack/break/crack/destroy/fight/hit/kill/murder/punch/smash/thump/torture/wreck OBJ;knock over OBJ;l/look at OBJ;l/look inside/in/into/through OBJ;l/look under OBJ;listen to OBJ;mess up OBJ;mess/tilt/disturb OBJ;open/uncover/unwrap OBJ;order/buy/purchase OBJ;order/buy/purchase a OBJ;pick OBJ up;pick up OBJ;play OBJ;pour/spill OBJ;put OBJ down;put down OBJ;put on OBJ;read/check/describe/examine/watch/x OBJ;rotate/screw/turn/twist/unscrew OBJ;search OBJ;shoving/clear/move/press/push/shift OBJ;sit on OBJ;sit on top of OBJ;sit on/in/inside OBJ;smell/sniff OBJ;squash/squeeze OBJ;stand on 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;talk OBJ;talk to OBJ;taste OBJ;un plug OBJ;wave OBJ;wink at OBJ;adjust/set OBJ to OBJ;aim/point OBJ at OBJ;aim/point OBJ towards OBJ;answer/say/shout/speak OBJ to OBJ;apply OBJ to OBJ;apply/paint/spread/smear OBJ onto OBJ;ask OBJ about OBJ;ask OBJ for OBJ;attach/fasten/fix/tie OBJ to OBJ;carry/hold/take OBJ off OBJ;clean/dust/polish/rub/scrub/shine/sweep/wipe OBJ with OBJ;clean/dust/polish/rub/scrub/shine/sweep/wipe down OBJ with OBJ;clean/dust/polish/rub/scrub/shine/sweep/wipe up OBJ with OBJ;connect OBJ to OBJ;connect/plug OBJ into OBJ;consult OBJ on/about OBJ;discard/drop/throw OBJ at/against/on/onto OBJ;discard/drop/throw OBJ in/into/down OBJ;discard/drop/throw/put OBJ on/onto OBJ;display/present/show OBJ OBJ;display/present/show OBJ to OBJ;draw on OBJ with OBJ;feed/give/offer/pay OBJ OBJ;feed/give/offer/pay OBJ to OBJ;insert OBJ in/into OBJ;l/look up OBJ in OBJ;lock OBJ with OBJ;paint/spread/smear OBJ on OBJ;plug in OBJ OBJ;plug in OBJ into OBJ;plug in OBJ to OBJ;plug/plug OBJ in OBJ;put OBJ in/inside/into OBJ;read OBJ in OBJ;read about OBJ in OBJ;remove/get/carry/hold/take OBJ from OBJ;tell OBJ about OBJ;unlock/open/uncover/unwrap OBJ with OBJ;",
     "max_word_length" : 9
 }

tools/test_games.py

@@ -471,6 +471,14 @@
             "examine tree",  # snorkel hanging from the tree.  You take it.
             "examine boot",  # boot further reveals a crystal, which you take.
         ]
+    },
+    "partyfoul.z8": {
+        "*": [
+            34, 35,  # Lights turn off and back on.
+            39,  # It seems as if someone has just turned something off in another room (the hair dryer).
+            41,  # You get caugth with celery in your hands.
+            47,  # Abbey take the knife from your hands.
+        ],
     }
 }
 
@@ -887,7 +895,11 @@
         ]
     },
     "partyfoul.z8": {
-        "z": [53, 54],  # Ending sequence.
+        1: "look at frank",
+        2: "look at ron",
+        7: "take jar",  # Abbey stops you.
+        30: "z",  # Waiting for Abbey to leave the room.
+        31: "z",  # Waiting for Abbey to leave the room.
     },
     "pentari.z5": {},
     "planetfall.z3": {