Skip to content

Commit

Permalink
[Aftershock] Add Solar Array Special (#74498)
Browse files Browse the repository at this point in the history 
* Add Solar Array Mapgen with two solar panel layout variants.

* Add a robot recharging station to the building.

* Fix Road Connection point

* Add Robot spawn group to inside building.

* Lint

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Maleclypse <[email protected]>
  • Loading branch information
@QuillInkwell @github-actions @Maleclypse
3 people authored Jun 15, 2024
1 parent 8c1a78e commit 3a12119
Show file tree
Hide file tree
Showing 3 changed files with 185 additions and 0 deletions.
159 changes: 159 additions & 0 deletions data/mods/Aftershock/maps/mapgen/solar_array.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "afs_solar_arrary_a1", "afs_solar_array_a2" ] ],
"object": {
"fill_ter": "t_metal_floor",
"rows": [
" ",
" 1111111111111111111111 ",
" 1 1 ",
" 1 1 ",
" 1 1©©© ©©© ©©© ©© ©© ©",
" 1 //#//////©¢¢¢ ¢ ¢¢¢ ¢ ¢¢©",
" 1 /3'/Fohy/ ¢ ¢ ¢¢¢¢¢ ¢ ",
" 1 /3./.'hy/©¢¢ ¢¢¢ ¢ ¢¢¢ ¢©",
" 1 //:/://// ¢¢ ¢ ¢¢¢ ©",
" 1 =k.../'*/©¢¢¢ ¢¢ ¢¢¢¢¢ ¢©",
" 1 =ch..:.&/©††† ††¢ ¢¢ ¢¢¢¢©",
" 1 =k.'.////©¢¢ ¢¢¢ ¢ ¢¢¢©",
" 1 =ch..:'❶/ ¢¢¢ ¢ ¢¢¢ ¢¢¢ ",
" 1 =k.../.❺/©¢¢ ¢¢ ¢¢¢¢¢ ¢ ©",
" 1 =4..%/❻❷/©¢¢ ¢¢¢¢¢ ¢ ",
" 1 //!////// ††††††¢¢¢¢ ¢¢¢¢ ",
" 1 1/'l/©©©©©¢¢ ¢¢¢ ¢ ¢ ¢©",
" 1 1/.l/ ℗℗©©¢ ¢¢ ¢¢¢ ¢¢¢ ©",
" 1 1/!//©℗℗b©¢¢¢ ¢¢ ¢¢ ¢¢ ¢©",
" 1 1©© ©©℗℗b©¢¢¢¢¢¢¢ ¢¢ ",
" 1 2 © ℗℗©©© ©©©©¢¢¢¢ ¢¢ ¢ ",
" 1 1© © © ©©¢¢ ¢ ¢©",
" 1111111111111111111111©©©©©© © ©©©©¢¢¢ ¢¢¢©",
" ©© ©©© ©©© ¢¢¢¢ ¢¢ ©"
],
"palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_habitat_life_support" ],
"terrain": { "1": "t_chainfence", "2": "t_chaingate_c", "b": "t_sidewalk" },
"furniture": { "3": "f_server", "4": "f_drone_recharge_station" },
"place_monster": [
{ "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 40 },
{ "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 24, 47 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 40 },
{ "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 24, 29 ], "y": [ 6, 14 ], "pack_size": [ 1, 3 ], "chance": 50 }
],
"place_nested": [
{ "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 24, "y": 0 },
{
"chunks": [ [ "afs_solar_array_panels_lines", 50 ], [ "afs_solar_array_panels_circle", 50 ] ],
"x": 0,
"y": 0
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "afs_solar_arrary_a1_roof", "afs_solar_array_a2_roof" ] ],
"object": {
"fill_ter": "t_metal_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" [[[[[[[[[ ",
" [£££££££[ ",
" [£££1£1£[ ",
" [£££££££[ ",
" [£££2£2£[ ",
" [£££2£2£[ ",
" [£££2£2£[ ",
" [£££££££[ ",
" [£3£££££[ ",
" [£££££££[ ",
" [[££[[[[[ ",
" [££[ ",
" [££[ ",
" [[[[ ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "afs_habitat_structure", "afs_habitat_exterior" ],
"terrain": { " ": "t_open_air" },
"furniture": { "1": "f_small_satelitte_dish", "2": "f_vent_pipe", "3": "f_standing_tank" }
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "afs_solar_array_panels_lines",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" 11111 11111 11111 ",
" 11111 11111 11111 ",
" ",
" ",
" 11111 11111 11111 ",
" 11111 11111 11111 ",
" ",
" ",
" 11111 11111 11111 ",
" 11111 11111 11111 ",
" ",
" ",
" 11111 11111 11111 ",
" 11111 11111 11111 ",
" ",
" ",
" 11111 11111 11111 ",
" 11111 11111 11111 ",
" ",
" ",
" "
],
"furniture": { "1": "f_solar_unit" }
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "afs_solar_array_panels_circle",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" 1111 1111 ",
" 11111 11111 ",
" 111 111 ",
" 111 111 111 111 ",
" 11 1111 1111 11 ",
" 11 111 111 11 ",
" 11 11 11 11 ",
" 11 11 ",
" 22 ",
" 22 ",
" 11 11 ",
" 11 11 11 11 ",
" 11 111 111 11 ",
" 11 1111 1111 11 ",
" 111 111 111 111 ",
" 111 111 ",
" 11111 11111 ",
" 1111 1111 ",
" ",
" ",
" "
],
"furniture": { "1": "f_solar_unit", "2": "f_capacitor" }
}
}
]
16 changes: 16 additions & 0 deletions data/mods/Aftershock/maps/overmap_specials.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,22 @@
"occurrences": [ 0, 2 ],
"flags": [ "MAN_MADE", "EXOPLANET" ]
},
{
"type": "overmap_special",
"id": "afs_solar_array",
"overmaps": [
{ "point": [ 1, 0, 0 ], "overmap": "afs_solar_arrary_a1_south" },
{ "point": [ 0, 0, 0 ], "overmap": "afs_solar_array_a2_south" },
{ "point": [ 1, 0, 1 ], "overmap": "afs_solar_arrary_a1_roof_south" },
{ "point": [ 0, 0, 1 ], "overmap": "afs_solar_array_a2_roof_south" }
],
"connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ],
"locations": [ "land" ],
"city_distance": [ 7, -1 ],
"city_sizes": [ 10, -1 ],
"occurrences": [ 0, 2 ],
"flags": [ "MAN_MADE", "EXOPLANET" ]
},
{
"type": "overmap_special",
"id": "afs_power_station_small",
Expand Down
10 changes: 10 additions & 0 deletions data/mods/Aftershock/maps/overmap_terrain.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,16 @@
"mondensity": 2,
"flags": [ "SIDEWALK" ]
},
{
"type": "overmap_terrain",
"name": "Solar Array",
"id": [ "afs_solar_arrary_a1", "afs_solar_array_a2", "afs_solar_arrary_a1_roof", "afs_solar_array_a2_roof" ],
"sym": "S",
"color": "light_blue",
"see_cost": 3,
"mondensity": 2,
"flags": [ "SIDEWALK" ]
},
{
"type": "overmap_terrain",
"name": "Malamute Transport Wreck",
Expand Down

0 comments on commit 3a12119

Please sign in to comment.