diff options
-rw-r--r-- | Archipelago/load.gd | 33 | ||||
-rw-r--r-- | data/LL1.yaml | 12 |
2 files changed, 25 insertions, 20 deletions
diff --git a/Archipelago/load.gd b/Archipelago/load.gd index af1f6b5..c720f45 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd | |||
@@ -18,20 +18,6 @@ func _load(): | |||
18 | if "answer" in node: | 18 | if "answer" in node: |
19 | node.answer = apclient.ap_user | 19 | node.answer = apclient.ap_user |
20 | 20 | ||
21 | # Handle our other static panels. | ||
22 | set_static_panel("Entry Room/Panel_write_write", "seed") | ||
23 | set_static_panel("Entry Room/Panel_same_same", str(apclient._slot_seed)) | ||
24 | set_static_panel("Entry Room/Panel_type_type", "victory") | ||
25 | |||
26 | var victory_condition = "unknown" | ||
27 | if apclient._victory_condition == apclient.kTHE_END: | ||
28 | victory_condition = "the end" | ||
29 | elif apclient._victory_condition == apclient.kTHE_MASTER: | ||
30 | victory_condition = "the master" | ||
31 | |||
32 | set_static_panel("Entry Room/Panel_this_this", victory_condition) | ||
33 | set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo") | ||
34 | |||
35 | # This is the best time to create the location nodes, since the map is now | 21 | # This is the best time to create the location nodes, since the map is now |
36 | # loaded but the panels haven't been solved from the save file yet. | 22 | # loaded but the panels haven't been solved from the save file yet. |
37 | var panels_parent = self.get_node("Panels") | 23 | var panels_parent = self.get_node("Panels") |
@@ -104,6 +90,25 @@ func _load(): | |||
104 | target_panel_node.text = source["hint"] | 90 | target_panel_node.text = source["hint"] |
105 | target_panel_node.answer = source["answer"] | 91 | target_panel_node.answer = source["answer"] |
106 | 92 | ||
93 | # Handle our other static panels after panel randomization, so that the old | ||
94 | # values can enter the pool, if necessary. | ||
95 | set_static_panel("Entry Room/Panel_hi_hi", "hi") | ||
96 | set_static_panel("Entry Room/Panel_write_write", "seed") | ||
97 | set_static_panel("Entry Room/Panel_same_same", str(apclient._slot_seed)) | ||
98 | set_static_panel("Entry Room/Panel_type_type", "victory") | ||
99 | |||
100 | var victory_condition = "unknown" | ||
101 | if apclient._victory_condition == apclient.kTHE_END: | ||
102 | victory_condition = "the end" | ||
103 | elif apclient._victory_condition == apclient.kTHE_MASTER: | ||
104 | victory_condition = "the master" | ||
105 | |||
106 | set_static_panel("Entry Room/Panel_this_this", victory_condition) | ||
107 | set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo") | ||
108 | set_static_panel("Entry Room/Panel_hi_high", "goode", "good") | ||
109 | set_static_panel("Entry Room/Panel_low_low", "serendipity", "luck") | ||
110 | set_static_panel("Shuffle Room/Panel_secret_secret", "trans rights", "human rights") | ||
111 | |||
107 | # Randomize the paintings, if necessary. | 112 | # Randomize the paintings, if necessary. |
108 | if apclient._painting_shuffle: | 113 | if apclient._painting_shuffle: |
109 | var pd_script = ResourceLoader.load("user://maps/Archipelago/paintingdata.gd") | 114 | var pd_script = ResourceLoader.load("user://maps/Archipelago/paintingdata.gd") |
diff --git a/data/LL1.yaml b/data/LL1.yaml index ab5a312..d7fcb36 100644 --- a/data/LL1.yaml +++ b/data/LL1.yaml | |||
@@ -1,22 +1,22 @@ | |||
1 | --- | 1 | --- |
2 | - id: Entry Room/Panel_hi_hi | 2 | - id: Entry Room/Panel_hi_hi |
3 | color: white | 3 | color: white |
4 | tag: forbid | 4 | tag: midwhite |
5 | - id: Entry Room/Panel_type_type | 5 | - id: Entry Room/Panel_type_type |
6 | color: white | 6 | color: white |
7 | tag: forbid | 7 | tag: midwhite |
8 | - id: Entry Room/Panel_this_this | 8 | - id: Entry Room/Panel_this_this |
9 | color: white | 9 | color: white |
10 | tag: forbid | 10 | tag: midwhite |
11 | - id: Entry Room/Panel_write_write | 11 | - id: Entry Room/Panel_write_write |
12 | color: white | 12 | color: white |
13 | tag: forbid | 13 | tag: midwhite |
14 | - id: Entry Room/Panel_same_same | 14 | - id: Entry Room/Panel_same_same |
15 | color: white | 15 | color: white |
16 | tag: forbid | 16 | tag: midwhite |
17 | - id: Entry Room/Panel_hidden_hidden | 17 | - id: Entry Room/Panel_hidden_hidden |
18 | color: white | 18 | color: white |
19 | tag: forbid | 19 | tag: midwhite |
20 | - id: Entry Room/Panel_hi_high | 20 | - id: Entry Room/Panel_hi_high |
21 | color: white | 21 | color: white |
22 | tag: topwhite | 22 | tag: topwhite |