[DinoMod] DinoZoo update (#76781)

* [DinoMod] zoo update * Update overmap_terrain_zoo.json * Update dinosaur.json * Update wilderness.json * fix atm and solar * fix names * atm terrain to furniture * start here * Update startlocations.json * Update scenarios.json
CleverRaven · Oct 5, 2024 · 1060aa1 · 1060aa1
1 parent 6815c0c
commit 1060aa1
Show file tree

Hide file tree

Showing 6 changed files with 500 additions and 852 deletions.
diff --git a/data/mods/DinoMod/mapgen/zoo.json b/data/mods/DinoMod/mapgen/zoo.json
diff --git a/data/mods/DinoMod/monstergroups/dinosaur.json b/data/mods/DinoMod/monstergroups/dinosaur.json
@@ -8,7 +8,8 @@
       { "group": "GROUP_DINOSAUR_SAUROPODS_WILDERNESS", "weight": 150 },
       { "group": "GROUP_DINOSAUR_HADROSAURS_WILDERNESS", "weight": 150 },
       { "group": "GROUP_DINOSAUR_PREDATOR_STREAM", "weight": 150 },
-      { "group": "GROUP_DINOSAUR_PREDATOR_SWAMP", "weight": 150 }
+      { "group": "GROUP_DINOSAUR_PREDATOR_SWAMP", "weight": 150 },
+      { "group": "GROUP_DINOSAUR_CAVE", "weight": 150 }
     ]
   },
   {
@@ -453,5 +454,23 @@
       { "monster": "mon_zorythosaurus", "weight": 5, "cost_multiplier": 20, "pack_size": [ 4, 12 ] },
       { "monster": "mon_zypacrosaurus", "weight": 5, "cost_multiplier": 20, "pack_size": [ 4, 12 ] }
     ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_DINOSAUR_CAVE",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_compsognathus", "weight": 400, "pack_size": [ 4, 12 ] },
+      { "monster": "mon_albertonykus", "weight": 200, "pack_size": [ 1, 2 ], "conditions": [ "WINTER" ] },
+      { "monster": "mon_saurornitholestes", "weight": 150, "pack_size": [ 2, 4 ], "conditions": [ "DAY" ] },
+      { "monster": "mon_stenonychosaurus", "weight": 150, "pack_size": [ 1, 2 ], "conditions": [ "DAY" ] },
+      { "monster": "mon_oryctodromeus", "weight": 150, "pack_size": [ 1, 2 ] },
+      {
+        "monster": "mon_dimorphodon",
+        "weight": 500,
+        "pack_size": [ 2, 4 ],
+        "conditions": [ "NIGHT", "SPRING", "SUMMER", "AUTUMN" ]
+      }
+    ]
   }
 ]
diff --git a/data/mods/DinoMod/monstergroups/wilderness.json b/data/mods/DinoMod/monstergroups/wilderness.json
@@ -204,19 +204,7 @@
     "type": "monstergroup",
     "name": "GROUP_CAVE",
     "is_animal": true,
