Skip to content

Commit

Permalink
Merge pull request CleverRaven#78881 from CleverRaven/tileset-updates
Browse files Browse the repository at this point in the history 
Routine tileset updates on 01 January 2025
  • Loading branch information
@Maleclypse
Maleclypse authored Jan 6, 2025
2 parents ebf3401 + f08f9ad commit 7bed475
Show file tree
Hide file tree
Showing 117 changed files with 56,705 additions and 55,315 deletions.
281 changes: 275 additions & 6 deletions gfx/ASCII_Overmap/tile_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
},
{ "id": "clear", "fg": 178, "bg": 111 },
{ "id": "null", "fg": 139, "bg": 145 },
{ "id": "moonlit_scenario_weather", "fg": 180, "bg": 111 },
{ "id": "cabin_isherwood", "fg": 29, "bg": 88 },
{
"id": [
Expand Down Expand Up @@ -472,6 +473,8 @@
"bg": 1,
"rotates": true
},
{ "id": "s_weldingstore", "fg": 106, "bg": 1, "rotates": true },
{ "id": "s_weldingstore_roof", "fg": 106, "bg": 1, "rotates": true },
{ "id": [ "s_electronics", "s_electronics_1", "s_electronicstore" ], "fg": 183, "bg": 1, "rotates": true },
{
"id": [ "s_electronics_roof", "s_electronics_roof_1", "s_electronicstore_roof" ],
Expand Down Expand Up @@ -1250,9 +1253,36 @@
"fg": 29,
"bg": 134
},
{ "id": [ "s_library", "s_library_1", "s_library_2", "s_library_3" ], "fg": 44, "bg": 53, "rotates": true },
{
"id": [ "s_library_roof", "s_library_roof_1", "s_library_roof_2", "s_library_roof_3" ],
"id": [
"s_library",
"s_library_1",
"s_library_2",
"s_library_3",
"urban_library_1",
"urban_library_2",
"urban_library_3",
"urban_library_4",
"urban_library_5",
"urban_library_6",
"urban_library_7",
"urban_library_8"
],
"fg": 44,
"bg": 53,
"rotates": true
},
{
"id": [
"s_library_roof",
"s_library_roof_1",
"s_library_roof_2",
"s_library_roof_3",
"urban_library_roof_1",
"urban_library_roof_2",
"urban_library_roof_3",
"urban_library_roof_4"
],
"fg": 44,
"bg": 53,
"rotates": true
Expand Down Expand Up @@ -2486,6 +2516,205 @@
{ "id": "trailer_road_turn", "fg": 74, "bg": 1, "rotates": true },
{ "id": "trailer_road_3way", "fg": 77, "bg": 1, "rotates": true },
{ "id": "trailer_hub_01", "fg": 80, "bg": 1, "rotates": true },
{ "id": "hw_symbolic_road", "fg": 72, "bg": 1, "rotates": true },
{ "id": "hw_symbolic_ramp_up", "fg": 124, "bg": 1, "rotates": true },
{ "id": "hw_symbolic_ramp_down", "fg": 112, "bg": 1, "rotates": true },
{ "id": [ "hw_bridge_supports", "hw_fb_supports" ], "fg": 50, "bg": 1, "rotates": true },
{ "id": "hw_underpass", "fg": 72, "bg": 1, "rotates": true },
{ "id": "hw_road", "fg": 113, "bg": 1, "rotates": true },
{ "id": "hw_fb_crossroad", "fg": 120, "bg": 1, "rotates": true },
{ "id": "hw_fb_tee", "fg": 117, "bg": 1, "rotates": true },
{ "id": [ "hw_fb_bend_0_0", "hw_fb_bend_1_1" ], "fg": 122, "bg": 1, "rotates": true },
{ "id": "hw_fb_bend_1_0", "fg": 119, "bg": 1, "rotates": true },
{ "id": "hw_fb_bend_0_1", "fg": 113, "bg": 1, "rotates": true },
{
"id": [
"hw_diamond_interchange_-1_-2",
"hw_diamond_interchange_0_-2",
"hw_diamond_interchange_1_-2",
"hw_diamond_interchange_2_-2",
"hw_diamond_interchange_-2_-1",
"hw_diamond_interchange_-1_-1",
"hw_diamond_interchange_2_-1",
"hw_diamond_interchange_3_-1",
"hw_diamond_interchange_-2_0",
"hw_diamond_interchange_-1_0",
"hw_diamond_interchange_2_0",
"hw_diamond_interchange_3_0",
"hw_rest_area_parking_-1_-2",
"hw_rest_area_parking_-2_-1",
"hw_rest_area_parking_-1_-1",
"hw_rest_area_parking_-2_0",
"hw_rest_area_parking_-1_0",
"hw_rest_area_parking_-2_2",
"hw_rest_area_parking_-1_2",
"hw_rest_area_parking_-1_3",
"hw_bend_2_0",
"hw_bend_3_0",
"hw_bend_4_0",
"hw_bend_1_1",
"hw_bend_2_1",
"hw_bend_3_1",
"hw_bend_4_1",
"hw_bend_0_2",
"hw_bend_1_2",
"hw_bend_2_2",
"hw_bend_3_2",
"hw_bend_0_3",
"hw_bend_1_3",
"hw_bend_2_3",
"hw_bend_0_4",
"hw_bend_1_4",
"hw_trumpet_1_-3",
"hw_trumpet_2_-3",
"hw_trumpet_3_-3",
"hw_trumpet_4_-3",
"hw_trumpet_0_-2",
"hw_trumpet_1_-2",
"hw_trumpet_2_-2",
"hw_trumpet_3_-2",
"hw_trumpet_4_-2",
"hw_trumpet_5_-2",
"hw_trumpet_0_-1",
"hw_trumpet_1_-1",
"hw_trumpet_3_-1",
"hw_trumpet_4_-1",
"hw_trumpet_5_-1",
"hw_trumpet_6_-1",
"hw_trumpet_0_0",
"hw_trumpet_1_0",
"hw_trumpet_4_0",
"hw_trumpet_5_0",
"hw_trumpet_6_0",
"hw_trumpet_7_0",
"hw_trumpet_-3_1",
"hw_trumpet_-2_1",
"hw_trumpet_-1_1",
"hw_trumpet_0_1",
"hw_trumpet_1_1",
"hw_trumpet_2_1",
"hw_trumpet_3_1",
"hw_trumpet_-2_2",
"hw_trumpet_-1_2",
"hw_trumpet_0_2",
"hw_trumpet_1_2",
"hw_trumpet_2_2",
"hw_trumpet_3_2",
"hw_trumpet_-1_3",
"hw_trumpet_0_3",
"hw_trumpet_1_3",
"hw_trumpet_2_3",
"hw_trumpet_0_4",
"hw_trumpet_1_4",
"hw_trumpet_bridge_0_0",
"hw_trumpet_bridge_1_0",
"hw_trumpet_bridge_0_1",
"hw_trumpet_bridge_1_1",
"hw_three_lane",
"hw_three_lane_merge_e",
"hw_three_lane_merge_w"
],
"fg": 113,
"bg": 1,
"rotates": true
},
{
"id": [
"hw_clover_leaf_0_-5",
"hw_clover_leaf_-3_-4",
"hw_clover_leaf_-2_-4",
"hw_clover_leaf_-1_-4",
"hw_clover_leaf_0_-4",
"hw_clover_leaf_1_-4",
"hw_clover_leaf_2_-4",
"hw_clover_leaf_3_-4",
"hw_clover_leaf_4_-4",
"hw_clover_leaf_-4_-3",
"hw_clover_leaf_-3_-3",
"hw_clover_leaf_-2_-3",
"hw_clover_leaf_-1_-3",
"hw_clover_leaf_0_-3",
"hw_clover_leaf_1_-3",
"hw_clover_leaf_2_-3",
"hw_clover_leaf_3_-3",
"hw_clover_leaf_4_-3",
"hw_clover_leaf_5_-3",
"hw_clover_leaf_-4_-2",
"hw_clover_leaf_-3_-2",
"hw_clover_leaf_-1_-2",
"hw_clover_leaf_0_-2",
"hw_clover_leaf_1_-2",
"hw_clover_leaf_2_-2",
"hw_clover_leaf_4_-2",
"hw_clover_leaf_5_-2",
"hw_clover_leaf_-4_-1",
"hw_clover_leaf_-3_-1",
"hw_clover_leaf_-2_-1",
"hw_clover_leaf_-1_-1",
"hw_clover_leaf_2_-1",
"hw_clover_leaf_3_-1",
"hw_clover_leaf_4_-1",
"hw_clover_leaf_5_-1",
"hw_clover_leaf_-4_0",
"hw_clover_leaf_-3_0",
"hw_clover_leaf_-2_0",
"hw_clover_leaf_-1_0",
"hw_clover_leaf_2_0",
"hw_clover_leaf_4_0",
"hw_clover_leaf_5_0",
"hw_clover_leaf_6_0",
"hw_clover_leaf_-5_1",
"hw_clover_leaf_-4_1",
"hw_clover_leaf_-3_1",
"hw_clover_leaf_-2_1",
"hw_clover_leaf_-1_1",
"hw_clover_leaf_2_1",
"hw_clover_leaf_4_1",
"hw_clover_leaf_5_1",
"hw_clover_leaf_-4_2",
"hw_clover_leaf_-3_2",
"hw_clover_leaf_-2_2",
"hw_clover_leaf_-1_2",
"hw_clover_leaf_2_2",
"hw_clover_leaf_3_2",
"hw_clover_leaf_4_2",
"hw_clover_leaf_5_2",
"hw_clover_leaf_-4_3",
"hw_clover_leaf_-3_3",
"hw_clover_leaf_-1_3",
"hw_clover_leaf_2_3",
"hw_clover_leaf_4_3",
"hw_clover_leaf_5_3",
"hw_clover_leaf_-4_4",
"hw_clover_leaf_-3_4",
"hw_clover_leaf_-2_4",
"hw_clover_leaf_-1_4",
"hw_clover_leaf_0_4",
"hw_clover_leaf_1_4",
"hw_clover_leaf_2_4",
"hw_clover_leaf_3_4",
"hw_clover_leaf_4_4",
"hw_clover_leaf_5_4",
"hw_clover_leaf_-3_5",
"hw_clover_leaf_-2_5",
"hw_clover_leaf_-1_5",
"hw_clover_leaf_0_5",
"hw_clover_leaf_1_5",
"hw_clover_leaf_2_5",
"hw_clover_leaf_3_5",
"hw_clover_leaf_4_5",
"hw_clover_leaf_1_6",
"hw_clover_leaf_bridge_-1_0",
"hw_clover_leaf_bridge_0_0",
"hw_clover_leaf_bridge_2_0",
"hw_clover_leaf_bridge_-1_1",
"hw_clover_leaf_bridge_0_1",
"hw_clover_leaf_bridge_2_1"
],
"fg": 113,
"bg": 1,
"rotates": true
},
{ "id": "urban_25_sewer_connector", "fg": 91, "bg": 1, "rotates": true },
{ "id": "dump", "fg": 30, "bg": 53 },
{ "id": [ "trailer_public_00", "trailer_public_00_roof" ], "fg": 30, "bg": 53 },
Expand Down Expand Up @@ -2638,9 +2867,44 @@
{ "id": "dinoexhibit_roof", "fg": 65, "bg": 1, "rotates": true },
{ "id": [ "mi-go_scout_tower_dino_1", "mi-go_scout_tower_dino_3" ], "fg": 123, "bg": 1, "rotates": true },
{ "id": [ "dinozoo_0_0", "dinozoo_1_0" ], "fg": 38, "bg": 88 },
{ "id": "dinozoo_2_0", "fg": 38, "bg": 88 },
{ "id": [ "dinozoo_2_0", "dinozoo_3_0" ], "fg": 38, "bg": 88 },
{
"id": [
"dinozoo_0_1",
"dinozoo_1_1",
"dinozoo_2_1",
"dinozoo_3_1",
"dinozoo_0_2",
"dinozoo_1_2",
"dinozoo_2_2",
"dinozoo_3_2",
"dinozoo_0_3",
"dinozoo_1_3",
"dinozoo_2_3",
"dinozoo_3_3"
],
"fg": 43,
"bg": 88
},
{
"id": [ "dinozoo_0_1", "dinozoo_1_1", "dinozoo_2_1", "dinozoo_0_2", "dinozoo_1_2", "dinozoo_2_2" ],
"id": [
"dinozoo_0_0_roof",
"dinozoo_1_0_roof",
"dinozoo_2_0_roof",
"dinozoo_3_0_roof",
"dinozoo_0_1_roof",
"dinozoo_1_1_roof",
"dinozoo_2_1_roof",
"dinozoo_3_1_roof",
"dinozoo_0_2_roof",
"dinozoo_1_2_roof",
"dinozoo_2_2_roof",
"dinozoo_3_2_roof",
"dinozoo_0_3_roof",
"dinozoo_1_3_roof",
"dinozoo_2_3_roof",
"dinozoo_3_3_roof"
],
"fg": 43,
"bg": 88
},
Expand Down Expand Up @@ -2871,6 +3135,13 @@
},
{ "id": [ "cathedralv_b_NW", "cathedralv_b_NE", "cathedralv_b_SW", "cathedralv_b_SE" ], "fg": 29, "bg": 134 },
{ "id": "blotted_sun", "fg": 20, "bg": 48 },
{ "id": "magic_weather_thick_fog", "fg": 71, "bg": 111 },
{ "id": "magic_weather_light_drizzle", "fg": 105, "bg": 48 },
{ "id": "magic_weather_drizzle", "fg": 105, "bg": 48 },
{ "id": "magic_weather_rain", "fg": 49, "bg": 48 },
{ "id": "magic_weather_rainstorm", "fg": 20, "bg": 48 },
{ "id": "magic_weather_thunder", "fg": 20, "bg": 48 },
{ "id": "magic_weather_lightning", "fg": 179, "bg": 48 },
{ "id": [ "npc_male", "npc_female" ], "fg": 143, "bg": 1 },
{ "id": [ "player_male", "player_female" ], "fg": 171, "bg": 1 },
{ "id": "overmap_remembered_vehicle", "fg": 110, "bg": 1 },
Expand All @@ -2887,8 +3158,6 @@
{ "id": "mission_cursor", "fg": 154, "bg": 1 },
{ "id": "black36", "fg": 19 },
{ "id": "black60", "fg": 25 },
{ "id": "light_gray194", "fg": 117 },
{ "id": "light_gray197", "fg": 120 },
{ "id": "yellow111", "fg": 174 },
{ "id": "yellow46", "fg": 181 }
]
Expand Down
Binary file modified gfx/Altica/centered.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/character.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/filler_tall.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/fillerhoder.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/giant.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/huge.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/human_body.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/human_body_plus.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/incomplete.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/incomplete_large.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/large.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/large_ridden.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/normal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/Altica/small.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7bed475

Please sign in to comment.