From 883490ba63110fca757610a169621953bf2bd288 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 10 Mar 2021 11:08:46 -0500
Subject: Added a Masked Man that just watches you

He's standing in an unreachable part of hallucination_interior and can only really be seen when standing in a specific position.
---
 res/maps/hallucination_interior.tmx |  10 +-
 res/sprites/masked_man.png          | Bin 0 -> 51228 bytes
 res/sprites/masked_man_anim.txt     |  42 +++++++
 res/sprites/masked_man_frames.txt   | 233 ++++++++++++++++++++++++++++++++++++
 4 files changed, 284 insertions(+), 1 deletion(-)
 create mode 100644 res/sprites/masked_man.png
 create mode 100644 res/sprites/masked_man_anim.txt
 create mode 100644 res/sprites/masked_man_frames.txt

diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx
index 1077cf5..ba43c66 100644
--- a/res/maps/hallucination_interior.tmx
+++ b/res/maps/hallucination_interior.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="14">
+<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="17">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -188,6 +188,14 @@
   <object id="13" name="switch_claus_rsvp" type="warp" x="816" y="688">
    <point/>
   </object>
+  <object id="15" name="mm_watcher" type="sprite" x="168" y="832">
+   <properties>
+    <property name="animation" value="masked_man"/>
+    <property name="direction" value="right"/>
+    <property name="shadow" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="64" height="64">
   <properties>
diff --git a/res/sprites/masked_man.png b/res/sprites/masked_man.png
new file mode 100644
index 0000000..06e0976
Binary files /dev/null and b/res/sprites/masked_man.png differ
diff --git a/res/sprites/masked_man_anim.txt b/res/sprites/masked_man_anim.txt
new file mode 100644
index 0000000..ddd1edc
--- /dev/null
+++ b/res/sprites/masked_man_anim.txt
@@ -0,0 +1,42 @@
+../res/sprites/masked_man.png
+../res/sprites/masked_man_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
+frozen[down]: 0
+frozen[down_left]: 1
+frozen[left]: 2
+frozen[up_left]: 3
+frozen[up]: 4
+frozen[up_right]: 5
+frozen[right]: 6
+frozen[down_right]: 7
+walk[down]: 8,0,16,0
+walk[down_left]: 9,1,17,1
+walk[left]: 10,2,18,2
+walk[up_left]: 11,3,19,3
+walk[up]: 12,4,20,4
+walk[up_right]: 13,5,21,5
+walk[right]: 14,6,22,6
+walk[down_right]: 15,7,23,7
+crouch[down]: 0
+crouch[down_left]: 1
+crouch[left]: 2
+crouch[up_left]: 3
+crouch[up]: 4
+crouch[up_right]: 5
+crouch[right]: 6
+crouch[down_right]: 7
+talk[down]: 24,0
+talk[down_left]: 25,1
+talk[left]: 26,2
+talk[up_left]: 27,3
+talk[up]: 28,4
+talk[up_right]: 29,5
+talk[right]: 30,6
+talk[down_right]: 31,7
\ No newline at end of file
diff --git a/res/sprites/masked_man_frames.txt b/res/sprites/masked_man_frames.txt
new file mode 100644
index 0000000..dddcc2f
--- /dev/null
+++ b/res/sprites/masked_man_frames.txt
@@ -0,0 +1,233 @@
+39,32 cell size
+10 frames per row
+229 frames
+
+32,32,16,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+32,32,17,32
+16,32,9,32
+16,32,8,32
+16,32,8,32
+32,32,16,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+32,32,17,32
+16,32,9,32
+16,32,8,32
+16,32,8,32
+32,32,16,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+32,32,17,32
+16,32,9,32
+16,32,8,32
+16,32,8,32
+32,32,16,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+32,32,17,32
+16,32,9,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+32,24,17,24
+32,24,16,24
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+16,32,9,32
+17,32,9,32
+32,32,16,32
+32,32,17,32
+32,32,14,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
+17,32,8,32
+17,32,8,32
+17,32,8,32
+17,32,8,32
+17,32,8,32
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+32,32,16,29
+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,33
+32,32,16,33
+32,32,16,33
+32,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+33,32,17,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,31
+32,32,16,32
+33,32,17,32
+33,32,17,32
+33,32,17,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,23
+32,32,16,22
+32,32,16,24
+32,32,16,25
+32,32,16,23
+32,32,16,29
+32,32,16,26
+32,24,16,17
+32,24,16,17
+32,24,16,17
+32,24,16,25
+32,16,16,19
+32,24,16,24
+32,32,16,32
+32,32,16,34
+32,32,16,32
+32,32,16,31
+32,32,16,30
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,31
+32,32,16,31
+32,24,16,23
+32,32,16,31
+32,32,16,31
+32,32,16,31
+32,32,14,31
+32,32,14,31
+32,32,9,31
+32,32,9,31
+32,32,24,31
+32,32,24,31
+32,32,24,31
+32,32,16,31
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,16,27
+32,32,16,25
+32,32,16,25
+32,32,24,32
+32,32,24,32
+39,32,16,32
+39,32,16,32
+39,32,16,32
+39,32,16,32
+39,32,16,32
+39,24,16,24
+32,24,9,24
+32,24,9,24
+32,24,9,24
+32,24,9,27
+32,32,9,32
+32,32,16,38
+32,32,16,41
+32,32,16,41
+32,24,16,32
+32,32,16,28
+32,32,16,24
+36,32,16,32
+32,24,12,24
+32,24,12,24
+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,15,32
+32,32,15,32
+32,32,8,32
+32,32,8,30
+32,32,8,30
+32,32,8,30
+32,32,8,30
+32,32,9,29
+32,32,9,29
+16,24,-7,21
+32,32,16,32
+32,32,16,32
+32,32,16,32
+32,32,24,32
+32,32,24,32
+32,32,24,32
+32,32,17,32
+32,32,17,32
+33,32,17,32
+33,32,17,32
+32,32,17,32
+32,32,17,32
+32,32,17,32
-- 
cgit 1.4.1