summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--res/maps/pink_shell.tmx17
-rw-r--r--res/scripts/pink_shell.lua52
-rw-r--r--res/sfx/ruler_smack.wavbin0 -> 66896 bytes
-rw-r--r--res/sprites/human_mixolydia_anim.txt4
4 files changed, 70 insertions, 3 deletions
diff --git a/res/maps/pink_shell.tmx b/res/maps/pink_shell.tmx index 2389b70..4f59461 100644 --- a/res/maps/pink_shell.tmx +++ b/res/maps/pink_shell.tmx
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="11"> 2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="16">
3 <properties> 3 <properties>
4 <property name="music" value="are_you_gorgeous"/> 4 <property name="music" value="are_you_gorgeous"/>
5 </properties> 5 </properties>
@@ -89,6 +89,21 @@
89 <object id="10" name="claus_lineup" type="warp" x="296" y="144"> 89 <object id="10" name="claus_lineup" type="warp" x="296" y="144">
90 <point/> 90 <point/>
91 </object> 91 </object>
92 <object id="11" name="smack_boney_pos" type="warp" x="232" y="136">
93 <point/>
94 </object>
95 <object id="12" name="smack_duster_pos" type="warp" x="280" y="136">
96 <point/>
97 </object>
98 <object id="13" name="smack_kumatora_pos" type="warp" x="264" y="136">
99 <point/>
100 </object>
101 <object id="14" name="smack_claus_pos" type="warp" x="296" y="136">
102 <point/>
103 </object>
104 <object id="15" name="smack_lucas_pos" type="warp" x="248" y="136">
105 <point/>
106 </object>
92 </objectgroup> 107 </objectgroup>
93 <layer id="1" name="Upper" width="32" height="32"> 108 <layer id="1" name="Upper" width="32" height="32">
94 <properties> 109 <properties>
diff --git a/res/scripts/pink_shell.lua b/res/scripts/pink_shell.lua index 5747186..775aeae 100644 --- a/res/scripts/pink_shell.lua +++ b/res/scripts/pink_shell.lua
@@ -100,6 +100,8 @@ function pink_shell.talk_to_mixolydia()
100 SetMovementSpeed("lucas", 2) 100 SetMovementSpeed("lucas", 2)
101 Delay(100) 101 Delay(100)
102 102
103 SetDirection("mixolydia", Direction.DOWN)
104
103 UnpauseSprite("kuma") 105 UnpauseSprite("kuma")
104 SetMovementSpeed("kuma", 1) 106 SetMovementSpeed("kuma", 1)
105 DirectSpriteToLocation("kuma", "kumatora_lineup", PathfindingOptions.CARDINAL_DIRECTIONS_ONLY) 107 DirectSpriteToLocation("kuma", "kumatora_lineup", PathfindingOptions.CARDINAL_DIRECTIONS_ONLY)
@@ -145,7 +147,6 @@ function pink_shell.talk_to_mixolydia()
145 SetMovementSpeed("join_claus", 0) 147 SetMovementSpeed("join_claus", 0)
146 end 148 end
147 149
148 MakeSpriteSolid("lucas")
149 Delay(1000) 150 Delay(1000)
150 151
151 if gamestate.went_in_hot_spring then 152 if gamestate.went_in_hot_spring then
@@ -162,6 +163,55 @@ function pink_shell.talk_to_mixolydia()
162 WaitForEndOfMessage() 163 WaitForEndOfMessage()
163 164
164 SetAnimation("mixolydia", "still") 165 SetAnimation("mixolydia", "still")
166 Delay(500)
167
168 SetDirection("mixolydia", Direction.UP)
169 Delay(500)
170
171 -- smack each character
172 UnpauseSprite("mixolydia")
173 SetMovementSpeed("mixolydia", 1)
174
175 pink_shell.smack("smack_boney_pos")
176 SetAnimation("boney", "frozen")
177 Delay(1000)
178
179 pink_shell.smack("smack_lucas_pos")
180 SetAnimation("lucas", "frozen")
181 Delay(1000)
182
183 pink_shell.smack("smack_kumatora_pos")
184 SetAnimation("kuma", "frozen")
185 Delay(1000)
186
187 pink_shell.smack("smack_duster_pos")
188 SetAnimation("duster", "frozen")
189 Delay(1000)
190
191 -- TODO: handle fake claus
192 if gamestate.still_has_claus then
193 pink_shell.smack("smack_claus_pos")
194 end
165 195
166 -- TODO: rest of scene 196 -- TODO: rest of scene
197
198 MakeSpriteSolid("lucas")
199end
200
201function pink_shell.smack(posname)
202 DirectSpriteToLocation("mixolydia", posname, PathfindingOptions.CARDINAL_DIRECTIONS_ONLY)
203 WaitForSpritePath("mixolydia")
204
205 SetAnimation("mixolydia", "holding_stick")
206 Delay(2000)
207
208 SetAnimation("mixolydia", "turn_down!")
209 WaitForAnimation("mixolydia")
210
211 SetDirection("mixolydia", Direction.DOWN)
212 SetAnimation("mixolydia", "smack!")
213 WaitForAnimation("mixolydia")
214
215 PlaySound("ruler_smack.wav")
216 SetAnimation("mixolydia", "holding_stick")
167end 217end
diff --git a/res/sfx/ruler_smack.wav b/res/sfx/ruler_smack.wav new file mode 100644 index 0000000..a7e718e --- /dev/null +++ b/res/sfx/ruler_smack.wav
Binary files differ
diff --git a/res/sprites/human_mixolydia_anim.txt b/res/sprites/human_mixolydia_anim.txt index f48364b..cef27ab 100644 --- a/res/sprites/human_mixolydia_anim.txt +++ b/res/sprites/human_mixolydia_anim.txt
@@ -13,6 +13,8 @@ holding_stick[down_left]: 16
13holding_stick[left]: 17 13holding_stick[left]: 17
14holding_stick[right]: 18 14holding_stick[right]: 18
15holding_stick[down_right]: 19 15holding_stick[down_right]: 19
16turn_down![left]%60: 16#5,15#80
17turn_down![right]%60: 19#5,15#80
16walk[left]: 20,21 18walk[left]: 20,21
17walk[right]: 22,23 19walk[right]: 22,23
18smack![down]: 15,24,25,26,27 \ No newline at end of file 20smack![down]%60: 24#5,25#10,26#4,27#2,15 \ No newline at end of file