Skip to content

Commit

Permalink
[Ultica] Fixes\tweaks to the overmap (#2204)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hoasd1
hoasd1 authored Nov 24, 2023
1 parent f71c1fb commit e063b30
Show file tree
Hide file tree
Showing 20 changed files with 391 additions and 281 deletions.
4 changes: 2 additions & 2 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/cabin/cabin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"cabin_strange_b",
"riverside_dwelling"
],
"fg": [ "cabin_faceN", "cabin_faceE", "cabin_faceS", "cabin_faceW" ],
"fg": [ "cabin_faceN", "cabin_faceW", "cabin_faceS", "cabin_faceE" ],
"bg": "field",
"rotates": true
},{
Expand All @@ -35,7 +35,7 @@
"cabin_lake_roof",
"lake_cabin_boathouse_roof"
],
"fg": [ "cabin_faceN", "cabin_faceE", "cabin_faceS", "cabin_faceW" ],
"fg": [ "cabin_faceN", "cabin_faceW", "cabin_faceS", "cabin_faceE" ],
"bg": "open_air",
"rotates": true
}]
8 changes: 4 additions & 4 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/cs_private_park/cs_private_park.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"id": "cs_private_park_roof",
"fg": [
"cs_private_park_rot_N",
"cs_private_park_rot_E",
"cs_private_park_rot_W",
"cs_private_park_rot_S",
"cs_private_park_rot_W"
"cs_private_park_rot_E"
],
"bg": "open_air",
"rotates": true
Expand All @@ -14,9 +14,9 @@
"id": "cs_private_park",
"fg": [
"cs_private_park_rot_N",
"cs_private_park_rot_E",
"cs_private_park_rot_W",
"cs_private_park_rot_S",
"cs_private_park_rot_W"
"cs_private_park_rot_E"
],
"bg": "field",
"rotates": true
Expand Down
4 changes: 2 additions & 2 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/cs_public_art_piece/cs_public_art_piece.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"id": "cs_public_art_piece",
"fg": [
"cs_public_art_piece_rot_N",
"cs_public_art_piece_rot_E",
"cs_public_art_piece_rot_W",
"cs_public_art_piece_rot_S",
"cs_public_art_piece_rot_W"
"cs_public_art_piece_rot_E"
],
"bg": "field",
"rotates": true
Expand Down
4 changes: 2 additions & 2 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/cs_public_space/cs_public_space.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"id": "cs_public_space",
"fg": [
"cs_public_space_rot_N",
"cs_public_space_rot_E",
"cs_public_space_rot_W",
"cs_public_space_rot_S",
"cs_public_space_rot_W"
"cs_public_space_rot_E"
],
"bg": "field",
"rotates": true
Expand Down
48 changes: 30 additions & 18 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/dirt_road/dirt_road.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
[
{
"id": [ "dirt_road", "dirt_road_forest" ],
"fg": [ "dirt_road_edge_ns", "dirt_road_edge_ew" ],
"rotates": true
},{
"id": [ "dirt_road_3way", "dirt_road_3way_forest" ],
"fg": [ "dirt_road_t_connection_n", "dirt_road_t_connection_e", "dirt_road_t_connection_s", "dirt_road_t_connection_w" ],
"rotates": true
},{
"id": [ "dirt_road_turn", "dirt_road_turn_forest" ],
"fg": [ "dirt_road_corner_ne", "dirt_road_corner_se", "dirt_road_corner_sw", "dirt_road_corner_nw" ],
"rotates": true
},{
"id": [ "dirt_road_turn1", "dirt_road_turn1_forest" ],
"fg": [ "dirt_road_corner_nw", "dirt_road_corner_ne", "dirt_road_corner_se", "dirt_road_corner_sw" ],
"rotates": true
}
]
{
"id": [ "dirt_road", "dirt_road_forest" ],
"fg": [ "dirt_road_edge_ns", "dirt_road_edge_ew" ],
"rotates": true
},
{
"id": [ "dirt_road_turnback", "trailhead" ],
"fg": [ "dirt_road_end_piece_s", "dirt_road_end_piece_e", "dirt_road_end_piece_n", "dirt_road_end_piece_w" ],
"rotates": true
},
{
"id": [ "dirt_road_3way", "dirt_road_3way_forest" ],
"fg": [ "dirt_road_t_connection_n", "dirt_road_t_connection_w", "dirt_road_t_connection_s", "dirt_road_t_connection_e" ],
"rotates": true
},
{
"id": [ "dirt_road_turn", "dirt_road_turn_forest" ],
"fg": [ "dirt_road_corner_ne", "dirt_road_corner_nw", "dirt_road_corner_sw", "dirt_road_corner_se" ],
"rotates": true
},
{
"id": [ "dirt_road_turn1", "dirt_road_turn1_forest" ],
"fg": [ "dirt_road_corner_nw", "dirt_road_corner_ne", "dirt_road_corner_se", "dirt_road_corner_sw" ],
"rotates": true
},
{
"id": "dirt_road_4way",
"fg": "dirt_road_center"
}
]
37 changes: 22 additions & 15 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/evac_shelters/evac_shelters.json
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
[
{
"id": [
"shelter",
"shelter_1",
"shelter_2",
"shelter_vandal",
"shelter_1_vandal",
"shelter_2_vandal"
],
"fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceE", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceW" ],
"shelter",
"shelter_1",
"shelter_2",
"shelter_vandal",
"shelter_1_vandal",
"shelter_2_vandal",
"shelter_1b"
],
"fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceW", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceE" ],
"bg": "field",
"rotates": true
},{
},
{
"id": [
"shelter_roof",
"shelter_roof",
"shelter_roof_1",
"shelter_roof_2"
"shelter_roof_2",
"shelter_roof_1b"
],
"fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceE", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceW" ],
"fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceW", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceE" ],
"bg": "open_air",
"rotates": true
},{
"id": "shelter_under",
"fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceE", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceW" ],
},
{
"id": [
"shelter_under",
"shelter_under_1b"
],
"fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceW", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceE" ],
"rotates": true
}
]
2 changes: 1 addition & 1 deletion gfx/UltimateCataclysm/pngs_normal_32x32/overmap/gas/omt_gasstations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"garage_gas_1", "garage_gas_2", "garage_gas_3",
"garage_gas_roof_1", "garage_gas_roof_2", "garage_gas_roof_3"
],
"fg": [ "gas_small_faceN", "gas_small_faceE", "gas_small_faceS", "gas_small_faceW" ],
"fg": [ "gas_small_faceN", "gas_small_faceW", "gas_small_faceS", "gas_small_faceE" ],
"bg": "field"
}
]
6 changes: 3 additions & 3 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/missile_silo/missile_silo.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[
{
"id": "silo",
"fg": [ "silo_rot_N", "silo_rot_E", "silo_rot_S", "silo_rot_W" ],
"fg": [ "silo_rot_N", "silo_rot_W", "silo_rot_S", "silo_rot_E" ],
"bg": "field",
"rotates": true
},
{
"id": "silo_1",
"fg": [ "silo_rot_N", "silo_rot_E", "silo_rot_S", "silo_rot_W" ],
"fg": [ "silo_rot_N", "silo_rot_W", "silo_rot_S", "silo_rot_E" ],
"bg": "t_soil_center",
"rotates": true
},
{
"id": [ "silo_2", "silo_3", "silo_4", "silo_finale" ],
"fg": [ "silo_rot_N", "silo_rot_E", "silo_rot_S", "silo_rot_W" ],
"fg": [ "silo_rot_N", "silo_rot_W", "silo_rot_S", "silo_rot_E" ],
"bg": "t_rock_center",
"rotates": true
}
Expand Down
177 changes: 124 additions & 53 deletions gfx/UltimateCataclysm/pngs_normal_32x32/overmap/pasture/pasture.json
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,124 @@
[{
"id": "2farm_4",
"fg": [ "pasture_end_n", "pasture_end_e", "pasture_end_s", "pasture_end_w" ],
"rotates": true
},{
"id": "2farm_8",
"fg": [ "pasture_end_s", "pasture_end_w", "pasture_end_n", "pasture_end_e" ],
"rotates": true
},{
"id": "dairy_farm_NW",
"fg": [ "pasture_end_w", "pasture_end_n", "pasture_end_e", "pasture_end_s" ],
"rotates": true
},{
"id": "dairy_farm_NE",
"fg": [ "pasture_end_e", "pasture_end_s", "pasture_end_w", "pasture_end_n" ],
"rotates": true
},{
"id": "ranch_camp_1",
"fg": [ "pasture_corner_nw", "pasture_corner_ne", "pasture_corner_se", "pasture_corner_sw" ],
"rotates": true
},{
"id": [ "ranch_camp_2", "ranch_camp_3", "ranch_camp_4", "ranch_camp_5", "ranch_camp_6", "ranch_camp_7", "ranch_camp_8" ],
"fg": [ "pasture_not_n", "pasture_not_e", "pasture_not_s", "pasture_not_w" ],
"rotates": true
},{
"id": "ranch_camp_9",
"fg": [ "pasture_corner_ne", "pasture_corner_se", "pasture_corner_sw", "pasture_corner_nw" ],
"rotates": true
},{
"id": [ "ranch_camp_10", "ranch_camp_19", "ranch_camp_28", "ranch_camp_37", "ranch_camp_46", "ranch_camp_55", "ranch_camp_64" ],
"fg": [ "pasture_not_w", "pasture_not_n", "pasture_not_e", "pasture_not_s" ],
"rotates": true
},{
"id": [ "ranch_camp_11", "ranch_camp_12", "ranch_camp_13", "ranch_camp_14", "ranch_camp_15", "ranch_camp_16", "ranch_camp_20", "ranch_camp_21", "ranch_camp_22", "ranch_camp_23", "ranch_camp_24", "ranch_camp_25", "ranch_camp_26", "ranch_camp_29", "ranch_camp_30", "ranch_camp_31", "ranch_camp_32", "ranch_camp_33", "ranch_camp_34", "ranch_camp_35", "ranch_camp_38", "ranch_camp_39", "ranch_camp_40", "ranch_camp_41", "ranch_camp_42", "ranch_camp_43", "ranch_camp_44", "ranch_camp_47", "ranch_camp_48", "ranch_camp_49", "ranch_camp_50", "ranch_camp_51", "ranch_camp_52", "ranch_camp_53", "ranch_camp_56", "ranch_camp_58", "ranch_camp_59", "ranch_camp_60", "ranch_camp_61", "ranch_camp_62", "ranch_camp_65", "ranch_camp_69", "ranch_camp_70", "ranch_camp_71" ],
"fg": "pasture_center",
"rotates": true
},{
"id": [ "ranch_camp_18", "ranch_camp_27", "ranch_camp_36", "ranch_camp_45", "ranch_camp_54", "ranch_camp_63", "ranch_camp_72" ],
"fg": [ "pasture_not_e", "pasture_not_s", "pasture_not_w", "pasture_not_n" ],
"rotates": true
},{
"id": [ "ranch_camp_73", "ranch_camp_78" ],
"fg": [ "pasture_corner_sw", "pasture_corner_nw", "pasture_corner_ne", "pasture_corner_se" ],
"rotates": true
},{
"id": [ "ranch_camp_74", "ranch_camp_79", "ranch_camp_80" ],
"fg": [ "pasture_not_s", "pasture_not_w", "pasture_not_n", "pasture_not_e" ],
"rotates": true
},{
"id": [ "ranch_camp_75", "ranch_camp_81" ],
"fg": [ "pasture_corner_se", "pasture_corner_sw", "pasture_corner_nw", "pasture_corner_ne" ],
"rotates": true
}]
[
{
"id": "2farm_4",
"fg": [ "pasture_end_n", "pasture_end_e", "pasture_end_s", "pasture_end_w" ],
"rotates": true
},
{
"id": "2farm_8",
"fg": [ "pasture_end_s", "pasture_end_w", "pasture_end_n", "pasture_end_e" ],
"rotates": true
},
{
"id": "dairy_farm_NW",
"fg": [ "pasture_end_w", "pasture_end_s", "pasture_end_e", "pasture_end_n" ],
"rotates": true
},
{
"id": "dairy_farm_NE",
"fg": [ "pasture_end_e", "pasture_end_n", "pasture_end_w", "pasture_end_s" ],
"rotates": true
},
{
"id": "ranch_camp_1",
"fg": [ "pasture_corner_nw", "pasture_corner_ne", "pasture_corner_se", "pasture_corner_sw" ],
"rotates": true
},
{
"id": [ "ranch_camp_2", "ranch_camp_3", "ranch_camp_4", "ranch_camp_5", "ranch_camp_6", "ranch_camp_7", "ranch_camp_8" ],
"fg": [ "pasture_not_n", "pasture_not_e", "pasture_not_s", "pasture_not_w" ],
"rotates": true
},
{
"id": "ranch_camp_9",
"fg": [ "pasture_corner_ne", "pasture_corner_se", "pasture_corner_sw", "pasture_corner_nw" ],
"rotates": true
},
{
"id": [ "ranch_camp_10", "ranch_camp_19", "ranch_camp_28", "ranch_camp_37", "ranch_camp_46", "ranch_camp_55", "ranch_camp_64" ],
"fg": [ "pasture_not_w", "pasture_not_n", "pasture_not_e", "pasture_not_s" ],
"rotates": true
},
{
"id": [ "ranch_camp_11", "ranch_camp_12", "ranch_camp_13", "ranch_camp_14", "ranch_camp_15", "ranch_camp_16", "ranch_camp_20", "ranch_camp_21", "ranch_camp_22", "ranch_camp_23", "ranch_camp_24", "ranch_camp_25", "ranch_camp_26", "ranch_camp_29", "ranch_camp_30", "ranch_camp_31", "ranch_camp_32", "ranch_camp_33", "ranch_camp_34", "ranch_camp_35", "ranch_camp_38", "ranch_camp_39", "ranch_camp_40", "ranch_camp_41", "ranch_camp_42", "ranch_camp_43", "ranch_camp_44", "ranch_camp_47", "ranch_camp_48", "ranch_camp_49", "ranch_camp_50", "ranch_camp_51", "ranch_camp_52", "ranch_camp_53", "ranch_camp_56", "ranch_camp_58", "ranch_camp_59", "ranch_camp_60", "ranch_camp_61", "ranch_camp_62", "ranch_camp_65", "ranch_camp_69", "ranch_camp_70", "ranch_camp_71" ],
"fg": "pasture_center",
"rotates": true
},
{
"id": [ "ranch_camp_18", "ranch_camp_27", "ranch_camp_36", "ranch_camp_45", "ranch_camp_54", "ranch_camp_63", "ranch_camp_72" ],
"fg": [ "pasture_not_e", "pasture_not_s", "pasture_not_w", "pasture_not_n" ],
"rotates": true
},
{
"id": [ "ranch_camp_73", "ranch_camp_78" ],
"fg": [ "pasture_corner_sw", "pasture_corner_nw", "pasture_corner_ne", "pasture_corner_se" ],
"rotates": true
},
{
"id": [ "ranch_camp_74", "ranch_camp_79", "ranch_camp_80" ],
"fg": [ "pasture_not_s", "pasture_not_w", "pasture_not_n", "pasture_not_e" ],
"rotates": true
},
{
"id": [ "ranch_camp_75", "ranch_camp_81" ],
"fg": [ "pasture_corner_se", "pasture_corner_sw", "pasture_corner_nw", "pasture_corner_ne" ],
"rotates": true
},
{
"id": [ "paddock", "paddock_R_gap" ],
"fg": "pasture_unconnected"
},
{
"id": [ "paddock_trailhead_2", "paddock_trailhead_8" ],
"fg": "pasture_connection_ew"
},
{
"id": "paddock_DR",
"fg": "pasture_end_n"
},
{
"id": [ "paddock_trailhead_5", "paddock_R_butt" ],
"fg": "pasture_end_w"
},
{
"id": [ "paddock_L_butt", "paddock_C" ],
"fg": "pasture_end_e"
},
{
"id": "paddock_trailhead_3",
"fg": "pasture_corner_se"
},
{
"id": [ "splitrail_fence_DL", "paddock_trailhead_7" ],
"fg": "pasture_corner_nw"
},
{
"id": "paddock_trailhead_1",
"fg": "pasture_corner_ne"
},
{
"id": "splitrail_fence_UL",
"fg": [ "pasture_corner_se", "pasture_corner_ne" ],
"rotates": true
},
{
"id": "paddock_trailhead_4",
"fg": "pasture_not_n"
},
{
"id": "splitrail_fence_butt",
"fg": "pasture_not_e"
},
{
"id": "paddock_trailhead_6",
"fg": "pasture_not_s"
},
{
"id": "splitrail_fence_gap",
"fg": "pasture_not_w"
},
{
"id": [ "splitrail_fence_UR", "paddock_trailhead_9" ],
"fg": "pasture_corner_sw"
}
]
Loading

0 comments on commit e063b30

Please sign in to comment.