From 7292e4256a06a76b40c6a04ae5f747c845231062 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 6 Sep 2023 20:17:11 -0400 Subject: [PATCH 1/3] dino camp hunting --- data/mods/DinoMod/monstergroups/misc.json | 61 +++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/data/mods/DinoMod/monstergroups/misc.json b/data/mods/DinoMod/monstergroups/misc.json index 620296d728557..8076810541760 100644 --- a/data/mods/DinoMod/monstergroups/misc.json +++ b/data/mods/DinoMod/monstergroups/misc.json @@ -108,5 +108,66 @@ { "monster": "mon_zeinonychus", "weight": 25, "cost_multiplier": 30, "starts": 672, "pack_size": [ 2, 3 ] }, { "monster": "mon_zeinonychus", "weight": 25, "cost_multiplier": 30, "starts": 2160, "pack_size": [ 2, 3 ] } ] + }, + { + "type": "monstergroup", + "name": "GROUP_CAMP_HUNTING", + "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", + "//1": "Can be overwritten by mods.", + "//2": "This group always has a chance of being the result, regardless of mission type.", + "monsters": [ + { "monster": "mon_gallimimus", "weight": 5 }, + { "monster": "mon_struthiomimus", "weight": 5 }, + { "monster": "mon_ornithomimus", "weight": 5 }, + { "monster": "mon_albertonykus", "weight": 10 }, + { "monster": "mon_scutellosaurus", "weight": 5 }, + { "monster": "mon_stegoceras", "weight": 3 }, + { "monster": "mon_pachycephalosaurus", "weight": 3 }, + { "monster": "mon_aquilops", "weight": 3 }, + { "monster": "mon_leptoceratops", "weight": 3 }, + { "monster": "mon_nanosaurus", "weight": 5 }, + { "monster": "mon_thescelosaurus", "weight": 5 }, + { "monster": "mon_dimorphodon", "weight": 5 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_CAMP_TRAPPING", + "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", + "//1": "Can be overwritten by mods.", + "//2": "This group can only be picked from when the trapping mission is used, in addition to GROUP_CAMP_HUNTING.", + "monsters": [ + { "monster": "mon_albertonykus", "weight": 10 }, + { "monster": "mon_compsognathus", "weight": 5 }, + { "monster": "mon_scutellosaurus", "weight": 5 }, + { "monster": "mon_stegoceras", "weight": 3 }, + { "monster": "mon_aquilops", "weight": 3 }, + { "monster": "mon_leptoceratops", "weight": 3 }, + { "monster": "mon_nanosaurus", "weight": 5 }, + { "monster": "mon_dimorphodon", "weight": 5 }, + { "monster": "mon_pteranodon", "weight": 5 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_CAMP_HUNTING_LARGE", + "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", + "//1": "Can be overwritten by mods.", + "//2": "This group can only be picked from when the hunt large animals mission is used, in addition to GROUP_CAMP_HUNTING.", + "monsters": [ + { "monster": "mon_tenontosaurus", "weight": 10 }, + { "monster": "mon_dryosaurus", "weight": 10 }, + { "monster": "mon_camptosaurus", "weight": 10 }, + { "monster": "mon_hadrosaurus", "weight": 10 }, + { "monster": "mon_maiasaura", "weight": 10 }, + { "monster": "mon_gryposaurus", "weight": 10 }, + { "monster": "mon_prosaurolophus", "weight": 10 }, + { "monster": "mon_saurolophus", "weight": 10 }, + { "monster": "mon_edmontosaurus", "weight": 10 }, + { "monster": "mon_parasaurolophus", "weight": 10 }, + { "monster": "mon_lambeosaurus", "weight": 10 }, + { "monster": "mon_corythosaurus", "weight": 10 }, + { "monster": "mon_hypacrosaurus", "weight": 10 } + ] } ] From 813532d0d2296a86a35593e07eeb081f7dc044f7 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 9 Sep 2023 09:39:28 -0400 Subject: [PATCH 2/3] copy-from --- data/mods/DinoMod/monstergroups/misc.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/mods/DinoMod/monstergroups/misc.json b/data/mods/DinoMod/monstergroups/misc.json index 8076810541760..5d1ddd0d2c788 100644 --- a/data/mods/DinoMod/monstergroups/misc.json +++ b/data/mods/DinoMod/monstergroups/misc.json @@ -115,6 +115,7 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//1": "Can be overwritten by mods.", "//2": "This group always has a chance of being the result, regardless of mission type.", + "copy-from": "GROUP_CAMP_HUNTING", "monsters": [ { "monster": "mon_gallimimus", "weight": 5 }, { "monster": "mon_struthiomimus", "weight": 5 }, @@ -136,6 +137,7 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//1": "Can be overwritten by mods.", "//2": "This group can only be picked from when the trapping mission is used, in addition to GROUP_CAMP_HUNTING.", + "copy-from": "GROUP_CAMP_TRAPPING", "monsters": [ { "monster": "mon_albertonykus", "weight": 10 }, { "monster": "mon_compsognathus", "weight": 5 }, @@ -154,6 +156,7 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//1": "Can be overwritten by mods.", "//2": "This group can only be picked from when the hunt large animals mission is used, in addition to GROUP_CAMP_HUNTING.", + "copy-from": "GROUP_CAMP_HUNTING_LARGE", "monsters": [ { "monster": "mon_tenontosaurus", "weight": 10 }, { "monster": "mon_dryosaurus", "weight": 10 }, From df3d2edb4044ff76de537106818a61ffbb7f7885 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 9 Sep 2023 15:41:52 -0400 Subject: [PATCH 3/3] remove copy-from --- data/mods/DinoMod/monstergroups/misc.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/data/mods/DinoMod/monstergroups/misc.json b/data/mods/DinoMod/monstergroups/misc.json index 5d1ddd0d2c788..8ed74eaecf69d 100644 --- a/data/mods/DinoMod/monstergroups/misc.json +++ b/data/mods/DinoMod/monstergroups/misc.json @@ -115,15 +115,10 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//1": "Can be overwritten by mods.", "//2": "This group always has a chance of being the result, regardless of mission type.", - "copy-from": "GROUP_CAMP_HUNTING", "monsters": [ - { "monster": "mon_gallimimus", "weight": 5 }, - { "monster": "mon_struthiomimus", "weight": 5 }, - { "monster": "mon_ornithomimus", "weight": 5 }, { "monster": "mon_albertonykus", "weight": 10 }, { "monster": "mon_scutellosaurus", "weight": 5 }, { "monster": "mon_stegoceras", "weight": 3 }, - { "monster": "mon_pachycephalosaurus", "weight": 3 }, { "monster": "mon_aquilops", "weight": 3 }, { "monster": "mon_leptoceratops", "weight": 3 }, { "monster": "mon_nanosaurus", "weight": 5 }, @@ -137,7 +132,6 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//1": "Can be overwritten by mods.", "//2": "This group can only be picked from when the trapping mission is used, in addition to GROUP_CAMP_HUNTING.", - "copy-from": "GROUP_CAMP_TRAPPING", "monsters": [ { "monster": "mon_albertonykus", "weight": 10 }, { "monster": "mon_compsognathus", "weight": 5 }, @@ -146,7 +140,6 @@ { "monster": "mon_aquilops", "weight": 3 }, { "monster": "mon_leptoceratops", "weight": 3 }, { "monster": "mon_nanosaurus", "weight": 5 }, - { "monster": "mon_dimorphodon", "weight": 5 }, { "monster": "mon_pteranodon", "weight": 5 } ] }, @@ -156,8 +149,11 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//1": "Can be overwritten by mods.", "//2": "This group can only be picked from when the hunt large animals mission is used, in addition to GROUP_CAMP_HUNTING.", - "copy-from": "GROUP_CAMP_HUNTING_LARGE", "monsters": [ + { "monster": "mon_gallimimus", "weight": 5 }, + { "monster": "mon_struthiomimus", "weight": 5 }, + { "monster": "mon_ornithomimus", "weight": 5 }, + { "monster": "mon_pachycephalosaurus", "weight": 3 }, { "monster": "mon_tenontosaurus", "weight": 10 }, { "monster": "mon_dryosaurus", "weight": 10 }, { "monster": "mon_camptosaurus", "weight": 10 },