8 files changed, 97 insertions, 1 deletions

@@ -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="4">
+<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="5">
  <properties>
   <property name="music" value="are_you_gorgeous"/>
  </properties>
@@ -61,6 +61,19 @@
    </properties>
    <point/>
   </object>
+  <object id="4" name="mixolydia" type="sprite" x="248" y="136">
+   <properties>
+    <property name="animation" value="human_mixolydia"/>
+    <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="direction" value="up"/>
+    <property name="interactionScript" value="talk_to_mixolydia"/>
+    <property name="shadow" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="32" height="32">
   <properties>
@@ -13,3 +13,7 @@ function pink_shell.talk_to_ocho()
   SetAnimation("ocho", "still")
   HideCutsceneBars()
 end
+
+function pink_shell.talk_to_mixolydia()
+  SetDirection("mixolydia", Direction.UP)
+end
@@ -0,0 +1,18 @@
+../res/sprites/human_mixolydia.png
+../res/sprites/human_mixolydia_frames.txt
+still[down]: 0
+still[left]: 1
+still[up]: 2
+still[right]: 3
+talk[down]: 4,5
+talk[left]: 6,7
+talk[up]: 8,9
+talk[right]: 10,11
+holding_stick[down]: 15
+holding_stick[down_left]: 16
+holding_stick[left]: 17
+holding_stick[right]: 18
+holding_stick[down_right]: 19
+walk[left]: 20,21
+walk[right]: 22,23
+smack![down]: 15,24,25,26,27
\ No newline at end of file
@@ -0,0 +1,57 @@
+32,32 cell size
+10 frames per row
+53 frames
+
+16,32,8,32
+16,32,8,32
+32,32,16,32
+16,32,7,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+32,32,16,32
+32,32,16,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,7,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,15,32
+32,32,15,32
+32,31,16,31
+32,31,16,31
+32,31,15,31
+32,31,15,31
+16,32,8,32
+16,32,8,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
@@ -64,6 +64,7 @@ void Game::loadMap(std::string filename) {
       if (!p.animName.empty()) {
         getSystem<AnimationSystem>().setSpriteAnimation(spriteId, p.animName);
       }
+      getSystem<AnimationSystem>().setSpriteDirection(spriteId, p.dir);
     }
     getSprite(spriteId).interactionScript = p.interactionScript;
     if (p.movementSpeed != -1) {
@@ -91,6 +91,8 @@ Map::Map(std::string_view name) : name_(name) {
               p.animationFilename = "../res/sprites/" + property.getStringValue() + "_anim.txt";
             } else if (property.getName() == "animName") {
               p.animName = property.getStringValue();
+            } else if (property.getName() == "direction") {
+              p.dir = directionFromString(property.getStringValue());
             } else if (property.getName() == "interactionScript") {
               p.interactionScript = property.getStringValue();
             } else if (property.getName() == "shadow") {
@@ -25,6 +25,7 @@ struct Prototype {
   vec2i collisionSize;
   std::string animationFilename;
   std::string animName;
+  Direction dir = Direction::down;
   std::string interactionScript;
   bool shadow = false;
   bool wander = false;