[Defense Mode]: My Sweet Cataclysm compatibility (#67839)

* Add everything * Update data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monstergroups.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Aug 23, 2023 · b080355 · b080355
1 parent e0f1cbf
commit b080355
Show file tree

Hide file tree

Showing 6 changed files with 217 additions and 4 deletions.
diff --git a/data/mods/Defense_Mode/eocs.json b/data/mods/Defense_Mode/eocs.json
@@ -71,7 +71,8 @@
           [ "DEFENSE_MODE_WAVE_SPAWN_GOBLINS", { "const": 1 } ],
           [ "DEFENSE_MODE_WAVE_SPAWN_ORCS", { "const": 1 } ],
           [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", { "const": 1 } ],
-          [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", { "const": 1 } ]
+          [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", { "const": 1 } ],
+          [ "DEFENSE_MODE_WAVE_SPAWN_CANDY", { "const": 1 } ]
         ]
       }
     ]
@@ -95,7 +96,8 @@
           [ "DEFENSE_MODE_WAVE_SPAWN_GOBLINS", { "const": 1 } ],
           [ "DEFENSE_MODE_WAVE_SPAWN_ORCS", { "const": 1 } ],
           [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", { "const": 1 } ],
-          [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", { "const": 1 } ]
+          [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", { "const": 1 } ],
+          [ "DEFENSE_MODE_WAVE_SPAWN_CANDY", { "const": 1 } ]
         ]
       }
     ]

diff --git a/data/mods/Defense_Mode/menu_screen.json b/data/mods/Defense_Mode/menu_screen.json
@@ -22,7 +22,8 @@
             { "math": [ "goblins_allowed", "==", "1" ] },
             { "math": [ "golems_allowed", "==", "1" ] },
             { "math": [ "orcs_allowed", "==", "1" ] },
-            { "math": [ "mindovermatter_allowed", "==", "1" ] }
+            { "math": [ "mindovermatter_allowed", "==", "1" ] },
+            { "math": [ "candymonsters_allowed", "==", "1" ] }
           ]
         },
         "topic": "TALK_DONE"
@@ -190,6 +191,18 @@
         "effect": { "math": [ "mindovermatter_allowed", "=", "0" ] },
         "topic": "TALK_DEFENSE_MODE_ENEMY_SELECTION"
       },
+      {
+        "text": "Allow sweets.",
+        "condition": { "and": [ { "mod_is_loaded": "my_sweet_cataclysm" }, { "math": [ "candymonsters_allowed", "==", "0" ] } ] },
+        "effect": { "math": [ "candymonsters_allowed", "=", "1" ] },
+        "topic": "TALK_DEFENSE_MODE_ENEMY_SELECTION"
+      },
+      {
+        "text": "Disable sweets.",
+        "condition": { "and": [ { "mod_is_loaded": "my_sweet_cataclysm" }, { "math": [ "candymonsters_allowed", "==", "1" ] } ] },
+        "effect": { "math": [ "candymonsters_allowed", "=", "0" ] },
+        "topic": "TALK_DEFENSE_MODE_ENEMY_SELECTION"
+      },
       {
         "text": "Play!",
         "condition": {
@@ -206,7 +219,8 @@
             { "math": [ "goblins_allowed", "==", "1" ] },
             { "math": [ "golems_allowed", "==", "1" ] },
             { "math": [ "orcs_allowed", "==", "1" ] },
-            { "math": [ "mindovermatter_allowed", "==", "1" ] }
+            { "math": [ "mindovermatter_allowed", "==", "1" ] },
+            { "math": [ "candymonsters_allowed", "==", "1" ] }
           ]
         },
         "topic": "TALK_DONE"

