Skip to content

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.

Hollow Knight: Tiso, Quirrel and Sly's rescue

Mason Chenea921369a6cb
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 813855de..d7b473f8 100644
Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differ
diff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.h
index 4c4e52ab..8a085745 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -529,30 +529,45 @@
#define CLIP_VM0_TALK_RIGHT 469
#define CLIP_VM0_TURN_LEFT 470
#define CLIP_VM0_TURN_RIGHT 471
-#define CLIP_VM4_HEGEMOL_CAST 472
-#define CLIP_VM4_HEGEMOL_IDLE 473
-#define CLIP_VM4_LURIEN_CAST 474
-#define CLIP_VM4_LURIEN_IDLE 475
-#define CLIP_VM4_MONOMON_CAST 476
-#define CLIP_VM4_MONOMON_IDLE 477
-#define CLIP_VM5_IDLE 478
-#define CLIP_VM5_SIT_IDLE 479
-#define CLIP_VM5_SIT_TALK 480
-#define CLIP_VM5_SIT_TALK_END 481
-#define CLIP_VM5_SUMMON 482
-#define CLIP_VM5_TALK 483
-#define CLIP_VM5_TALK_END 484
-#define CLIP_VM5_TURN 485
-#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 486
-#define CLIP_ANIM1_GROUND_PLINK_0 487
-#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 488
-#define SPRITE_HERO_LIGHT 2100
-#define SPRITE_DIALOGUE_BACKBOARD 2101
-#define SPRITE_PROMPT_SHADOW 2102
-#define SPRITE_CORPSE_NAIL 2103
-#define SPRITE_FK_BARREL 2104
-#define SPRITE_FK_STAFF 2105
-#define SPRITE_DIGIT0 2313
+#define CLIP_VM2_IDLE 472
+#define CLIP_VM2_LOOKLEFT 473
+#define CLIP_VM2_LOOKRIGHT 474
+#define CLIP_VM3_IDLE 475
+#define CLIP_VM3_TALK 476
+#define CLIP_VM3_TALK_END 477
+#define CLIP_VM4_IDLE 478
+#define CLIP_VM4_LOOKLEFT 479
+#define CLIP_VM4_LOOKRIGHT 480
+#define CLIP_VM4_SIT 481
+#define CLIP_VM4_SIT_TALK 482
+#define CLIP_VM4_SIT_TALK_END 483
+#define CLIP_VM5_DAZED 484
+#define CLIP_VM5_IDLE 485
+#define CLIP_VM5_WAKE 486
+#define CLIP_VM8_HEGEMOL_CAST 487
+#define CLIP_VM8_HEGEMOL_IDLE 488
+#define CLIP_VM8_LURIEN_CAST 489
+#define CLIP_VM8_LURIEN_IDLE 490
+#define CLIP_VM8_MONOMON_CAST 491
+#define CLIP_VM8_MONOMON_IDLE 492
+#define CLIP_VM9_IDLE 493
+#define CLIP_VM9_SIT_IDLE 494
+#define CLIP_VM9_SIT_TALK 495
+#define CLIP_VM9_SIT_TALK_END 496
+#define CLIP_VM9_SUMMON 497
+#define CLIP_VM9_TALK 498
+#define CLIP_VM9_TALK_END 499
+#define CLIP_VM9_TURN 500
+#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 501
+#define CLIP_ANIM1_GROUND_PLINK_0 502
+#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 503
+#define SPRITE_HERO_LIGHT 2231
+#define SPRITE_DIALOGUE_BACKBOARD 2232
+#define SPRITE_PROMPT_SHADOW 2233
+#define SPRITE_CORPSE_NAIL 2234
+#define SPRITE_FK_BARREL 2235
+#define SPRITE_FK_STAFF 2236
+#define SPRITE_DIGIT0 2444
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -593,20 +608,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 32
-#define TXT_PROMPT_REST 33
-#define TXT_PROMPT_INSPECT 34
-#define TXT_PROMPT_ENTER 35
-#define TXT_PROMPT_SIT 36
-#define TXT_PROMPT_SHOP 37
-#define TXT_PROMPT_TRAVEL 38
-#define TXT_PROMPT_ASCEND 39
-#define TXT_PROMPT_DESCEND 40
-#define TXT_PROMPT_EXIT 41
-#define TXT_PROMPT_ACCEPT 42
-#define TXT_PROMPT_TRADE 43
-#define TXT_PROMPT_WATCH 44
-#define TXT_PROMPT_CHALLENGE 45
+#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 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
@@ -699,7 +714,8 @@
#define VMOP_TEXTALIGN 88
#define VMOP_OBJALPHA 89
#define VMOP_BUILDSTRING 90
-#define VMOP_GETOBJALPHA 91
+#define VMOP_STARTCONVERSATIONOF 91
+#define VMOP_GETOBJALPHA 92
#define VMEV_FINISHED 0
#define VMEV_CONVO_FINISH 1
#define VMEV_CONVO_START 2
@@ -727,9 +743,9 @@
#define VMEV_FADE_OUT 24
#define VMEV_FSM_CANCEL 25
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 220
-#define VMSTR_DISPLAY_RIGHT 221
-#define VMSTR_HORNET_SAVER 83
+#define VMSTR_VISITED 240
+#define VMSTR_DISPLAY_RIGHT 241
+#define VMSTR_HORNET_SAVER 104
#define STR_ATTACK_RANGE 23
#define STR_EVADE_RANGE 50
#define STR_SPIT_RANGE 51
@@ -757,20 +773,20 @@
#define TITLE_TISO_NC 18
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
-#define TITLE_TABLE {{46, 47, -1, -1}, {48, 49, 50, -1}, {51, 52, -1, 53}, {54, 55, -1, 56}, {57, 58, -1, 59}, {60, 61, -1, -1}, {62, 63, 64, -1}, {65, 66, -1, -1}, {67, 68, -1, -1}, {69, 70, -1, -1}, {71, 72, -1, -1}, {73, 74, -1, -1}, {75, 76, -1, -1}, {77, 78, -1, -1}, {79, 80, -1, 81}, {82, 83, -1, 84}, {82, 83, -1, 85}, {86, 87, 88, -1}, {86, 87, -1, -1}, {89, 90, -1, 91}}
-#define SPRITE_FLEUR_TOP 2106
+#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 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
#define FLEUR_FPS 15.0f
-#define SPRITE_FLEUR_BOT 2107
+#define SPRITE_FLEUR_BOT 2238
#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}
-#define SPRITE_MSG_BG 2108
-#define SPRITE_MSG_STOP 2109
-#define SPRITE_MSG_FLEUR 2110
-#define SPRITE_MSG_KEY 2111
-#define SPRITE_MSG_ICON_FIREBALL 2112
-#define SPRITE_MSG_ICON_DASH 2113
-#define SPRITE_GRASS_BALL 2114
-#define MSG_TABLE {{92, 93, 94, 95, 96, 97}, {98, 99, 100, 101, 102, 103}}
+#define SPRITE_MSG_BG 2239
+#define SPRITE_MSG_STOP 2240
+#define SPRITE_MSG_FLEUR 2241
+#define SPRITE_MSG_KEY 2242
+#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 MSG_FIREBALL 0
#define MSG_DASH 1
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index 31f42ed7..e9025d4c 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -13,7 +13,7 @@ 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_COUNT
+ PDF_HORNET_F19, PDF_MET_QUIRREL, PDF_TISO_ENCOUNTERED_BENCH, PDF_COUNT
};
typedef struct {
/* (saved: the layout only ever grows into reserved) */
@@ -35,7 +35,8 @@ typedef struct {
uint8_t current_area; /* (the area whose title showed last: AreaTitleController) */
uint8_t elderbug; /* (Elderbug's state) */
uint8_t hornet_greenpath; /* (hornetGreenpath: her encounters in Greenpath) */
- uint8_t reserved[60];
+ uint8_t quirrel_egg_temple; /* (quirrelEggTemple: his talks at the Black Egg) */
+ uint8_t reserved[59];
/* (saved apart, by the objects' names: their states) */
uint8_t persist[MAX_PERSIST / 8];
/* (not saved) */
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index 7a30f5e5..e1d61387 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -39,7 +39,7 @@ typedef struct {
uint16_t blend; /* (its material's: BL_*) */
uint8_t col0, ncol; /* (the colliders it has: on as it is) */
uint8_t r, g, b, a; /* (its renderer's color) */
- uint16_t pad;
+ uint16_t cond2; /* (a second condition, as cond) */
} ObjRec;
typedef struct {
@@ -193,6 +193,7 @@ static int pd_int(int i) {
case 8: return g_pd.elderbug;
case 10: return g_pd.nail_damage;
case 11: return g_pd.hornet_greenpath;
+ case 12: return g_pd.quirrel_egg_temple;
default: return 0;
}
}
@@ -205,6 +206,7 @@ static void pd_set_int(int i, int v) {
case 7: g_pd.shaman = (uint8_t)v; break;
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;
}
}
@@ -903,6 +905,19 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case VMOP_STARTCONVERSATION:
dialogue_start(rv(&r));
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));
+ int n = rb(&r);
+ for (int k = 0; k < n; k++) {
+ uint16_t kk = rv(&r), ss = rv(&r), t = rv(&r);
+ if (kk == key && ss == sheet) {
+ dialogue_start(t);
+ break;
+ }
+ }
+ return true;
+ }
case VMOP_HEROCALL: {
int m = rb(&r);
uint8_t store = rb(&r);
@@ -1212,7 +1227,9 @@ void vm_enter(void) {
o->x = r->x, o->y = r->y, o->sx = r->sx, o->sy = r->sy;
o->flags = r->flags & (OF_ACTIVE | OF_RENDERER | OF_COLLIDER);
/* (DeactivateIfPlayerdataTrue, False; or a scene loaded with the room's by a bool, not now) */
- if (r->cond != NONE && pd_flag(r->cond & 0x7FFF) == ((r->cond & 0x8000) != 0)) o->flags = OF_COND_OFF;
+ if ((r->cond != NONE && pd_flag(r->cond & 0x7FFF) == ((r->cond & 0x8000) != 0)) ||
+ (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;
o->alpha = 255;
}
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index dcb33d93..bca1530a 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -10,7 +10,10 @@ import unity, text, state
# rooms -> the objects whose scripts run here (and all under them)
ROOMS = {
- "Town": ["_NPCs/Elderbug"],
+ "Town": ["_NPCs/Elderbug", "_NPCs/Tiso Town NPC"],
+ "Room_temple": ["Quirrel"],
+ "Crossroads_47": ["_NPCs/Tiso Bench NPC"],
+ "Room_ruinhouse": ["Sly Dazed"],
"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",
@@ -37,11 +40,11 @@ SPECIAL = {"Hero": 0xFF00, "HeroLight": 0xFF01, "DialogueManager": 0xFF02, "Dial
O_NONE = 0xFFFF
# PlayerData ints (src/vm.c: pd_int)
PD_INTS = ["MPCharge", "health", "maxHealth", "geo", "fireballLevel", "quakeLevel", "screamLevel", "shaman", "elderbug",
- "permadeathMode", "nailDamage", "hornetGreenpath"]
+ "permadeathMode", "nailDamage", "hornetGreenpath", "quirrelEggTemple"]
# 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
-PD_CONST = {"equippedCharm_10": False, "elderbugGaveFlower": False, "elderbugRequestedFlower": False,
+PD_CONST = {"backerCredits": False, "equippedCharm_10": False, "elderbugGaveFlower": False, "elderbugRequestedFlower": False,
"xunFlowerBroken": False, "hasXunFlower": False, "openedBlackEggDoor": False,
"visitedCrossroadsInfected": False, "defeatedNightmareGrimm": False, "jijiDoorUnlocked": False,
"visitedCliffs": False, "mineLiftOpened": False, "brettaRescued": False, "elderbugHistory2": False,
@@ -192,6 +195,7 @@ op("SetFsmFloat", ("gameObject", "o"), ("fsmName", "s"), ("variableName", "s"),
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("GetObjAlpha", ("gameObject", "o"), ("store", "F"))
# HeroController's methods the scripts call (HeroCall's method)
@@ -316,8 +320,10 @@ class Room:
return self.obj_index.get(o["id"], O_NONE)
-def _string_values(rm, f, v):
- """the strings a string operand of an FSM can be (constants: itself; a variable: as it starts and as it is set)"""
+def _string_values(rm, f, v, depth=0):
+ """the strings a string operand of an FSM can be (constants: itself; a variable: as it starts and as it is set,
+ by other FSMs or its own SetStringValue and BuildString)"""
+ import itertools
if not (isinstance(v, str) and v.startswith("$")):
return [v or ""]
n = v[1:]
@@ -329,6 +335,18 @@ def _string_values(rm, f, v):
P = dict(a["params"])
if a["name"] == "SetFsmString" and P.get("fsmName") == f["name"] and P.get("variableName") == n:
out.append(P.get("setValue") or "")
+ for st in f["states"]:
+ for a in st["actions"]:
+ if not a.get("enabled", True):
+ continue
+ P = dict(a["params"])
+ if a["name"] == "SetStringValue" and P.get("stringVariable") == v and depth < 4:
+ out += _string_values(rm, f, P.get("stringValue"), depth + 1)
+ elif a["name"] == "BuildString" and P.get("storeResult") == v and depth < 4:
+ sep = P.get("separator") or ""
+ parts = [_string_values(rm, f, q, depth + 1) for q in P.get("stringParts") or []]
+ for row in itertools.product(*parts):
+ out.append(sep.join(row) + (sep if P.get("addToEnd") else ""))
return sorted(set(out))
@@ -698,8 +716,22 @@ class Compiler:
beh, m = P.get("behaviour"), P.get("methodName")
args = P.get("parameters") or []
if beh == "DialogueBox" and m == "StartConversation":
- key, sheet = args[0]["s"], args[1]["s"]
- return self.emit("StartConversation", {"text": self.rm.texts.id(sheet, key)})
+ arg = lambda q: q["s"] if isinstance(q, dict) else q
+ key, sheet = arg(args[0]), arg(args[1])
+ keys, sheets = self.string_values(key), self.string_values(sheet)
+ import text
+ rows = [(k, sh) for k in keys for sh in sheets if k in text.sheets().get(sh, {})]
+ if not rows:
+ self.problem("conversation %s %s" % (keys, sheets))
+ return None
+ if len(keys) == 1 and len(sheets) == 1:
+ return self.emit("StartConversation", {"text": self.rm.texts.id(sheet, key)})
+ # (by what its variables hold: each conversation they can name)
+ body = struct.pack("<HHB", self.value(key, "s"), self.value(sheet, "s"), len(rows))
+ for k, sh in rows:
+ body += struct.pack("<HHH", STR.id(k), STR.id(sh), self.rm.texts.id(sh, k))
+ assert len(body) < 256, rows
+ return bytes([OPS["StartConversationOf"][0], len(body)]) + body
if beh == "GameManager" and m == "CheckCharmAchievements":
return None
if beh == "HeroController" and m in HERO_METHODS:
@@ -713,8 +745,8 @@ class Compiler:
v = (P.get("functionCall") or {}).get("value")
return self.emit("HeroCall", {"method": HERO_METHODS.index(fn), "store": None,
"a": float(v) if isinstance(v, (int, float)) and not isinstance(v, bool) else 0})
- if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "SetActionString", "RefreshButtonIcon",
- "StopBounce"):
+ if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "StoryRecord_visited", "SetActionString",
+ "RefreshButtonIcon", "StopBounce"):
return None
self.problem("SendMessage %s" % fn)
return None
@@ -1011,15 +1043,16 @@ def room_blob(name, clip_index, sprites, owners=()):
if sr and sr.get("m_Sprite"):
# (its own size, drawn at its scale: its texture as fine as it is drawn)
sprite = sprites.id(o.get("_doc") or rm.d, sr["m_Sprite"], 1.0, max(abs(sx), abs(sy)))
- cond = 0xFFFF
- for bn, off_if in state.conditions(o):
- if bn in pdf:
- cond = pdf[bn] | (0x8000 if off_if else 0)
+ # (DeactivateIfPlayerdataTrue, False: two at most)
+ conds = [pdf[bn] | (0x8000 if off_if else 0) for bn, off_if in state.conditions(o) if bn in pdf]
+ conds = sorted(set(conds), key=conds.index)
if o.get("_variant"):
# (a scene loaded with the room's by a PlayerData bool: there only when it has that value)
bn, val = o["_variant"]
- assert cond == 0xFFFF, o["path"]
- cond = pdf[bn] | (0 if val else 0x8000)
+ assert not conds, o["path"]
+ conds = [pdf[bn] | (0 if val else 0x8000)]
+ assert len(conds) <= 2, o["path"]
+ cond, cond2 = (conds + [0xFFFF, 0xFFFF])[:2]
cols = [k for k, ow in enumerate(owners) if k and ow == (o.get("_scene", name), o.get("_raw", o["id"]))]
assert cols == list(range(cols[0], cols[-1] + 1)) if cols else True, o["path"]
assert len(cols) < 256 and (not cols or cols[-1] < 256), o["path"]
@@ -1037,7 +1070,7 @@ def room_blob(name, clip_index, sprites, owners=()):
rgba = [max(0, min(255, int(round(col[k] * 255)))) for k in "rgba"]
objs += struct.pack(OBJ, o["pos"][0], o["pos"][1], o["pos"][2], sx, sy, bx, by, bhx, bhy, parent,
STR.id(o["name"]), sprite, first, start, min(count, 255), fl, cond, layer, order, blend,
- cols[0] if cols else 0, len(cols), *rgba, 0)
+ cols[0] if cols else 0, len(cols), *rgba, cond2)
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)