From 40cd0a72b70c56a1ba434a25484c8cb8016e95cb Mon Sep 17 00:00:00 2001
From: Xe Iaso <me@christine.website>
Date: Sat, 2 Jul 2022 09:50:00 -0400
Subject: [PATCH] maps/overworld: add warp target, make tiles nicer

Signed-off-by: Xe Iaso <me@christine.website>
---
 maps/RPGmap.json       | 51 ++++++++++++++++++++++++++++--------------
 maps/RPGmap.tmx        | 11 ++++++---
 src/maps/overworld.zig |  4 ++--
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/maps/RPGmap.json b/maps/RPGmap.json
index fba32d9..8296e27 100644
--- a/maps/RPGmap.json
+++ b/maps/RPGmap.json
@@ -201,17 +201,6 @@
                  "x":145.091,
                  "y":111.273
                 }, 
-                {
-                 "class":"",
-                 "height":6.54545,
-                 "id":27,
-                 "name":"",
-                 "rotation":0,
-                 "visible":true,
-                 "width":31.0909,
-                 "x":0.363636,
-                 "y":153.273
-                }, 
                 {
                  "class":"",
                  "height":7.09091,
@@ -225,14 +214,25 @@
                 }, 
                 {
                  "class":"",
-                 "height":5.81818,
-                 "id":29,
+                 "height":27.4299344066786,
+                 "id":36,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":8,
-                 "x":51.8182,
-                 "y":154
+                 "width":61.2204333134566,
+                 "x":0.397535281256212,
+                 "y":153.846153846154
+                }, 
+                {
+                 "class":"",
+                 "height":11.1309878751739,
+                 "id":37,
+                 "name":"",
+                 "rotation":0,
+                 "visible":true,
+                 "width":8.34824090638045,
+                 "x":62.015503875969,
+                 "y":162.194394752534
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -338,6 +338,23 @@
                  "width":14.978,
                  "x":96.4758,
                  "y":17.0705
+                }, 
+                {
+                 "class":"",
+                 "height":7.95070562512423,
+                 "id":38,
+                 "name":"house 1",
+                 "properties":[
+                        {
+                         "name":"warpTarget",
+                         "type":"int",
+                         "value":2
+                        }],
+                 "rotation":0,
+                 "visible":true,
+                 "width":14.7088054064798,
+                 "x":128.801431127013,
+                 "y":112.900019876764
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -368,7 +385,7 @@
          "y":0
         }],
  "nextlayerid":6,
- "nextobjectid":36,
+ "nextobjectid":39,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.9.0",
diff --git a/maps/RPGmap.tmx b/maps/RPGmap.tmx
index b5414a6..22ae036 100644
--- a/maps/RPGmap.tmx
+++ b/maps/RPGmap.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="8" tileheight="8" infinite="0" nextlayerid="6" nextobjectid="36">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="8" tileheight="8" infinite="0" nextlayerid="6" nextobjectid="39">
  <editorsettings>
   <export target="RPGmap.json" format="json"/>
  </editorsettings>
@@ -62,9 +62,9 @@
   <object id="24" x="127.636" y="80" width="16.3636" height="7.09091"/>
   <object id="25" x="114.364" y="111.818" width="11.4545" height="12.5455"/>
   <object id="26" x="145.091" y="111.273" width="12.1818" height="12.5455"/>
-  <object id="27" x="0.363636" y="153.273" width="31.0909" height="6.54545"/>
   <object id="28" x="11.2727" y="146.182" width="8.90909" height="7.09091"/>
-  <object id="29" x="51.8182" y="154" width="8" height="5.81818"/>
+  <object id="36" x="0.397535" y="153.846" width="61.2204" height="27.4299"/>
+  <object id="37" x="62.0155" y="162.194" width="8.34824" height="11.131"/>
  </objectgroup>
  <objectgroup id="3" name="act">
   <object id="30" name="sign" x="16" y="96" width="16" height="20">
@@ -92,6 +92,11 @@
     <property name="warpTarget" type="int" value="1"/>
    </properties>
   </object>
+  <object id="38" name="house 1" x="128.801" y="112.9" width="14.7088" height="7.95071">
+   <properties>
+    <property name="warpTarget" type="int" value="2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="4" name="spc">
   <object id="33" name="mara_start" x="32" y="31" width="16" height="16"/>
diff --git a/src/maps/overworld.zig b/src/maps/overworld.zig
index 9cb8f51..3eab2a6 100644
--- a/src/maps/overworld.zig
+++ b/src/maps/overworld.zig
@@ -191,9 +191,9 @@ pub const coll = [_]Rect{
     Rect{.base = Point{.x = 128, .y = 80}, .width = 16, .height = 7},
     Rect{.base = Point{.x = 114, .y = 112}, .width = 11, .height = 13},
     Rect{.base = Point{.x = 145, .y = 111}, .width = 12, .height = 13},
-    Rect{.base = Point{.x = 0, .y = 153}, .width = 31, .height = 7},
     Rect{.base = Point{.x = 11, .y = 146}, .width = 9, .height = 7},
-    Rect{.base = Point{.x = 52, .y = 154}, .width = 8, .height = 6},
+    Rect{.base = Point{.x = 0, .y = 154}, .width = 61, .height = 27},
+    Rect{.base = Point{.x = 62, .y = 162}, .width = 8, .height = 11},
 };
 
 pub const triggers = [_]Trigger{