From deccb6218766d8e9ba9f9d5ad2f54ab6f9768325 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 28 Mar 2022 21:53:52 -0400 Subject: [PATCH 1/7] start locations --- data/mods/DinoMod/startlocations.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/data/mods/DinoMod/startlocations.json b/data/mods/DinoMod/startlocations.json index cb5cb11a93525..145199e1cc6a9 100644 --- a/data/mods/DinoMod/startlocations.json +++ b/data/mods/DinoMod/startlocations.json @@ -10,5 +10,24 @@ "id": "sloc_dinolab", "name": "DinoLab", "terrain": [ "microlab_DinoLab_edge" ] + }, + { + "type": "start_location", + "id": "sloc_dinozoo_giftshop", + "name": "DinoZoo (Giftshop)", + "terrain": [ "dinozoo_0_1" ] + }, + { + "type": "start_location", + "id": "sloc_dinozoo_cages", + "name": "DinoZoo (Cages)", + "terrain": [ "dinozoo_1_1" ] + }, + { + "type": "start_location", + "id": "sloc_swamp", + "name": "Middle of Swamp", + "terrain": [ "forest_water" ], + "flags": [ "ALLOW_OUTSIDE" ] } ] From 48147206befc85e0693b636c3b3b127defce8994 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 28 Mar 2022 21:56:36 -0400 Subject: [PATCH 2/7] scenarios --- data/mods/DinoMod/scenarios.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/data/mods/DinoMod/scenarios.json b/data/mods/DinoMod/scenarios.json index 56e869bbd8b2e..f8dbaa71f599d 100644 --- a/data/mods/DinoMod/scenarios.json +++ b/data/mods/DinoMod/scenarios.json @@ -24,6 +24,8 @@ "sloc_bookstore", "sloc_zoo_giftshop", "sloc_zoo_cages", + "sloc_dinozoo_giftshop", + "sloc_dinozoo_cages", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -46,6 +48,8 @@ "sloc_bookstore", "sloc_zoo_giftshop", "sloc_zoo_cages", + "sloc_dinozoo_giftshop", + "sloc_dinozoo_cages", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -70,6 +74,8 @@ "sloc_bookstore", "sloc_zoo_giftshop", "sloc_zoo_cages", + "sloc_dinozoo_giftshop", + "sloc_dinozoo_cages", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -92,6 +98,8 @@ "sloc_bookstore", "sloc_zoo_giftshop", "sloc_zoo_cages", + "sloc_dinozoo_giftshop", + "sloc_dinozoo_cages", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -118,6 +126,8 @@ "sloc_bookstore", "sloc_zoo_giftshop", "sloc_zoo_cages", + "sloc_dinozoo_giftshop", + "sloc_dinozoo_cages", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -150,5 +160,23 @@ "sloc_ice_lab_finale", "sloc_dinolab" ] + }, + { + "type": "scenario", + "id": "dm_predator_nest", + "name": "Woke up in a Dinosaur Nest", + "points": 0, + "description": "When you wake up, you find yourself in the swamp next to some large eggs. Something big is nearby.", + "start_name": "Predator Dinosaur Nest", + "allowed_locs": [ "sloc_swamp" ], + "map_extra": [ + "mx_nest_acrocanthosaurus", + "mx_nest_allosaurus", + "mx_nest_ceratosaurus", + "mx_nest_siats", + "mx_nest_tyrannosaurus", + "mx_nest_utahraptor" + ], + "flags": [ "LONE_START" ] } ] From de342c3f78150f19c71d2e7f49ff1e0aed185bbe Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 28 Mar 2022 21:57:20 -0400 Subject: [PATCH 3/7] new dinozoo OMT --- .../DinoMod/overmap/overmap_terrain_zoo.json | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 data/mods/DinoMod/overmap/overmap_terrain_zoo.json diff --git a/data/mods/DinoMod/overmap/overmap_terrain_zoo.json b/data/mods/DinoMod/overmap/overmap_terrain_zoo.json new file mode 100644 index 0000000000000..ed7b0000e8968 --- /dev/null +++ b/data/mods/DinoMod/overmap/overmap_terrain_zoo.json @@ -0,0 +1,56 @@ +[ + { + "type": "city_building", + "id": "dinozoo", + "locations": [ "land" ], + "overmaps": [ + { "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": [ 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": [ 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" } + ] + }, + { + "type": "overmap_terrain", + "id": [ "dinozoo_0_0", "dinozoo_1_0" ], + "copy-from": "generic_city_building", + "name": "dinozoo parking", + "sym": "P", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "dinozoo_2_0", + "copy-from": "generic_city_building", + "name": "zoo pavilion", + "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" ], + "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" ], + "copy-from": "generic_city_building", + "name": "dinozoo roof", + "sym": "Z", + "color": "i_green" + } +] From 4f150bd28a9e45f3d661f4fa12ea7864bcc88001 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 28 Mar 2022 21:58:10 -0400 Subject: [PATCH 4/7] update dinozoo mapgen --- data/mods/DinoMod/mapgen/zoo.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/mods/DinoMod/mapgen/zoo.json b/data/mods/DinoMod/mapgen/zoo.json index 2e7cf7a478332..cf00b888234dc 100644 --- a/data/mods/DinoMod/mapgen/zoo.json +++ b/data/mods/DinoMod/mapgen/zoo.json @@ -1,7 +1,7 @@ [ { "method": "json", - "om_terrain": "zoo_0_0", + "om_terrain": "dinozoo_0_0", "type": "mapgen", "weight": 100, "object": { @@ -44,7 +44,7 @@ }, { "method": "json", - "om_terrain": "zoo_0_1", + "om_terrain": "dinozoo_0_1", "type": "mapgen", "weight": 100, "object": { @@ -129,8 +129,8 @@ }, { "method": "json", - "om_terrain": "zoo_0_1", - "//": "variant of zoo_0_1 with broken open bear cage", + "om_terrain": "dinozoo_0_1", + "//": "variant of dinozoo_0_1 with broken open bear cage", "type": "mapgen", "weight": 100, "object": { @@ -216,7 +216,7 @@ }, { "method": "json", - "om_terrain": "zoo_0_2", + "om_terrain": "dinozoo_0_2", "type": "mapgen", "weight": 100, "object": { @@ -302,7 +302,7 @@ }, { "method": "json", - "om_terrain": "zoo_1_0", + "om_terrain": "dinozoo_1_0", "type": "mapgen", "weight": 100, "object": { @@ -345,7 +345,7 @@ }, { "method": "json", - "om_terrain": "zoo_1_1", + "om_terrain": "dinozoo_1_1", "type": "mapgen", "weight": 100, "object": { @@ -448,8 +448,8 @@ }, { "method": "json", - "om_terrain": "zoo_1_1", - "//": "variant of zoo_1_1 with broken open moose cage", + "om_terrain": "dinozoo_1_1", + "//": "variant of dinozoo_1_1 with broken open moose cage", "type": "mapgen", "weight": 100, "object": { @@ -556,7 +556,7 @@ }, { "method": "json", - "om_terrain": "zoo_1_2", + "om_terrain": "dinozoo_1_2", "type": "mapgen", "weight": 100, "object": { @@ -639,7 +639,7 @@ }, { "method": "json", - "om_terrain": "zoo_2_0", + "om_terrain": "dinozoo_2_0", "type": "mapgen", "weight": 100, "object": { @@ -682,7 +682,7 @@ }, { "method": "json", - "om_terrain": "zoo_2_1", + "om_terrain": "dinozoo_2_1", "type": "mapgen", "weight": 100, "object": { @@ -779,7 +779,7 @@ }, { "method": "json", - "om_terrain": "zoo_2_2", + "om_terrain": "dinozoo_2_2", "type": "mapgen", "weight": 100, "object": { From 3c2df6d83fdbad010dbd071bcce1433b2d74a8b3 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 28 Mar 2022 22:10:32 -0400 Subject: [PATCH 5/7] more swamp --- data/mods/DinoMod/scenarios.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/DinoMod/scenarios.json b/data/mods/DinoMod/scenarios.json index f8dbaa71f599d..9831e1b118bbb 100644 --- a/data/mods/DinoMod/scenarios.json +++ b/data/mods/DinoMod/scenarios.json @@ -6,7 +6,7 @@ "points": 0, "description": "You find yourself among trees. The screaming and moaning is fainter, but it sounds like something bigger and more dangerous is close by.", "start_name": "Wilderness", - "allowed_locs": [ "sloc_field", "sloc_forest", "sloc_campsite", "sloc_campground", "sloc_desert_island", "sloc_river" ], + "allowed_locs": [ "sloc_field", "sloc_forest", "sloc_swamp", "sloc_campsite", "sloc_campground", "sloc_desert_island", "sloc_river" ], "flags": [ "LONE_START" ], "surround_groups": [ [ "GROUP_DINOSAUR_MEGA_CARNIVORE", 70.0 ] ] }, From 348ee41276f1c9c1b2c35b5656d3feb210214b25 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 28 Mar 2022 22:20:07 -0400 Subject: [PATCH 6/7] fewer nest options --- data/mods/DinoMod/scenarios.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/mods/DinoMod/scenarios.json b/data/mods/DinoMod/scenarios.json index 9831e1b118bbb..f0d00e027f82a 100644 --- a/data/mods/DinoMod/scenarios.json +++ b/data/mods/DinoMod/scenarios.json @@ -169,14 +169,7 @@ "description": "When you wake up, you find yourself in the swamp next to some large eggs. Something big is nearby.", "start_name": "Predator Dinosaur Nest", "allowed_locs": [ "sloc_swamp" ], - "map_extra": [ - "mx_nest_acrocanthosaurus", - "mx_nest_allosaurus", - "mx_nest_ceratosaurus", - "mx_nest_siats", - "mx_nest_tyrannosaurus", - "mx_nest_utahraptor" - ], + "map_extra": "mx_nest_tyrannosaurus", "flags": [ "LONE_START" ] } ] From 2e1d93edc341e6652d7ebe278e2c148f17b5124c Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 29 Mar 2022 00:05:25 -0400 Subject: [PATCH 7/7] dinozoo spawns --- data/mods/DinoMod/regional_overlay.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/DinoMod/regional_overlay.json b/data/mods/DinoMod/regional_overlay.json index 09be78581acdd..d656b9778d2cd 100644 --- a/data/mods/DinoMod/regional_overlay.json +++ b/data/mods/DinoMod/regional_overlay.json @@ -44,6 +44,7 @@ "mx_nest_triceratops": 30 } } - } + }, + "city": { "parks": { "dinozoo": 25 } } } ]