diff --git a/tools/create_hugo/staticdata.h b/tools/create_hugo/staticdata.h index a9f9a1ff314..8926c88f724 100755 --- a/tools/create_hugo/staticdata.h +++ b/tools/create_hugo/staticdata.h @@ -6149,8 +6149,9 @@ act6 adropbung_1w = {INIT_CARRY, 0, BUNG_1w, false}; act7 amovekey_1w = {INIT_HF_COORD, 0, KEY_1w}; act7 ahchase1_1w = {INIT_HF_COORD, 5 * NORMAL_TPS, DOG_1w}; act7 akchase1_1w = {INIT_HF_COORD, 5 * NORMAL_TPS, DOG_1w}; -act7 abut6e_1w = {INIT_HH_COORD, 7, HDLSHERO_1w}; -act7 adead2_1w = {INIT_HH_COORD, 0, HERODEAD_1w}; +// Those two actions were defined as act11 with a type set to INIT_HF_COORD +act7 adog3_1w = {INIT_HF_COORD, 0, DOG_1w}; +act7 alab1_1w = {INIT_HF_COORD, 0, PROF_1w}; act8 ascr01_1w = {NEW_SCREEN, 0, 1}; act8 ascr12_1w = {NEW_SCREEN, 12, 2}; @@ -6246,7 +6247,6 @@ act11 aswapcheck_1w = {COND_R, 0, MASK_1w, 0, kALwearmask_1w, act11 abut3a_1w = {COND_R, 0, BUTLER_1w, 0, kALbutp_1w, 0}; act11 abut5_1w = {COND_R, 0, MASK_1w, 0, kALbutchopped_1w, kALbutchop_1w}; act11 abut6_1w = {COND_R, 0, MASK_1w, 0, kALbutchopped_1w, kALbutroam_1w}; -act11 adog3_1w = {INIT_HF_COORD, 0, DOG_1w, 0, 0, 0}; act11 at78b_1w = {COND_R, 0, MASK_1w, 1, kALswapmask_1w, 0}; act11 atrap_1w = {COND_R, 0, BOLT_1w, 2, kALopenpass_1w, kALopenfail_1w}; act11 abatcheck_1w = {COND_R, 0, WHISTLE_1w, 0, kALbatty_1w, 0}; @@ -6263,7 +6263,6 @@ act11 achkd3_1w = {COND_R, 0, GDOOR_1w, 3, kALdmsg3_1w, act11 achkd2_1w = {COND_R, 0, GDOOR_1w, 2, kALdmsg2_1w, kALchkd3_1w}; act11 achkd1_1w = {COND_R, 0, GDOOR_1w, 1, kALdmsg1_1w, kALchkd2_1w}; act11 achkd0_1w = {COND_R, 0, GDOOR_1w, 0, kALok151_1w, kALchkd1_1w}; -act11 alab1_1w = {INIT_HF_COORD, 0, PROF_1w, 0, 0, 0}; act11 achklab_1w = {COND_R, 0, GDOOR_1w, 0, kALprof_1w, 0}; act11 abbox_1w = {COND_R, 0, GDOOR_1w, 0, kALbox0_1w, 0}; act11 aichk3_1w = {COND_R, 0, GDOOR_1w, 3, kALigor3_1w, kALinorm_1w}; @@ -6407,6 +6406,10 @@ act20 adef1_1w = {DEL_EVENTS, 1 * NORMAL_TPS, ASCHEDULE}; act21 abut6g_1w = {GAMEOVER, 7}; act21 adead5_1w = {GAMEOVER, 0}; +// Those two were act7, with a type set to INIT_HH_COORD +act22 abut6e_1w = {INIT_HH_COORD, 7, HDLSHERO_1w}; +act22 adead2_1w = {INIT_HH_COORD, 0, HERODEAD_1w}; + act23 bye3_1w = {EXIT, 4 * NORMAL_TPS}; act24 abonus12_1w = {BONUS, 0, 12}; @@ -6420,6 +6423,8 @@ act24 abonus4_1w = {BONUS, 0, 4}; act24 abonus5_1w = {BONUS, 0, 5}; act24 abonus7_1w = {BONUS, 0, 7}; act24 abonus8_1w = {BONUS, 0, 8}; +// The following was defined as a act27 with a type set to BONUS +act24 abut7b_1w = {BONUS, 0, 10}; act25 achkdoor_1w = {COND_BOX, 2 * NORMAL_TPS, HERO, 25, 173, 40, 175, kALgoinside_1w, 0}; act25 achkbbox_1w = {COND_BOX, 0, HERO, 100, 153, 144, 160, kALbbox_1w, 0}; @@ -6442,7 +6447,6 @@ act26 asplash_1w = {SOUND, 0, SPLASH_1w}; act26 afinale_1w = {SOUND, 0, T_TRACK1}; act26 abgsnd_1w = {SOUND, 0, MACHINE_NOISE_1w}; -act27 abut7b_1w = {BONUS, 0, 10}; act27 ashedoil4_1w = {ADD_SCORE, 0, OILCAN_1w}; act28 a115f_1w = {SUB_SCORE, 0, MASK_1w}; @@ -7456,19 +7460,21 @@ act16 apenseq6_2w = {INIT_OBJ_SEQ, PENDELAY + 74, PENNY_2w, 2}; act17 acopbit1_2w = {SET_STATE_BITS, 0, COP_2w, 1}; act17 acopbit16_2w = {SET_STATE_BITS, 0, COP_2w, 16}; act17 acopbit4_2w = {SET_STATE_BITS, 0, COP_2w, 4}; -act17 agatescls_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 32}; act17 agatesopn_2w = {SET_STATE_BITS, 0, BUTTON_2w, 32}; -act17 aglightoff2_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 2}; act17 aglighton2_2w = {SET_STATE_BITS, 0, BUTTON_2w, 2}; act17 aphoto3_2w = {SET_STATE_BITS, 0, COP_2w, 2}; act17 ashed23_2w = {SET_STATE_BITS, 0, BUTTON_2w, 16}; -act17 aslightoff2_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 1}; act17 aslighton2_2w = {SET_STATE_BITS, 0, BUTTON_2w, 1}; act17 astream12_2w = {SET_STATE_BITS, 0, BUTTON_2w, 4}; -act17 azapperoff2_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 8}; act17 azapperon2_2w = {SET_STATE_BITS, 0, BUTTON_2w, 8}; act17 acopbit8_2w = {SET_STATE_BITS, 0, COP_2w, 8}; +//all the act18 were defined as act17 with a type set to CLEAR_STATE_BITS +act18 agatescls_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 32}; +act18 aglightoff2_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 2}; +act18 aslightoff2_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 1}; +act18 azapperoff2_2w = {CLEAR_STATE_BITS, 0, BUTTON_2w, 8}; + act19 achkbugs_2w = {TEST_STATE_BITS, 0, BUTTON_2w, 8, kALbugflit_2w, kALbugattack_2w}; act19 achkgates_2w = {TEST_STATE_BITS, 2, BUTTON_2w, 16, kALswgates_2w, kALrumbling_2w}; act19 achkglight_2w = {TEST_STATE_BITS, 2, BUTTON_2w, 2, kALglightoff_2w, kALglighton_2w}; @@ -8353,63 +8359,31 @@ act11 avinetest_3w = {COND_R, 0, BLOCK1_3w, 0, kALtievine_3w act11 awebtest1_3w = {COND_R, 0, PENNY_3w, 0, kALspider_3w, kALwebtest2_3w}; act11 awebtest2_3w = {COND_R, 0, PENNY_3w, 1, kALmission_3w, kALreturn_3w}; -act12 aasleep_3w = {WARN, 30, kSTAsleep_3w}; act12 ablk1_3w = {TEXT, 0, kSTBlk1_3w}; act12 abook1_3w = {TEXT, 0, kSTBook1_3w}; -act12 abrg_msg1_3w = {WARN, 0, kSTBridgedown_3w}; act12 abtip_3w = {TEXT, 0, kSTBridgetip_3w}; act12 acanttake_3w = {TEXT, 0, kSTCanttake_3w}; act12 acheese2_3w = {TEXT, 0, kSTYummy_3w}; -act12 acom0a_3w = {WARN, 0, kSTCom0_3w}; -act12 acom1a_3w = {WARN, 0, kSTCom1_3w}; -act12 acom2a_3w = {WARN, 0, kSTCom2_3w}; -act12 acom3a_3w = {WARN, 0, kSTCom3_3w}; -act12 acom4a_3w = {WARN, 0, kSTCom4_3w}; -act12 acom5a_3w = {WARN, 0, kSTCom5_3w}; -act12 acom6a_3w = {WARN, 0, kSTCom6_3w}; -act12 acom7a_3w = {WARN, 0, kSTCom7_3w}; -act12 acom8a_3w = {WARN, 0, kSTCom8_3w}; -act12 acom9_3w = {WARN, 0, kSTCom9_3w}; -act12 acrash11_3w = {WARN, 20, kSTPenny1_3w}; -act12 acrash12_3w = {WARN, 20, kSTPenny2_3w}; -act12 acrash13_3w = {WARN, 34, kSTPenny3_3w}; act12 acubestip_3w = {TEXT, 0, kSTCubestip_3w}; -act12 adammed2_3w = {WARN, 0, kSTDammed_3w}; act12 adammedtip_3w = {TEXT, 0, kSTDammedtip_3w}; act12 adart0_3w = {TEXT, 0, kSTDartElephant_3w}; act12 adarted_3w = {TEXT, 0, kSTDarted_3w}; act12 adrinkno_3w = {TEXT, 0, kSTDrinkno_3w}; act12 adrinkyes_3w = {TEXT, 0, kSTDrinkyes_3w}; act12 adropcheese4_3w = {TEXT, 0, kSTDropCheese_3w}; -act12 aelewaking_3w = {WARN, 0, kSTElewaking_3w}; act12 aemptymagic_3w = {TEXT, 0, kSTEmptymagic_3w}; act12 aemptyord_3w = {TEXT, 0, kSTEmptyord_3w}; -act12 aenter2_3w = {WARN, 0, kSTMouse1_3w}; act12 aex5_3w = {TEXT, 0, kSTExor1_3w}; act12 aex6_3w = {TEXT, 0, kSTExor2_3w}; act12 aexordone_3w = {TEXT, 0, kSTExordone_3w}; act12 afillmagic2_3w = {TEXT, 0, kSTFillmagic_3w}; act12 afillord1_3w = {TEXT, 0, kSTFillord_3w}; act12 afindb4_3w = {TEXT, 2, kSTFoundbook_3w}; -act12 aflask2_3w = {WARN, 0, kSTEnd1_3w}; -act12 aflask3_3w = {WARN, 0, kSTEnd2_3w}; -act12 aflask4_3w = {WARN, 0, kSTEnd3_3w}; -act12 agive4_3w = {WARN, 0, kSTGiveb1_3w}; -act12 agive5_3w = {WARN, 0, kSTGiveb2_3w}; act12 ago1_3w = {TEXT, 0, kSTMousefree_3w}; -act12 agot1c_3w = {WARN, 1, kSTGot1_3w}; -act12 agot9_3w = {WARN, 54, kSTGot2_3w}; -act12 ahelp1_3w = {WARN, 2, kSTHelp1_3w}; act12 alookfall_3w = {TEXT, 0, kSTLookwfall1_3w}; act12 alooknofall_3w = {TEXT, 0, kSTLookwfall2_3w}; act12 amagictip_3w = {TEXT, 0, kSTMagictip_3w}; act12 amakeclay3_3w = {TEXT, 0, kSTMakeeffigy_3w}; -act12 amission10_3w = {WARN, 5, kSTMission1_3w}; -act12 amission16_3w = {WARN, 30, kSTMission2_3w}; -act12 amission20_3w = {WARN, 50, kSTMission3_3w}; -act12 amission21_3w = {WARN, 50, kSTMission4_3w}; -act12 amission22_3w = {WARN, 50, kSTMission5_3w}; -act12 amission24_3w = {WARN, 60, kSTMission6_3w}; act12 amodeltip_3w = {TEXT, 0, kSTModeltip_3w}; act12 amousegone_3w = {TEXT, 0, kSTMousegone_3w}; act12 amousetip_3w = {TEXT, 0, kSTMousetip_3w}; @@ -8424,30 +8398,18 @@ act12 anostickpin_3w = {TEXT, 0, kSTNostickpin_3w}; act12 anotakecb_3w = {TEXT, 0, kSTOldmannotake_3w}; act12 anotip_3w = {TEXT, 0, kSTNotip_3w}; act12 anottied_3w = {TEXT, 0, kSTNottied_3w}; -act12 aold0a_3w = {WARN, 40, kSTOldman0a_3w}; -act12 aold0b_3w = {WARN, 40, kSTOldman0b_3w}; -act12 aold6c_3w = {WARN, 0, kSTOldman4_3w}; -act12 aold6d_3w = {WARN, 0, kSTOldman5_3w}; act12 aold7_3w = {TEXT, 0, kSTAllwrong_3w}; act12 aoldmantip_3w = {TEXT, 0, kSTOldmantip_3w}; act12 aplanetip_3w = {TEXT, 0, kSTPlanetip_3w}; -act12 aprod4_3w = {WARN, 8, kSTProd1_3w}; -act12 aprod5_3w = {WARN, 20, kSTProd2_3w}; act12 aputitdown_3w = {TEXT, 0, kSTPutitdown_3w}; act12 arefuse_3w = {TEXT, 0, kSTRefuse_3w}; act12 arefuseflask_3w = {TEXT, 0, kSTRefuseflask_3w}; act12 aremedytip_3w = {TEXT, 0, kSTRemedytip_3w}; act12 arub_3w = {TEXT, 0, kSTRubcrystal_3w}; -act12 ascare13_3w = {WARN, 12, kSTScare1_3w}; -act12 ascared_3w = {WARN, 0, kSTScared_3w}; -act12 asleepy_3w = {WARN, 0, kSTSleepy_3w}; act12 asteps1_3w = {TEXT, 0, kSTStep1_3w}; act12 astick2_3w = {TEXT, 0, kSTStickpin_3w}; act12 asticktip_3w = {TEXT, 0, kSTSticktip_3w}; act12 astuckpin_3w = {TEXT, 0, kSTStuckpin_3w}; -act12 asunset1_3w = {WARN, 20, kSTAdios1_3w}; -act12 asunset2_3w = {WARN, 50, kSTAdios2_3w}; -act12 asunset3_3w = {WARN, 70, kSTAdios3_3w}; act12 aswingtip_3w = {TEXT, 0, kSTSwingtip_3w}; act12 atakecb2_3w = {TEXT, 0, kSTOldmantakeball_3w}; act12 atalkdoc1_3w = {TEXT, 0, kSTTalkdoc_3w}; @@ -8460,11 +8422,6 @@ act12 auntie_3w = {TEXT, 0, kSTUntievine_3w}; act12 avine6_3w = {TEXT, 0, kSTBlk2_3w}; act12 awarn_3w = {TEXT, 0, kSTCavewarn_3w}; act12 awaterfalling_3w = {TEXT, 0, kSTWaterfalling_3w}; -act12 aweb10_3w = {WARN, 50, kSTPenny5_3w}; -act12 aweb15_3w = {WARN, 105, kSTSpider1_3w}; -act12 aweb17_3w = {WARN, 108, kSTSpider2_3w}; -act12 aweb20_3w = {WARN, 110, kSTSpider3_3w}; -act12 aweb6_3w = {WARN, 25, kSTPenny4_3w}; act12 awrong1_3w = {TEXT, 0, kSTWrong_3w}; act12 aclick_3w = {TEXT, 0, kSTClick_3w}; act12 aempty_3w = {TEXT, 0, kSTEmpty1_3w}; @@ -8639,6 +8596,57 @@ act38 alips_3w = {INIT_LIPS, 0, LIPS_3w, PENNY_3w, LIPDX, LIPDY}; act39 amission23_3w = {INIT_STORY_MODE, 50, false}; act39 astory_mode_3w = {INIT_STORY_MODE, 0, true}; +// All the act40 were defined as act12 with a type set to WARN +act40 aasleep_3w = {WARN, 30, kSTAsleep_3w}; +act40 abrg_msg1_3w = {WARN, 0, kSTBridgedown_3w}; +act40 acom0a_3w = {WARN, 0, kSTCom0_3w}; +act40 acom1a_3w = {WARN, 0, kSTCom1_3w}; +act40 acom2a_3w = {WARN, 0, kSTCom2_3w}; +act40 acom3a_3w = {WARN, 0, kSTCom3_3w}; +act40 acom4a_3w = {WARN, 0, kSTCom4_3w}; +act40 acom5a_3w = {WARN, 0, kSTCom5_3w}; +act40 acom6a_3w = {WARN, 0, kSTCom6_3w}; +act40 acom7a_3w = {WARN, 0, kSTCom7_3w}; +act40 acom8a_3w = {WARN, 0, kSTCom8_3w}; +act40 acom9_3w = {WARN, 0, kSTCom9_3w}; +act40 acrash11_3w = {WARN, 20, kSTPenny1_3w}; +act40 acrash12_3w = {WARN, 20, kSTPenny2_3w}; +act40 acrash13_3w = {WARN, 34, kSTPenny3_3w}; +act40 adammed2_3w = {WARN, 0, kSTDammed_3w}; +act40 aelewaking_3w = {WARN, 0, kSTElewaking_3w}; +act40 aenter2_3w = {WARN, 0, kSTMouse1_3w}; +act40 aflask2_3w = {WARN, 0, kSTEnd1_3w}; +act40 aflask3_3w = {WARN, 0, kSTEnd2_3w}; +act40 aflask4_3w = {WARN, 0, kSTEnd3_3w}; +act40 agive4_3w = {WARN, 0, kSTGiveb1_3w}; +act40 agive5_3w = {WARN, 0, kSTGiveb2_3w}; +act40 agot1c_3w = {WARN, 1, kSTGot1_3w}; +act40 agot9_3w = {WARN, 54, kSTGot2_3w}; +act40 ahelp1_3w = {WARN, 2, kSTHelp1_3w}; +act40 amission10_3w = {WARN, 5, kSTMission1_3w}; +act40 amission16_3w = {WARN, 30, kSTMission2_3w}; +act40 amission20_3w = {WARN, 50, kSTMission3_3w}; +act40 amission21_3w = {WARN, 50, kSTMission4_3w}; +act40 amission22_3w = {WARN, 50, kSTMission5_3w}; +act40 amission24_3w = {WARN, 60, kSTMission6_3w}; +act40 aold0a_3w = {WARN, 40, kSTOldman0a_3w}; +act40 aold0b_3w = {WARN, 40, kSTOldman0b_3w}; +act40 aold6c_3w = {WARN, 0, kSTOldman4_3w}; +act40 aold6d_3w = {WARN, 0, kSTOldman5_3w}; +act40 aprod4_3w = {WARN, 8, kSTProd1_3w}; +act40 aprod5_3w = {WARN, 20, kSTProd2_3w}; +act40 ascare13_3w = {WARN, 12, kSTScare1_3w}; +act40 ascared_3w = {WARN, 0, kSTScared_3w}; +act40 asleepy_3w = {WARN, 0, kSTSleepy_3w}; +act40 asunset1_3w = {WARN, 20, kSTAdios1_3w}; +act40 asunset2_3w = {WARN, 50, kSTAdios2_3w}; +act40 asunset3_3w = {WARN, 70, kSTAdios3_3w}; +act40 aweb10_3w = {WARN, 50, kSTPenny5_3w}; +act40 aweb15_3w = {WARN, 105, kSTSpider1_3w}; +act40 aweb17_3w = {WARN, 108, kSTSpider2_3w}; +act40 aweb20_3w = {WARN, 110, kSTSpider3_3w}; +act40 aweb6_3w = {WARN, 25, kSTPenny4_3w}; + act41 ac1_3w = {COND_BONUS, 0, 3, kALac2_3w, kALswingtip_3w}; act41 ac2_3w = {COND_BONUS, 0, 13, kALac3_3w, kALplanetip_3w}; act41 ac3_3w = {COND_BONUS, 0, 4, kALac4_3w, kALmodeltip_3w}; @@ -10404,19 +10412,21 @@ act16 apenseq6_2d = {INIT_OBJ_SEQ, PENDELAY + 74, PENNY_2d, 2}; act17 acopbit1_2d = {SET_STATE_BITS, 0, COP_2d, 1}; act17 acopbit16_2d = {SET_STATE_BITS, 0, COP_2d, 16}; act17 acopbit4_2d = {SET_STATE_BITS, 0, COP_2d, 4}; -act17 agatescls_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 32}; act17 agatesopn_2d = {SET_STATE_BITS, 0, BUTTON_2d, 32}; -act17 aglightoff2_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 2}; act17 aglighton2_2d = {SET_STATE_BITS, 0, BUTTON_2d, 2}; act17 aphoto3_2d = {SET_STATE_BITS, 0, COP_2d, 2}; act17 ashed23_2d = {SET_STATE_BITS, 0, BUTTON_2d, 16}; -act17 aslightoff2_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 1}; act17 aslighton2_2d = {SET_STATE_BITS, 0, BUTTON_2d, 1}; act17 astream12_2d = {SET_STATE_BITS, 0, BUTTON_2d, 4}; -act17 azapperoff2_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 8}; act17 azapperon2_2d = {SET_STATE_BITS, 0, BUTTON_2d, 8}; act17 acopbit8_2d = {SET_STATE_BITS, 0, COP_2d, 8}; +// all act18 were defined as act17 with a type set to CLEAR_STATE_BITS +act18 agatescls_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 32}; +act18 aglightoff2_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 2}; +act18 aslightoff2_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 1}; +act18 azapperoff2_2d = {CLEAR_STATE_BITS, 0, BUTTON_2d, 8}; + act19 achkbugs_2d = {TEST_STATE_BITS, 0, BUTTON_2d, 8, kALbugflit_2d, kALbugattack_2d}; act19 achkgates_2d = {TEST_STATE_BITS, 2, BUTTON_2d, 16, kALswgates_2d, kALrumbling_2d}; act19 achkglight_2d = {TEST_STATE_BITS, 2, BUTTON_2d, 2, kALglightoff_2d, kALglighton_2d}; @@ -10823,7 +10833,6 @@ actListPtr ALzapperon_2d[] = {&abonus9_2d, &azapperon1_2d, &azapperon2_2d, // Special action list for maze act2 aheroxy_2d = {INIT_OBJXY, 0, HERO, 0, 0}; -//act5 astophero_2d = {INIT_OBJVXY, 0, HERO, 0, 0}; act1 aherostop_2d = {START_OBJ, 0, HERO, 0, NOT_CYCLING}; act8 anewscr_2d = {NEW_SCREEN, 0, 0}; actListPtr ALnewscr_2d[] = {&aheroxy_2d, &astophero_2d, &aherostop_2d, &anewscr_2d, 0}; @@ -11257,61 +11266,29 @@ act11 awebtest1_3d = {COND_R, 0, PENNY_3d, 0, kALspider_3d, act11 awebtest2_3d = {COND_R, 0, PENNY_3d, 1, kALmission_3d, kALreturn_3d}; act11 ahoriz5_3d = {COND_R, 1, HERO, 0, kALup_3d, kALdn_3d}; -act12 aasleep_3d = {WARN, 30, kSTAsleep_3d}; act12 ablk1_3d = {TEXT, 0, kSTBlk1_3d}; act12 abook1_3d = {TEXT, 0, kSTBook1_3d}; -act12 abrg_msg1_3d = {WARN, 0, kSTBridgedown_3d}; act12 abtip_3d = {TEXT, 0, kSTBridgetip_3d}; act12 acanttake_3d = {TEXT, 0, kSTCanttake_3d}; act12 acheese2_3d = {TEXT, 0, kSTYummy_3d}; -act12 acom0a_3d = {WARN, 0, kSTCom0_3d}; -act12 acom1a_3d = {WARN, 0, kSTCom1_3d}; -act12 acom2a_3d = {WARN, 0, kSTCom2_3d}; -act12 acom3a_3d = {WARN, 0, kSTCom3_3d}; -act12 acom4a_3d = {WARN, 0, kSTCom4_3d}; -act12 acom5a_3d = {WARN, 0, kSTCom5_3d}; -act12 acom6a_3d = {WARN, 0, kSTCom6_3d}; -act12 acom7a_3d = {WARN, 0, kSTCom7_3d}; -act12 acom8a_3d = {WARN, 0, kSTCom8_3d}; -act12 acom9_3d = {WARN, 0, kSTCom9_3d}; -act12 acrash11_3d = {WARN, 20, kSTPenny1_3d}; -act12 acrash12_3d = {WARN, 20, kSTPenny2_3d}; -act12 acrash13_3d = {WARN, 34, kSTPenny3_3d}; act12 acubestip_3d = {TEXT, 0, kSTCubestip_3d}; -act12 adammed3_3d = {WARN, 0, kSTDammed_3d}; act12 adammedtip_3d = {TEXT, 0, kSTDammedtip_3d}; act12 adarted_3d = {TEXT, 0, kSTDarted_3d}; act12 adrinkno_3d = {TEXT, 0, kSTDrinkno_3d}; act12 adrinkyes_3d = {TEXT, 0, kSTDrinkyes_3d}; -act12 aelewaking_3d = {WARN, 0, kSTElewaking_3d}; act12 aemptymagic_3d = {TEXT, 0, kSTEmptymagic_3d}; act12 aemptyord_3d = {TEXT, 0, kSTEmptyord_3d}; -act12 aenter2_3d = {WARN, 0, kSTMouse1_3d}; act12 aex5_3d = {TEXT, 0, kSTExor1_3d}; act12 aex6_3d = {TEXT, 0, kSTExor2_3d}; act12 aexordone_3d = {TEXT, 0, kSTExordone_3d}; act12 afillmagic2_3d = {TEXT, 0, kSTFillmagic_3d}; act12 afillord1_3d = {TEXT, 0, kSTFillord_3d}; act12 afindb4_3d = {TEXT, 2, kSTFoundbook_3d}; -act12 aflask2_3d = {WARN, 0, kSTEnd1_3d}; -act12 aflask3_3d = {WARN, 0, kSTEnd2_3d}; -act12 aflask4_3d = {WARN, 0, kSTEnd3_3d}; -act12 agive4_3d = {WARN, 0, kSTGiveb1_3d}; -act12 agive5_3d = {WARN, 0, kSTGiveb2_3d}; act12 ago1_3d = {TEXT, 0, kSTMousefree_3d}; -act12 agot1c_3d = {WARN, 1, kSTGot1_3d}; -act12 agot9_3d = {WARN, 54, kSTGot2_3d}; -act12 ahelp1_3d = {WARN, 2, kSTHelp1_3d}; act12 alookfall_3d = {TEXT, 0, kSTLookwfall1_3d}; act12 alooknofall_3d = {TEXT, 0, kSTLookwfall2_3d}; act12 amagictip_3d = {TEXT, 0, kSTMagictip_3d}; act12 amakeclay3_3d = {TEXT, 0, kSTMakeeffigy_3d}; -act12 amission10_3d = {WARN, 5, kSTMission1_3d}; -act12 amission16_3d = {WARN, 30, kSTMission2_3d}; -act12 amission20_3d = {WARN, 50, kSTMission3_3d}; -act12 amission21_3d = {WARN, 50, kSTMission4_3d}; -act12 amission22_3d = {WARN, 50, kSTMission5_3d}; -act12 amission24_3d = {WARN, 60, kSTMission6_3d}; act12 amodeltip_3d = {TEXT, 0, kSTModeltip_3d}; act12 amousegone_3d = {TEXT, 0, kSTMousegone_3d}; act12 amousetip_3d = {TEXT, 0, kSTMousetip_3d}; @@ -11326,28 +11303,17 @@ act12 anostickpin_3d = {TEXT, 0, kSTNostickpin_3d}; act12 anotakecb_3d = {TEXT, 0, kSTOldmannotake_3d}; act12 anotip_3d = {TEXT, 0, kSTNotip_3d}; act12 anottied_3d = {TEXT, 0, kSTNottied_3d}; -act12 aold0a_3d = {WARN, 40, kSTOldman0a_3d}; -act12 aold0b_3d = {WARN, 40, kSTOldman0b_3d}; -act12 aold6c_3d = {WARN, 0, kSTOldman4_3d}; -act12 aold6d_3d = {WARN, 0, kSTOldman5_3d}; act12 aold7_3d = {TEXT, 0, kSTAllwrong_3d}; act12 aoldmantip_3d = {TEXT, 0, kSTOldmantip_3d}; act12 aplanetip_3d = {TEXT, 0, kSTPlanetip_3d}; -act12 aprod4_3d = {WARN, 8, kSTProd1_3d}; -act12 aprod5_3d = {WARN, 20, kSTProd2_3d}; act12 aputitdown_3d = {TEXT, 0, kSTPutitdown_3d}; act12 arefuse_3d = {TEXT, 0, kSTRefuse_3d}; act12 arefuseflask_3d = {TEXT, 0, kSTRefuseflask_3d}; act12 aremedytip_3d = {TEXT, 0, kSTRemedytip_3d}; act12 arub_3d = {TEXT, 0, kSTRubcrystal_3d}; -act12 ascare13_3d = {WARN, 12, kSTScare1_3d}; -act12 ascared_3d = {WARN, 0, kSTScared_3d}; -act12 asleepy_3d = {WARN, 0, kSTSleepy_3d}; act12 astick2_3d = {TEXT, 0, kSTStickpin_3d}; act12 asticktip_3d = {TEXT, 0, kSTSticktip_3d}; act12 astuckpin_3d = {TEXT, 0, kSTStuckpin_3d}; -act12 asunset1_3d = {WARN, 20, kSTAdios1_3d}; -act12 asunset2_3d = {WARN, 40, kSTAdios2_3d}; act12 aswingtip_3d = {TEXT, 0, kSTSwingtip_3d}; act12 atakecb2_3d = {TEXT, 0, kSTOldmantakeball_3d}; act12 atalkweb_3d = {TEXT, 0, kSTTalkweb_3d}; @@ -11357,11 +11323,6 @@ act12 auntie_3d = {TEXT, 0, kSTUntievine_3d}; act12 avine5_3d = {TEXT, 0, kSTBlk2_3d}; act12 awarn_3d = {TEXT, 0, kSTCavewarn_3d}; act12 awaterfalling_3d = {TEXT, 0, kSTWaterfalling_3d}; -act12 aweb10_3d = {WARN, 50, kSTPenny5_3d}; -act12 aweb15_3d = {WARN, 105, kSTSpider1_3d}; -act12 aweb17_3d = {WARN, 108, kSTSpider2_3d}; -act12 aweb20_3d = {WARN, 110, kSTSpider3_3d}; -act12 aweb6_3d = {WARN, 25, kSTPenny4_3d}; act12 awrong1_3d = {TEXT, 0, kSTWrong_3d}; act12 aclick_3d = {TEXT, 0, kSTClick_3d}; act12 aempty_3d = {TEXT, 0, kSTEmpty1_3d}; @@ -11456,22 +11417,22 @@ act22 ahoriz3_3d = {INIT_HH_COORD, 1, HERO}; act23 asunset3_3d = {EXIT, 50}; -act24 adammed1_3d = {BONUS,0, 11}; -act24 adart2_3d = {BONUS,DARTTIME, 10}; -act24 adropcheese1_3d = {BONUS,0, 6}; -act24 aenter0_3d = {BONUS,0, 7}; -act24 aex1_3d = {BONUS,0, 15}; -act24 afillmagic1_3d = {BONUS,0, 8}; -act24 aflask1_3d = {BONUS,0, 1}; -act24 agive2_3d = {BONUS,0, 14}; -act24 amakeclay1_3d = {BONUS,0, 4}; -act24 aold6b_3d = {BONUS,0, 12}; -act24 ascarebonus_3d = {BONUS,0, 9}; -act24 astick1_3d = {BONUS,0, 5}; -act24 aswing0_3d = {BONUS,0, 3}; -act24 atakecb1_3d = {BONUS,0, 16}; -act24 atakencheese_3d = {BONUS,0, 13}; -act24 avine1_3d = {BONUS,0, 2}; +act24 adammed1_3d = {BONUS, 0, 11}; +act24 adart2_3d = {BONUS, DARTTIME, 10}; +act24 adropcheese1_3d = {BONUS, 0, 6}; +act24 aenter0_3d = {BONUS, 0, 7}; +act24 aex1_3d = {BONUS, 0, 15}; +act24 afillmagic1_3d = {BONUS, 0, 8}; +act24 aflask1_3d = {BONUS, 0, 1}; +act24 agive2_3d = {BONUS, 0, 14}; +act24 amakeclay1_3d = {BONUS, 0, 4}; +act24 aold6b_3d = {BONUS, 0, 12}; +act24 ascarebonus_3d = {BONUS, 0, 9}; +act24 astick1_3d = {BONUS, 0, 5}; +act24 aswing0_3d = {BONUS, 0, 3}; +act24 atakecb1_3d = {BONUS, 0, 16}; +act24 atakencheese_3d = {BONUS, 0, 13}; +act24 avine1_3d = {BONUS, 0, 2}; act25 aentertest3_3d = {COND_BOX, 1, MOUSE_3d, 156, 133, 163, 148, kALtrapped_3d, 0}; act25 amousel_3d = {COND_BOX, 0, HERO, 0, 0, 254, 199, kALholel_3d, 0}; @@ -11524,6 +11485,56 @@ act38 alips_3d = {INIT_LIPS, 0, LIPS_3d, PENNY_3d, LIPDX, LIPDY}; act39 amission23_3d = {INIT_STORY_MODE, 50, false}; act39 astory_mode_3d = {INIT_STORY_MODE, 0, true}; +// all the act40 were previously defined as act12 with a type set to WARN +act40 aasleep_3d = {WARN, 30, kSTAsleep_3d}; +act40 abrg_msg1_3d = {WARN, 0, kSTBridgedown_3d}; +act40 acom0a_3d = {WARN, 0, kSTCom0_3d}; +act40 acom1a_3d = {WARN, 0, kSTCom1_3d}; +act40 acom2a_3d = {WARN, 0, kSTCom2_3d}; +act40 acom3a_3d = {WARN, 0, kSTCom3_3d}; +act40 acom4a_3d = {WARN, 0, kSTCom4_3d}; +act40 acom5a_3d = {WARN, 0, kSTCom5_3d}; +act40 acom6a_3d = {WARN, 0, kSTCom6_3d}; +act40 acom7a_3d = {WARN, 0, kSTCom7_3d}; +act40 acom8a_3d = {WARN, 0, kSTCom8_3d}; +act40 acom9_3d = {WARN, 0, kSTCom9_3d}; +act40 acrash11_3d = {WARN, 20, kSTPenny1_3d}; +act40 acrash12_3d = {WARN, 20, kSTPenny2_3d}; +act40 acrash13_3d = {WARN, 34, kSTPenny3_3d}; +act40 adammed3_3d = {WARN, 0, kSTDammed_3d}; +act40 aelewaking_3d = {WARN, 0, kSTElewaking_3d}; +act40 aenter2_3d = {WARN, 0, kSTMouse1_3d}; +act40 aflask2_3d = {WARN, 0, kSTEnd1_3d}; +act40 aflask3_3d = {WARN, 0, kSTEnd2_3d}; +act40 aflask4_3d = {WARN, 0, kSTEnd3_3d}; +act40 agive4_3d = {WARN, 0, kSTGiveb1_3d}; +act40 agive5_3d = {WARN, 0, kSTGiveb2_3d}; +act40 agot1c_3d = {WARN, 1, kSTGot1_3d}; +act40 agot9_3d = {WARN, 54, kSTGot2_3d}; +act40 ahelp1_3d = {WARN, 2, kSTHelp1_3d}; +act40 amission10_3d = {WARN, 5, kSTMission1_3d}; +act40 amission16_3d = {WARN, 30, kSTMission2_3d}; +act40 amission20_3d = {WARN, 50, kSTMission3_3d}; +act40 amission21_3d = {WARN, 50, kSTMission4_3d}; +act40 amission22_3d = {WARN, 50, kSTMission5_3d}; +act40 amission24_3d = {WARN, 60, kSTMission6_3d}; +act40 aold0a_3d = {WARN, 40, kSTOldman0a_3d}; +act40 aold0b_3d = {WARN, 40, kSTOldman0b_3d}; +act40 aold6c_3d = {WARN, 0, kSTOldman4_3d}; +act40 aold6d_3d = {WARN, 0, kSTOldman5_3d}; +act40 aprod4_3d = {WARN, 8, kSTProd1_3d}; +act40 aprod5_3d = {WARN, 20, kSTProd2_3d}; +act40 ascare13_3d = {WARN, 12, kSTScare1_3d}; +act40 ascared_3d = {WARN, 0, kSTScared_3d}; +act40 asleepy_3d = {WARN, 0, kSTSleepy_3d}; +act40 asunset1_3d = {WARN, 20, kSTAdios1_3d}; +act40 asunset2_3d = {WARN, 40, kSTAdios2_3d}; +act40 aweb10_3d = {WARN, 50, kSTPenny5_3d}; +act40 aweb15_3d = {WARN, 105, kSTSpider1_3d}; +act40 aweb17_3d = {WARN, 108, kSTSpider2_3d}; +act40 aweb20_3d = {WARN, 110, kSTSpider3_3d}; +act40 aweb6_3d = {WARN, 25, kSTPenny4_3d}; + act41 ac1_3d = {COND_BONUS, 0, 3, kALac2_3d, kALswingtip_3d}; act41 ac2_3d = {COND_BONUS, 0, 13, kALac3_3d, kALplanetip_3d}; act41 ac3_3d = {COND_BONUS, 0, 4, kALac4_3d, kALmodeltip_3d};