From b7e7dec72a882a264fc4403695a1f1640411bf2b Mon Sep 17 00:00:00 2001
From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com>
Date: Mon, 20 May 2024 17:38:44 -0500
Subject: [PATCH] [MoM] Zombie looks-like + slightly reduce skyscraper lab
 break area spawns (#73942)

* Initial commit

* Spawn changes

* Fix misplaced glass wall
---
 .../mapgen/nested/skyscraper_lab_modular.json        | 12 ++++++------
 .../mapgen/skyscraper_lab/skyscraper_lab.json        |  2 +-
 data/mods/MindOverMatter/monsters/zombies.json       |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/mods/MindOverMatter/mapgen/nested/skyscraper_lab_modular.json b/data/mods/MindOverMatter/mapgen/nested/skyscraper_lab_modular.json
index b9c9bb5e406d1..e6e6905756771 100644
--- a/data/mods/MindOverMatter/mapgen/nested/skyscraper_lab_modular.json
+++ b/data/mods/MindOverMatter/mapgen/nested/skyscraper_lab_modular.json
@@ -1581,7 +1581,7 @@
         ]
       },
       "place_monster": [
-        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 50, "repeat": [ 1, 3 ] },
+        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 33, "repeat": [ 1, 3 ] },
         { "group": "GROUP_FERAL_CLAIRSENTIENT_TELEPATH", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 5 }
       ]
     }
@@ -1609,7 +1609,7 @@
         ]
       },
       "place_monster": [
-        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 50, "repeat": [ 1, 3 ] },
+        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 33, "repeat": [ 1, 3 ] },
         { "group": "GROUP_FERAL_CLAIRSENTIENT_TELEPATH", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 5 }
       ]
     }
@@ -1637,7 +1637,7 @@
         ]
       },
       "place_monster": [
-        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 50, "repeat": [ 1, 3 ] },
+        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 33, "repeat": [ 1, 3 ] },
         { "group": "GROUP_FERAL_CLAIRSENTIENT_TELEPATH", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 5 }
       ]
     }
@@ -1665,7 +1665,7 @@
         ]
       },
       "place_monster": [
-        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 50, "repeat": [ 1, 3 ] },
+        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 33, "repeat": [ 1, 3 ] },
         { "group": "GROUP_FERAL_CLAIRSENTIENT_TELEPATH", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 5 }
       ]
     }
@@ -1692,7 +1692,7 @@
         ]
       },
       "place_monster": [
-        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 50, "repeat": [ 1, 3 ] },
+        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 33, "repeat": [ 1, 3 ] },
         { "group": "GROUP_FERAL_CLAIRSENTIENT_TELEPATH", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 5 }
       ]
     }
@@ -1719,7 +1719,7 @@
         ]
       },
       "place_monster": [
-        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 50, "repeat": [ 1, 3 ] },
+        { "group": "GROUP_PHAVIAN_SKYSCRAPER_LAB", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 33, "repeat": [ 1, 3 ] },
         { "group": "GROUP_FERAL_CLAIRSENTIENT_TELEPATH", "x": [ 1, 2 ], "y": [ 1, 2 ], "chance": 5 }
       ]
     }
diff --git a/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json b/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json
index 0b5868b0b046a..77cd840dfe066 100644
--- a/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json
+++ b/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json
@@ -28,7 +28,7 @@
         "   V....|..............................|....V   ",
         "   V....|..............................|....V   ",
         "   |....+...|--|-|-|--¥!!---|-|-|--|...+....|   ",
-        "   |----|...|SS|T|T|^......^|T|T|SS|...|----V   ",
+        "   |----|...|SS|T|T|^......^|T|T|SS|...|----|   ",
         "   V....|...+..|+|+|^......^|+|+|..+...|....V   ",
         "   V....|...|......|^......^|......|...|....V   ",
         "   |....|...|---|--||......||--|---|...|....|   ",
diff --git a/data/mods/MindOverMatter/monsters/zombies.json b/data/mods/MindOverMatter/monsters/zombies.json
index 08eb9d9c4a8aa..fb415ebf5b124 100644
--- a/data/mods/MindOverMatter/monsters/zombies.json
+++ b/data/mods/MindOverMatter/monsters/zombies.json
@@ -2,6 +2,7 @@
   {
     "id": "mon_zombie_scientist_phavian",
     "copy-from": "mon_zombie_scientist",
+    "looks_like": "mon_zombie_scientist",
     "type": "MONSTER",
     "name": { "str": "zombie scientist" },
     "death_drops": "mon_zombie_scientist_phavian_death_drops"