Merge pull request #14 from TheRealEmissions/update-maps

updated maps to include activity hours and spawn points
TheRealEmissions · Mar 19, 2024 · 809017a · 809017a
2 parents b290f5a + 67fc516
commit 809017a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/assets/map/inside_house.tmx b/assets/map/inside_house.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="9">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="11">
  <tileset firstgid="1" source="interior.tsx"/>
  <layer id="4" name="room" width="30" height="20">
   <data encoding="csv">
@@ -172,39 +172,59 @@
  <objectgroup id="12" name="gameObjects">
   <object id="1" name="cookFood" x="224.057" y="112.193" width="16" height="16">
    <properties>
+    <property name="activityStr" value="cook a meal"/>
+    <property name="activityTime" type="int" value="2"/>
     <property name="activityType" value="hunger"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="2" name="getFood" x="271.764" y="111.864" width="16" height="16">
    <properties>
+    <property name="activityStr" value="have a snack"/>
+    <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="hunger"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="4" name="studyAtDesk" x="160.558" y="223.728" width="32" height="32">
    <properties>
+    <property name="activityStr" value="study at your desk"/>
+    <property name="activityTime" type="int" value="3"/>
     <property name="activityType" value="study"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="5" name="watchFish" x="175.693" y="207.278" width="32" height="14">
    <properties>
+    <property name="activityStr" value="watch the fish"/>
+    <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="social"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="6" name="sleep" x="273.08" y="190.827" width="30.9272" height="35.5333">
    <properties>
+    <property name="activityStr" value="go to bed"/>
+    <property name="activityTime" type="int" value="9"/>
     <property name="activityType" value="sleep"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="7" name="nap" x="160.887" y="119.102" width="16.1216" height="41.1265">
    <properties>
+    <property name="activityStr" value="have a nap"/>
+    <property name="activityTime" type="int" value="4"/>
     <property name="activityType" value="sleep"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
+  <object id="9" name="startingPoint" x="231.693" y="255.187" width="16" height="16"/>
+  <object id="10" name="goOutside" x="223.937" y="255.351" width="32" height="16">
+   <properties>
+    <property name="isNewMap" type="bool" value="true"/>
+    <property name="newMap" value="map"/>
+    <property name="newMapStr" value="go outside"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/assets/map/map.tmx b/assets/map/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="28">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="30">
  <tileset firstgid="1" source="cosy_town_tiles.tsx"/>
  <tileset firstgid="3016" source="buildings.tsx"/>
  <tileset firstgid="8488" source="interior.tsx"/>
@@ -205,7 +205,8 @@
   </object>
   <object id="17" name="enterLibrary" x="64.7519" y="96.8722" width="32" height="16">
    <properties>
-    <property name="activityStr" value="study"/>
+    <property name="activityStr" value="study at the library"/>
+    <property name="activityTime" type="int" value="2"/>
     <property name="activityType" value="study"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
@@ -219,14 +220,32 @@
   </object>
   <object id="21" name="enterPub" x="424.988" y="144.159" width="20" height="32">
    <properties>
-    <property name="activityStr" value="enter the pub"/>
+    <property name="activityStr" value="go for drinks"/>
+    <property name="activityTime" type="int" value="2"/>
     <property name="activityType" value="social"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="23" name="enterBusStop" x="16.2257" y="230.904" width="62.5791" height="24.9925">
    <properties>
     <property name="activityStr" value="head to town"/>
+    <property name="activityTime" type="int" value="3"/>
+    <property name="activityType" value="social"/>
+    <property name="isActivity" type="bool" value="true"/>
+   </properties>
+  </object>
+  <object id="28" name="feedTheDucks" x="220.551" y="44.9123" width="21.6541" height="35.2882">
+   <properties>
+    <property name="activityStr" value="feed the ducks"/>
+    <property name="activityTime" type="int" value="1"/>
+    <property name="activityType" value="social"/>
+    <property name="isActivity" type="bool" value="true"/>
+   </properties>
+  </object>
+  <object id="29" name="climbTower" x="389.774" y="0" width="90.5464" height="80.9223">
+   <properties>
+    <property name="activityStr" value="climb clifford's tower"/>
+    <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="social"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>