From 5834a85dcfafd50a1863a00fc2daf2cf1e8bb7e9 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 15 Feb 2021 12:42:55 -0500
Subject: Added Doria

Things to note about her: she does not have walking animations in the intercardinal directions. Also her disappearing animation needs a higher frame rate than the 30 FPS we currently have.
---
 res/maps/map2.tmx            |  18 ++++-
 res/scripts/map2.lua         |   4 +
 res/sprites/doria.png        | Bin 0 -> 42556 bytes
 res/sprites/doria_anim.txt   |  25 ++++++
 res/sprites/doria_frames.txt | 178 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 res/sprites/doria.png
 create mode 100644 res/sprites/doria_anim.txt
 create mode 100644 res/sprites/doria_frames.txt

diff --git a/res/maps/map2.tmx b/res/maps/map2.tmx
index f6d6dd2..fe58daf 100644
--- a/res/maps/map2.tmx
+++ b/res/maps/map2.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="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="7">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="9">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10">
   <image source="map2_tiles.png" width="160" height="288"/>
   <tile id="61">
@@ -660,6 +660,22 @@
   <object id="6" name="debugWarp_mailboxes" type="warp" x="598.667" y="420.667">
    <point/>
   </object>
+  <object id="7" name="doria" type="sprite" x="328" y="525">
+   <properties>
+    <property name="animation" value="../res/sprites/doria_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="shadow" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="8" name="approach_doria" type="trigger" x="384" y="512" width="16" height="64">
+   <properties>
+    <property name="script" value="approach_doria"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="64" height="64">
   <data encoding="csv">
diff --git a/res/scripts/map2.lua b/res/scripts/map2.lua
index cdab0f5..1249f7d 100644
--- a/res/scripts/map2.lua
+++ b/res/scripts/map2.lua
@@ -65,3 +65,7 @@ function map2.mailbox_lightning()
   WaitForEndOfMessage()
   HideCutsceneBars()
 end
+
+function map2.approach_doria()
+  SetAnimation("doria", "hearts")
+end
diff --git a/res/sprites/doria.png b/res/sprites/doria.png
new file mode 100644
index 0000000..c105a22
Binary files /dev/null and b/res/sprites/doria.png differ
diff --git a/res/sprites/doria_anim.txt b/res/sprites/doria_anim.txt
new file mode 100644
index 0000000..c52a456
--- /dev/null
+++ b/res/sprites/doria_anim.txt
@@ -0,0 +1,25 @@
+../res/sprites/doria.png
+../res/sprites/doria_frames.txt
+still[down]: 0
+still[down_left]: 1
+still[left]: 2
+still[up_left]: 3
+still[up]: 4
+still[up_right]: 5
+still[right]: 6
+still[down_right]: 7
+walk[down]: 8,0,16,0
+walk[left]: 10,2,18,2
+walk[up]: 12,4,20,4
+walk[right]: 14,6,22,6
+talk[down]: 24,32,40
+talk[down_left]: 25,33,41
+talk[left]: 26,34,42
+talk[up_left]: 27,35,43
+talk[up]: 28,36,44
+talk[up_right]: 29,37,45
+talk[right]: 30,38,46
+talk[down_right]: 31,39,47
+hairflip![down]: 48,49,50,51,52,53,54,55,56
+hearts[down]: 57,58,59,60,61,62,63
+cheer[down_right]: 76,77,78,79
\ No newline at end of file
diff --git a/res/sprites/doria_frames.txt b/res/sprites/doria_frames.txt
new file mode 100644
index 0000000..910b4ef
--- /dev/null
+++ b/res/sprites/doria_frames.txt
@@ -0,0 +1,178 @@
+35,33 cell size
+10 frames per row
+174 frames
+
+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
+32,32,16,32
+32,32,16,32
+32,32,16,32
+35,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,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,31
+32,32,16,30
+22,33,11,32
+22,33,11,31
+22,33,11,30
+22,33,11,32
+22,33,11,31
+22,33,11,30
+22,33,11,30
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,32,19,32
+32,24,19,32
+16,8,8,8
+32,32,18,32
+32,32,18,32
+32,24,18,32
+32,32,18,34
+16,32,10,34
+16,32,10,34
+8,32,8,34
+16,16,8,22
+16,16,8,22
+16,16,8,23
+16,16,8,24
+16,16,8,25
+16,16,8,26
+16,16,8,27
+16,16,8,28
+16,16,8,28
+16,16,8,28
+8,8,8,28
+16,16,8,28
+16,16,8,28
+32,24,16,28
+32,24,16,28
+32,24,16,28
+32,24,16,28
+32,24,16,28
+32,24,16,28
+16,16,8,20
+16,16,8,20
+16,16,8,20
+16,8,8,12
+16,16,8,20
-- 
cgit 1.4.1