Skip to content

Commit

Permalink
Merge pull request #73424 from CleverRaven/tileset-updates
Browse files Browse the repository at this point in the history
Routine tileset updates on 01 May 2024
  • Loading branch information
Maleclypse authored May 1, 2024
2 parents 1d81cc0 + de0af21 commit 2b66dff
Show file tree
Hide file tree
Showing 47 changed files with 48,480 additions and 48,004 deletions.
Binary file modified gfx/ASCII_Overmap/ASCIITiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,031 changes: 520 additions & 511 deletions gfx/ASCII_Overmap/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/Altica/huge.png
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
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
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18,853 changes: 9,468 additions & 9,385 deletions gfx/Altica/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/Altica/ultica-tall.png
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/ChibiUltica/ChibiNormal.png
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/ChibiUltica/ChibiTall.png
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/ChibiUltica/filler.png
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/ChibiUltica/huge.png
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/ChibiUltica/human_body_plus.png
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/ChibiUltica/large.png
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/ChibiUltica/normal.png
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/ChibiUltica/small.png
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/ChibiUltica/tall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23,455 changes: 11,783 additions & 11,672 deletions gfx/ChibiUltica/tile_config.json

Large diffs are not rendered by default.

268 changes: 137 additions & 131 deletions gfx/GiantDays/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/Larwick_Overmap/overmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 14 additions & 19 deletions gfx/Larwick_Overmap/tile_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2867,7 +2867,6 @@
{ "id": "rift", "fg": 220 },
{ "id": "hellmouth", "fg": 218 },
{ "id": "anthill", "fg": 140 },
{ "id": "ants", "fg": 211 },
{ "id": "ants_food", "fg": 145 },
{ "id": "ants_larvae", "fg": 146 },
{ "id": "ants_queen", "fg": 145 },
Expand Down Expand Up @@ -6196,19 +6195,20 @@
{ "id": [ "portal_storm", "close_portal_storm" ], "fg": 220 },
{ "id": [ "early_portal_storm", "distant_portal_storm" ], "fg": 218 },
{
"id": [ "dirt_road", "dirt_road_forest", "rural_road", "rural_road_forest" ],
"fg": [ 82, 81, 82, 81 ],
"rotates": true
},
{
"id": [ "dirt_road_3way", "dirt_road_3way_forest", "rural_road_3way", "rural_road_3way_forest" ],
"fg": [ 88, 87, 89, 90 ],
"rotates": true
"id": [ "ants", "ants_acid", "rural_road", "rural_road_forest" ],
"fg": 91,
"multitile": true,
"additional_tiles": [
{ "id": "center", "fg": 76 },
{ "id": "corner", "fg": [ 78, 80, 79, 77 ] },
{ "id": "t_connection", "fg": [ 88, 90, 89, 87 ] },
{ "id": "edge", "fg": [ 82, 81 ] },
{ "id": "end_piece", "fg": [ 84, 83, 85, 86 ] },
{ "id": "unconnected", "fg": [ 91, 91 ] }
]
},
{ "id": "dirt_road_turn_forest", "fg": [ 77, 79, 80, 78 ], "rotates": true },
{ "id": "dirt_road_turn1_forest", "fg": [ 78, 77, 79, 80 ], "rotates": true },
{
"id": "forest_trail",
"id": [ "forest_trail", "sewer" ],
"fg": 113,
"multitile": true,
"additional_tiles": [
Expand All @@ -6224,7 +6224,7 @@
{ "id": [ "player_male", "player_female" ], "fg": 209, "rotates": false },
{ "id": "overmap_remembered_vehicle", "fg": 229, "rotates": false },
{
"id": "road",
"id": [ "road", "mine_tunnel", "subway" ],
"fg": 246,
"multitile": true,
"additional_tiles": [
Expand All @@ -6238,12 +6238,6 @@
},
{ "id": "anchor_brown", "fg": 1 },
{ "id": "cursor", "fg": 75 },
{ "id": "dirt_road_center", "fg": 76 },
{ "id": "dirt_road_end_piece_e", "fg": 83 },
{ "id": "dirt_road_end_piece_n", "fg": 84 },
{ "id": "dirt_road_end_piece_s", "fg": 85 },
{ "id": "dirt_road_end_piece_w", "fg": 86 },
{ "id": "dirt_road_unconnected", "fg": 91 },
{ "id": "highlight", "fg": 139 },
{ "id": "hive_magenta", "fg": 143 },
{ "id": "house_light_green", "fg": 154 },
Expand All @@ -6260,6 +6254,7 @@
{ "id": "mission_cursor", "fg": 186 },
{ "id": "open_air_brown", "fg": 191 },
{ "id": "parking_light_blue", "fg": 205 },
{ "id": "pond_brown", "fg": 211 },
{ "id": "v_runway", "fg": 253 },
{ "id": "two_story_light_green", "fg": 316 },
{ "id": "unknown_terrain", "fg": 318 },
Expand Down
Binary file modified gfx/MshockXotto+/overmap.png
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/MshockXotto+/small.png
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/MshockXotto+/tall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17,736 changes: 8,956 additions & 8,780 deletions gfx/MshockXotto+/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/MshockXotto+/tiles.png
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/NeoDaysTileset/large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7,728 changes: 3,867 additions & 3,861 deletions gfx/NeoDaysTileset/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/NeoDaysTileset/tiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,476 changes: 1,226 additions & 1,250 deletions gfx/RetroDaysTileset/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/RetroDaysTileset/tiles.png
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/SurveyorsMap/overmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,998 changes: 1,000 additions & 998 deletions gfx/SurveyorsMap/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/Ultica_iso/human_body_plus_2x.png
Binary file modified gfx/Ultica_iso/normal_2x.png
Binary file modified gfx/Ultica_iso/small.png
Binary file modified gfx/Ultica_iso/tall_2x.png
717 changes: 366 additions & 351 deletions gfx/Ultica_iso/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/UltimateCataclysm/huge.png
Binary file modified gfx/UltimateCataclysm/human_body_plus.png
Binary file modified gfx/UltimateCataclysm/large.png
14 changes: 14 additions & 0 deletions gfx/UltimateCataclysm/layering.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@
{ "field": "fd_fire", "sprite": [ { "id": "f_55gal_firebarrel_fd_fire", "weight": 2 } ] },
{ "field": "fd_smoke", "sprite": [ { "id": "fd_smoke_overlay", "weight": 2 } ] }
]
},
{
"context": "t_puddle",
"item_variants": [
{ "item": "water", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 100 },
{ "item": "water_clean", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 }
]
},
{
"context": "t_puddle_underground",
"item_variants": [
{ "item": "water", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 100 },
{ "item": "water_clean", "sprite": [ { "id": "puddle_water", "weight": 1 } ], "layer": 90 }
]
}
]
}
Binary file modified gfx/UltimateCataclysm/normal.png
Binary file modified gfx/UltimateCataclysm/small.png
Binary file modified gfx/UltimateCataclysm/tall.png
Loading

0 comments on commit 2b66dff

Please sign in to comment.