-    "monsters": [
-      { "monster": "mon_compsognathus", "weight": 400, "pack_size": [ 4, 12 ] },
-      { "monster": "mon_albertonykus", "weight": 200, "pack_size": [ 1, 2 ], "conditions": [ "WINTER" ] },
-      { "monster": "mon_saurornitholestes", "weight": 150, "pack_size": [ 2, 4 ], "conditions": [ "DAY" ] },
-      { "monster": "mon_stenonychosaurus", "weight": 150, "pack_size": [ 1, 2 ], "conditions": [ "DAY" ] },
-      { "monster": "mon_oryctodromeus", "weight": 150, "pack_size": [ 1, 2 ] },
-      {
-        "monster": "mon_dimorphodon",
-        "weight": 500,
-        "pack_size": [ 2, 4 ],
-        "conditions": [ "NIGHT", "SPRING", "SUMMER", "AUTUMN" ]
-      }
-    ]
+    "monsters": [ { "group": "GROUP_DINOSAUR_CAVE", "weight": 200 } ]
   },
   {
     "type": "monstergroup",

diff --git a/data/mods/DinoMod/overmap/overmap_terrain_zoo.json b/data/mods/DinoMod/overmap/overmap_terrain_zoo.json
@@ -7,18 +7,37 @@
       { "point": [ 0, 0, 0 ], "overmap": "dinozoo_0_0_north" },
       { "point": [ 1, 0, 0 ], "overmap": "dinozoo_1_0_north" },
       { "point": [ 2, 0, 0 ], "overmap": "dinozoo_2_0_north" },
+      { "point": [ 3, 0, 0 ], "overmap": "dinozoo_3_0_north" },
       { "point": [ 0, 1, 0 ], "overmap": "dinozoo_0_1_north" },
-      { "point": [ 0, 1, 1 ], "overmap": "zoo_0_1_roof_north" },
       { "point": [ 1, 1, 0 ], "overmap": "dinozoo_1_1_north" },
-      { "point": [ 1, 1, 1 ], "overmap": "zoo_1_1_roof_north" },
       { "point": [ 2, 1, 0 ], "overmap": "dinozoo_2_1_north" },
-      { "point": [ 2, 1, 1 ], "overmap": "zoo_2_1_roof_north" },
+      { "point": [ 3, 1, 0 ], "overmap": "dinozoo_3_1_north" },
       { "point": [ 0, 2, 0 ], "overmap": "dinozoo_0_2_north" },
-      { "point": [ 0, 2, 1 ], "overmap": "zoo_0_2_roof_north" },
       { "point": [ 1, 2, 0 ], "overmap": "dinozoo_1_2_north" },
-      { "point": [ 1, 2, 1 ], "overmap": "zoo_1_2_roof_north" },
       { "point": [ 2, 2, 0 ], "overmap": "dinozoo_2_2_north" },
-      { "point": [ 2, 2, 1 ], "overmap": "zoo_2_2_roof_north" }
+      { "point": [ 3, 2, 0 ], "overmap": "dinozoo_3_2_north" },
+      { "point": [ 0, 3, 0 ], "overmap": "dinozoo_0_3_north" },
+      { "point": [ 1, 3, 0 ], "overmap": "dinozoo_1_3_north" },
+      { "point": [ 2, 3, 0 ], "overmap": "dinozoo_2_3_north" },
+      { "point": [ 3, 3, 0 ], "overmap": "dinozoo_3_3_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "dinozoo_0_0_roof_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "dinozoo_1_0_roof_north" },
+      { "point": [ 2, 0, 1 ], "overmap": "dinozoo_2_0_roof_north" },
+      { "point": [ 3, 0, 1 ], "overmap": "dinozoo_3_0_roof_north" },
+      { "point": [ 0, 1, 1 ], "overmap": "dinozoo_0_1_roof_north" },
+      { "point": [ 1, 1, 1 ], "overmap": "dinozoo_1_1_roof_north" },
+      { "point": [ 2, 1, 1 ], "overmap": "dinozoo_2_1_roof_north" },
+      { "point": [ 3, 1, 1 ], "overmap": "dinozoo_3_1_roof_north" },
+      { "point": [ 0, 2, 1 ], "overmap": "dinozoo_0_2_roof_north" },
+      { "point": [ 1, 2, 1 ], "overmap": "dinozoo_1_2_roof_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "dinozoo_2_2_roof_north" },
+      { "point": [ 3, 2, 1 ], "overmap": "dinozoo_3_2_roof_north" },
+      { "point": [ 0, 3, 1 ], "overmap": "dinozoo_0_3_roof_north" },
+      { "point": [ 1, 3, 1 ], "overmap": "dinozoo_1_3_roof_north" },
+      { "point": [ 2, 3, 1 ], "overmap": "dinozoo_2_3_roof_north" },
+      { "point": [ 3, 3, 1 ], "overmap": "dinozoo_3_3_roof_north" },
+      { "point": [ 3, 2, -1 ], "overmap": "dinozoo_3_2_basement_north" },
+      { "point": [ 3, 3, -1 ], "overmap": "dinozoo_3_3_basement_north" }
     ]
   },
   {
@@ -31,23 +50,61 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "dinozoo_2_0",
+    "id": [ "dinozoo_2_0", "dinozoo_3_0" ],
     "copy-from": "generic_city_building",
-    "name": "zoo pavilion",
+    "name": "DinoZoo entrance",
     "sym": "P",
     "color": "i_green"
   },
   {
     "type": "overmap_terrain",
-    "id": [ "dinozoo_0_1", "dinozoo_1_1", "dinozoo_2_1", "dinozoo_0_2", "dinozoo_1_2", "dinozoo_2_2" ],
+    "id": [
+      "dinozoo_0_1",
+      "dinozoo_1_1",
+      "dinozoo_2_1",
+      "dinozoo_3_1",
+      "dinozoo_0_2",
+      "dinozoo_1_2",
+      "dinozoo_2_2",
+      "dinozoo_3_2",
+      "dinozoo_0_3",
+      "dinozoo_1_3",
+      "dinozoo_2_3",
+      "dinozoo_3_3"
+    ],
     "copy-from": "generic_city_building",
     "name": "DinoZoo",
     "sym": "Z",
     "color": "i_green"
   },
   {
     "type": "overmap_terrain",
-    "id": [ "zoo_0_1_roof", "zoo_1_1_roof", "zoo_2_1_roof", "zoo_0_2_roof", "zoo_1_2_roof", "zoo_2_2_roof" ],
+    "id": [ "dinozoo_3_2_basement", "dinozoo_3_3_basement" ],
+    "copy-from": "generic_city_building",
+    "name": "DinoZoo cave",
+    "sym": "Z",
+    "color": "light_gray"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": [
+      "dinozoo_0_0_roof",
+      "dinozoo_1_0_roof",
+      "dinozoo_2_0_roof",
+      "dinozoo_3_0_roof",
+      "dinozoo_0_1_roof",
+      "dinozoo_1_1_roof",
+      "dinozoo_2_1_roof",
+      "dinozoo_3_1_roof",
+      "dinozoo_0_2_roof",
+      "dinozoo_1_2_roof",
+      "dinozoo_2_2_roof",
+      "dinozoo_3_2_roof",
+      "dinozoo_0_3_roof",
+      "dinozoo_1_3_roof",
+      "dinozoo_2_3_roof",
+      "dinozoo_3_3_roof"
+    ],
     "copy-from": "generic_city_building",
     "name": "DinoZoo roof",
     "sym": "Z",

