Skip to content

Commit

Permalink
Merge pull request #19 from TheRealEmissions/scale-values
Browse files Browse the repository at this point in the history
scaled values and updated activity type of daydream activity
  • Loading branch information
Zr695 authored Mar 21, 2024
2 parents fccdbc3 + 9a7d1c0 commit 4ac7b9c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions assets/map/inside_house.tmx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<property name="activityStr" value="study at your desk"/>
<property name="activityTime" type="int" value="3"/>
<property name="activityType" value="study"/>
<property name="changeAmount" value="0,0.3,0.2"/>
<property name="changeAmount" value=".2,0.3,0.2"/>
<property name="isActivity" type="bool" value="true"/>
</properties>
</object>
Expand All @@ -160,7 +160,7 @@
<property name="activityStr" value="watch the fish"/>
<property name="activityTime" type="int" value="1"/>
<property name="activityType" value="entertain"/>
<property name="changeAmount" value="0.1,0.05"/>
<property name="changeAmount" value="0.1,0.1"/>
<property name="isActivity" type="bool" value="true"/>
</properties>
</object>
Expand Down Expand Up @@ -195,12 +195,12 @@
<property name="newMapStr" value="go outside"/>
</properties>
</object>
<object id="11" name="daydream" x="164.448" y="184.482">
<object id="11" name="daydream" x="164.448" y="184.482" width="16" height="16">
<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="activityType" value="nap"/>
<property name="changeAmount" value="0.15"/>
<property name="isActivity" type="bool" value="true"/>
</properties>
</object>
Expand Down
2 changes: 1 addition & 1 deletion assets/map/map.tmx
Original file line number Diff line number Diff line change
Expand Up @@ -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.1,0.05"/>
<property name="changeAmount" value="0.1,0.15"/>
<property name="isActivity" type="bool" value="true"/>
</properties>
</object>
Expand Down

0 comments on commit 4ac7b9c

Please sign in to comment.