Merge pull request CleverRaven#76639 from LyleSY/sauro_upstream

[DinoMod] sauropods out of the water
Standing-Storm · Oct 1, 2024 · 856b7eb · 856b7eb
2 parents 5ab4eaf + e2d810c
commit 856b7eb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/data/mods/DinoMod/monstergroups/dinosaur.json b/data/mods/DinoMod/monstergroups/dinosaur.json
@@ -7,7 +7,7 @@
       { "group": "GROUP_WILDERNESS_FOREST_DINO", "weight": 250 },
       { "group": "GROUP_DINOSAUR_SAUROPODS_WILDERNESS", "weight": 150 },
       { "group": "GROUP_DINOSAUR_HADROSAURS_WILDERNESS", "weight": 150 },
-      { "group": "GROUP_DINOSAUR_PREDATOR_RIVER", "weight": 150 },
+      { "group": "GROUP_DINOSAUR_PREDATOR_STREAM", "weight": 150 },
       { "group": "GROUP_DINOSAUR_PREDATOR_SWAMP", "weight": 150 }
     ]
   },
@@ -323,7 +323,7 @@
   },
   {
     "type": "monstergroup",
-    "name": "GROUP_DINOSAUR_PREDATOR_RIVER",
+    "name": "GROUP_DINOSAUR_PREDATOR_STREAM",
     "monsters": [
       { "monster": "mon_tawa", "pack_size": [ 4, 8 ] },
       { "monster": "mon_coelophysis", "pack_size": [ 4, 8 ] },
@@ -356,7 +356,7 @@
   },
   {
     "type": "monstergroup",
-    "name": "GROUP_DINOSAUR_ZREDATOR_RIVER",
+    "name": "GROUP_DINOSAUR_ZREDATOR_STREAM",
     "monsters": [
       { "monster": "mon_zeratosaurus", "cost_multiplier": 35 },
       { "monster": "mon_zorvosaurus", "cost_multiplier": 35 },

diff --git a/data/mods/DinoMod/monstergroups/wilderness.json b/data/mods/DinoMod/monstergroups/wilderness.json
@@ -74,13 +74,31 @@
     "type": "monstergroup",
     "name": "GROUP_RIVER",
     "monsters": [
-      { "group": "GROUP_DINOSAUR_PREDATOR_RIVER", "weight": 10, "starts": "3 days" },
-      { "group": "GROUP_DINOSAUR_PREDATOR_RIVER", "weight": 20, "starts": "3 days", "ends": "7 days" },
-      { "group": "GROUP_DINOSAUR_PREDATOR_RIVER", "weight": 20, "starts": "3 days", "ends": "28 days" },
-      { "group": "GROUP_DINOSAUR_PREDATOR_RIVER", "weight": 20, "starts": "3 days", "ends": "90 days" },
-      { "group": "GROUP_DINOSAUR_ZREDATOR_RIVER", "weight": 25, "starts": "7 days" },
-      { "group": "GROUP_DINOSAUR_ZREDATOR_RIVER", "weight": 25, "starts": "28 days" },
-      { "group": "GROUP_DINOSAUR_ZREDATOR_RIVER", "weight": 25, "starts": "90 days" },
+      { "monster": "mon_pteranodon", "weight": 25, "cost_multiplier": 20, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_quetzalcoatlus", "weight": 4, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_mosasaurus", "weight": 1, "cost_multiplier": 25, "starts": "3 days" },
+      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "7 days" },
+      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "14 days" },
+      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "28 days" },
+      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "90 days" },
+      { "monster": "mon_plesiosaurus", "weight": 1, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "7 days" },
+      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "14 days" },
+      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "28 days" },
+      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "90 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_STREAM",
+    "monsters": [
+      { "group": "GROUP_DINOSAUR_PREDATOR_STREAM", "weight": 10, "starts": "3 days" },
+      { "group": "GROUP_DINOSAUR_PREDATOR_STREAM", "weight": 20, "starts": "3 days", "ends": "7 days" },
+      { "group": "GROUP_DINOSAUR_PREDATOR_STREAM", "weight": 20, "starts": "3 days", "ends": "28 days" },
+      { "group": "GROUP_DINOSAUR_PREDATOR_STREAM", "weight": 20, "starts": "3 days", "ends": "90 days" },
+      { "group": "GROUP_DINOSAUR_ZREDATOR_STREAM", "weight": 25, "starts": "7 days" },
+      { "group": "GROUP_DINOSAUR_ZREDATOR_STREAM", "weight": 25, "starts": "28 days" },
+      { "group": "GROUP_DINOSAUR_ZREDATOR_STREAM", "weight": 25, "starts": "90 days" },
       { "group": "GROUP_DINOSAUR_SAUROPODS_WILDERNESS", "weight": 25, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
       {
         "group": "GROUP_DINOSAUR_SAUROPODS_WILDERNESS",
@@ -109,19 +127,7 @@
       { "group": "GROUP_DINOSAUR_ZAUROPODS_WILDERNESS", "weight": 25, "starts": "3 days" },
       { "group": "GROUP_DINOSAUR_ZAUROPODS_WILDERNESS", "weight": 25, "starts": "7 days" },
       { "group": "GROUP_DINOSAUR_ZAUROPODS_WILDERNESS", "weight": 25, "starts": "28 days" },
-      { "group": "GROUP_DINOSAUR_ZAUROPODS_WILDERNESS", "weight": 25, "starts": "90 days" },
-      { "monster": "mon_pteranodon", "weight": 25, "cost_multiplier": 20, "pack_size": [ 2, 4 ] },
-      { "monster": "mon_quetzalcoatlus", "weight": 4, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
-      { "monster": "mon_mosasaurus", "weight": 1, "cost_multiplier": 25, "starts": "3 days" },
-      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "7 days" },
-      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "14 days" },
-      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "28 days" },
-      { "monster": "mon_zosasaurus", "cost_multiplier": 25, "starts": "90 days" },
-      { "monster": "mon_plesiosaurus", "weight": 1, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
-      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "7 days" },
-      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "14 days" },
-      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "28 days" },
-      { "monster": "mon_zlesiosaurus", "cost_multiplier": 25, "starts": "90 days" }
+      { "group": "GROUP_DINOSAUR_ZAUROPODS_WILDERNESS", "weight": 25, "starts": "90 days" }
     ]
   },
   {