diff --git a/data/mods/Defense_Mode/mod_interactions/My_Sweet_Cataclysm/eocs.json b/data/mods/Defense_Mode/mod_interactions/My_Sweet_Cataclysm/eocs.json
@@ -0,0 +1,34 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "DEFENSE_MODE_WAVE_SPAWN_CANDY",
+    "condition": { "math": [ "candymonsters_allowed", "==", "1" ] },
+    "effect": [
+      {
+        "u_spawn_monster": "GROUP_SWEET_HORDE",
+        "real_count": { "global_val": "wave_number", "default": 1 },
+        "outdoor_only": true,
+        "group": true,
+        "min_radius": 20,
+        "max_radius": 40
+      },
+      {
+        "u_spawn_monster": "GROUP_SWEET_HORDE",
+        "real_count": { "global_val": "wave_number", "default": 1 },
+        "outdoor_only": true,
+        "group": true,
+        "min_radius": 20,
+        "max_radius": 40
+      },
+      {
+        "u_spawn_monster": "GROUP_SWEET_HORDE",
+        "real_count": { "global_val": "wave_number", "default": 1 },
+        "outdoor_only": true,
+        "group": true,
+        "min_radius": 20,
+        "max_radius": 40
+      }
+    ],
+    "false_effect": { "run_eocs": "DEFENSE_MODE_WAVE_SPAWN_FALLBACK" }
+  }
+]
diff --git a/data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monstergroups.json b/data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monstergroups.json
@@ -0,0 +1,20 @@
+[
+  {
+    "name": "GROUP_SWEET_HORDE",
+    "type": "monstergroup",
+    "monsters": [
+      { "monster": "mon_marshmallow_guy_dm" },
+      { "monster": "mon_marshmallow_buff_dm" },
+      { "monster": "mon_marshmallow_guy_armored_dm" },
+      { "monster": "mon_marshmallow_buff_armored_dm" },
+      { "monster": "mon_gummy_dm" },
+      { "monster": "mon_gummy_gator_dm" },
+      { "monster": "mon_cracker_dm" },
+      { "monster": "mon_cookie_dm" },
+      { "monster": "mon_cookie_hydra_dm" },
+      { "monster": "mon_spider_gum_dm" },
+      { "monster": "mon_gum_spider_wolf_dm" },
+      { "monster": "mon_licorice_snake_dm" }
+    ]
+  }
+]
diff --git a/data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monsters.json b/data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monsters.json
@@ -0,0 +1,135 @@
+[
+  {
+    "id": "mon_marshmallow_guy_dm",
+    "copy-from": "mon_marshmallow_guy",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_marshmallow_buff_dm",
+    "copy-from": "mon_marshmallow_buff",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_marshmallow_guy_armored_dm",
+    "copy-from": "mon_marshmallow_guy_armored",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_marshmallow_buff_armored_dm",
+    "copy-from": "mon_marshmallow_buff_armored",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_gummy_dm",
+    "copy-from": "mon_gummy",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "hp": 50,
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_gummy_gator_dm",
+    "copy-from": "mon_gummy_gator",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_cracker_dm",
+    "copy-from": "mon_cracker",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_cookie_dm",
+    "copy-from": "mon_cookie",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_cookie_hydra_dm",
+    "copy-from": "mon_cookie_hydra",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_spider_gum_dm",
+    "copy-from": "mon_spider_gum",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_gum_spider_wolf_dm",
+    "copy-from": "mon_gum_spider_wolf",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  },
+  {
+    "id": "mon_licorice_snake_dm",
+    "copy-from": "mon_licorice_snake",
+    "type": "MONSTER",
+    "species": [ "DM_SWEETS" ],
+    "default_faction": "marshmallow_boys",
+    "vision_day": 99,
+    "vision_night": 99,
+    "aggression": 100,
+    "morale": 100
+  }
+]
diff --git a/data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/species.json b/data/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/species.json
@@ -0,0 +1,8 @@
+[
+  {
+    "type": "SPECIES",
+    "id": "DM_SWEETS",
+    "flags": [ "ALL_SEEING", "NEMESIS" ],
+    "footsteps": "shlop."
+  }
+]