diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-22 18:26:46 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-22 18:26:46 -0500 |
commit | 254ecd9527c105a8e15174bbddf13dc1fb4f554a (patch) | |
tree | 5526238166df427b25353389d67f6f5bbaf6ba1f /res/scripts | |
parent | eccebd48ac6c311023052386155d685dadfef202 (diff) | |
download | tanetane-254ecd9527c105a8e15174bbddf13dc1fb4f554a.tar.gz tanetane-254ecd9527c105a8e15174bbddf13dc1fb4f554a.tar.bz2 tanetane-254ecd9527c105a8e15174bbddf13dc1fb4f554a.zip |
Re-dumped hallucination map/tileset
The hallucination cliff area and the hot spring map have also been dumped now, but they have not been tested and likely need work because they use a third layer, which is not yet supported. However these all share a tileset now, yay! I added collision and run sounds back to the tiles and hopefully it matches up with what it was before. Also the maps have nicer names now. i.e. big change with no noticeable effects
Diffstat (limited to 'res/scripts')
-rw-r--r-- | res/scripts/hallucination_beach.lua (renamed from res/scripts/map1.lua) | 10 | ||||
-rw-r--r-- | res/scripts/hallucination_interior.lua (renamed from res/scripts/map2.lua) | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/res/scripts/map1.lua b/res/scripts/hallucination_beach.lua index 7d6014a..be9277d 100644 --- a/res/scripts/map1.lua +++ b/res/scripts/hallucination_beach.lua | |||
@@ -1,6 +1,6 @@ | |||
1 | map1 = {} | 1 | hallucination_beach = {} |
2 | 2 | ||
3 | function map1.script0001() | 3 | function hallucination_beach.script0001() |
4 | StartCutscene() | 4 | StartCutscene() |
5 | SetAnimation("boney", "barking") | 5 | SetAnimation("boney", "barking") |
6 | local barkingNoise = LoopSound("barking_at_hallucination.wav") | 6 | local barkingNoise = LoopSound("barking_at_hallucination.wav") |
@@ -25,11 +25,11 @@ function map1.script0001() | |||
25 | HideCutsceneBars() | 25 | HideCutsceneBars() |
26 | end | 26 | end |
27 | 27 | ||
28 | function map1.off_right() | 28 | function hallucination_beach.off_right() |
29 | ChangeMap("map2", "fromLeft") | 29 | ChangeMap("hallucination_interior", "fromLeft") |
30 | end | 30 | end |
31 | 31 | ||
32 | function map1.test_trigger() | 32 | function hallucination_beach.test_trigger() |
33 | StartCutscene() | 33 | StartCutscene() |
34 | PlaySound("boney_growl.wav") | 34 | PlaySound("boney_growl.wav") |
35 | DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE) | 35 | DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE) |
diff --git a/res/scripts/map2.lua b/res/scripts/hallucination_interior.lua index 31b9e00..f0716dc 100644 --- a/res/scripts/map2.lua +++ b/res/scripts/hallucination_interior.lua | |||
@@ -1,10 +1,10 @@ | |||
1 | map2 = {} | 1 | hallucination_interior = {} |
2 | 2 | ||
3 | function map2.off_left() | 3 | function hallucination_interior.off_left() |
4 | ChangeMap("map1", "fromRight") | 4 | ChangeMap("hallucination_beach", "fromRight") |
5 | end | 5 | end |
6 | 6 | ||
7 | function map2.mailbox1() | 7 | function hallucination_interior.mailbox1() |
8 | StartCutscene() | 8 | StartCutscene() |
9 | DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE) | 9 | DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE) |
10 | ShowChoice("Yes", "No") | 10 | ShowChoice("Yes", "No") |
@@ -24,7 +24,7 @@ function map2.mailbox1() | |||
24 | HideCutsceneBars() | 24 | HideCutsceneBars() |
25 | end | 25 | end |
26 | 26 | ||
27 | function map2.join_claus() | 27 | function hallucination_interior.join_claus() |
28 | StartCutscene() | 28 | StartCutscene() |
29 | SetAnimation("join_claus", "talk") | 29 | SetAnimation("join_claus", "talk") |
30 | DisplayMessage("* Say, Lucas. Whatcha up to?\n\f* It looks so fun! Let me join you!", "Claus", SpeakerType.MAN) | 30 | DisplayMessage("* Say, Lucas. Whatcha up to?\n\f* It looks so fun! Let me join you!", "Claus", SpeakerType.MAN) |
@@ -50,7 +50,7 @@ function map2.join_claus() | |||
50 | HideCutsceneBars() | 50 | HideCutsceneBars() |
51 | end | 51 | end |
52 | 52 | ||
53 | function map2.mailbox_lightning() | 53 | function hallucination_interior.mailbox_lightning() |
54 | StartCutscene() | 54 | StartCutscene() |
55 | DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE) | 55 | DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE) |
56 | ShowChoice("Yes", "No") | 56 | ShowChoice("Yes", "No") |
@@ -92,7 +92,7 @@ function map2.mailbox_lightning() | |||
92 | HideCutsceneBars(CutsceneOptions.DO_NOT_CHANGE_ANIMATION) | 92 | HideCutsceneBars(CutsceneOptions.DO_NOT_CHANGE_ANIMATION) |
93 | end | 93 | end |
94 | 94 | ||
95 | function map2.approach_doria() | 95 | function hallucination_interior.approach_doria() |
96 | if gamestate.approached_doria then | 96 | if gamestate.approached_doria then |
97 | return | 97 | return |
98 | end | 98 | end |
@@ -173,7 +173,7 @@ function map2.approach_doria() | |||
173 | HideCutsceneBars() | 173 | HideCutsceneBars() |
174 | end | 174 | end |
175 | 175 | ||
176 | function map2.talk_to_ionia() | 176 | function hallucination_interior.talk_to_ionia() |
177 | Halt("ionia") | 177 | Halt("ionia") |
178 | StartCutscene() | 178 | StartCutscene() |
179 | SetAnimation("ionia", "talk") | 179 | SetAnimation("ionia", "talk") |