From 7c173eda1eba83bf582e85ef7b11ecbf52627a60 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Tue, 28 Apr 2020 21:43:45 +0200
Subject: [PATCH] Fix A secret garden: clearing out monsters

---
 .../conversationlist_stoutford_combined.json  | 26 ++++++++---------
 .../raw/monsterlist_stoutford_combined.json   | 29 +++++++++++++++++++
 AndorsTrail/res/xml/lakecave0.tmx             |  6 ++++
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index 69deca3b8..ef097fc3a 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -1140,6 +1140,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"secret_garden",
                 "value":50
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"lakecave0_15",
+                "mapName":"lakecave0"
             }
         ]
     },
@@ -1150,19 +1155,9 @@
                 "nextPhraseID":"caeda_root50_3",
                 "requires":[
                     {
-                        "requireType":"killedMonster",
-                        "requireID":"cave_troll_2",
-                        "value":7
-                    },
-                    {
-                        "requireType":"killedMonster",
-                        "requireID":"cave_troll_3",
-                        "value":15
-                    },
-                    {
-                        "requireType":"killedMonster",
-                        "requireID":"cave_troll_4",
-                        "value":7
+                        "requireType":"questProgress",
+                        "requireID":"secret_garden",
+                        "value":55
                     }
                 ]
             },
@@ -3352,6 +3347,11 @@
                         "requireType":"killedMonster",
                         "requireID":"cave_troll_4",
                         "value":7
+                    },
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"cave_troll_7",
+                        "value":1
                     }
                 ]
             }
diff --git a/AndorsTrail/res/raw/monsterlist_stoutford_combined.json b/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
index dca445a02..336a18532 100644
--- a/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
@@ -431,6 +431,35 @@
             ]
         }
     },
+    {
+        "id":"cave_troll_7",
+        "name":"Cave troll",
+        "iconID":"monsters_tometik5:14",
+        "maxHP":230,
+        "maxAP":10,
+        "moveCost":5,
+        "unique":1,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":1,
+            "max":15
+        },
+        "spawnGroup":"cave_troll_7",
+        "droplistID":"cave_troll_1",
+        "attackCost":5,
+        "attackChance":60,
+        "blockChance":40,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":2,
+                    "chance":"10"
+                }
+            ]
+        }
+    },
     {
         "id":"honey_bee",
         "name":"Honey bee",
diff --git a/AndorsTrail/res/xml/lakecave0.tmx b/AndorsTrail/res/xml/lakecave0.tmx
index 09ba96c16..8d0b9fa4e 100644
--- a/AndorsTrail/res/xml/lakecave0.tmx
+++ b/AndorsTrail/res/xml/lakecave0.tmx
@@ -355,6 +355,12 @@
     <property name="spawngroup" value="cave_troll_1"/>
    </properties>
   </object>
+  <object id="28" name="lakecave0_15" type="spawn" x="288" y="288" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="cave_troll_7"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
  <objectgroup name="Replace">