diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-03-09 13:49:03 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-03-09 13:49:03 -0500 |
commit | aac3b1bc1ba48b6e50f661b97326ef191cce3e6c (patch) | |
tree | dff16d2e26332a09576ff4965d0126070efa1b63 /res | |
parent | 032f60bc2686364f4df5bfb6c9faf86b84de31a6 (diff) | |
download | tanetane-aac3b1bc1ba48b6e50f661b97326ef191cce3e6c.tar.gz tanetane-aac3b1bc1ba48b6e50f661b97326ef191cce3e6c.tar.bz2 tanetane-aac3b1bc1ba48b6e50f661b97326ef191cce3e6c.zip |
switch_claus starts talking when he gets ya
Kumatora, Duster, and Boney had to be given hitboxes, but they are not considered solid. #10
Diffstat (limited to 'res')
-rw-r--r-- | res/maps/hallucination_interior.tmx | 1 | ||||
-rw-r--r-- | res/scripts/hallucination_interior.lua | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx index 7e012eb..1077cf5 100644 --- a/res/maps/hallucination_interior.tmx +++ b/res/maps/hallucination_interior.tmx | |||
@@ -159,6 +159,7 @@ | |||
159 | <object id="7" name="switch_claus" type="sprite" x="864" y="784"> | 159 | <object id="7" name="switch_claus" type="sprite" x="864" y="784"> |
160 | <properties> | 160 | <properties> |
161 | <property name="animation" value="claus"/> | 161 | <property name="animation" value="claus"/> |
162 | <property name="bumpPlayerScript" value="lets_switch_places"/> | ||
162 | <property name="enclosureZone" value="switch_claus_enclosure"/> | 163 | <property name="enclosureZone" value="switch_claus_enclosure"/> |
163 | <property name="interactionScript" value="lets_switch_places"/> | 164 | <property name="interactionScript" value="lets_switch_places"/> |
164 | <property name="movementSpeed" type="int" value="1"/> | 165 | <property name="movementSpeed" type="int" value="1"/> |
diff --git a/res/scripts/hallucination_interior.lua b/res/scripts/hallucination_interior.lua index 96b90a6..c265a46 100644 --- a/res/scripts/hallucination_interior.lua +++ b/res/scripts/hallucination_interior.lua | |||
@@ -270,6 +270,7 @@ end | |||
270 | function hallucination_interior.lets_switch_places() | 270 | function hallucination_interior.lets_switch_places() |
271 | StartCutscene() | 271 | StartCutscene() |
272 | 272 | ||
273 | FaceTowardSprite("switch_claus", "lucas") | ||
273 | FacePartyTowardSprite("lucas", "switch_claus") | 274 | FacePartyTowardSprite("lucas", "switch_claus") |
274 | Halt("switch_claus") | 275 | Halt("switch_claus") |
275 | SetAnimation("switch_claus", "talk") | 276 | SetAnimation("switch_claus", "talk") |
@@ -280,9 +281,13 @@ function hallucination_interior.lets_switch_places() | |||
280 | 281 | ||
281 | if GetChoiceSelection() == 0 then | 282 | if GetChoiceSelection() == 0 then |
282 | DisplayMessage("* You'd like that, wouldn't you?\n\f* ...no. That's too easy.\n\fI'm not letting you off that easy.\n\f* It should've been you, right?\nYou feel guilty, right?\n\f* Well guess what, Lucas?\n\fYou're going to live with that for the rest of your life.\n\f* You know why?\n\f* Because you're going to live, Lucas!\n\fYOU'RE. GOING. TO. LIVE!", "Claus", SpeakerType.MAN) | 283 | DisplayMessage("* You'd like that, wouldn't you?\n\f* ...no. That's too easy.\n\fI'm not letting you off that easy.\n\f* It should've been you, right?\nYou feel guilty, right?\n\f* Well guess what, Lucas?\n\fYou're going to live with that for the rest of your life.\n\f* You know why?\n\f* Because you're going to live, Lucas!\n\fYOU'RE. GOING. TO. LIVE!", "Claus", SpeakerType.MAN) |
283 | SetAnimation("switch_claus", "still") | ||
284 | HideCutsceneBars() | 284 | HideCutsceneBars() |
285 | |||
286 | SetAnimation("switch_claus", "still") | ||
285 | else | 287 | else |
286 | -- TODO: let's switch places | 288 | -- TODO: let's switch places |
287 | end | 289 | end |
290 | |||
291 | -- Just so we can get away, for now. | ||
292 | hallucination_interior.switch_claus_lose_interest() | ||
288 | end | 293 | end |