From 5878a1c0b28763b2e4a6afb200abbb528bd326b4 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 3 Mar 2021 08:11:10 -0500
Subject: Set default collision bounds for map sprites

Since it's always the same ones anyway, might as well set defaults and allow them to be overridden.
---
 res/maps/hallucination_beach.tmx      |  4 ----
 res/maps/hallucination_hot_spring.tmx |  4 ----
 res/maps/hallucination_interior.tmx   | 12 ------------
 res/maps/pink_shell.tmx               |  8 --------
 res/maps/underwater_start.tmx         |  4 ----
 src/map.h                             |  4 ++--
 6 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/res/maps/hallucination_beach.tmx b/res/maps/hallucination_beach.tmx
index 9830cf5..2c783ee 100644
--- a/res/maps/hallucination_beach.tmx
+++ b/res/maps/hallucination_beach.tmx
@@ -44,10 +44,6 @@
   <object id="3" name="flint" type="sprite" x="560.14" y="304.895">
    <properties>
     <property name="animation" value="flint"/>
-    <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="script0001"/>
     <property name="shadow" type="bool" value="true"/>
    </properties>
diff --git a/res/maps/hallucination_hot_spring.tmx b/res/maps/hallucination_hot_spring.tmx
index 7ccc0cb..d750a2b 100644
--- a/res/maps/hallucination_hot_spring.tmx
+++ b/res/maps/hallucination_hot_spring.tmx
@@ -37,10 +37,6 @@
    <properties>
     <property name="animName" value="swim_still"/>
     <property name="animation" value="ionia"/>
-    <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"/>
    </properties>
    <point/>
   </object>
diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx
index a4ff7b3..734b113 100644
--- a/res/maps/hallucination_interior.tmx
+++ b/res/maps/hallucination_interior.tmx
@@ -99,10 +99,6 @@
   <object id="7" name="doria" type="sprite" x="328" y="525">
    <properties>
     <property name="animation" value="doria"/>
-    <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/>
@@ -115,10 +111,6 @@
   <object id="9" name="join_claus" type="sprite" x="640.334" y="153.667">
    <properties>
     <property name="animation" value="claus"/>
-    <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="join_claus"/>
     <property name="shadow" type="bool" value="true"/>
    </properties>
@@ -127,10 +119,6 @@
   <object id="10" name="ionia" type="sprite" x="821.333" y="135.333">
    <properties>
     <property name="animation" value="ionia"/>
-    <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="enclosureZone" value="ionia_enclosure"/>
     <property name="interactionScript" value="talk_to_ionia"/>
     <property name="movementSpeed" type="int" value="1"/>
diff --git a/res/maps/pink_shell.tmx b/res/maps/pink_shell.tmx
index 4f59461..dc0ada5 100644
--- a/res/maps/pink_shell.tmx
+++ b/res/maps/pink_shell.tmx
@@ -52,10 +52,6 @@
   <object id="3" name="ocho" type="sprite" x="280" y="222">
    <properties>
     <property name="animation" value="human_ocho"/>
-    <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>
@@ -64,10 +60,6 @@
   <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"/>
diff --git a/res/maps/underwater_start.tmx b/res/maps/underwater_start.tmx
index cd73e07..d616c27 100644
--- a/res/maps/underwater_start.tmx
+++ b/res/maps/underwater_start.tmx
@@ -83,10 +83,6 @@
   <object id="2" name="fish1" type="sprite" x="216.923" y="198.462">
    <properties>
     <property name="animation" value="fish"/>
-    <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="enclosureZone" value="fish1_enclosure"/>
     <property name="interactionScript" value="talk_to_fish1"/>
     <property name="movementSpeed" type="int" value="1"/>
diff --git a/src/map.h b/src/map.h
index 80a79b0..a125082 100644
--- a/src/map.h
+++ b/src/map.h
@@ -21,8 +21,8 @@ struct Tile {
 struct Prototype {
   std::string name;
   vec2i pos;
-  vec2i collisionOffset;
-  vec2i collisionSize;
+  vec2i collisionOffset {-8, -8};
+  vec2i collisionSize {12, 8};
   std::string animationFilename;
   std::string animName;
   Direction dir = Direction::down;
-- 
cgit 1.4.1