Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.
C calculatorcalculator-gamescasiochesscrossy-roaddrive-madfx-cg50gamesgeometry-dashgraphing-calculatorndlessnumworksnumworks-appsnumworks-calculatornumworks-gamenumworks-gamestetristi-84-plus-ceti-nspire
Hollow Knight: item notices, charm tutorial, shiny items, saved pickups
Mason Chen98cbe6dd062b
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex 2710b6f7..59fd916d 100644Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differdiff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.hindex 5399cdb5..236e4bc6 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -567,7 +567,7 @@#define SPRITE_CORPSE_NAIL 2234#define SPRITE_FK_BARREL 2235#define SPRITE_FK_STAFF 2236-#define SPRITE_DIGIT0 2460+#define SPRITE_DIGIT0 2481#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -575,9 +575,12 @@#define STYLE_TITLE_SUB 4#define STYLE_MSG 5#define STYLE_MSG_NAME 6-#define STYLE_MENU 7-#define STYLE_MENU_TITLE 8-#define STYLE_MENU_SMALL 9+#define STYLE_NOTICE 7+#define STYLE_TUTE_TITLE 8+#define STYLE_TUTE 9+#define STYLE_MENU 10+#define STYLE_MENU_TITLE 11+#define STYLE_MENU_SMALL 12#define TEXT_K 1.333333f#define FONT_PHASES 4#define EK_CRAWLER 1@@ -611,20 +614,20 @@#define EK_HORNET 29#define NUM_KINDS 30#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 162, 161, -1, -1, -1, -1, -1, -1, -1, -1, 164, 165}}, {EF_BUZZER, {167, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 169, 170}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 177, 176, -1, -1, -1, -1, -1, -1, -1, 174, 175}}, {EF_BOUNCER, {-1, -1, -1, 180, -1, -1, -1, -1, -1, -1, -1, 178, 179}}, {EF_SPITTER, {-1, -1, -1, 183, 184, 182, -1, -1, -1, -1, -1, 181, -1}}, {EF_ROLLER, {187, -1, -1, 189, 188, 190, -1, -1, -1, -1, -1, 185, 186}}, {EF_BLOCKER, {197, -1, -1, 193, 198, 191, 192, 199, 200, 196, 195, -1, 194}}, {EF_HUSK, {206, 207, 208, 201, 203, 202, -1, -1, -1, -1, -1, 204, 205}}, {EF_HUSK, {214, 215, 216, 209, 211, 210, -1, -1, -1, -1, -1, 212, 213}}, {EF_HUSK, {222, 223, 224, 217, 219, 218, -1, -1, -1, -1, -1, 220, 221}}, {EF_HUSK, {230, 231, 232, 225, 227, 226, -1, -1, -1, -1, -1, 228, 229}}, {EF_LEAPER, {236, 238, 239, 233, 237, -1, -1, -1, -1, -1, -1, 234, 235}}, {EF_GUARD, {245, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 242, 243}}, {EF_FK, {267, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 265}}, {EF_FKHEAD, {287, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 285}}, {EF_HATCHER, {-1, -1, -1, 292, 291, -1, -1, -1, -1, -1, -1, 289, 290}}, {EF_HATCHLING, {-1, -1, -1, 293, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {299, -1, -1, 297, 298, 301, 300, 294, -1, -1, -1, 295, 296}}, {EF_GFLY, {314, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 323, 324, 322, 318, 319, -1, -1, -1, -1, -1, 320, 321}}, {EF_PIGEON, {-1, -1, -1, 326, 327, 328, 325, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {330, -1, -1, 333, 332, 331, -1, -1, -1, -1, -1, 329, -1}}, {EF_SHAKER, {337, 338, 339, 334, -1, -1, -1, -1, -1, -1, -1, 335, 336}}, {EF_MOSQUITO, {344, -1, -1, 346, 345, 341, 340, -1, -1, -1, -1, 342, 343}}, {EF_FATFLY, {350, -1, -1, 347, -1, -1, -1, -1, -1, -1, -1, 348, 349}}, {EF_MOSSCHARGER, {-1, -1, -1, 351, 352, 355, 358, 357, 359, 356, -1, 353, 354}}, {EF_MOSSKNIGHT, {365, 380, 384, -1, -1, -1, -1, -1, -1, -1, -1, 360, 361}}, {EF_HORNET, {400, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 388, -1}}}-#define TXT_PROMPT_LISTEN 47-#define TXT_PROMPT_REST 48-#define TXT_PROMPT_INSPECT 49-#define TXT_PROMPT_ENTER 50-#define TXT_PROMPT_SIT 51-#define TXT_PROMPT_SHOP 52-#define TXT_PROMPT_TRAVEL 53-#define TXT_PROMPT_ASCEND 54-#define TXT_PROMPT_DESCEND 55-#define TXT_PROMPT_EXIT 56-#define TXT_PROMPT_ACCEPT 57-#define TXT_PROMPT_TRADE 58-#define TXT_PROMPT_WATCH 59-#define TXT_PROMPT_CHALLENGE 60+#define TXT_PROMPT_LISTEN 50+#define TXT_PROMPT_REST 51+#define TXT_PROMPT_INSPECT 52+#define TXT_PROMPT_ENTER 53+#define TXT_PROMPT_SIT 54+#define TXT_PROMPT_SHOP 55+#define TXT_PROMPT_TRAVEL 56+#define TXT_PROMPT_ASCEND 57+#define TXT_PROMPT_DESCEND 58+#define TXT_PROMPT_EXIT 59+#define TXT_PROMPT_ACCEPT 60+#define TXT_PROMPT_TRADE 61+#define TXT_PROMPT_WATCH 62+#define TXT_PROMPT_CHALLENGE 63#define PROMPT_SORT 884737u#define DIGIT_ADV {0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f}#define VMOP_NOP 1@@ -718,7 +721,16 @@#define VMOP_OBJALPHA 89#define VMOP_BUILDSTRING 90#define VMOP_STARTCONVERSATIONOF 91-#define VMOP_GETOBJALPHA 92+#define VMOP_NOTICEICON 92+#define VMOP_NOTICETEXT 93+#define VMOP_CHARMNOTICE 94+#define VMOP_CHARMTUTE 95+#define VMOP_GETOBJALPHA 96+#define VMOP_FLINGOBJECT 97+#define VMOP_GETSPEED2D 98+#define VMOP_SENDRANDOMEVENT 99+#define VMOP_INCREMENTPLAYERDATAINT 100+#define VMOP_LISTENFORINVENTORY 101#define VMEV_FINISHED 0#define VMEV_CONVO_FINISH 1#define VMEV_CONVO_START 2@@ -745,10 +757,13 @@#define VMEV_FADE_IN 23#define VMEV_FADE_OUT 24#define VMEV_FSM_CANCEL 25+#define VMEV_CLOSE 26+#define VMEV_FK_DEATH 27#define VMSTR_NPC_TITLE 14-#define VMSTR_VISITED 240-#define VMSTR_DISPLAY_RIGHT 241+#define VMSTR_VISITED 258+#define VMSTR_DISPLAY_RIGHT 259#define VMSTR_HORNET_SAVER 104+#define VMSTR_ITEM 226#define STR_ATTACK_RANGE 23#define STR_EVADE_RANGE 50#define STR_SPIT_RANGE 51@@ -776,7 +791,7 @@#define TITLE_TISO_NC 18#define TITLE_CHARM_SLUG 19#define NUM_TITLES 20-#define TITLE_TABLE {{61, 62, -1, -1}, {63, 64, 65, -1}, {66, 67, -1, 68}, {69, 70, -1, 71}, {72, 73, -1, 74}, {75, 76, -1, -1}, {77, 78, 79, -1}, {80, 81, -1, -1}, {82, 83, -1, -1}, {84, 85, -1, -1}, {86, 87, -1, -1}, {88, 89, -1, -1}, {90, 91, -1, -1}, {92, 93, -1, -1}, {94, 95, -1, 96}, {97, 98, -1, 99}, {97, 98, -1, 100}, {101, 102, 103, -1}, {101, 102, -1, -1}, {104, 105, -1, 106}}+#define TITLE_TABLE {{64, 65, -1, -1}, {66, 67, 68, -1}, {69, 70, -1, 71}, {72, 73, -1, 74}, {75, 76, -1, 77}, {78, 79, -1, -1}, {80, 81, 82, -1}, {83, 84, -1, -1}, {85, 86, -1, -1}, {87, 88, -1, -1}, {89, 90, -1, -1}, {91, 92, -1, -1}, {93, 94, -1, -1}, {95, 96, -1, -1}, {97, 98, -1, 99}, {100, 101, -1, 102}, {100, 101, -1, 103}, {104, 105, 106, -1}, {104, 105, -1, -1}, {107, 108, -1, 109}}#define SPRITE_FLEUR_TOP 2237#define FLEUR_TOP_RECTS {{0.781f, -0.844f, 0.953f, -0.688f}, {-1.078f, -0.984f, 1.141f, -0.531f}, {-1.281f, -1.016f, 1.313f, -0.484f}, {-1.359f, -1.016f, 1.969f, -0.141f}, {-2.141f, -1.031f, 2.531f, 0.047f}, {-2.250f, -1.078f, 2.766f, 0.266f}, {-2.797f, -1.203f, 3.094f, 0.578f}, {-2.938f, -1.219f, 3.219f, 0.859f}, {-3.203f, -1.234f, 3.469f, 1.141f}, {-3.312f, -1.234f, 3.766f, 1.281f}, {-3.547f, -1.250f, 4.000f, 1.328f}, {-3.844f, -1.250f, 4.016f, 1.328f}, {-4.016f, -1.250f, 4.031f, 1.344f}, {-4.031f, -1.250f, 4.031f, 1.344f}, {-4.047f, -1.250f, 4.031f, 1.359f}, {-4.047f, -1.250f, 4.031f, 1.359f}, {-4.047f, -1.266f, 4.031f, 1.359f}, {-4.047f, -1.266f, 4.031f, 1.359f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}}#define FLEUR_FRAMES 22@@ -790,38 +805,49 @@#define SPRITE_MSG_ICON_FIREBALL 2243#define SPRITE_MSG_ICON_DASH 2244#define SPRITE_GRASS_BALL 2245-#define MSG_TABLE {{107, 108, 109, 110, 111, 112}, {113, 114, 115, 116, 117, 118}}-#define MENU_LOGO {2246, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MSG_TABLE {{110, 111, 112, 113, 114, 115}, {116, 117, 118, 119, 120, 121}}+#define NOTICE_BACKBOARD {2246, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2241, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {2247, 1.0000f, 0.9560f}+#define TUTE_IMAGE {2248, 1.0000f, 1.0000f}+#define TUTE_STOP {2240, 1.0000f, 1.0000f}+#define NOTICE_ICONS {2249, 2250, 2251}+#define CHARM_ICONS {-1, 2252, 2253, 2254, 2255, -1, 2256, 2257, 2258, -1, -1, -1, -1, -1, 2259, -1, -1, -1, 2260, 2261, 2262, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_NAMES {-1, 122, 123, 124, 125, -1, 126, 127, 128, -1, -1, -1, -1, -1, 129, -1, -1, -1, 130, 131, 132, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_CHARM_TUTE_TITLE 133+#define TXT_CHARM_TUTE_SUB 134+#define TXT_CHARM_REMINDER 135+#define MENU_LOGO {2263, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_QUIT_Y -2.3582f-#define MENU_POINTER {2247, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2264, 0.0000f, 0.0000f, 1.0023f, 1.0000f}#define MENU_POINTER_GAP 0.7525f#define MENU_PROFILES_TITLE_Y 6.4481f-#define MENU_PROFILES_FLEUR {2248, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2265, 0.0000f, 0.0000f, 1.0000f, 1.0807f}#define MENU_PROFILES_FLEUR_Y 5.4077f#define MENU_SLOT_X -2.8186f#define MENU_SLOT_Y 3.1252f#define MENU_SLOT_DY -2.3269f-#define MENU_SLOT_ZONES {{2, {2249, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2250, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2251, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2252, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2253, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {2266, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2267, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2268, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2269, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2270, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 5#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2254, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2271, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_FLEUR_X 0.0000f#define MENU_SLOT_FLEUR_Y 0.4512f-#define MENU_SLOT_SELECTOR {2255, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2272, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_SELECTOR_X -0.1626f#define MENU_SLOT_SELECTOR_Y 0.0813f-#define MENU_SLOT_CURSOR {2256, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2273, 0.0000f, 0.0000f, 1.0000f, 1.0025f}#define MENU_SLOT_CURSOR_X -8.2367f#define MENU_SLOT_CURSOR_Y 0.0000f-#define MENU_SLOT_ORB {2257, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2274, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_ORB_X -4.3089f#define MENU_SLOT_ORB_Y 0.1230f-#define MENU_SLOT_GEO {2258, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2275, 0.0000f, 0.0000f, 1.0039f, 1.0000f}#define MENU_SLOT_GEO_X -3.6961f#define MENU_SLOT_GEO_Y -0.5395f-#define MENU_SLOT_HEALTH {2259, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2276, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_HEALTH_X -3.5916f#define MENU_SLOT_HEALTH_Y 0.3577f#define MENU_SLOT_CURSOR_X2 8.0334f@@ -839,25 +865,25 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2260, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2277, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2261, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2278, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 0.6428f#define MENU_PAUSE_QUIT_Y -0.4548f-#define TXT_MAIN_START 119-#define TXT_MAIN_QUIT 120-#define TXT_PROFILE_NEW_GAME 121-#define TXT_PROFILE_CLEAR_BUTTON 122-#define TXT_PROFILE_CLEAR_PROMPT 123-#define TXT_NAV_YES 124-#define TXT_NAV_NO 125-#define TXT_NAV_BACK 126-#define TXT_PAUSE_CONTINUE 127-#define TXT_PAUSE_MAIN 128-#define TXT_PROFILE_CORRUPTED 129-#define TXT_SCREEN_SAVE_PROFILES 130-#define TXT_ZONES {131, 132, 133, 134, 135}+#define TXT_MAIN_START 136+#define TXT_MAIN_QUIT 137+#define TXT_PROFILE_NEW_GAME 138+#define TXT_PROFILE_CLEAR_BUTTON 139+#define TXT_PROFILE_CLEAR_PROMPT 140+#define TXT_NAV_YES 141+#define TXT_NAV_NO 142+#define TXT_NAV_BACK 143+#define TXT_PAUSE_CONTINUE 144+#define TXT_PAUSE_MAIN 145+#define TXT_PROFILE_CORRUPTED 146+#define TXT_SCREEN_SAVE_PROFILES 147+#define TXT_ZONES {148, 149, 150, 151, 152}#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}#define MSG_FIREBALL 0#define MSG_DASH 1diff --git a/games/hollowknight/src/enemy.c b/games/hollowknight/src/enemy.cindex f7b0e79b..501c4fc8 100644--- a/games/hollowknight/src/enemy.c+++ b/games/hollowknight/src/enemy.c@@ -2712,7 +2712,8 @@ static void fk_update(Enemy *e) {break;case FK_READY:if (e->t0 >= 1) {- /* Blow: the maggot out, the staff flung */+ /* Blow: FK DEATH, the maggot out, the staff flung */+ vm_broadcast(VMEV_FK_DEATH);Enemy *h = fk_head();if (h) h->mode = EM_OFF;fk.head_shown = false;diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex a552538d..9f141378 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -13,7 +13,25 @@ enum {PDF_ELDERBUG_HISTORY1, PDF_ELDERBUG_SPEECH_SLY, PDF_ELDERBUG_SPEECH_STATION, PDF_ELDERBUG_SPEECH_EGG_TEMPLE,PDF_ELDERBUG_SPEECH_MAP_SHOP, PDF_ELDERBUG_FIRST_CALL, PDF_SLY_RESCUED, PDF_OPENED_TOWN_BUILDING,PDF_EGG_TEMPLE_VISITED, PDF_OPENED_MAPPER_SHOP, PDF_DREAMER_SCENE1, PDF_CORN_GREENPATH_LEFT,- PDF_HORNET_F19, PDF_MET_QUIRREL, PDF_TISO_ENCOUNTERED_BENCH, PDF_COUNT+ PDF_HORNET_F19, PDF_MET_QUIRREL, PDF_TISO_ENCOUNTERED_BENCH, PDF_FOUND_TRINKET1, PDF_FOUND_TRINKET2,+ PDF_FOUND_TRINKET3, PDF_FOUND_TRINKET4, PDF_HAS_CITY_KEY,+ /* (gotCharm_1 .. 40, equippedCharm_1 .. 40: the charm numbers the game's) */+ PDF_GOT_CHARM_1, PDF_GOT_CHARM_2, PDF_GOT_CHARM_3, PDF_GOT_CHARM_4, PDF_GOT_CHARM_5, PDF_GOT_CHARM_6,+ PDF_GOT_CHARM_7, PDF_GOT_CHARM_8, PDF_GOT_CHARM_9, PDF_GOT_CHARM_10, PDF_GOT_CHARM_11, PDF_GOT_CHARM_12,+ PDF_GOT_CHARM_13, PDF_GOT_CHARM_14, PDF_GOT_CHARM_15, PDF_GOT_CHARM_16, PDF_GOT_CHARM_17, PDF_GOT_CHARM_18,+ PDF_GOT_CHARM_19, PDF_GOT_CHARM_20, PDF_GOT_CHARM_21, PDF_GOT_CHARM_22, PDF_GOT_CHARM_23, PDF_GOT_CHARM_24,+ PDF_GOT_CHARM_25, PDF_GOT_CHARM_26, PDF_GOT_CHARM_27, PDF_GOT_CHARM_28, PDF_GOT_CHARM_29, PDF_GOT_CHARM_30,+ PDF_GOT_CHARM_31, PDF_GOT_CHARM_32, PDF_GOT_CHARM_33, PDF_GOT_CHARM_34, PDF_GOT_CHARM_35, PDF_GOT_CHARM_36,+ PDF_GOT_CHARM_37, PDF_GOT_CHARM_38, PDF_GOT_CHARM_39, PDF_GOT_CHARM_40,+ PDF_EQUIPPED_CHARM_1, PDF_EQUIPPED_CHARM_2, PDF_EQUIPPED_CHARM_3, PDF_EQUIPPED_CHARM_4, PDF_EQUIPPED_CHARM_5,+ PDF_EQUIPPED_CHARM_6, PDF_EQUIPPED_CHARM_7, PDF_EQUIPPED_CHARM_8, PDF_EQUIPPED_CHARM_9, PDF_EQUIPPED_CHARM_10,+ PDF_EQUIPPED_CHARM_11, PDF_EQUIPPED_CHARM_12, PDF_EQUIPPED_CHARM_13, PDF_EQUIPPED_CHARM_14, PDF_EQUIPPED_CHARM_15,+ PDF_EQUIPPED_CHARM_16, PDF_EQUIPPED_CHARM_17, PDF_EQUIPPED_CHARM_18, PDF_EQUIPPED_CHARM_19, PDF_EQUIPPED_CHARM_20,+ PDF_EQUIPPED_CHARM_21, PDF_EQUIPPED_CHARM_22, PDF_EQUIPPED_CHARM_23, PDF_EQUIPPED_CHARM_24, PDF_EQUIPPED_CHARM_25,+ PDF_EQUIPPED_CHARM_26, PDF_EQUIPPED_CHARM_27, PDF_EQUIPPED_CHARM_28, PDF_EQUIPPED_CHARM_29, PDF_EQUIPPED_CHARM_30,+ PDF_EQUIPPED_CHARM_31, PDF_EQUIPPED_CHARM_32, PDF_EQUIPPED_CHARM_33, PDF_EQUIPPED_CHARM_34, PDF_EQUIPPED_CHARM_35,+ PDF_EQUIPPED_CHARM_36, PDF_EQUIPPED_CHARM_37, PDF_EQUIPPED_CHARM_38, PDF_EQUIPPED_CHARM_39, PDF_EQUIPPED_CHARM_40,+ PDF_COUNT};typedef struct {/* (saved: the layout only ever grows into reserved) */@@ -37,7 +55,10 @@ typedef struct {uint8_t hornet_greenpath; /* (hornetGreenpath: her encounters in Greenpath) */uint8_t quirrel_egg_temple; /* (quirrelEggTemple: his talks at the Black Egg) */uint8_t map_zone; /* (mapZone: the room's, as it is entered; the save profiles show its area) */- uint8_t reserved[58];+ uint8_t charms_owned; /* (charmsOwned) */+ uint8_t trinkets[4]; /* (trinket1 .. 4: Wanderer's Journals, Hallownest Seals, King's Idols, Arcane Eggs) */+ uint8_t rancid_eggs, ore;+ uint8_t reserved[51];/* (saved apart, by the objects' names: their states) */uint8_t persist[MAX_PERSIST / 8];/* (not saved) */@@ -304,6 +325,12 @@ void blanker_set(float alpha, bool on);void white_blanker_fade(bool in); /* HUD Blanker White: FADE IN, FADE OUT (over its Fade Time) */void white_blanker_time(float t);void white_blanker_reset(void);+/* the notices (Relic Get Msg, Charm Get Msg) and the charm tutorial (Charm Tutorial Msg) */+void notice_icon(int k); /* (the next notice's icon: the scripts' NOTICE_ICONS) */+void notice_show(int text); /* a relic's notice: its icon, its name */+void charm_notice(int id); /* a charm's (in the tutorial, as it is made: its charm) */+void charm_tute(void);+void charm_tute_close(void);bool bench_respawn(const char *name); /* RESPAWN: the Knight asleep on the bench so named *//* the Spell Control FSM (spell.c): focus, spells */diff --git a/games/hollowknight/src/msg.c b/games/hollowknight/src/msg.cindex 31480959..867be7d8 100644--- a/games/hollowknight/src/msg.c+++ b/games/hollowknight/src/msg.c@@ -24,7 +24,11 @@ static struct {uint32_t prev_keys;} m;+static void notices_off(void);+static void notices_tick(void);+void msg_show(int item) {+ notices_off();memset(&m, 0, sizeof m);m.item = (uint8_t)item;for (int i = 0; i < NF; i++) m.t_up[i] = -1;@@ -62,6 +66,7 @@ static void white_blanker_tick(void) {void msg_tick(void) {white_blanker_tick();+ notices_tick();if (m.st == MS_OFF) return;uint32_t pressed = g_hero.keys & ~m.prev_keys;m.prev_keys = g_hero.keys;@@ -135,11 +140,110 @@ static float blank_alpha;static bool blank_on;void blanker_set(float alpha, bool on) { blank_alpha = alpha, blank_on = on; }+/* ---------------------------------------------------------------- notices, the charm tutorial */+/* (Relic Msg, Charm Msg: at (-11.91, -6.22) on the HUD, up 4.25 s then down; their parts fade up in 0.3 s, down in 0.2.+ * Charm Tute Msg: at (0, 2.77); its parts (color_fader) up in 1 s after their delays, its stop at 5 s, down in 1 s as+ * it is closed. A new one sends the others away: DESTROY JOURNAL MSG) */+typedef struct {+ int16_t sprite;+ float kx, ky; /* (its x and y scales from the one it was made at) */+} Piece;+static const Piece notice_bb = NOTICE_BACKBOARD, tute_fleur = TUTE_FLEUR, tute_bb = TUTE_BACKBOARD, tute_image = TUTE_IMAGE,+ tute_stop = TUTE_STOP;+static const int16_t notice_icons[] = NOTICE_ICONS, charm_icons[41] = CHARM_ICONS, charm_names[41] = CHARM_NAMES;+enum { NT_OFF, NT_RELIC, NT_CHARM, NT_TUTE };+static struct {+ uint8_t kind;+ int16_t icon, text, next_icon;+ float t, t_down; /* (time up; time since it went down: -1 not yet) */+} nt = {NT_OFF, -1, -1, -1, 0, -1};++static void notices_off(void) { nt.kind = NT_OFF; }++void notice_icon(int k) { nt.next_icon = k >= 0 && k < (int)(sizeof notice_icons / sizeof notice_icons[0]) ? notice_icons[k] : -1; }++static void notice_start(int kind, int icon, int text) {+ m.st = MS_OFF; /* (the item message: gone, as a new one shows) */+ nt.kind = (uint8_t)kind, nt.icon = (int16_t)icon, nt.text = (int16_t)text, nt.t = 0, nt.t_down = -1;+}++void notice_show(int text) { notice_start(NT_RELIC, nt.next_icon, text); }++void charm_notice(int id) {+ if (id < 0 || id > 40) return;+ /* (in a tutorial just made: its own Charm Get Msg's charm) */+ if (nt.kind == NT_TUTE && nt.t == 0) nt.icon = charm_icons[id], nt.text = charm_names[id];+ else notice_start(NT_CHARM, charm_icons[id], charm_names[id]);+}++void charm_tute(void) { notice_start(NT_TUTE, -1, -1); }++void charm_tute_close(void) {+ if (nt.kind == NT_TUTE && nt.t_down < 0) nt.t_down = 0;+}++static void notices_tick(void) {+ if (nt.kind == NT_OFF) return;+ nt.t += DT;+ if (nt.t_down >= 0) nt.t_down += DT;+ if (nt.kind != NT_TUTE) {+ if (nt.t >= 4.25f && nt.t_down < 0) nt.t_down = 0;+ if (nt.t_down >= 1) nt.kind = NT_OFF;+ } else if (nt.t_down >= 1)+ nt.kind = NT_OFF;+}++/* a part's alpha: up over `up` after `delay`, down over `down` once it went down */+static float fader(float delay, float up, float down) {+ float a = (nt.t - delay) / up;+ a = a < 0 ? 0 : a > 1 ? 1 : a;+ if (nt.t_down >= 0) {+ float d = 1 - nt.t_down / down;+ if (d < a) a = d < 0 ? 0 : d;+ }+ return a;+}++static void piece(const Piece *p, float x, float y, float a, int slot) {+ uint8_t al = (uint8_t)(a * 255 + 0.5f);+ if (!al || p->sprite < 0) return;+ Inst in;+ sprite_inst(p->sprite, x, y, 0, p->kx, p->ky, gfx_dyn_tint(slot, 255, 255, 255, al), &in);+ gfx_hud(&in, 0);+}++static void notices_draw(void) {+ if (nt.kind == NT_OFF) return;+ if (nt.kind != NT_TUTE) {+ const float x = -11.91f, y = -6.22f;+ float a = fader(0, 0.3f, 0.2f);+ piece(¬ice_bb, x + 2.82f, y - 0.12f, a * 0.797f, 22);+ if (nt.icon >= 0) sprite(nt.icon, x - 0.46f, y - 0.05f, a, 23);+ /* (its Text: left-aligned in its box, 6.12 wide about (3.64, -0.03)) */+ line(nt.text, STYLE_NOTICE, x + 3.64f - 3.06f, y - 0.03f, 2, false, a);+ return;+ }+ const float x = 0, y = 2.77f;+ float a0 = fader(0, 1, 1), a1 = fader(1, 1, 1), a3 = fader(3, 1, 1);+ piece(&tute_bb, x, y - 0.53f, a0, 22);+ piece(&tute_fleur, x, y + 2.06f, a0, 24);+ /* (its Charm Get Msg: no backboard) */+ if (nt.icon >= 0) sprite(nt.icon, x - 2.9f, y + 0.83f, a0, 23);+ line(nt.text, STYLE_NOTICE, x + 1.2f - 3.06f, y + 0.85f, 2, false, a0);+ /* (Title, Subtitle, Text: their tops at their rects' tops, 4.02 high) */+ line(TXT_CHARM_TUTE_TITLE, STYLE_TUTE_TITLE, x, y + 1.55f + 2.01f, 0, true, a0);+ line(TXT_CHARM_TUTE_SUB, STYLE_TUTE, x, y - 2.29f + 2.01f, 0, true, a1);+ piece(&tute_image, x, y - 4.51f, a3, 25);+ line(TXT_CHARM_REMINDER, STYLE_TUTE, x, y - 9.59f + 2.01f, 0, true, a3);+ if (nt.t >= 5 && nt.t_down < 0) piece(&tute_stop, x + 0.05f, y - 9.19f, 1, 26);+}+void msg_draw(void) {if (wb.on && wb.alpha > 0)gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(28, 255, 255, 255, (uint8_t)(wb.alpha * 255 + 0.5f)));if (blank_on && blank_alpha > 0)gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(27, 0, 0, 0, (uint8_t)(blank_alpha * 255 + 0.5f)));+ notices_draw();if (m.st == MS_OFF) return;const int16_t *t = table[m.item];/* (BG: black, at 0.766 of its color's alpha) */diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.cindex c96db72b..db430b22 100644--- a/games/hollowknight/src/obj.c+++ b/games/hollowknight/src/obj.c@@ -284,13 +284,22 @@ static void chest_hit(Obj *o, const Ent *e) {static void chest_tick(Obj *o, const Ent *e) {if (o->state == CH_OPEN && (o->anim.events & ANIM_TRIGGER)) {- /* Spawn Items: the geo, the item */+ /* Spawn Items: the geo, the item (its Item's children: the scripts'). (The item starts inside the chest's box,+ * which the game's physics pushes it out of by its top: the box off now, the item flies free as it does there) */+ for (int c = e->a; c < e->a + e->group; c++) phys_collider_enable(c, false);+ vm_activate_children(VMSTR_ITEM, true);+ o->hits = 1;geo_fling_at(0, (int)e->p0, e->x0, e->y0, 25, 38, 78, 102, 1);geo_fling_at(1, (int)e->p1, e->x0, e->y0, 25, 38, 78, 102, 1);geo_fling_at(2, (int)e->p2, e->x0, e->y0, 25, 38, 78, 102, 1);o->state = CH_SPAWNED;} else if (o->state == CH_SPAWNED && (o->anim.events & ANIM_DONE))chest_opened(o, e);+ else if (o->state == CH_OPENED && !o->hits) {+ /* (Activated: what it held, on; taken, it goes) */+ vm_activate_children(VMSTR_ITEM, true);+ o->hits = 1;+ }}static void chest_draw(const Obj *o, const Ent *e) {diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.cindex b162a964..7e5e1945 100644--- a/games/hollowknight/src/vm.c+++ b/games/hollowknight/src/vm.c@@ -17,7 +17,7 @@#define NONE 0xFFFF#define OWNER 0xFF0Fenum { O_HERO = 0xFF00, O_HERO_LIGHT, O_DIALOGUE_MANAGER, O_DIALOGUE_TEXT, O_AREA_TITLE, O_CAMERA_PARENT, O_MAIN_CAMERA,- O_GAME_MANAGER, O_HUD_BLANKER, O_HORNET = 0xFF0C, O_WHITE_BLANKER };+ O_GAME_MANAGER, O_HUD_BLANKER, O_HORNET = 0xFF0C, O_WHITE_BLANKER, O_CHARM_TUTE };#define O_GATE 0xFD00 /* (+ k: a battle gate, obj.c's) */#define O_ENT 0xF000 /* (+ i: a room record (a camera lock area), the game's) */enum { OF_ACTIVE = 1, OF_RENDERER = 2, OF_ANIMATOR = 4, OF_TRIGGER = 8, OF_COLLIDER = 16,@@ -50,11 +50,21 @@ typedef struct {} Obj;typedef struct {int16_t obj; /* (-1: none) */- float vx, vy, g; /* (one the scripts set moving: velocity, gravity scale) */- /* (iTweenMoveBy: by, how much of it so far (eased), time so far, its time, ease; 1 going, 2 over; its loop: none,- * again, back and forth. It moves by steps, with what else moves it: Translate) */- float tdx, tdy, te, tt, ttime;uint8_t ease, tween, loop;+ uint8_t nc, ccol[2]; /* (flung: its body's contacts) */+ float vx, vy, g; /* (one the scripts set moving: velocity, gravity scale) */+ union {+ /* (iTweenMoveBy: by, how much of it so far (eased), time so far, its time, ease; 1 going, 2 over; its loop: none,+ * again, back and forth. It moves by steps, with what else moves it: Translate. (tween 3: flung, below)) */+ struct {+ float tdx, tdy, te, tt, ttime;+ };+ /* (flung (FlingObject): a body, as Box2D moves it; its box, bounce and friction as the action has them) */+ struct {+ const uint8_t *box;+ float cnx[2], cny[2];+ };+ };} Mover;typedef struct {@@ -75,6 +85,8 @@ static struct {Fsm fsms[MAX_VM_FSMS];uint32_t vars[MAX_VM_VARS];Mover movers[MAX_MOVERS];+ const uint8_t *persist; /* (what the save keeps: FSM, slot, bit) */+ int npersist;Fsm *executing; /* (the FSM whose action runs: its events to itself wait) */int depth;/* the area title's variables as scripts set them (title.c starts it from them) */@@ -162,6 +174,11 @@ static uint16_t rv(Rd *r) {return s;}static uint8_t rb(Rd *r) { return *r->p++; }+static float rdf(const uint8_t *p) {+ float x;+ memcpy(&x, p, 4);+ return x;+}/* ---------------------------------------------------------------- PlayerData */static bool pd_bool(uint16_t s) {@@ -194,6 +211,10 @@ static int pd_int(int i) {case 10: return g_pd.nail_damage;case 11: return g_pd.hornet_greenpath;case 12: return g_pd.quirrel_egg_temple;+ case 13: return g_pd.charms_owned;+ case 14: case 15: case 16: case 17: return g_pd.trinkets[i - 14];+ case 18: return g_pd.rancid_eggs;+ case 19: return g_pd.ore;default: return 0;}}@@ -207,6 +228,10 @@ static void pd_set_int(int i, int v) {case 8: g_pd.elderbug = (uint8_t)v; break;case 11: g_pd.hornet_greenpath = (uint8_t)v; break;case 12: g_pd.quirrel_egg_temple = (uint8_t)v; break;+ case 13: g_pd.charms_owned = (uint8_t)v; break;+ case 14: case 15: case 16: case 17: g_pd.trinkets[i - 14] = (uint8_t)v; break;+ case 18: g_pd.rancid_eggs = (uint8_t)v; break;+ case 19: g_pd.ore = (uint8_t)v; break;}}@@ -318,7 +343,8 @@ static void obj_set_active(int o, bool on) {if (on) vm.objs[o].flags |= OF_ACTIVE;else vm.objs[o].flags &= (uint16_t)~OF_ACTIVE;if (!was && on) anims_start();- if (!was && on && (vm.rec[o].flags & (OF_WAVE | OF_FADE))) vm.objs[o].anim.time = 0; /* (its wave, its fade, from the start) */+ /* (its wave, its fade, from the start; a wave's speed (anim.fps) its first) */+ if (!was && on && (vm.rec[o].flags & (OF_WAVE | OF_FADE))) vm.objs[o].anim.time = 0, vm.objs[o].anim.fps = vm.rec[o].bx;/* (an FSM starts again as its object comes on: RestartOnEnable; the first time, on its Start, the next frame) */if (!was && on)for (int i = 0; i < vm.nfsms; i++) {@@ -398,6 +424,10 @@ static void obj_event(int o, int ev, uint16_t fsm_name) {if (ev == VMEV_FADE_IN || ev == VMEV_FADE_OUT) white_blanker_fade(ev == VMEV_FADE_IN);return;}+ if (o == O_CHARM_TUTE) {+ if (ev == VMEV_CLOSE) charm_tute_close();+ return;+ }if (o == O_HERO) {if (ev == VMEV_FSM_CANCEL) spell_cancel(); /* (its FSMs' FSM CANCEL: a spell, a focus, stopped) */return;@@ -647,6 +677,36 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {pd_set_int(i, ival(f, rv(&r)));return true;}+ case VMOP_INCREMENTPLAYERDATAINT: {+ int i = rb(&r);+ pd_set_int(i, pd_int(i) + 1);+ return true;+ }+ case VMOP_FLINGOBJECT: {+ int o = oval(f, rv(&r));+ float smin = fval(f, rv(&r)), smax = fval(f, rv(&r)), amin = fval(f, rv(&r)), amax = fval(f, rv(&r));+ Mover *m = obj_ok(o) ? mover(o, true) : NULL;+ if (m) {+ float s = rand_range(smin, smax), a = rand_range(amin, amax) * (float)M_PI / 180;+ m->vx = s * cosf(a), m->vy = s * sinf(a);+ m->box = r.p, m->nc = 0, m->tween = 3;+ }+ return true;+ }+ case VMOP_GETSPEED2D: {+ int o = oval(f, rv(&r));+ uint8_t st = rb(&r);+ bool every = rb(&r);+ Mover *m = mover(o, false);+ set_f(f, st, o == O_HERO ? sqrtf(g_hero.body.vx * g_hero.body.vx + g_hero.body.vy * g_hero.body.vy)+ : m ? sqrtf(m->vx * m->vx + m->vy * m->vy) : 0);+ return !every;+ }+ case VMOP_SENDRANDOMEVENT: {+ int n = rb(&r);+ if (n) fsm_event(f, r.p[(int)rand_range(0, (float)n - 0.001f)]);+ return true;+ }case VMOP_ACTIVATEGAMEOBJECT: {int o = oval(f, rv(&r));bool on = val(f, rv(&r)) != 0;@@ -847,12 +907,13 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {case VMOP_LISTENFORRIGHT:case VMOP_LISTENFORATTACK:case VMOP_LISTENFORJUMP:- case VMOP_LISTENFORCAST: {+ case VMOP_LISTENFORCAST:+ case VMOP_LISTENFORINVENTORY: {int ev = rb(&r);if (mode != M_UPDATE) return false;uint32_t k = op == VMOP_LISTENFORUP ? K_UP : op == VMOP_LISTENFORDOWN ? K_DOWN : op == VMOP_LISTENFORLEFT ? K_LEFT: op == VMOP_LISTENFORRIGHT ? K_RIGHT : op == VMOP_LISTENFORATTACK ? K_ATTACK : op == VMOP_LISTENFORJUMP ? K_JUMP- : K_SPELL;+ : op == VMOP_LISTENFORINVENTORY ? K_INV : K_SPELL;if (pressed_keys() & k) fsm_event(f, ev);return false;}@@ -905,6 +966,18 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {case VMOP_STARTCONVERSATION:dialogue_start(rv(&r));return true;+ case VMOP_NOTICEICON:+ notice_icon(rb(&r));+ return true;+ case VMOP_NOTICETEXT:+ notice_show((int)val(f, rv(&r)));+ return true;+ case VMOP_CHARMNOTICE:+ charm_notice((int)val(f, rv(&r)));+ return true;+ case VMOP_CHARMTUTE:+ charm_tute();+ return true;case VMOP_STARTCONVERSATIONOF: {/* (the conversation its key and sheet name now) */uint16_t key = (uint16_t)val(f, rv(&r)), sheet = (uint16_t)val(f, rv(&r));@@ -1045,6 +1118,7 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {Mover *m = mover(o, enter);if (enter) {if (!m) return true;+ m->nc = 0;m->tdx = has(vec) ? fval(f, vec) : 0, m->tdy = has(vec) ? fval(f, (uint16_t)(vec + 1)) : 0;m->te = 0, m->tt = 0, m->ttime = t, m->ease = (uint8_t)ease, m->tween = 1, m->loop = (uint8_t)loop;return false;@@ -1231,6 +1305,7 @@ void vm_enter(void) {(r->cond2 != NONE && pd_flag(r->cond2 & 0x7FFF) == ((r->cond2 & 0x8000) != 0)))o->flags = OF_COND_OFF;o->anim.clip = -1, o->anim.sprite = -1;+ if (r->flags & OF_WAVE) o->anim.fps = r->bx;o->alpha = 255;}const uint8_t *p = vm.map + 4 * nmap;@@ -1246,6 +1321,10 @@ void vm_enter(void) {f->next = 255;}vm.nfsms = nfsms;+ /* (PersistentBoolItem's Start: its FSM's Activated as the save has it) */+ vm.persist = p, vm.npersist = rd16(b + 6);+ for (int i = 0; i < vm.npersist; i++, p += 4)+ if (p[0] < nfsms && persist_get(rd16(p + 2))) set_var(&vm.fsms[p[0]], p[1], 1);vm.prev_keys = g_hero.keys;/* (what it holds within the condition's: off too) */for (int i = 0; i < nobjs; i++)@@ -1272,8 +1351,12 @@ void vm_tick(void) {o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~OF_SPELL_HIT);o->flags = (uint16_t)(spell ? o->flags | OF_SPELL_IN : o->flags & ~OF_SPELL_IN);if (vm.rec[i].flags & OF_WAVE) {- /* (WaveEffectControl: its timer at its speed; past 1, off) */- if (obj_active(i) && (o->anim.time += DT * vm.rec[i].bx) > 1) obj_set_active(i, false);+ /* (WaveEffectControl: its speed down by a twentieth a step, to a half at least; its timer at that speed; past 1,+ * off) */+ if (obj_active(i)) {+ o->anim.fps = o->anim.fps * 0.95f < 0.5f ? 0.5f : o->anim.fps * 0.95f;+ if ((o->anim.time += DT * o->anim.fps) > 1) obj_set_active(i, false);+ }continue;}if (vm.rec[i].flags & OF_FADE) {@@ -1290,16 +1373,34 @@ void vm_tick(void) {Mover *m = &vm.movers[k];if (m->obj < 0) continue;Obj *o = &vm.objs[m->obj];+ if (m->tween == 3) {+ /* (flung: its body; ObjectBounce as it hits, from the speed it had) */+ Body b;+ memset(&b, 0, sizeof b);+ b.x = o->x, b.y = o->y, b.vx = m->vx, b.vy = m->vy;+ b.ox = rdf(m->box), b.oy = rdf(m->box + 4), b.hx = rdf(m->box + 8), b.hy = rdf(m->box + 12);+ b.gravity_scale = m->g, b.friction = rdf(m->box + 20), b.mask = CF_TERRAIN;+ b.ncontacts = m->nc;+ for (int c = 0; c < m->nc; c++) b.ccol[c] = m->ccol[c], b.cnx[c] = m->cnx[c], b.cny[c] = m->cny[c];+ float pvx = b.vx, pvy = b.vy;+ int had = b.ncontacts;+ body_step(&b, DT);+ if (b.ncontacts > had) body_bounce(&b, pvx, pvy, had, rdf(m->box + 16));+ m->vx = b.vx, m->vy = b.vy;+ m->nc = (uint8_t)(b.ncontacts < 2 ? b.ncontacts : 2);+ for (int c = 0; c < m->nc; c++) m->ccol[c] = b.ccol[c], m->cnx[c] = b.cnx[c], m->cny[c] = b.cny[c];+ obj_move(m->obj, b.x, b.y);+ continue;+ }+ float nx = o->x + m->vx * DT, ny = o->y;if (m->g > 0) {m->vy -= 60 * m->g * DT;- float ny = o->y + m->vy * DT;+ ny = o->y + m->vy * DT;PhysHit hit;if (m->vy < 0 && phys_ray(o->x, o->y, 0, -1, o->y - ny + 0.76f, CF_TERRAIN, &hit) && hit.dist <= o->y - ny + 0.76f)- o->y = o->y - hit.dist + 0.76f, m->vy = 0;- else- o->y = ny;+ ny = o->y - hit.dist + 0.76f, m->vy = 0;}- o->x += m->vx * DT;+ obj_move(m->obj, nx, ny);}for (int i = 0; i < vm.nfsms; i++) fsm_step(&vm.fsms[i], M_FIXED);/* (tweens: iTween's Update) */@@ -1322,6 +1423,12 @@ void vm_tick(void) {}for (int i = 0; i < vm.nfsms; i++) fsm_step(&vm.fsms[i], M_UPDATE);vm.prev_keys = g_hero.keys;+ /* (SaveState: Activated into the save) */+ for (int i = 0; i < vm.npersist; i++) {+ const uint8_t *p = vm.persist + 4 * i;+ const Fsm *f = &vm.fsms[p[0]];+ if (p[1] < f->nvars && vm.vars[f->var0 + p[1]] && !persist_get(rd16(p + 2))) persist_set(rd16(p + 2));+ }if (vm.title_start) {vm.title_start = false;if (vm.title >= 0)diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.cindex 1a164f06..a851131f 100644--- a/games/hollowknight/tests/play.c+++ b/games/hollowknight/tests/play.c@@ -98,6 +98,8 @@ int main(int argc, char **argv) {dialogue_start(atoi(strchr(getenv("HKTALK"), ':') + 1));}if (getenv("HKKILL") && atoi(getenv("HKKILL")) == tick) hero_take_damage(SIDE_LEFT, 99, HAZ_NORMAL);+ /* (HKREENTER=tick: the room entered again then, as it was left) */+ if (getenv("HKREENTER") && atoi(getenv("HKREENTER")) == tick) game_enter(id, px, py, true);if (getenv("HKGOD")) g_pd.health = g_pd.max_health;if (getenv("HKHIT") && atoi(getenv("HKHIT")) <= tick &&tick % (getenv("HKHITN") ? atoi(getenv("HKHITN")) : 10) == 0) {@@ -164,7 +166,10 @@ int main(int argc, char **argv) {printf("pd:");for (int i = 0; i < PDF_COUNT; i++)if (pd_flag(i)) printf(" %d", i);- printf(" hornet_greenpath %d\n", g_pd.hornet_greenpath);+ int np = 0;+ for (int i = 0; i < MAX_PERSIST; i++) np += persist_get(i);+ printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d\n", g_pd.hornet_greenpath, g_pd.trinkets[0],+ g_pd.trinkets[1], g_pd.trinkets[2], g_pd.trinkets[3], g_pd.charms_owned, np);}return 0;}diff --git a/games/hollowknight/tools/art.py b/games/hollowknight/tools/art.pyindex d1884be4..c0e96e0a 100644--- a/games/hollowknight/tools/art.py+++ b/games/hollowknight/tools/art.py@@ -166,8 +166,9 @@ def black_sprite(s):FIT = {} # room -> texture scale factor (fit.py: so that every view's tiles fit the calculator's cache)-def build_variants(rooms, vis_of):- """Assign every instance a texture variant. vis_of(room) -> (weights, cells)."""+def build_variants(rooms, vis_of, owned=lambda r: ()):+ """Assign every instance a texture variant. vis_of(room) -> (weights, cells); owned(room) -> the (scene, object id)+ drawn by others (left out)."""variants = {}per_room = {}for r in rooms:@@ -176,7 +177,10 @@ def build_variants(rooms, vis_of):w, cells = vis_of(r)bz = st["blur_z"] if st["blur_z"] is not None else 1e9keep = []+ mine = set(owned(r))for it in inst:+ if (it.scene, it.obj["id"]) in mine:+ continueif it.solid:keep.append(it)continuediff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.pyindex 0558dd36..d02921fe 100644--- a/games/hollowknight/tools/ents.py+++ b/games/hollowknight/tools/ents.py@@ -240,6 +240,10 @@ def pd_flags():if n in PD_RAW_NAMES:out[PD_RAW_NAMES[n]] = icontinue+ m = re.match(r"PDF_(GOT|EQUIPPED)_CHARM_(\d+)$", n)+ if m:+ out[("gotCharm_" if m.group(1) == "GOT" else "equippedCharm_") + m.group(2)] = i+ continue# (Cornifer's: "corn_greenpathLeft")c = camel(n[9:]) if n.startswith("PDF_CORN_") else camel(n[4:])out[("corn_" if n.startswith("PDF_CORN_") else "") + c[0].lower() + c[1:]] = idiff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.pyindex 6f5c78c7..dbeb9f0a 100644--- a/games/hollowknight/tools/pack.py+++ b/games/hollowknight/tools/pack.py@@ -448,11 +448,12 @@ def main():if os.path.exists(fp):import jsonart.FIT.update(json.load(open(fp)))- variants, per_room = art.build_variants(ROOMS, visible.compute)- print("variants", len(variants), "%.0fs" % (time.time() - t0), flush=True)- jobs = [art.Job(v) for v in variants]actors.add_props(ALL_ROOMS)vm.prepare(ROOMS, SPRITES, TEXTS) # (the characters' scripts, and their libraries as actors)+ # (the scripts' objects: drawn by them, not with the room)+ variants, per_room = art.build_variants(ROOMS, visible.compute, vm.owned)+ print("variants", len(variants), "%.0fs" % (time.time() - t0), flush=True)+ jobs = [art.Job(v) for v in variants]sprites, clips = actors.build()ents.CLIP_INDEX.update({c["id"]: i for i, c in enumerate(clips)})# the rooms' objects, and the sprites they show (after the actors')@@ -490,6 +491,32 @@ def main():pgb = unity.prefab("sharedassets149.assets", 34)fleurs["SPRITE_GRASS_BALL"] = SPRITES.id(pgb, next(c["v"] for c in pgb["objects"][0]["c"] if c["type"] == "SpriteRenderer")["m_Sprite"], 1)fleurs["MSG_TABLE"] = "{%s}" % ", ".join(msgs)+ # the notices (Relic Get Msg, Charm Get Msg) and the charm tutorial (Charm Tutorial Msg): their pieces, the icons the+ # scripts set, the charms' icons (CharmIconList) and names+ def piece(doc, o, scale=None):+ """a prefab object's sprite at its scale: (sprite, its x scale / y scale as drawn)"""+ sr = next(c["v"] for c in o["c"] if c["type"] == "SpriteRenderer")+ sx, sy = (scale or o["lscale"])[:2]+ return SPRITES.id(doc, sr["m_Sprite"], max(sx, sy), hud_res), sx / max(sx, sy), sy / max(sx, sy)+ prel, ptute = unity.prefab("resources.assets", 4251), unity.prefab("sharedassets6.assets", 491)+ by_rel = {o["path"]: o for o in prel["objects"]}+ by_tute = {o["path"]: o for o in ptute["objects"]}+ s, kx, ky = piece(prel, by_rel["Relic Get Msg/pop_up_backboard"])+ fleurs["NOTICE_BACKBOARD"] = "{%d, %.4ff, %.4ff}" % (s, kx, ky)+ for name, path in (("FLEUR", "Warning_Fleur0008"), ("BACKBOARD", "backboard"), ("IMAGE", "Image"), ("STOP", "Stop")):+ s, kx, ky = piece(ptute, by_tute["Charm Tutorial Msg/" + path])+ fleurs["TUTE_" + name] = "{%d, %.4ff, %.4ff}" % (s, kx, ky)+ fleurs["NOTICE_ICONS"] = "{%s}" % ", ".join(str(SPRITES.id(dd, list(rr), 1.0, hud_res)) for dd, rr in vm.NOTICE_ICONS) \+ if vm.NOTICE_ICONS else "{-1}"+ pmenu = unity.scene("Menu_Title")+ icl = next(c["v"] for o in pmenu["objects"] for c in o["c"] if c.get("class") == "CharmIconList")["spriteList"]+ fleurs["CHARM_ICONS"] = "{%s}" % ", ".join(str(SPRITES.id(pmenu, icl[i], 1.0, hud_res)) if i in vm.CHARMS else "-1"+ for i in range(41))+ fleurs["CHARM_NAMES"] = "{%s}" % ", ".join(+ str(TEXTS.add(text.clean(text.sheets()["UI"]["CHARM_NAME_%d" % i]), "NOTICE")) if i in vm.CHARMS else "-1"+ for i in range(41))+ for key, style in (("CHARM_TUTE_TITLE", "TUTE_TITLE"), ("CHARM_TUTE_SUB", "TUTE"), ("CHARM_REMINDER", "TUTE")):+ fleurs["TXT_" + key] = TEXTS.add(text.clean(text.sheets()["Prompts"][key]), style)# the title screen, the save profiles, the pause menu; each room's map zone (the save slots' area)import menufleurs.update(menu.build(SPRITES, TEXTS))@@ -501,10 +528,10 @@ def main():if r in VARIANT_ROOMS:room_data(r, 1)clip_index = {c["id"]: i for i, c in enumerate(clips)}- vm_rooms = [vm.room_blob(r, clip_index, SPRITES, ROOM_OWNERS.get((r, 0), [])) for r in ROOMS]+ vm_rooms = [vm.room_blob(r, clip_index, SPRITES, ROOM_OWNERS.get((r, 0), []), PERSIST) for r in ROOMS]sheet = text.sheets()["Prompts"]vm_prompts = {s: TEXTS.id("Prompts", s.upper(), "PROMPT") for s in vm.STR.list if s.upper() in sheet}- for s in ("NPC Title", "Visited", "Display Right", "Hornet Saver"):+ for s in ("NPC Title", "Visited", "Display Right", "Hornet Saver", "Item"):vm.STR.id(s)sprites += actors.unity_sprites(SPRITES.list)# the HUD's geo count: TrajanPro-Bold digits (TextMesh: size 45, character size 1, scale 0.1527)@@ -711,7 +738,7 @@ def main():f.write("#define VMOP_%s %d\n" % (name.upper(), code))for i, e in enumerate(vm.EVENTS.list[:vm.FIXED_EVENTS]):f.write("#define VMEV_%s %d\n" % (e.upper().replace(" ", "_"), i))- for name in ("NPC Title", "Visited", "Display Right", "Hornet Saver"):+ for name in ("NPC Title", "Visited", "Display Right", "Hornet Saver", "Item"):f.write("#define VMSTR_%s %d\n" % (name.upper().replace(" ", "_"), vm.STR.index[name]))for name, i in str_ids.items():f.write("#define STR_%s %d\n" % (name.upper().replace(" ", "_"), i))diff --git a/games/hollowknight/tools/text.py b/games/hollowknight/tools/text.pyindex 6a89c90a..99018092 100644--- a/games/hollowknight/tools/text.py+++ b/games/hollowknight/tools/text.py@@ -92,6 +92,11 @@ STYLES = {# the message as an item is taken (UI Msg Get Item: its lines, a third bigger; its item's name)"MSG": _style("Perpetua", 3.73 * 1.4407, HUD_PX, 134.0625, 0, 117, 95.9375, -38.1875),"MSG_NAME": _style("TrajanPro-Bold", 9.32 * 1.4407, HUD_PX, *TRAJAN, k=1, phases=1),+ # the notices as a relic or a charm is taken (Relic Get Msg, Charm Get Msg: Perpetua 8), the charm tutorial's title+ # (9) and its lines (6)+ "NOTICE": _style("Perpetua", 8, HUD_PX, 134.0625, 0, 117, 95.9375, -38.1875),+ "TUTE_TITLE": _style("Perpetua", 9, HUD_PX, 134.0625, 0, 117, 95.9375, -38.1875, phases=1),+ "TUTE": _style("Perpetua", 6, HUD_PX, 134.0625, 0, 117, 95.9375, -38.1875),# the menus (Menu_Title's UI canvas, 1920 x 1200 for 320 x 200 pixels; their text bigger: menu.MENU_K): the# buttons (Trajan bold, 54 at 0.549 and 45 at 0.7), the screens' titles and slot numbers, the slots' details"MENU": _style("TrajanPro-Bold", 31 / 6 * 1.6 * 10, 1, *TRAJAN, k=1),diff --git a/games/hollowknight/tools/unity.py b/games/hollowknight/tools/unity.pyindex b17f7839..5394b347 100644--- a/games/hollowknight/tools/unity.py+++ b/games/hollowknight/tools/unity.py@@ -362,5 +362,26 @@ def material(path, pid):return (m.m_Name, shn)[email protected]_cache(maxsize=None)+def physics_material(path, pid):+ """A PhysicsMaterial2D's values (friction, bounciness)"""+ f = asset_file(path)+ if f is None or pid not in f.objects:+ return {}+ with in_data():+ return dict(f.objects[pid].read_typetree())++[email protected]_cache(maxsize=None)+def tag_name(i):+ """A GameObject's tag (m_Tag) -> its name (Unity's own; the game's, TagManager's from 20000)"""+ if i >= 20000:+ for o in asset_file("globalgamemanagers").objects.values():+ if o.type.name == "TagManager":+ return o.read_typetree()["tags"][i - 20000]+ return {0: "Untagged", 1: "Respawn", 2: "Finish", 3: "EditorOnly", 5: "MainCamera", 6: "Player",+ 7: "GameController"}.get(i, "Untagged")++def ref_path(d, fid):return d["externals"][fid - 1] if fid > 0 else d["level"]diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex bca1530a..21a00e13 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -17,7 +17,12 @@ ROOMS = {"Fungus1_04": ["Hornet Infected Knight Encounter", "Hornet Saver", "Cloak Corpse", "Dream Scene Activate","Dreamer Scene 1"],"Crossroads_ShamanTemple": ["_Props/Shaman Meeting", "_Props/Shaman Trapped", "_Props/Shaman Killed Blocker",- "_Props/Knight Get Fireball", "Battle Scene/Reminder Cast"],+ "_Props/Knight Get Fireball", "Battle Scene/Reminder Cast", "Shiny Item"],+ # items lying about (Shiny Item: a relic, a charm), the City Crest the False Knight leaves+ "Crossroads_01": ["Shiny Item"],+ "Tutorial_01": ["_Props/Chest/Item"], # (its chest: src/obj.c, which turns on what is in it)+ "Fungus1_22": ["Shiny Item"],+ "Crossroads_10": ["Key Giver"],# Hornet seen in Greenpath before her arena"Fungus1_02": ["Hornet Encounter GP1"],"Fungus1_03": ["Set Hornet Encounter"],@@ -40,7 +45,8 @@ SPECIAL = {"Hero": 0xFF00, "HeroLight": 0xFF01, "DialogueManager": 0xFF02, "DialO_NONE = 0xFFFF# PlayerData ints (src/vm.c: pd_int)PD_INTS = ["MPCharge", "health", "maxHealth", "geo", "fireballLevel", "quakeLevel", "screamLevel", "shaman", "elderbug",- "permadeathMode", "nailDamage", "hornetGreenpath", "quirrelEggTemple"]+ "permadeathMode", "nailDamage", "hornetGreenpath", "quirrelEggTemple", "charmsOwned", "trinket1", "trinket2",+ "trinket3", "trinket4", "rancidEggs", "ore"]# PlayerData bools kept elsewhere (src/vm.c)PD_SPECIAL = {"disablePause": 0xFFF0, "hasSpell": 0xFFF1, "canDash": 0xFFF2}# PlayerData bools that keep their new game value all through this part of the game@@ -75,7 +81,7 @@ EVENTS = Strings()for e in ("FINISHED", "CONVO_FINISH", "CONVO START", "CONVO END", "BIG TITLE START", "BIG TITLE END", "HERO DAMAGED","NPC TITLE DOWN", "NPC CONVO START", "BOX UP", "BOX DOWN", "LEAVING SCENE", "TAKE DAMAGE", "GET ITEM MSG END","HORNET LEAVE", "BG CLOSE", "BG QUICK CLOSE", "BG OPEN", "BG QUICK OPEN", "BG DESTROY", "WAKE", "BOX UP DREAM",- "BOX DOWN DREAM", "FADE IN", "FADE OUT", "FSM CANCEL"):+ "BOX DOWN DREAM", "FADE IN", "FADE OUT", "FSM CANCEL", "CLOSE", "FK DEATH"):EVENTS.id(e)FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)@@ -196,7 +202,18 @@ op("TextAlign", ("centre", "n"))op("ObjAlpha", ("gameObject", "o"), ("alpha", "f"), ("everyFrame", "n"))op("BuildString") # (custom: its parts, the strings they can make, where it keeps it)op("StartConversationOf") # (custom: its key and sheet, then the conversations they can name)+op("NoticeIcon", ("icon", "n"))+op("NoticeText", ("text", "i"))+op("CharmNotice", ("id", "i"))+op("CharmTute")op("GetObjAlpha", ("gameObject", "o"), ("store", "F"))+# (flung: its box, from the position; its bounce (ObjectBounce, -1 none), its friction)+op("FlingObject", ("flungObject", "o"), ("speedMin", "f"), ("speedMax", "f"), ("angleMin", "f"), ("angleMax", "f"),+ ("ox", "k"), ("oy", "k"), ("hx", "k"), ("hy", "k"), ("bounce", "k"), ("friction", "k"))+op("GetSpeed2d", ("gameObject", "o"), ("storeResult", "F"), ("everyFrame", "n"))+op("SendRandomEvent", ("events", "e*"))+op("IncrementPlayerDataInt", ("intName", "q"))+op("ListenForInventory", ("wasPressed", "e"))# HeroController's methods the scripts call (HeroCall's method)HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",@@ -209,8 +226,17 @@ PROMPT_PREFAB = ("resources.assets", 6142)PREFAB_SPAWNS = {("sharedassets76.assets", 69), ("sharedassets133.assets", 23), ("sharedassets6.assets", 509)}# prefabs the pool gives (SpawnObjectFromGlobalPool) that the scripts show (made beforehand, off)POOL_SPAWNS = {("resources.assets", 5267)}+# the notices' prefabs (made by the C code: msg.c): a relic's, a charm's, the charm tutorial+NOTICE_PREFABS = {("resources.assets", 4251): "relic", ("sharedassets6.assets", 446): "charm",+ ("sharedassets6.assets", 491): "tute"}+# the icons the scripts set on a notice (SetSpriteRendererSprite): (scene or prefab document, sprite ref), as NoticeIcon+# numbers them (pack.py makes the sprites)+NOTICE_ICONS = []+# the charms this part of the game has (their icons and names: msg.c, the inventory)+CHARMS = [1, 2, 3, 4, 6, 7, 8, 14, 18, 19, 20]# the game's objects the scripts find by name that are not theirs (enemies): what they are to themGAME_OBJECTS = {"Hornet Boss 1": 0xFF0C}+O_CHARM_TUTE = 0xFF0E # (src/vm.c)# what a trigger's Trigger2dEvent hears, by collideTag: the Knight (any), a spellTRIGGER_TAGS = {None: 0, "": 0, "Player": 0, "Untagged": 0, "Hero Spell": 1}# the items the message shows (text.MSGS's order), by Msg Control's Item@@ -248,6 +274,7 @@ class Room:self.by_path.setdefault(q["path"], c)self.objs, self.obj_index = [], {}self.fsms = []+ self.persist, self.persist_objs = [], [] # (PersistentBoolItem: FSM, its Activated's slot, its object)self.problems = []# ------------------------------------------------------------ objects@@ -365,15 +392,51 @@ def _active_chain(rm, o):# ---------------------------------------------------------------- compiling an FSM-def _slots(vars_):- """Its variables -> {name: (slot, type)}, the number of slots (vectors take 3, colors 4)."""+def _slots(vars_, keep=None):+ """Its variables (those in keep) -> {name: (slot, type)}, the number of slots (vectors take 3, colors 4)."""out, n = {}, 0for name, (t, _) in vars_.items():+ if keep is not None and name not in keep:+ continueout[name] = (n, t)n += {"vector3": 3, "vector2": 2, "color": 4, "rect": 4}.get(t, 1)return out, n+def _dollars(v):+ """the variables a parameter names ($name), however deep"""+ if isinstance(v, str):+ return [v[1:]] if v.startswith("$") else []+ if isinstance(v, dict):+ return [n for q in v.values() for n in _dollars(q)]+ if isinstance(v, (list, tuple)):+ return [n for q in v for n in _dollars(q)]+ return []+++SCALARS = ("int", "bool", "float", "string", "gameObject")+++def _layout(f, external):+ """Its variables as the VM keeps them: those an action may change (or another FSM: external), in slots; those+ only read, constants (their values as they start); the rest, nothing -> (slots, their number, the constants'+ names). (By what its actions are, all of them: the same for each FSM made the same)"""+ reads, other = set(), set()+ for st in f["states"]:+ for a in st["actions"]:+ if not a.get("enabled", True):+ continue+ schema = dict(OPS[a["name"]][1]) if a["name"] in OPS else {}+ for k, v in a["params"]:+ kind = schema.get(k)+ (reads if kind and kind[0].islower() else other).update(_dollars(v))+ vars_ = f["vars"]+ inline = {n for n in reads - other - set(external) if n in vars_ and vars_[n][0] in SCALARS}+ keep = {n for n in reads | other if n in vars_} - inline+ slots, n = _slots(vars_, keep)+ return slots, n, inline++def _u32(v):if isinstance(v, bool):return int(v)@@ -388,7 +451,7 @@ OWNER = 0xFF0Fclass Compiler:def __init__(self, rm, o, f):self.rm, self.o, self.f = rm, o, f- self.slots, self.nvars = _slots(f["vars"])+ self.slots, self.nvars, self.inline = _layout(f, rm.external_vars())self.consts = []self.states = {s["name"]: i for i, s in enumerate(f["states"])}self.where = ""@@ -436,13 +499,18 @@ class Compiler:return bytes([OPS["BuildString"][0], len(body)]) + bodydef fsm_slot(self, fsm_name, var):- """another FSM's variable, by its FSM's name and its own (one of the room's): its slot, 255 not known"""+ """another FSM's variable, by its FSM's name and its own (one of the room's): its slot, 255 not known or not+ kept (nothing reads it)"""+ found = set()for o in list(self.rm.by_id.values()):for c in o["c"]:q = c.get("fsm")if q and q["name"] == fsm_name and var in q["vars"]:- return _slots(q["vars"])[0][var][0]- return 255+ s = _layout(q, self.rm.external_vars())[0]+ found.add(s[var][0] if var in s else 255)+ if len(found) > 1:+ self.problem("%s's %s: in different slots %s" % (fsm_name, var, sorted(found)))+ return min(found) if found else 255def problem(self, msg):self.rm.problems.append("%s: %s: %s: %s: %s" % (self.rm.name, self.o["path"], self.f["name"], self.where, msg))@@ -460,6 +528,20 @@ class Compiler:return self.rm.ref_obj(v, self.o.get("_key"))return O_NONE+ def init_value(self, t, v):+ """a variable's value as it starts (a number; a list for vectors, colors)"""+ if t == "gameObject":+ return self.obj_value(v) if v else O_NONE+ if t == "string":+ return STR.id(v or "")+ if t in ("vector3", "vector2", "color", "rect"):+ return [_u32(float(q)) for q in v or []]+ if t == "float":+ return _u32(float(v or 0))+ if t in ("int", "bool"):+ return _u32(int(v or 0))+ return 0+def value(self, v, kind):"""an input operand -> its slot (u16)"""if v is None:@@ -468,6 +550,9 @@ class Compiler:n = v[1:]if n in self.slots:return self.slots[n][0]+ if n in self.inline:+ t, iv = self.f["vars"][n]+ return self.const(self.init_value(t, iv))if n in SPECIAL:return self.const(SPECIAL[n])self.problem("variable %s unknown" % n)@@ -662,6 +747,30 @@ class Compiler:return self.emit("TextAlign", {"centre": 1 if P.get("topCentre") else 0})if n == "SetFsmFloat":return self.emit(n, dict(P, slot=self.fsm_slot(P.get("fsmName"), P.get("variableName"))))+ if n == "SetFsmInt" and P.get("fsmName") == "Charm Msg" and P.get("variableName") == "ID":+ return self.emit("CharmNotice", {"id": P.get("setValue")})+ if n == "SetSpriteRendererSprite" and P.get("gameObject") == "$Msg Icon":+ r = P.get("sprite")+ if not (isinstance(r, (list, tuple)) and r and r[0] == "ref"):+ self.problem("notice icon %r" % (r,))+ return None+ key = (self.o.get("_doc") or self.rm.d, (r[1], r[2]))+ k = next((i for i, (dd, rr) in enumerate(NOTICE_ICONS) if dd is key[0] and rr == key[1]), None)+ if k is None:+ k = len(NOTICE_ICONS)+ NOTICE_ICONS.append(key)+ return self.emit("NoticeIcon", {"icon": k})+ if n == "GetLanguageString":+ # (a text of the game's: its number, in the notices' style)+ import text+ sh, key = P.get("sheetName"), P.get("convName")+ if not (isinstance(key, str) and not key.startswith("$") and key in text.sheets().get(sh, {})):+ self.problem("language string %s %s" % (sh, key))+ return None+ return self.emit("SetIntValue", {"intVariable": P.get("storeValue"),+ "intValue": self.rm.texts.add(text.clean(text.sheets()[sh][key]), "NOTICE")})+ if n == "SetTextMeshProText" and P.get("gameObject") == "$Msg Text":+ return self.emit("NoticeText", {"text": P.get("textString")})if n == "BuildString":return self.build_string(P)if n == "SetMaterialColor" and P.get("gameObject") == "$HUD Blanker":@@ -695,12 +804,20 @@ class Compiler:obj = self.rm.add_prefab(f, pid, (self.o["id"], self.where, P.get("storeObject")))return self.emit("CreateObject", {"gameObject": ("objindex", obj), "x": pos[0], "y": pos[1],"storeObject": P.get("storeObject")})+ if NOTICE_PREFABS.get((f, pid)) == "tute":+ # (the charm tutorial: the C code's, as an object the scripts close)+ return self.emit("CharmTute", {}) + self.emit("SetGameObject", {+ "variable": P.get("storeObject"), "gameObject": ("objindex", O_CHARM_TUTE)})+ if (f, pid) in NOTICE_PREFABS:+ return None # (its parts set below: CharmNotice)return None # (effects)if n == "SpawnObjectFromGlobalPool":r = P.get("gameObject")if isinstance(r, (list, tuple)) and r and r[0] == "ref":import entsf, pid = ents._ref_file(self.o.get("_doc") or self.rm.d, [r[1], r[2]])+ if (f, pid) in NOTICE_PREFABS:+ return None # (a relic's notice: its icon and text set below, NoticeIcon, NoticeText)if (f, pid) in POOL_SPAWNS:pos = P.get("position") or [None, None, None]obj = self.rm.add_prefab(f, pid, (self.o["id"], self.where, P.get("storeObject")))@@ -798,10 +915,43 @@ class Compiler:if n in ("Collision2dEvent", "Collision2dEventLayer"):return self.emit("Collision2dEvent", P)if n in ("ListenForUp", "ListenForDown", "ListenForLeft", "ListenForRight", "ListenForAttack", "ListenForJump",- "ListenForCast"):+ "ListenForCast", "ListenForInventory"):if P.get("eventTarget") not in (None, "Self"):self.problem("%s to another" % n)return self.emit(n, P)+ if n == "GetTag":+ # (an object's tag: what it always is)+ o = self.o if P.get("gameObject") in ("Owner", "$Self") else None+ if o is None or P.get("everyFrame"):+ self.problem("GetTag %r" % P.get("gameObject"))+ return None+ return self.emit("SetStringValue", {"stringVariable": P.get("storeResult"),+ "stringValue": unity.tag_name(o.get("tag", 0)), "everyFrame": 0})+ if n == "SendRandomEvent":+ w = [x for x in P.get("weights") or []]+ if len(set(w)) > 1 or (P.get("delay") or 0) >= 0.001:+ self.problem("SendRandomEvent %r" % P)+ return self.emit(n, P)+ if n == "FlingObject":+ o = self.o if P.get("flungObject") == "Owner" else None+ if o is None:+ self.problem("FlingObject %r" % P.get("flungObject"))+ return None+ import ents+ doc = o.get("_doc") or self.rm.d+ box = next((ents._box(o, c) for c in o["c"] if c["type"] == "BoxCollider2D" and c.get("v") and+ not c["v"].get("m_IsTrigger")), None)+ if not box:+ self.problem("FlingObject: no box")+ return None+ ob = next((c["v"] for c in o["c"] if c.get("class") == "ObjectBounce" and c.get("v")), None)+ mat = next((c["v"].get("m_Material") for c in o["c"] if c["type"] == "BoxCollider2D" and c.get("v")), None)+ friction = 0.4 # (Unity's default material)+ if mat and mat[1]:+ friction = unity.physics_material(unity.ref_path(doc, mat[0]), mat[1]).get("friction", 0.4)+ return self.emit(n, dict(P, ox=(box[0] + box[2]) / 2 - o["pos"][0], oy=(box[1] + box[3]) / 2 - o["pos"][1],+ hx=(box[2] - box[0]) / 2, hy=(box[3] - box[1]) / 2,+ bounce=ob.get("bounceFactor", 0) if ob else -1, friction=friction))if n in OPS:return self.emit(n, P)self.problem("action %s" % n)@@ -853,20 +1003,11 @@ class Compiler:assert len(body) < 65536init = [0] * self.nvarsfor name, (slot, t) in self.slots.items():- v = f["vars"][name][1]- if t == "gameObject":- init[slot] = self.obj_value(v) if v else O_NONE- elif t == "string":- init[slot] = STR.id(v or "")- elif t in ("vector3", "vector2", "color", "rect"):- for k, q in enumerate(v or []):- init[slot + k] = _u32(float(q))- elif t == "float":- init[slot] = _u32(float(v or 0))- elif t in ("int", "bool"):- init[slot] = _u32(int(v or 0))+ v = self.init_value(t, f["vars"][name][1])+ if isinstance(v, list):+ init[slot:slot + len(v)] = velse:- init[slot] = 0+ init[slot] = vreturn bytes(body), init@@ -909,6 +1050,15 @@ def prepare(rooms, sprites, texts):DEF_INDEX[body] = len(DEFS)DEFS.append(body)rm.fsms.append((DEF_INDEX[body], rm.obj_index[o["id"]], init, STR.id(f["name"])))+ # (PersistentBoolItem: the save keeps its object's first FSM with an Activated bool's Activated)+ pbi = next((c2.get("v") for c2 in o["c"] if c2.get("class") == "PersistentBoolItem"), None)+ if pbi is not None and f["vars"].get("Activated", [None])[0] == "bool" and \+ not any(p[0] == len(rm.fsms) - 1 for p in rm.persist) and \+ not any(q[1] == rm.obj_index[o["id"]] for q in rm.persist_objs):+ assert not pbi.get("semiPersistent"), o["path"]+ if "Activated" in cp.slots:+ rm.persist.append((len(rm.fsms) - 1, cp.slots["Activated"][0], o))+ rm.persist_objs.append((len(rm.fsms) - 1, rm.obj_index[o["id"]]))for p in rm.problems:print("vm:", p)nvars = sum(len(i) for _, _, i, _ in rm.fsms)@@ -971,8 +1121,9 @@ OBJ = "<fffffffffHHHHHBBHHhHBBBBBBH" # x y z, sx sy, its trigger (center fromOF_ACTIVE, OF_RENDERER, OF_ANIMATOR, OF_TRIGGER, OF_COLLIDER, OF_ANIM_OFF, OF_WAVE, OF_FADE = 1, 2, 4, 8, 16, 32, 64, 128-def room_blob(name, clip_index, sprites, owners=()):- """A room's VM data (src/vm.c): counts, its objects, their clip maps, its FSMs (definition, owner, name, variables).+def room_blob(name, clip_index, sprites, owners=(), persist=None):+ """A room's VM data (src/vm.c): counts, its objects, their clip maps, its FSMs (definition, owner, name, variables),+ what the save keeps (FSM, slot, its bit: PersistentBoolItem's Activated).owners: each collider's (scene, object id): the colliders an object has, the scripts turn on and off with it."""import actors, ents, tk2drm = BUILT.get(name)@@ -1074,7 +1225,9 @@ def room_blob(name, clip_index, sprites, owners=()):fsms = bytearray()for di, owner, init, fname in rm.fsms:fsms += struct.pack("<HHHH", di, owner, fname, len(init)) + b"".join(struct.pack("<I", v) for v in init)- head = struct.pack("<HHHH", len(rm.objs), len(rm.fsms), nmap, 0)+ for fi, slot, o in rm.persist:+ fsms += struct.pack("<BBH", fi, slot, persist.id(o.get("_scene", name), o["path"]))+ head = struct.pack("<HHHH", len(rm.objs), len(rm.fsms), nmap, len(rm.persist))return bytes(head + objs + clipmap + fsms)@@ -1123,6 +1276,12 @@ def _pd_code(name):PD_INT_CONST = {"permadeathMode": 0, "quakeLevel": 0, "screamLevel": 0}+def owned(room):+ """the room's objects the scripts have (and draw): (scene, object id)"""+ rm = BUILT.get(room)+ return [(o.get("_scene", room), o.get("_raw", o["id"])) for o in rm.objs] if rm else []++def _const_bool(name):if name in PD_CONST:return PD_CONST[name]@@ -1132,7 +1291,8 @@ def _const_bool(name):def _const_vars(f, external=()):- """its bool variables nothing changes (none of its actions write them, no other FSM sets them): their values"""+ """its bool variables nothing changes (none of its actions write them, no other FSM sets them), and its int+ variables only read: their values"""written = set(external)for st in f["states"]:for a in st["actions"]:@@ -1140,7 +1300,10 @@ def _const_vars(f, external=()):if isinstance(v, str) and v.startswith("$") and (k.startswith("store") or k.endswith("Bool") and k != "boolName" or(a["name"] in ("SetBoolValue", "BoolFlip") and k == "boolVariable")):written.add(v[1:])- return {n: bool(val) for n, (t, val) in f["vars"].items() if t == "bool" and n not in written}+ out = {n: bool(val) for n, (t, val) in f["vars"].items() if t == "bool" and n not in written}+ _, _, inline = _layout(f, external)+ out.update({n: int(f["vars"][n][1] or 0) for n in inline if f["vars"][n][0] == "int"})+ return outdef _events_of_state(f, s, consts=None, where=False):@@ -1221,6 +1384,20 @@ def _events_of_state(f, s, consts=None, where=False):(ev(P.get("greaterThan")), lambda x, y: x > y)):if e and (a1 is None or a2 is None or test(a1, a2)):out.add(e)+ if a1 is not None and a2 is not None and not P.get("everyFrame") and e in takes:+ return (out, True, ai) if where else (out, True)+ continue+ if n == "IntSwitch":+ x = known.get(var(P.get("intVariable"))) if var(P.get("intVariable")) else P.get("intVariable")+ for c, e in zip(P.get("compareTo") or [], P.get("sendEvent") or []):+ e = ev(e)+ c = known.get(var(c)) if var(c) else c+ if e and (x is None or c is None or x == c):+ out.add(e)+ if x is not None and c is not None and not P.get("everyFrame") and e in takes:+ return (out, True, ai) if where else (out, True)+ if x is not None and c is not None and x == c:+ breakcontinueif n in ("IntCompareToBool", "IntTestToBool"):k1, k2 = ("integer1", "integer2") if n == "IntCompareToBool" else ("int1", "int2")