Noop check: pentari

Author: MarcCote

frotz/src/games/pentari.c

@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (C) 2018 Microsoft Corporation
 
 This program is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ char* pentari_clean_observation(char* obs) {
   char* pch;
   pch = strchr(obs, '>');
   if (pch != NULL) {
-    *(pch-2) = '\0';
+    *(pch) = '\0';
   }
   return obs+1;
 }
@@ -98,11 +98,11 @@ int pentari_ignore_attr_clr(zword obj_num, zword attr_idx) {
 }
 
 void pentari_clean_world_objs(zobject* objs) {
-    int i;
-    char mask;
-    mask = ~(1 << 7);
-    // Clear attr 24
-    for (i=1; i<=pentari_get_num_world_objs(); ++i) {
-        objs[i].attr[3] &= mask;
-    }
+  for (int i=1; i<=pentari_get_num_world_objs(); ++i) {
+    clear_attr(&objs[i], 25);
+  }
+
+  objs[103].parent = 0;
+  clear_prop(&objs[103], 51);
+  clear_prop(&objs[103], 52);
 }

jericho/game_info.py

@@ -343,7 +343,7 @@
     "name": "pentari",
     "rom": "pentari.z5",
     "seed" : 0,
-    "walkthrough" : "north/north/in/city/east/covert/south/smash seal/north/north/north/south/east/get in floor/up/north/open towel/north/south/south/west/west/put sword down/take dagger/north/take chest/south/east/put all down/south/south/north/north/take chest/put all down/north/enter/take scroll/get up/south/fwoosh/take emerald/put dagger in chest/west/take sword/hit elf/take emerald/put all on box/l",
+    "walkthrough" : "north/north/in/city/east/covert/south/smash seal/north/north/north/south/east/get in floor/up/north/open towel/north/south/south/west/west/put sword down/take dagger/north/take chest/south/east/put all down/south/south/north/north/take chest/put all down/north/enter/take scroll/get up/south/fwoosh/take emerald/z/west/take sword/hit elf/take emerald/put all on box/l",
     "grammar" : "awake/awaken/wake;awake/awaken/wake up;bother/curses/darn/drat;brief/normal;carry/hold/take inventory;city;covert;damn/fuck/shit/sod;defiant;die/q/quit;dive/swim;exit/out/outside/stand;full/fullscore;full/fullscore score;fwoosh;get out/off/up;hear/listen;help;hop/jump/skip;i/inv/inventory;i/inv/inventory tall;i/inv/inventory wide;in/inside/cross/enter;info;l/look;leave/go/run/walk;long/verbose;luminus;nap/sleep;no;noscript/unscript;notify off;notify on;nouns/pronouns;objects;places;pray;restart;restore;save;score;script/transcrip;script/transcrip off;script/transcrip on;short/superbrie;sing;smell/sniff;sorry;stand up;think;verify;version;wait/z;wave;y/yes;adjust/set OBJ;attach/fasten/fix/tie 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/hold/take off OBJ;chase/follow/pursue/trail OBJ;chase/follow/pursue/trail after OBJ;chop/cut/prune/slice OBJ;clean/dust/polish/rub/scrub/shine/sweep/wipe OBJ;clear/move/press/push/shift OBJ;climb/scale OBJ;climb/scale up/over OBJ;close/cover/shut OBJ;close/cover/shut up OBJ;cross/enter/go/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;eat OBJ;embrace/hug/kiss OBJ;empty OBJ;empty OBJ out;empty out OBJ;feel/fondle/grope/touch OBJ;fill OBJ;fold OBJ;get in/into/on/onto OBJ;get off OBJ;get/carry/hold/take OBJ;hear/listen OBJ;hear/listen to OBJ;hop/jump/skip over OBJ;l/look at OBJ;l/look inside/in/into/through OBJ;l/look under OBJ;leave OBJ;leave/go/run/walk into/in/inside/through OBJ;lie/sit on top of OBJ;lie/sit on/in/inside 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/check/describe/examine/watch/x OBJ;rotate/screw/turn/twist/unscrew OBJ;search OBJ;shatter/attack/break/crack/destroy/fight/hit/kill/murder/punch/smash/thump/torture/wreck 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;taste OBJ;unfold OBJ;wave OBJ;adjust/set OBJ to OBJ;attach/fasten/fix/tie OBJ to OBJ;burn/light OBJ with OBJ;carry/hold/take OBJ off OBJ;clear/move/press/push/shift OBJ OBJ;clear/move/press/push/shift/transfer OBJ to OBJ;consult OBJ about OBJ;consult OBJ on OBJ;dig OBJ with 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;empty OBJ to/into/on/onto OBJ;feed/give/offer/pay OBJ OBJ;feed/give/offer/pay OBJ to OBJ;feed/give/offer/pay over OBJ to OBJ;insert OBJ in/into OBJ;l/look up OBJ in OBJ;lock OBJ with OBJ;put OBJ in/inside/into OBJ;read OBJ in OBJ;read about OBJ in OBJ;remove/get/carry/hold/take OBJ from OBJ;unlock/open/uncover/undo/unwrap OBJ with OBJ;",
     "max_word_length" : 9
 }

tools/test_games.py

@@ -479,7 +479,13 @@
             41,  # You get caugth with celery in your hands.
             47,  # Abbey take the knife from your hands.
         ],
-    }
+    },
+    "pentari.z5": {
+        "*": [
+            44,  # Dark Elf gets you.
+            48,  # Victory.
+        ]
+    },
 }
 
 SKIP_CHECK_STATE = {
@@ -901,7 +907,9 @@
         30: "z",  # Waiting for Abbey to leave the room.
         31: "z",  # Waiting for Abbey to leave the room.
     },
-    "pentari.z5": {},
+    "pentari.z5": {
+        "z": [42],
+    },
     "planetfall.z3": {
         216: "eat brown goo",  # Not needed to complete the game.
     },