From 1f2321a83d56ceeb271df01c31a3ce3c884ac443 Mon Sep 17 00:00:00 2001
From: Fedja Beader <fedja@protonmail.ch>
Date: Sat, 11 Jan 2025 23:31:41 +0100
Subject: Deduplicate remaining duplicate spawners I could find

Utilities:
cat npc/*/_mobs.txt | grep monster | sort | uniq -c  | grep -v ' 1 '

cat maps/031-3.tmx | grep 'object id=' | cut -d' ' -f 5- | sort | uniq
-c | grep -v ' 1'

NB: 016-1 has another overlapping MauvePlant spawner that has
unconfigured delay (thus is not a direct duplicate). As changing it
would change game mechanis, it is out of scope for this commit.

NB: One of the 031-1 Bat dupe was probably added in
ff1acc14dcc3683aad70907c3748f. I could not extract a reason,
and did not look into who/what/why added the other duplicates.
---
 maps/011-1.tmx |  9 +--------
 maps/016-1.tmx | 10 +---------
 maps/031-3.tmx | 60 ++++++----------------------------------------------------
 3 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/maps/011-1.tmx b/maps/011-1.tmx
index 58fc4fc2..6966de4d 100644
--- a/maps/011-1.tmx
+++ b/maps/011-1.tmx
@@ -721,7 +721,7 @@
   <object id="12" name="Mouboo" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="10"/>
-    <property name="max_beings" value="5"/>
+    <property name="max_beings" value="10"/>
     <property name="monster_id" value="26"/>
    </properties>
   </object>
@@ -779,13 +779,6 @@
     <property name="dest_y" value="100"/>
    </properties>
   </object>
-  <object id="20" name="Mouboo" type="spawn" x="0" y="0">
-   <properties>
-    <property name="death" value="10"/>
-    <property name="max_beings" value="5"/>
-    <property name="monster_id" value="26"/>
-   </properties>
-  </object>
   <object id="21" name="ManaBug" type="spawn" x="32" y="32">
    <properties>
     <property name="max_beings" value="18"/>
diff --git a/maps/016-1.tmx b/maps/016-1.tmx
index b2cb0802..4c006e56 100644
--- a/maps/016-1.tmx
+++ b/maps/016-1.tmx
@@ -694,7 +694,7 @@
   <object id="9" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180000"/>
-    <property name="max_beings" value="4"/>
+    <property name="max_beings" value="8"/>
     <property name="monster_id" value="27"/>
     <property name="spawn" value="270000"/>
    </properties>
@@ -707,14 +707,6 @@
     <property name="spawn" value="0"/>
    </properties>
   </object>
-  <object id="11" name="MauvePlant" type="spawn" x="0" y="0">
-   <properties>
-    <property name="death" value="180000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="27"/>
-    <property name="spawn" value="270000"/>
-   </properties>
-  </object>
   <object id="13" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="7000"/>
diff --git a/maps/031-3.tmx b/maps/031-3.tmx
index 3dd45859..2714b469 100644
--- a/maps/031-3.tmx
+++ b/maps/031-3.tmx
@@ -1651,7 +1651,7 @@
   <object id="50" name="Bat" type="spawn" x="5760" y="8352" width="2144" height="1408">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="5"/>
+    <property name="max_beings" value="10"/>
     <property name="monster_id" value="15"/>
     <property name="spawn" value="100000"/>
    </properties>
@@ -1691,7 +1691,7 @@
   <object id="55" name="Moggun" type="spawn" x="2432" y="8960" width="1376" height="736">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="5"/>
+    <property name="max_beings" value="10"/>
     <property name="monster_id" value="59"/>
     <property name="spawn" value="100000"/>
    </properties>
@@ -1731,7 +1731,7 @@
   <object id="60" name="IceElement" type="spawn" x="2528" y="6144" width="1280" height="1440">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="2"/>
+    <property name="max_beings" value="4"/>
     <property name="monster_id" value="69"/>
     <property name="spawn" value="100000"/>
    </properties>
@@ -1752,14 +1752,6 @@
     <property name="spawn" value="100000"/>
    </properties>
   </object>
-  <object id="63" name="Moggun" type="spawn" x="2432" y="8960" width="1376" height="736">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="max_beings" value="5"/>
-    <property name="monster_id" value="59"/>
-    <property name="spawn" value="100000"/>
-   </properties>
-  </object>
   <object id="64" name="IceGoblin" type="spawn" x="8384" y="8800" width="1088" height="480">
    <properties>
     <property name="death" value="30000"/>
@@ -1768,14 +1760,6 @@
     <property name="spawn" value="100000"/>
    </properties>
   </object>
-  <object id="65" name="IceElement" type="spawn" x="2528" y="6144" width="1280" height="1440">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="69"/>
-    <property name="spawn" value="100000"/>
-   </properties>
-  </object>
   <object id="66" name="IceElement" type="spawn" x="8992" y="5792" width="288" height="2432">
    <properties>
     <property name="death" value="30000"/>
@@ -1803,7 +1787,7 @@
   <object id="69" name="Moggun" type="spawn" x="8032" y="6016" width="2016" height="544">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
+    <property name="max_beings" value="6"/>
     <property name="monster_id" value="59"/>
     <property name="spawn" value="100000"/>
    </properties>
@@ -1824,14 +1808,6 @@
     <property name="spawn" value="100000"/>
    </properties>
   </object>
-  <object id="74" name="Bat" type="spawn" x="5760" y="8352" width="2144" height="1408">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="max_beings" value="5"/>
-    <property name="monster_id" value="15"/>
-    <property name="spawn" value="100000"/>
-   </properties>
-  </object>
   <object id="75" name="Pollett" type="spawn" x="5760" y="8352" width="2144" height="1408">
    <properties>
     <property name="death" value="30000"/>
@@ -1872,26 +1848,10 @@
     <property name="spawn" value="100000"/>
    </properties>
   </object>
-  <object id="79" name="Moggun" type="spawn" x="8032" y="6016" width="2016" height="544">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="59"/>
-    <property name="spawn" value="100000"/>
-   </properties>
-  </object>
-  <object id="80" name="Moggun" type="spawn" x="5792" y="4832" width="2016" height="544">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="max_beings" value="7"/>
-    <property name="monster_id" value="59"/>
-    <property name="spawn" value="100000"/>
-   </properties>
-  </object>
   <object id="81" name="Moggun" type="spawn" x="5792" y="4832" width="2016" height="544">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="7"/>
+    <property name="max_beings" value="14"/>
     <property name="monster_id" value="59"/>
     <property name="spawn" value="100000"/>
    </properties>
@@ -1912,18 +1872,10 @@
     <property name="spawn" value="100000"/>
    </properties>
   </object>
-  <object id="84" name="Bat" type="spawn" x="8480" y="2208" width="1184" height="1024">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="max_beings" value="15"/>
-    <property name="monster_id" value="15"/>
-    <property name="spawn" value="100000"/>
-   </properties>
-  </object>
   <object id="85" name="Bat" type="spawn" x="8480" y="2208" width="1184" height="1024">
    <properties>
     <property name="death" value="30000"/>
-    <property name="max_beings" value="15"/>
+    <property name="max_beings" value="30"/>
     <property name="monster_id" value="15"/>
     <property name="spawn" value="100000"/>
    </properties>
-- 
cgit v1.2.3-70-g09d2