From 065d5dbac17664666d6a83583141d4cdf0bb691c Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 12 Mar 2021 16:41:25 -0500
Subject: Interacting with Kuma and Duster in the finale

The hot spring is also a little bigger now, because I'm using an enclosure to keep Lucas in, instead of setting the tiles to being solid or not.

#20
---
 res/maps/finale.tmx |  3 ++-
 res/maps/forest.tsx | 71 +++--------------------------------------------------
 2 files changed, 5 insertions(+), 69 deletions(-)

(limited to 'res/maps')

diff --git a/res/maps/finale.tmx b/res/maps/finale.tmx
index 5c48c97..be30d18 100644
--- a/res/maps/finale.tmx
+++ b/res/maps/finale.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="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="6">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="7">
  <tileset firstgid="1" source="forest.tsx"/>
  <layer id="2" name="Lower" width="32" height="16">
   <data encoding="csv">
@@ -34,6 +34,7 @@
   <object id="5" name="boney_start" type="warp" x="197.84" y="144">
    <point/>
   </object>
+  <object id="6" name="hotspring_enclosure" type="zone" x="224" y="104" width="96" height="56"/>
  </objectgroup>
  <layer id="1" name="Upper" width="32" height="16">
   <properties>
diff --git a/res/maps/forest.tsx b/res/maps/forest.tsx
index bff44a5..633544a 100644
--- a/res/maps/forest.tsx
+++ b/res/maps/forest.tsx
@@ -1,49 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.4" tiledversion="1.4.3" name="forest" tilewidth="16" tileheight="16" tilecount="80" columns="10">
  <image source="forest_tiles.png" width="160" height="128"/>
- <tile id="6">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="7">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="8">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="9">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="10">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
  <tile id="11">
   <properties>
-   <property name="solid" type="bool" value="true"/>
+   <property name="medium" value="water"/>
   </properties>
  </tile>
  <tile id="12">
   <properties>
-   <property name="solid" type="bool" value="true"/>
+   <property name="medium" value="water"/>
   </properties>
  </tile>
  <tile id="13">
   <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="14">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
+   <property name="medium" value="water"/>
   </properties>
  </tile>
  <tile id="15">
@@ -51,44 +21,9 @@
    <property name="medium" value="water"/>
   </properties>
  </tile>
- <tile id="16">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="18">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
  <tile id="19">
   <properties>
    <property name="medium" value="water"/>
   </properties>
  </tile>
- <tile id="22">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="23">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="24">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="25">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="26">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
 </tileset>
-- 
cgit 1.4.1