Skip to content

Commit

Permalink
Merge pull request CleverRaven#67969 from CleverRaven/tileset-updates
Browse files Browse the repository at this point in the history
Routine tileset updates on 01 September 2023
  • Loading branch information
Rivet-the-Zombie authored Sep 1, 2023
2 parents 3315e1f + 6192995 commit 53869b2
Show file tree
Hide file tree
Showing 37 changed files with 60,281 additions and 47,447 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.
4,149 changes: 2,068 additions & 2,081 deletions gfx/ASCII_Overmap/tile_config.json

Large diffs are not rendered by default.

Binary file modified gfx/Altica/human_body.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,108 changes: 9,102 additions & 9,006 deletions gfx/Altica/tile_config.json

Large diffs are not rendered by default.

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/ChibiSmall.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 added 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/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/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.
16,995 changes: 8,561 additions & 8,434 deletions gfx/ChibiUltica/tile_config.json

Large diffs are not rendered by default.

Binary file added gfx/GiantDays/cursor.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 added gfx/GiantDays/fallback.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 added gfx/GiantDays/items.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 added gfx/GiantDays/large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions gfx/GiantDays/layering.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"variants": [
{
"context": "f_flagpole",
"item_variants": [
{
"item": "american_flag",
"sprite": [ { "id": "american_flag", "weight": 1 } ],
"layer": 90,
"offset_x": 6,
"offset_y": -21
},
{
"item": "pride_flag",
"sprite": [ { "id": "pride_flag", "weight": 1 } ],
"layer": 90,
"offset_x": 6,
"offset_y": -21
}
]
},
{
"context": "f_wooden_flagpole",
"item_variants": [
{
"item": "american_flag",
"sprite": [ { "id": "american_flag", "weight": 1 } ],
"layer": 90,
"offset_x": 6,
"offset_y": -21
},
{
"item": "pride_flag",
"sprite": [ { "id": "pride_flag", "weight": 1 } ],
"layer": 90,
"offset_x": 6,
"offset_y": -21
}
]
}
]
}
Binary file added gfx/GiantDays/mobs.png
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 53869b2

Please sign in to comment.