Skip to content

Commit

Permalink
Merge pull request CleverRaven#73178 from Standing-Storm/sky-island-e…
Browse files Browse the repository at this point in the history
…ast-room

[Sky Island] Add east bunker room upgrades to possible missions
  • Loading branch information
Maleclypse authored Apr 22, 2024
2 parents c6baa45 + 146e012 commit 6797b1d
Show file tree
Hide file tree
Showing 3 changed files with 473 additions and 0 deletions.
51 changes: 51 additions & 0 deletions data/mods/Sky_Island/dialog_statue.json
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,57 @@
"effect": [ { "assign_mission": "SKYISLAND_BUILD_westroom4" } ],
"topic": "SKYISLAND_UPGRADES_INFRASTRUCTURE"
},
{
"text": "Construct: East Room 1",
"condition": {
"and": [
{ "not": { "u_has_mission": "SKYISLAND_BUILD_eastroom1" } },
{ "math": [ "skyisland_build_bigroom", ">=", "1" ] },
{ "math": [ "skyisland_build_eastroom", "==", "0" ] }
]
},
"effect": [ { "assign_mission": "SKYISLAND_BUILD_eastroom1" } ],
"topic": "SKYISLAND_UPGRADES_INFRASTRUCTURE"
},
{
"text": "Construct: East Room 2",
"condition": {
"and": [
{ "not": { "u_has_mission": "SKYISLAND_BUILD_eastroom2" } },
{ "math": [ "skyisland_build_eastroom", "==", "1" ] },
{ "math": [ "skyisland_build_bigroom", ">=", "1" ] },
{ "math": [ "islandrank", ">=", "2" ] }
]
},
"effect": [ { "assign_mission": "SKYISLAND_BUILD_eastroom2" } ],
"topic": "SKYISLAND_UPGRADES_INFRASTRUCTURE"
},
{
"text": "Construct: East Room 3",
"condition": {
"and": [
{ "not": { "u_has_mission": "SKYISLAND_BUILD_eastroom3" } },
{ "math": [ "skyisland_build_eastroom", "==", "2" ] },
{ "math": [ "skyisland_build_bigroom", ">=", "2" ] },
{ "math": [ "islandrank", ">=", "3" ] }
]
},
"effect": [ { "assign_mission": "SKYISLAND_BUILD_eastroom3" } ],
"topic": "SKYISLAND_UPGRADES_INFRASTRUCTURE"
},
{
"text": "Construct: East Room Gallery",
"condition": {
"and": [
{ "not": { "u_has_mission": "SKYISLAND_BUILD_eastroom4" } },
{ "math": [ "skyisland_build_eastroom", "==", "3" ] },
{ "math": [ "skyisland_build_bigroom", ">=", "3" ] },
{ "math": [ "islandrank", ">=", "3" ] }
]
},
"effect": [ { "assign_mission": "SKYISLAND_BUILD_eastroom4" } ],
"topic": "SKYISLAND_UPGRADES_INFRASTRUCTURE"
},
{ "text": "Nevermind.", "topic": "SKYISLAND_UPGRADE" }
]
}
Expand Down
160 changes: 160 additions & 0 deletions data/mods/Sky_Island/island_upgrades.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,26 @@
"id": "EOC_skyisland_build_westroom4",
"effect": [ { "mapgen_update": "mx_skyisland_w4", "target_var": { "global_val": "OM_island_subw" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_skyisland_build_eastroom1",
"effect": [ { "mapgen_update": "mx_skyisland_e1", "target_var": { "global_val": "OM_island_sube" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_skyisland_build_eastroom2",
"effect": [ { "mapgen_update": "mx_skyisland_e2", "target_var": { "global_val": "OM_island_sube" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_skyisland_build_eastroom3",
"effect": [ { "mapgen_update": "mx_skyisland_e3", "target_var": { "global_val": "OM_island_sube" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_skyisland_build_eastroom4",
"effect": [ { "mapgen_update": "mx_skyisland_e4", "target_var": { "global_val": "OM_island_sube" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_memorize_island",
Expand Down Expand Up @@ -562,5 +582,145 @@
"flags": [ "NO_UNDERLYING_ROTATE", "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "skyisland_bunker" ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_skyisland_e1",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ##### ",
"##########...# ",
".........+.*.# ",
"##########...# ",
" ##### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "NO_UNDERLYING_ROTATE", "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "skyisland_bunker" ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_skyisland_e2",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ######### ",
" #.......# ",
" #.......# ",
"xxxxxxx#..---..# ",
"-------+-.-O-..# ",
"xxxxxxx#..---..# ",
" #.......# ",
" #.......# ",
" ######### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "NO_UNDERLYING_ROTATE", "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "skyisland_bunker" ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_skyisland_e3",
"object": {
"rows": [
" ",
" ########### ",
" ##.........## ",
" ##...........## ",
" #.............# ",
" #...-------...# ",
" #...-------...# ",
"xxxx#...-------...# ",
"----+...---O--....# ",
"xxxx#...-------...# ",
" #...-------...# ",
" #...-------...# ",
" #.............# ",
" ##...........## ",
" ##.........## ",
" ########### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "NO_UNDERLYING_ROTATE", "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "skyisland_bunker" ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_skyisland_e4",
"object": {
"rows": [
" ",
" ########### ",
" ##.........## ",
" ##...........##### ",
" #.............#..G ",
" #...-------...#..G ",
" #...-------...#..G ",
"xxxx#...-------...#..G ",
"----+...---O--....+..G ",
"xxxx#...-------...#..G ",
" #...-------...#..G ",
" #...-------...#..G ",
" #.............#..G ",
" ##...........##### ",
" ##.........## ",
" ########### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "NO_UNDERLYING_ROTATE", "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"palettes": [ "skyisland_bunker" ]
}
}
]
Loading

0 comments on commit 6797b1d

Please sign in to comment.