From 112af518c4aaae3872da2be660821b17e3524f2c Mon Sep 17 00:00:00 2001
From: rixty <proxy@rape.lol>
Date: Sun, 27 Jun 2021 09:50:45 +0200
Subject: [PATCH] A-0.06.42

---
 README.md          |   2 +-
 changelog.md       |   2 +-
 engine/classes.txt |  12 ++---
 maps/farm.txt      | 119 ++++++++++++++++++++++++++++++++++-----------
 4 files changed, 99 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 9b88fbb..64cc20f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Hi, i'm trying to re-create with Flare a completely open source version (using t
 [![](https://pod.geraspora.de/uploads/images/7a9ea689d344b44f8a5a.jpg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 
 the version of the engine currently used is in this repo, for an easier download,
-windows version only, for other versions: https://github.com/clintbellanger/flare-game
+windows version only, for other versions: https://github.com/flareteam/flare-engine
 
 if you want to support the project: https://coindrop.to/openvalley
 
diff --git a/changelog.md b/changelog.md
index 7fefc70..24e869c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -25,7 +25,7 @@ Alpha 0.07
 * changed the days of the seasons from 28 to 31 (to not have each season start with the same day of the week)
 * added a cycle of 9999 years
 * added some soundfx
-* added 33/56 grass tiles (farm map)
+* added 40/56 grass tiles (farm map)
 * added the first tile of cutable grass (without character animation)
 * set the grass disappearing in winter
 * changed the day/night cycle, with the sunrise and sunset change time according to the season. now the day/night cycle changes every in-game half hour
diff --git a/engine/classes.txt b/engine/classes.txt
index 7807a82..16c0ad3 100644
--- a/engine/classes.txt
+++ b/engine/classes.txt
@@ -8,7 +8,7 @@ actionbar=10,11,12,13,0,0,0,0,0,0,0,0
 hero_options=0,1
 
 [class]
-name=Riverland
+name=[To-Do] Riverland
 description=The majority of this map is water. Fishing is viable on this farm.
 currency=500
 equipment=2
@@ -17,7 +17,7 @@ actionbar=0,0,0,0,0,0,0,0,0,0,0,0
 hero_options=0,1
 
 [class]
-name=Forest
+name=[To-Do] Forest
 description=The farm border is made of trees and foliage, just like in the Secret Woods.
 currency=500
 equipment=2
@@ -26,7 +26,7 @@ actionbar=0,0,0,0,0,0,0,0,0,0,0,0
 hero_options=0,1
 
 [class]
-name=Hill-top
+name=[To-Do] Hill-top
 description=The southwest hilltop spawns Stones, Ore nodes, and Geode nodes depending on the player's Mining level. The mining area may sometimes be blocked by a Large Stump, Large Log, or a Boulder, making it impossible to enter until the player has the correct tool.
 currency=500
 equipment=2
@@ -35,7 +35,7 @@ actionbar=0,0,0,0,0,0,0,0,0,0,0,0
 hero_options=0,1
 
 [class]
-name=Wilderness
+name=[To-Do] Wilderness
 description=Monsters spawn at night (scales with the player's Combat level).
 This map can spawn more Wilderness Golems than other farms if they have spawning monster enabled.
 currency=500
@@ -45,7 +45,7 @@ actionbar=0,0,0,0,0,0,0,0,0,0,0,0
 hero_options=0,1
 
 [class]
-name=Four-Corners
+name=[To-Do] Four-Corners
 description=The farming area is split by cliffs into four distinct areas, each reminiscent of some of the other Farm Maps.
 currency=500
 equipment=2
@@ -55,7 +55,7 @@ hero_options=0,1
 
 
 [class]
-name=Beach
+name=[To-Do] Beach
 description=Good foraging and fishing, and tons of open space. Sometimes, supply crates wash up on shore.
 currency=500
 equipment=2
diff --git a/maps/farm.txt b/maps/farm.txt
index b1ac8ec..9c74013 100644
--- a/maps/farm.txt
+++ b/maps/farm.txt
@@ -11916,81 +11916,144 @@ requires_status=grass33
 unset_status=grass33
 
 [event]
-# cut grass1
+# grass34
+type=event
+location=52,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,51,8,43;level 9,52,8,44;level 3,53,8,45;level 7,51,9,107;level 10,52,9,108;level 8,53,9,109;level 4,51,10,171;level 6,52,10,172;level 5,53,10,173
+requires_status=grass34
+
+[event]
+# cut grass34
 type=event
 location=52,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,51,8,0;level 9,52,8,0;level 3,53,8,0;level 7,51,9,0;level 10,52,9,0;level 8,53,9,0;level 4,51,10,0;level 6,52,10,0;level 5,53,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass34
+unset_status=grass34
 
 [event]
-# cut grass1
+# grass35
+type=event
+location=53,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,52,8,43;level 9,53,8,44;level 3,54,8,45;level 7,52,9,107;level 10,53,9,108;level 8,54,9,109;level 4,52,10,171;level 6,53,10,172;level 5,54,10,173
+requires_status=grass35
+
+[event]
+# cut grass35
 type=event
 location=53,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,52,8,0;level 9,53,8,0;level 3,54,8,0;level 7,52,9,0;level 10,53,9,0;level 8,54,9,0;level 4,52,10,0;level 6,53,10,0;level 5,54,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass35
+unset_status=grass35
 
 [event]
-# cut grass1
+# grass36
+type=event
+location=54,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,53,8,43;level 9,54,8,44;level 3,55,8,45;level 7,53,9,107;level 10,54,9,108;level 8,55,9,109;level 4,53,10,171;level 6,54,10,172;level 5,55,10,173
+requires_status=grass36
+
+[event]
+# cut grass36
 type=event
 location=54,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,53,8,0;level 9,54,8,0;level 3,55,8,0;level 7,53,9,0;level 10,54,9,0;level 8,55,9,0;level 4,53,10,0;level 6,54,10,0;level 5,55,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass36
+unset_status=grass36
 
 [event]
-# cut grass1
+# grass37
+type=event
+location=55,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,54,8,43;level 9,55,8,44;level 3,56,8,45;level 7,54,9,107;level 10,55,9,108;level 8,56,9,109;level 4,54,10,171;level 6,55,10,172;level 5,56,10,173
+requires_status=grass37
+
+[event]
+# cut grass37
 type=event
 location=55,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,54,8,0;level 9,55,8,0;level 3,56,8,0;level 7,54,9,0;level 10,55,9,0;level 8,56,9,0;level 4,54,10,0;level 6,55,10,0;level 5,56,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass37
+unset_status=grass37
 
 [event]
-# cut grass1
+# grass38
+type=event
+location=56,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,55,8,43;level 9,56,8,44;level 3,57,8,45;level 7,55,9,107;level 10,56,9,108;level 8,57,9,109;level 4,55,10,171;level 6,56,10,172;level 5,57,10,173
+requires_status=grass38
+
+[event]
+# cut grass38
 type=event
 location=56,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,55,8,0;level 9,56,8,0;level 3,57,8,0;level 7,55,9,0;level 10,56,9,0;level 8,57,9,0;level 4,55,10,0;level 6,56,10,0;level 5,57,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass38
+unset_status=grass38
 
 [event]
-# cut grass1
+# grass39
+type=event
+location=57,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,56,8,43;level 9,57,8,44;level 3,58,8,45;level 7,56,9,107;level 10,57,9,108;level 8,58,9,109;level 4,56,10,171;level 6,57,10,172;level 5,58,10,173
+requires_status=grass39
+
+[event]
+# cut grass39
 type=event
 location=57,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,56,8,0;level 9,57,8,0;level 3,58,8,0;level 7,56,9,0;level 10,57,9,0;level 8,58,9,0;level 4,56,10,0;level 6,57,10,0;level 5,58,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass39
+unset_status=grass39
 
 [event]
-# cut grass1
+# grass40
+type=event
+location=58,9,1,1
+activate=on_load
+hotspot=location
+mapmod=level 2,57,8,43;level 9,58,8,44;level 3,59,8,45;level 7,57,9,107;level 10,58,9,108;level 8,59,9,109;level 4,57,10,171;level 6,58,10,172;level 5,59,10,173
+requires_status=grass40
+
+[event]
+# cut grass40
 type=event
 location=58,9,1,1
 activate=on_interact
 hotspot=location
-mapmod=level 2,18,8,0;level 9,19,8,0;level 3,20,8,0;level 7,18,9,0;level 10,19,9,0;level 8,20,9,0;level 4,18,10,0;level 6,19,10,0;level 5,20,10,0
+mapmod=level 2,57,8,0;level 9,58,8,0;level 3,59,8,0;level 7,57,9,0;level 10,58,9,0;level 8,59,9,0;level 4,57,10,0;level 6,58,10,0;level 5,59,10,0
 requires_item=10
-requires_status=grass1
-unset_status=grass1
+requires_status=grass40
+unset_status=grass40
 
 [event]
 # cut grass1