From 1cb8cc47c64009999f054f42f6815b05ccfc305c Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 28 Feb 2021 16:42:52 -0500
Subject: Added (human) Ocho

---
 res/maps/pink_shell.tmx           |  14 +++++++++-
 res/scripts/pink_shell.lua        |  10 +++++++
 res/sprites/human_ocho.png        | Bin 0 -> 10615 bytes
 res/sprites/human_ocho_anim.txt   |  18 ++++++++++++
 res/sprites/human_ocho_frames.txt |  56 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 res/sprites/human_ocho.png
 create mode 100644 res/sprites/human_ocho_anim.txt
 create mode 100644 res/sprites/human_ocho_frames.txt

diff --git a/res/maps/pink_shell.tmx b/res/maps/pink_shell.tmx
index d7d90ac..12eea42 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="3">
+<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="4">
  <properties>
   <property name="music" value="are_you_gorgeous"/>
  </properties>
@@ -49,6 +49,18 @@
     <property name="script" value="go_outside"/>
    </properties>
   </object>
+  <object id="3" name="ocho" type="sprite" x="280" y="222">
+   <properties>
+    <property name="animation" value="../res/sprites/human_ocho_anim.txt"/>
+    <property name="collisionHeight" type="int" value="8"/>
+    <property name="collisionOffsetX" type="int" value="-8"/>
+    <property name="collisionOffsetY" type="int" value="-8"/>
+    <property name="collisionWidth" type="int" value="12"/>
+    <property name="interactionScript" value="talk_to_ocho"/>
+    <property name="shadow" type="bool" value="true"/>
+   </properties>
+   <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 e17236e..1719c4f 100644
--- a/res/scripts/pink_shell.lua
+++ b/res/scripts/pink_shell.lua
@@ -3,3 +3,13 @@ pink_shell = {}
 function pink_shell.go_outside()
   ChangeMap("hallucination_cliff", "fromInside")
 end
+
+function pink_shell.talk_to_ocho()
+  StartCutscene()
+  SetAnimation("ocho", "talk")
+  DisplayMessage("* *twist* *turn*\n\f* That person over there is Mixolydia.\n\f* Isn't she pretty?\n\f...\n\f* Hey, the four of you don't look so good.", "Ocho", SpeakerType.MAN)
+  WaitForEndOfMessage()
+
+  SetAnimation("ocho", "still")
+  HideCutsceneBars()
+end
diff --git a/res/sprites/human_ocho.png b/res/sprites/human_ocho.png
new file mode 100644
index 0000000..f7876b8
Binary files /dev/null and b/res/sprites/human_ocho.png differ
diff --git a/res/sprites/human_ocho_anim.txt b/res/sprites/human_ocho_anim.txt
new file mode 100644
index 0000000..d78e3c4
--- /dev/null
+++ b/res/sprites/human_ocho_anim.txt
@@ -0,0 +1,18 @@
+../res/sprites/human_ocho.png
+../res/sprites/human_ocho_frames.txt
+still[down]: 0
+still[down_left]: 0
+still[left]: 1
+still[up_left]: 1
+still[up]: 1
+still[up_right]: 1
+still[right]: 2
+still[down_right]: 2
+talk[down]: 0,3
+talk[down_left]: 0,3
+talk[left]: 1,4
+talk[up_left]: 1,4
+talk[up]: 1,4
+talk[up_right]: 1,4
+talk[right]: 2,5
+talk[down_right]: 2,5
\ No newline at end of file
diff --git a/res/sprites/human_ocho_frames.txt b/res/sprites/human_ocho_frames.txt
new file mode 100644
index 0000000..ebabb0e
--- /dev/null
+++ b/res/sprites/human_ocho_frames.txt
@@ -0,0 +1,56 @@
+32,32 cell size
+10 frames per row
+52 frames
+
+32,32,16,31
+32,32,16,31
+32,32,16,31
+32,32,16,31
+32,32,16,31
+32,32,16,31
+32,32,16,31
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
-- 
cgit 1.4.1