From f0efccecadea6476dde042748d5ed42d4a9b5cb3 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 2 Mar 2021 18:33:33 -0500
Subject: Added smacking to the Mixolydia scene

---
 res/maps/pink_shell.tmx              |  17 +++++++++++-
 res/scripts/pink_shell.lua           |  52 ++++++++++++++++++++++++++++++++++-
 res/sfx/ruler_smack.wav              | Bin 0 -> 66896 bytes
 res/sprites/human_mixolydia_anim.txt |   4 ++-
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 res/sfx/ruler_smack.wav

(limited to 'res')

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
  <properties>
   <property name="music" value="are_you_gorgeous"/>
  </properties>
@@ -89,6 +89,21 @@
   <object id="10" name="claus_lineup" type="warp" x="296" y="144">
    <point/>
   </object>
+  <object id="11" name="smack_boney_pos" type="warp" x="232" y="136">
+   <point/>
+  </object>
+  <object id="12" name="smack_duster_pos" type="warp" x="280" y="136">
+   <point/>
+  </object>
+  <object id="13" name="smack_kumatora_pos" type="warp" x="264" y="136">
+   <point/>
+  </object>
+  <object id="14" name="smack_claus_pos" type="warp" x="296" y="136">
+   <point/>
+  </object>
+  <object id="15" name="smack_lucas_pos" type="warp" x="248" y="136">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="32" height="32">
   <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()
   SetMovementSpeed("lucas", 2)
   Delay(100)
 
+  SetDirection("mixolydia", Direction.DOWN)
+
   UnpauseSprite("kuma")
   SetMovementSpeed("kuma", 1)
   DirectSpriteToLocation("kuma", "kumatora_lineup", PathfindingOptions.CARDINAL_DIRECTIONS_ONLY)
@@ -145,7 +147,6 @@ function pink_shell.talk_to_mixolydia()
     SetMovementSpeed("join_claus", 0)
   end
 
-  MakeSpriteSolid("lucas")
   Delay(1000)
 
   if gamestate.went_in_hot_spring then
@@ -162,6 +163,55 @@ function pink_shell.talk_to_mixolydia()
   WaitForEndOfMessage()
 
   SetAnimation("mixolydia", "still")
+  Delay(500)
+
+  SetDirection("mixolydia", Direction.UP)
+  Delay(500)
+
+  -- smack each character
+  UnpauseSprite("mixolydia")
+  SetMovementSpeed("mixolydia", 1)
+
+  pink_shell.smack("smack_boney_pos")
+  SetAnimation("boney", "frozen")
+  Delay(1000)
+
+  pink_shell.smack("smack_lucas_pos")
+  SetAnimation("lucas", "frozen")
+  Delay(1000)
+
+  pink_shell.smack("smack_kumatora_pos")
+  SetAnimation("kuma", "frozen")
+  Delay(1000)
+
+  pink_shell.smack("smack_duster_pos")
+  SetAnimation("duster", "frozen")
+  Delay(1000)
+
+  -- TODO: handle fake claus
+  if gamestate.still_has_claus then
+    pink_shell.smack("smack_claus_pos")
+  end
 
   -- TODO: rest of scene
+
+  MakeSpriteSolid("lucas")
+end
+
+function pink_shell.smack(posname)
+  DirectSpriteToLocation("mixolydia", posname, PathfindingOptions.CARDINAL_DIRECTIONS_ONLY)
+  WaitForSpritePath("mixolydia")
+
+  SetAnimation("mixolydia", "holding_stick")
+  Delay(2000)
+
+  SetAnimation("mixolydia", "turn_down!")
+  WaitForAnimation("mixolydia")
+
+  SetDirection("mixolydia", Direction.DOWN)
+  SetAnimation("mixolydia", "smack!")
+  WaitForAnimation("mixolydia")
+
+  PlaySound("ruler_smack.wav")
+  SetAnimation("mixolydia", "holding_stick")
 end
diff --git a/res/sfx/ruler_smack.wav b/res/sfx/ruler_smack.wav
new file mode 100644
index 0000000..a7e718e
Binary files /dev/null and b/res/sfx/ruler_smack.wav 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
 holding_stick[left]: 17
 holding_stick[right]: 18
 holding_stick[down_right]: 19
+turn_down![left]%60: 16#5,15#80
+turn_down![right]%60: 19#5,15#80
 walk[left]: 20,21
 walk[right]: 22,23
-smack![down]: 15,24,25,26,27
\ No newline at end of file
+smack![down]%60: 24#5,25#10,26#4,27#2,15
\ No newline at end of file
-- 
cgit 1.4.1