Skip to content

Commit

Permalink
updates variety of unmapped city tiles, mansion variant, quiet farm, …
Browse files Browse the repository at this point in the history
…ranch_camp
  • Loading branch information
ShnitzelX2 authored and Fris0uman committed Jun 23, 2024
1 parent 9fcac58 commit 433863d
Show file tree
Hide file tree
Showing 28 changed files with 227 additions and 35 deletions.
Binary file added gfx/Larwick_Overmap/autotile/wood_fence_autotile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
{
"id": "center",
"fg": "forest_trail_center"
},
{
"id": "intersection",
"fg": "square_green"
},
{
"id": "corner",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
"fg": "cross_white"
},
{
"id": "orchard",
"id": ["orchard","orchard_1"],
"fg": "small_tree_light_green"
},
{
Expand Down Expand Up @@ -578,5 +578,62 @@
"hayfield_end"
],
"fg": "square_brown"
},
{
"id": ["paddock","paddock_L_butt","paddock_R_butt","paddock_L_gap","paddock_R_gap","paddock_C","paddock_UL","paddock_UR","paddock_DL","paddock_DR","paddock_d_D_butt", "paddock_d_U_gap","paddock_d_D_gap","paddock_d_U_butt","paddock_special_1","paddock_special_2","paddock_special_3","paddock_special_4","paddock_end_UL","paddock_end_DL","paddock_end_UR","paddock_end_DR","paddock_trailhead_1","paddock_trailhead_3","paddock_trailhead_4","paddock_trailhead_6","paddock_trailhead_7","paddock_trailhead_9"],
"fg": "square_white"
},
{
"id": "paddock_trailhead_2",
"fg": "sign_brown"
},
{
"id": ["paddock_trailhead_5","paddock_trailhead_8"],
"fg": ["forest_trail_edge_ns","forest_trail_edge_ew","forest_trail_edge_ns","forest_trail_edge_ew"],
"rotates": true
},
{
"id": ["farm_horse_house_1","farm_horse_house_1_2ndfloor","farm_horse_house_1_roof"],
"fg": "cabin_brown"
},
{
"id": ["farm_horse_greenhouse","farm_horse_greenhouse_roof"],
"fg": "barn_green"
},
{
"id": ["farm_horse_stable_1","farm_horse_stable_1_hayloft","farm_horse_stable_1_roof","farm_horse_carriage_house_1","farm_horse_carriage_house_1_roof"],
"fg": "barn_brown"
},
{
"id": "farm_horse_track_large_1",
"fg": ["road_corner_nw","road_corner_sw","road_corner_se","road_corner_ne"],
"rotates": true
},
{
"id": "farm_horse_track_large_2",
"fg": ["road_corner_ne","road_corner_nw","road_corner_sw","road_corner_se"],
"rotates": true
},
{
"id": "farm_horse_track_large_3",
"fg": ["road_corner_sw","road_corner_se","road_corner_ne","road_corner_nw"],
"rotates": true
},
{
"id": "farm_horse_track_large_4",
"fg": ["road_corner_se","road_corner_ne","road_corner_nw","road_corner_sw"],
"rotates": true
},
{
"id": ["farm_horse_ring_1","farm_horse_ring_2","farm_horse_ring_3","farm_horse_ring_4"],
"fg": "square_brown"
},
{
"id": ["farm_horse_silo","farm_horse_silo_1","farm_horse_silo_roof"],
"fg": "silo_brown"
},
{
"id": ["splitrail_fence_UL","splitrail_fence_UR","splitrail_fence_DL","splitrail_fence_DR","splitrail_fence_butt","splitrail_fence_gap","splitrail_fence_inner"],
"fg": "square_brown"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -1747,5 +1747,13 @@
{
"id": "strip_mall_roof_5",
"fg": "open_air_blue"
},
{
"id": ["s_camping","s_camping_roof"],
"fg": "shop_brown"
},
{
"id": ["s_dive_shop","s_dive_shop_roof"],
"fg": "shop_blue"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"fg": "small_tree_brown"
},
{
"id": "construction_site",
"id": ["construction_site","house_vacant","house_vacant1","house_vacant2","house_vacant3"],
"fg": "square_dark_gray"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"id": "generic_mansion",
"fg": "mansion_white"
},
{
"id": "generic_mansion_entrance",
"fg": "mansion_white"
},
{
"id": "mansion_c1",
"fg": "mansion_white"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,41 @@
{
"id": "ranch_camp_76",
"fg": "square_dark_gray"
},
{
"id": ["ranch_camp_2","ranch_camp_3","ranch_camp_4","ranch_camp_5","ranch_camp_6","ranch_camp_7","ranch_camp_8","ranch_camp_74","ranch_camp_79","ranch_camp_80"],
"fg": [ "wood_fence_edge_ew", "wood_fence_edge_ns", "wood_fence_edge_ew", "wood_fence_edge_ns" ],
"rotates": true
},
{
"id": ["ranch_camp_10","ranch_camp_18","ranch_camp_19","ranch_camp_27","ranch_camp_28","ranch_camp_36","ranch_camp_37","ranch_camp_45","ranch_camp_46","ranch_camp_54","ranch_camp_55","ranch_camp_63","ranch_camp_64","ranch_camp_72"],
"fg": [ "wood_fence_edge_ns", "wood_fence_edge_ew", "wood_fence_edge_ns", "wood_fence_edge_ew" ],
"rotates": true
},
{
"id": "ranch_camp_77",
"fg": [ "road_edge_ns", "road_edge_ew", "road_edge_ns", "road_edge_ew" ],
"rotates": true
},
{
"id": ["ranch_camp_1"],
"fg": [ "wood_fence_corner_nw", "wood_fence_corner_sw", "wood_fence_corner_se", "wood_fence_corner_ne" ],
"rotates": true
},
{
"id": ["ranch_camp_9","ranch_camp_69"],
"fg": [ "wood_fence_corner_ne", "wood_fence_corner_nw", "wood_fence_corner_sw", "wood_fence_corner_se" ],
"rotates": true
},
{
"id": ["ranch_camp_73","ranch_camp_78"],
"fg": [ "wood_fence_corner_sw", "wood_fence_corner_se", "wood_fence_corner_ne", "wood_fence_corner_nw" ],
"rotates": true
},
{
"id": ["ranch_camp_75","ranch_camp_81"],
"fg": [ "wood_fence_corner_se", "wood_fence_corner_ne", "wood_fence_corner_nw", "wood_fence_corner_sw" ],
"rotates": true
}

]
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,21 @@
"fg": "pond_blue"
},
{
"id": "skate_park",
"id": ["skate_park","skate_park_up"],
"fg": "pond_light_gray"
},
{
"id": ["park_maze","park_maze_2"],
"fg": "big_tree_green"
},
{
"id": "volleyball_court",
"fg": "open_air_yellow"
},
{
"id": ["playground","playground_1","dog_park"],
"fg": "park_green"
},
{
"id": "small_wooded_trail",
"fg": "sign_brown"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,12 @@
"house_41_roof",
"house_42",
"house_42_roof",
"house_vacant",
"house_fence01",
"house_fence01_roof",
"house_fence03",
"house_fence03_roof",
"house_fence04",
"house_fence04_roof",
"house_toolshed",
"house_toolshed_roof",
"house_quiverfull",
Expand Down Expand Up @@ -236,14 +241,48 @@
"bungalow06",
"bungalow07",
"bungalow08",
"bungalow09",
"bungalow10",
"bungalow11",
"bungalow12",
"bungalow13",
"bungalow14",
"bungalow15",
"bungalow16",
"bungalow17",
"bungalow18",
"bungalow19",
"bungalow20",
"bungalow21",
"bungalow22",
"bungalow23",
"bungalow24",
"bungalow25",
"bungalow01_roof",
"bungalow02_roof",
"bungalow03_roof",
"bungalow04_roof",
"bungalow05_roof",
"bungalow06_roof",
"bungalow07_roof",
"bungalow08_roof"
"bungalow08_roof",
"bungalow09_roof",
"bungalow10_roof",
"bungalow11_roof",
"bungalow12_roof",
"bungalow13_roof",
"bungalow14_roof",
"bungalow15_roof",
"bungalow16_roof",
"bungalow17_roof",
"bungalow18_roof",
"bungalow19_roof",
"bungalow20_roof",
"bungalow21_roof",
"bungalow22_roof",
"bungalow23_roof",
"bungalow24_roof",
"bungalow25_roof"
],
"fg": "bungalow_light_gray"
},
Expand Down Expand Up @@ -284,6 +323,14 @@
],
"fg": "cabin_light_gray"
},
{
"id": ["unvitrified_farm_0","unvitrified_farm_1"],
"fg": "cabin_dark_gray"
},
{
"id": "unvitrified_orchard",
"fg": "small_tree_dark_gray"
},
{
"id": [
"apartments_tower_any",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,39 +270,11 @@
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_0_0",
"id": ["parking_garage_0_0","parking_garage_0_1","parking_garage_1_0","parking_garage_1_1","parking_garage_2_0","parking_garage_2_1","parking_garage_roof_0","parking_garage_roof_1","parking_garage_roof_top"],
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_0_1",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_1_0",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_1_1",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_2_0",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_2_1",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_roof_0",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_roof_1",
"fg": "big_building_light_gray"
},
{
"id": "parking_garage_roof_top",
"id": ["parking_garage2x2_0_0","parking_garage2x2_0_1","parking_garage2x2_0_2","parking_garage2x2_0_3","parking_garage2x2_1_0","parking_garage2x2_1_1","parking_garage2x2_1_2","parking_garage2x2_1_3","parking_garage2x2_2_0","parking_garage2x2_2_1","parking_garage2x2_2_2","parking_garage2x2_2_3","parking_garage2x2_3_0","parking_garage2x2_3_1","parking_garage2x2_3_2","parking_garage2x2_3_3","parking_garage2x2_4_2","parking_garage2x2_4_3"],
"fg": "big_building_light_gray"
}
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions gfx/Larwick_Overmap/pngs_overmap_16x16/wood_fence/wood_fence.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"id": "wood_fence",
"fg": "wood_fence_unconnected",
"multitile": true,
"additional_tiles": [
{
"id": "center",
"fg": "wood_fence_center"
},
{
"id": "corner",
"fg": [
"wood_fence_corner_nw",
"wood_fence_corner_sw",
"wood_fence_corner_se",
"wood_fence_corner_ne"
]
},
{
"id": "t_connection",
"fg": [
"wood_fence_t_connection_n",
"wood_fence_t_connection_w",
"wood_fence_t_connection_s",
"wood_fence_t_connection_e"
]
},
{
"id": "edge",
"fg": [
"wood_fence_edge_ns",
"wood_fence_edge_ew"
]
},
{
"id": "end_piece",
"fg": [
"wood_fence_end_piece_n",
"wood_fence_end_piece_w",
"wood_fence_end_piece_s",
"wood_fence_end_piece_e"
]
},
{
"id": "unconnected",
"fg": [
"wood_fence_unconnected",
"wood_fence_unconnected"
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 433863d

Please sign in to comment.