summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-03-08 19:43:37 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-03-08 19:43:37 -0500
commitdd052d68e95f5b2128da272127e165c4a70f3f94 (patch)
treebebc9f1f25bb803108464ef5a906abd38f5f9575
parent8227f9f2ecde583b2c4d40b233cd45611819574d (diff)
downloadtanetane-dd052d68e95f5b2128da272127e165c4a70f3f94.tar.gz
tanetane-dd052d68e95f5b2128da272127e165c4a70f3f94.tar.bz2
tanetane-dd052d68e95f5b2128da272127e165c4a70f3f94.zip
Nana shouldn't use the talk animation when she's silent
-rw-r--r--res/scripts/hallucination_cliff.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/res/scripts/hallucination_cliff.lua b/res/scripts/hallucination_cliff.lua index 910d614..d57c09a 100644 --- a/res/scripts/hallucination_cliff.lua +++ b/res/scripts/hallucination_cliff.lua
@@ -20,17 +20,20 @@ function hallucination_cliff.talk_to_nana()
20 end 20 end
21 21
22 StartCutscene() 22 StartCutscene()
23 SetAnimation("nana", "talk")
24 23
25 if gamestate.talked_to_nana_times == 0 then 24 if gamestate.talked_to_nana_times == 0 then
25 SetAnimation("nana", "talk")
26 DisplayMessage("* Don't talk to me.", "Nana", SpeakerType.WOMAN) 26 DisplayMessage("* Don't talk to me.", "Nana", SpeakerType.WOMAN)
27 elseif gamestate.talked_to_nana_times == 1 then 27 elseif gamestate.talked_to_nana_times == 1 then
28 SetAnimation("nana", "talk")
28 DisplayMessage("* Go bother someone else.", "Nana", SpeakerType.WOMAN) 29 DisplayMessage("* Go bother someone else.", "Nana", SpeakerType.WOMAN)
29 elseif gamestate.talked_to_nana_times == 2 then 30 elseif gamestate.talked_to_nana_times == 2 then
31 SetAnimation("nana", "talk")
30 DisplayMessage("* I only talked to you out of pity.", "Nana", SpeakerType.WOMAN) 32 DisplayMessage("* I only talked to you out of pity.", "Nana", SpeakerType.WOMAN)
31 elseif gamestate.talked_to_nana_times >= 3 and gamestate.talked_to_nana_times < 6 then 33 elseif gamestate.talked_to_nana_times >= 3 and gamestate.talked_to_nana_times < 6 then
32 DisplayMessage("* ...", "Nana", SpeakerType.WOMAN) 34 DisplayMessage("* ...", "Nana", SpeakerType.WOMAN)
33 elseif gamestate.talked_to_nana_times >= 6 then 35 elseif gamestate.talked_to_nana_times >= 6 then
36 SetAnimation("nana", "talk")
34 DisplayMessage("* Shut up shut up shut up!\n\f* Can't you take a hint, you stupid boy?", "Nana", SpeakerType.WOMAN) 37 DisplayMessage("* Shut up shut up shut up!\n\f* Can't you take a hint, you stupid boy?", "Nana", SpeakerType.WOMAN)
35 end 38 end
36 39