Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DinoMod] new scenarios #56451

Merged
merged 7 commits into from
Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions data/mods/DinoMod/mapgen/zoo.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"method": "json",
"om_terrain": "zoo_0_0",
"om_terrain": "dinozoo_0_0",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -44,7 +44,7 @@
},
{
"method": "json",
"om_terrain": "zoo_0_1",
"om_terrain": "dinozoo_0_1",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -216,7 +216,7 @@
},
{
"method": "json",
"om_terrain": "zoo_0_2",
"om_terrain": "dinozoo_0_2",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -302,7 +302,7 @@
},
{
"method": "json",
"om_terrain": "zoo_1_0",
"om_terrain": "dinozoo_1_0",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -345,7 +345,7 @@
},
{
"method": "json",
"om_terrain": "zoo_1_1",
"om_terrain": "dinozoo_1_1",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -556,7 +556,7 @@
},
{
"method": "json",
"om_terrain": "zoo_1_2",
"om_terrain": "dinozoo_1_2",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -639,7 +639,7 @@
},
{
"method": "json",
"om_terrain": "zoo_2_0",
"om_terrain": "dinozoo_2_0",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -682,7 +682,7 @@
},
{
"method": "json",
"om_terrain": "zoo_2_1",
"om_terrain": "dinozoo_2_1",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down Expand Up @@ -779,7 +779,7 @@
},
{
"method": "json",
"om_terrain": "zoo_2_2",
"om_terrain": "dinozoo_2_2",
"type": "mapgen",
"weight": 100,
"object": {
Expand Down
56 changes: 56 additions & 0 deletions data/mods/DinoMod/overmap/overmap_terrain_zoo.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
3 changes: 2 additions & 1 deletion data/mods/DinoMod/regional_overlay.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"mx_nest_triceratops": 30
}
}
}
},
"city": { "parks": { "dinozoo": 25 } }
}
]
23 changes: 22 additions & 1 deletion data/mods/DinoMod/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
},
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -150,5 +160,16 @@
"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_tyrannosaurus",
"flags": [ "LONE_START" ]
}
]
19 changes: 19 additions & 0 deletions data/mods/DinoMod/startlocations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]