Merge pull request #17 from TheRealEmissions/fix-need-levels

adjusted pair for levels
TheRealEmissions · Mar 21, 2024 · afd353d · afd353d
2 parents 5bc8aa2 + f649b80
commit afd353d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 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="12" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="11">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="12" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="12">
  <tileset firstgid="1" source="interior.tsx"/>
  <layer id="4" name="room" width="12" height="14">
   <data encoding="csv">
@@ -133,7 +133,7 @@
     <property name="activityStr" value="cook a meal"/>
     <property name="activityTime" type="int" value="2"/>
     <property name="activityType" value="eat"/>
-    <property name="changeAmount" value="0,0.1,0.2"/>
+    <property name="changeAmount" value="0.3"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -142,7 +142,7 @@
     <property name="activityStr" value="have a snack"/>
     <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="eat"/>
-    <property name="changeAmount" value="0,0.05,0.15"/>
+    <property name="changeAmount" value="0.1"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -160,16 +160,16 @@
     <property name="activityStr" value="watch the fish"/>
     <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="entertain"/>
-    <property name="changeAmount" value="0,0.05,0.1"/>
+    <property name="changeAmount" value="0.1,0.05"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
   <object id="6" name="sleep" x="112.955" y="126.827" width="47.0522" height="44.0333">
    <properties>
     <property name="activityStr" value="go to bed"/>
-    <property name="activityTime" type="int" value="9"/>
+    <property name="activityTime" type="int" value="8"/>
     <property name="activityType" value="sleep"/>
-    <property name="changeAmount" value="0,0,0"/>
+    <property name="changeAmount" value="0,0"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -178,7 +178,7 @@
     <property name="activityStr" value="have a nap"/>
     <property name="activityTime" type="int" value="4"/>
     <property name="activityType" value="nap"/>
-    <property name="changeAmount" value="0,0.3,0"/>
+    <property name="changeAmount" value="0.3"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -195,5 +195,14 @@
     <property name="newMapStr" value="go outside"/>
    </properties>
   </object>
+  <object id="11" name="daydream" x="164.448" y="184.482">
+   <properties>
+    <property name="activityStr" value="daydream"/>
+    <property name="activityTime" type="int" value="1"/>
+    <property name="activityType" value="entertain"/>
+    <property name="changeAmount" value="0.05,0.05"/>
+    <property name="isActivity" type="bool" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/assets/map/map.tmx b/assets/map/map.tmx
@@ -224,7 +224,7 @@
     <property name="activityStr" value="go for drinks"/>
     <property name="activityTime" type="int" value="2"/>
     <property name="activityType" value="entertain"/>
-    <property name="changeAmount" value="0,0.3,0.4"/>
+    <property name="changeAmount" value="0.4,0.25"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -233,7 +233,7 @@
     <property name="activityStr" value="head to town"/>
     <property name="activityTime" type="int" value="3"/>
     <property name="activityType" value="entertain"/>
-    <property name="changeAmount" value="0,0.1,0.2"/>
+    <property name="changeAmount" value="0.2,0.1"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -242,7 +242,7 @@
     <property name="activityStr" value="feed the ducks"/>
     <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="entertain"/>
-    <property name="changeAmount" value="0,0.05,0.1"/>
+    <property name="changeAmount" value="0.1,0.05"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>
@@ -251,7 +251,7 @@
     <property name="activityStr" value="climb clifford's tower"/>
     <property name="activityTime" type="int" value="1"/>
     <property name="activityType" value="entertain"/>
-    <property name="changeAmount" value="0,0.2,0.1"/>
+    <property name="changeAmount" value="0.1,0.2"/>
     <property name="isActivity" type="bool" value="true"/>
    </properties>
   </object>