5 files changed, 97 insertions, 1 deletions
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
--- /dev/null
+++ b/res/sprites/human_ocho.png

Binary files 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

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 @@
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="3">	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="4">
3	<properties>	3	<properties>
4	<property name="music" value="are_you_gorgeous"/>	4	<property name="music" value="are_you_gorgeous"/>
5	</properties>	5	</properties>
@@ -49,6 +49,18 @@
49	<property name="script" value="go_outside"/>	49	<property name="script" value="go_outside"/>
50	</properties>	50	</properties>
51	</object>	51	</object>
		52	<object id="3" name="ocho" type="sprite" x="280" y="222">
		53	<properties>
		54	<property name="animation" value="../res/sprites/human_ocho_anim.txt"/>
		55	<property name="collisionHeight" type="int" value="8"/>
		56	<property name="collisionOffsetX" type="int" value="-8"/>
		57	<property name="collisionOffsetY" type="int" value="-8"/>
		58	<property name="collisionWidth" type="int" value="12"/>
		59	<property name="interactionScript" value="talk_to_ocho"/>
		60	<property name="shadow" type="bool" value="true"/>
		61	</properties>
		62	<point/>
		63	</object>
52	</objectgroup>	64	</objectgroup>
53	<layer id="1" name="Upper" width="32" height="32">	65	<layer id="1" name="Upper" width="32" height="32">
54	<properties>	66	<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 = {}
3	function pink_shell.go_outside()	3	function pink_shell.go_outside()
4	ChangeMap("hallucination_cliff", "fromInside")	4	ChangeMap("hallucination_cliff", "fromInside")
5	end	5	end
		6
		7	function pink_shell.talk_to_ocho()
		8	StartCutscene()
		9	SetAnimation("ocho", "talk")
		10	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)
		11	WaitForEndOfMessage()
		12
		13	SetAnimation("ocho", "still")
		14	HideCutsceneBars()
		15	end


diff --git a/res/sprites/human_ocho.png b/res/sprites/human_ocho.png new file mode 100644 index 0000000..f7876b8 --- /dev/null +++ b/res/sprites/human_ocho.png
Binary files 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 @@
		1	../res/sprites/human_ocho.png
		2	../res/sprites/human_ocho_frames.txt
		3	still[down]: 0
		4	still[down_left]: 0
		5	still[left]: 1
		6	still[up_left]: 1
		7	still[up]: 1
		8	still[up_right]: 1
		9	still[right]: 2
		10	still[down_right]: 2
		11	talk[down]: 0,3
		12	talk[down_left]: 0,3
		13	talk[left]: 1,4
		14	talk[up_left]: 1,4
		15	talk[up]: 1,4
		16	talk[up_right]: 1,4
		17	talk[right]: 2,5
		18	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 @@
		1	32,32 cell size
		2	10 frames per row
		3	52 frames
		4
		5	32,32,16,31
		6	32,32,16,31
		7	32,32,16,31
		8	32,32,16,31
		9	32,32,16,31
		10	32,32,16,31
		11	32,32,16,31
		12	32,32,16,32
		13	32,32,16,32
		14	32,32,16,32
		15	32,32,16,32
		16	32,32,16,32
		17	32,32,16,32
		18	32,32,16,32
		19	32,32,16,32
		20	32,32,16,32
		21	32,32,16,32
		22	32,32,16,32
		23	32,32,16,32
		24	32,32,16,32
		25	32,32,16,32
		26	32,32,16,32
		27	32,32,16,32
		28	32,32,16,32
		29	32,32,16,32
		30	32,32,16,32
		31	32,32,16,32
		32	32,32,16,32
		33	32,32,16,32
		34	32,32,16,32
		35	32,32,16,32
		36	32,32,16,32
		37	32,32,16,32
		38	32,32,16,32
		39	32,32,16,32
		40	32,32,16,32
		41	32,32,16,32
		42	32,32,16,32
		43	32,32,16,32
		44	32,32,16,32
		45	32,32,16,32
		46	32,32,16,32
		47	32,32,16,32
		48	32,32,16,32
		49	32,32,16,32
		50	32,32,16,32
		51	32,32,16,32
		52	32,32,16,32
		53	32,32,16,32
		54	32,32,16,32
		55	32,32,16,32
		56	32,32,16,32