diff --git a/data/mods/DinoMod/scenarios.json b/data/mods/DinoMod/scenarios.json
@@ -24,8 +24,7 @@
       "sloc_bookstore",
       "sloc_zoo_giftshop",
       "sloc_zoo_cages",
-      "sloc_dinozoo_giftshop",
-      "sloc_dinozoo_cages",
+      "sloc_dinozoo_cafeteria",
       "sloc_golfcourse_mid_course",
       "sloc_golfcourse_clubhouse",
       "sloc_church",
@@ -48,8 +47,7 @@
       "sloc_bookstore",
       "sloc_zoo_giftshop",
       "sloc_zoo_cages",
-      "sloc_dinozoo_giftshop",
-      "sloc_dinozoo_cages",
+      "sloc_dinozoo_cafeteria",
       "sloc_golfcourse_mid_course",
       "sloc_golfcourse_clubhouse",
       "sloc_church",
@@ -74,8 +72,7 @@
       "sloc_bookstore",
       "sloc_zoo_giftshop",
       "sloc_zoo_cages",
-      "sloc_dinozoo_giftshop",
-      "sloc_dinozoo_cages",
+      "sloc_dinozoo_cafeteria",
       "sloc_golfcourse_mid_course",
       "sloc_golfcourse_clubhouse",
       "sloc_church",
@@ -98,8 +95,7 @@
       "sloc_bookstore",
       "sloc_zoo_giftshop",
       "sloc_zoo_cages",
-      "sloc_dinozoo_giftshop",
-      "sloc_dinozoo_cages",
+      "sloc_dinozoo_cafeteria",
       "sloc_golfcourse_mid_course",
       "sloc_golfcourse_clubhouse",
       "sloc_church",
@@ -126,8 +122,7 @@
       "sloc_bookstore",
       "sloc_zoo_giftshop",
       "sloc_zoo_cages",
-      "sloc_dinozoo_giftshop",
-      "sloc_dinozoo_cages",
+      "sloc_dinozoo_cafeteria",
       "sloc_golfcourse_mid_course",
       "sloc_golfcourse_clubhouse",
       "sloc_church",

diff --git a/data/mods/DinoMod/startlocations.json b/data/mods/DinoMod/startlocations.json
@@ -13,16 +13,10 @@
   },
   {
     "type": "start_location",
-    "id": "sloc_dinozoo_giftshop",
-    "name": "DinoZoo (Giftshop)",
+    "id": "sloc_dinozoo_cafeteria",
+    "name": "DinoZoo (Cafeteria)",
     "terrain": [ "dinozoo_0_1" ]
   },
-  {
-    "type": "start_location",
-    "id": "sloc_dinozoo_cages",
-    "name": "DinoZoo (Cages)",
-    "terrain": [ "dinozoo_1_1" ]
-  },
   {
     "type": "start_location",
     "id": "sloc_swamp",