Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Remove recent sprite changes from external_tileset #5707

Merged
merged 1 commit into from
Nov 13, 2024
Merged

refactor: Remove recent sprite changes from external_tileset #5707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 3 additions & 70 deletions data/json/external_tileset/External_Tileset_DP_Normal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,76 +89,9 @@
{ "id": "overlay_worn_helmet_scute", "fg": 77 },
{ "id": [ "armguard_scute", "overlay_wielded_armguard_scute" ], "fg": 78 },
{ "id": "overlay_worn_armguard_scute", "fg": 79 },
{
"id": "fd_blood",
"fg": 80,
"rotates": false,
"multitile": true,
"additional_tiles": [
{ "id": "center", "fg": 81 },
{ "id": "corner", "fg": [ 82, 83, 84, 85 ] },
{ "id": "t_connection", "fg": [ 92, 93, 94, 95 ] },
{ "id": "edge", "fg": [ 86, 87 ] },
{ "id": "end_piece", "fg": [ 88, 89, 90, 91 ] },
{
"id": "unconnected",
"fg": [
{ "weight": 1, "sprite": 96 },
{ "weight": 1, "sprite": 97 },
{ "weight": 1, "sprite": 98 },
{ "weight": 1, "sprite": 99 },
{ "weight": 1, "sprite": 100 },
{ "weight": 1, "sprite": 101 },
{ "weight": 1, "sprite": 102 },
{ "weight": 1, "sprite": 103 },
{ "weight": 1, "sprite": 104 },
{ "weight": 1, "sprite": 105 },
{ "weight": 1, "sprite": 106 },
{ "weight": 1, "sprite": 107 },
{ "weight": 1, "sprite": 108 },
{ "weight": 1, "sprite": 109 },
{ "weight": 1, "sprite": 110 },
{ "weight": 1, "sprite": 111 },
{ "weight": 1, "sprite": 112 },
{ "weight": 1, "sprite": 113 },
{ "weight": 1, "sprite": 114 },
{ "weight": 1, "sprite": 115 },
{ "weight": 1, "sprite": 116 },
{ "weight": 1, "sprite": 117 },
{ "weight": 1, "sprite": 118 },
{ "weight": 1, "sprite": 119 },
{ "weight": 1, "sprite": 120 },
{ "weight": 1, "sprite": 121 },
{ "weight": 1, "sprite": 122 },
{ "weight": 1, "sprite": 123 },
{ "weight": 1, "sprite": 124 },
{ "weight": 1, "sprite": 125 },
{ "weight": 1, "sprite": 126 },
{ "weight": 1, "sprite": 127 }
]
}
]
},
{
"id": "tr_portal",
"fg": [
{ "weight": 10, "sprite": 128 },
{ "weight": 10, "sprite": 129 },
{ "weight": 10, "sprite": 130 },
{ "weight": 10, "sprite": 131 },
{ "weight": 10, "sprite": 132 },
{ "weight": 10, "sprite": 133 },
{ "weight": 10, "sprite": 134 },
{ "weight": 10, "sprite": 135 }
],
"animated": true
},
{ "id": "overlay_worn_cuirass_bone", "fg": 136 },
{ "id": [ "greaves_bone", "overlay_wielded_greaves_bone" ], "fg": 137 },
{ "id": "overlay_worn_greaves_bone", "fg": 138 },
{ "id": "cursor", "fg": 139 },
{ "id": "line_target", "fg": 140 },
{ "id": "animation_line", "fg": 141 }
{ "id": "overlay_worn_cuirass_bone", "fg": 80 },
{ "id": [ "greaves_bone", "overlay_wielded_greaves_bone" ], "fg": 81 },
{ "id": "overlay_worn_greaves_bone", "fg": 82 }
],
"sprite_width": 32,
"sprite_height": 32
Expand Down
Binary file modified data/json/external_tileset/External_Tileset_DP_Normal.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
149 changes: 1 addition & 148 deletions data/json/external_tileset/External_Tileset_DP_terrain_normal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,154 +25,7 @@
{ "id": "t_shrub_blueberry_season_spring", "fg": 19 },
{ "id": "t_shrub_blueberry_season_summer", "fg": 20 },
{ "id": "t_shrub_strawberry_season_spring", "fg": 21 },
{ "id": "t_shrub_strawberry_season_summer", "fg": 22 },
{
"id": "t_sidewalk",
"fg": [
{ "weight": 90, "sprite": 23 },
{ "weight": 90, "sprite": 24 },
{ "weight": 90, "sprite": 25 },
{ "weight": 90, "sprite": 26 },
{ "weight": 8, "sprite": 27 },
{ "weight": 1, "sprite": 28 },
{ "weight": 1, "sprite": 29 },
{ "weight": 6, "sprite": 30 },
{ "weight": 1, "sprite": 31 },
{ "weight": 1, "sprite": 32 },
{ "weight": 2, "sprite": 33 },
{ "weight": 2, "sprite": 34 },
{ "weight": 2, "sprite": 35 },
{ "weight": 1, "sprite": 36 },
{ "weight": 1, "sprite": 37 },
{ "weight": 1, "sprite": 38 },
{ "weight": 6, "sprite": 39 },
{ "weight": 6, "sprite": 40 },
{ "weight": 6, "sprite": 41 },
{ "weight": 6, "sprite": 42 },
{ "weight": 8, "sprite": 43 },
{ "weight": 12, "sprite": 44 },
{ "weight": 12, "sprite": 45 },
{ "weight": 12, "sprite": 46 },
{ "weight": 12, "sprite": 47 },
{ "weight": 2, "sprite": 48 },
{ "weight": 12, "sprite": 49 },
{ "weight": 12, "sprite": 50 },
{ "weight": 12, "sprite": 51 },
{ "weight": 4, "sprite": 52 },
{ "weight": 12, "sprite": 53 },
{ "weight": 6, "sprite": 54 },
{ "weight": 12, "sprite": 55 },
{ "weight": 12, "sprite": 56 },
{ "weight": 12, "sprite": 57 },
{ "weight": 4, "sprite": 58 },
{ "weight": 5, "sprite": 59 },
{ "weight": 2, "sprite": 60 }
]
},
{
"id": "t_adobe_brick_wall",
"fg": 61,
"rotates": false,
"multitile": true,
"additional_tiles": [
{ "id": "center", "fg": 62 },
{ "id": "corner", "fg": [ 63, 64, 65, 66 ] },
{ "id": "t_connection", "fg": [ 73, 74, 75, 76 ] },
{ "id": "edge", "fg": [ 67, 68 ] },
{ "id": "end_piece", "fg": [ 69, 70, 71, 72 ] },
{ "id": "unconnected", "fg": 77 }
]
},
{
"id": "t_brick_wall",
"fg": 78,
"rotates": false,
"multitile": true,
"additional_tiles": [
{ "id": "center", "fg": 79 },
{ "id": "corner", "fg": [ 80, 81, 82, 83 ] },
{ "id": "t_connection", "fg": [ 90, 91, 92, 93 ] },
{ "id": "edge", "fg": [ 84, 85 ] },
{ "id": "end_piece", "fg": [ 86, 87, 88, 89 ] },
{ "id": "unconnected", "fg": 94 }
]
},
{ "id": "bg_t_floor", "fg": 95 },
{ "id": "t_door_c", "fg": 96 },
{ "id": "t_door_locked", "fg": 96 },
{ "id": "t_door_locked_alarm", "fg": 96 },
{ "id": "t_door_locked_interior", "fg": 96 },
{ "id": "t_door_b", "fg": 97 },
{ "id": "t_door_o", "fg": 98, "bg": 95 },
{ "id": "t_door_boarded", "fg": 99 },
{ "id": "t_door_boarded_damaged", "fg": 100 },
{ "id": "t_door_frame", "fg": 101, "bg": 95 },
{ "id": "t_door_c_peep", "fg": 102 },
{ "id": "t_door_b_peep", "fg": 103 },
{ "id": "t_door_o_peep", "fg": 104, "bg": 95 },
{ "id": "t_door_boarded_peep", "fg": 105 },
{ "id": "t_door_boarded_damaged_peep", "fg": 106 },
{ "id": "t_door_red_c", "fg": 107 },
{ "id": "t_door_red_b", "fg": 108 },
{ "id": "t_door_red_o", "fg": 109, "bg": 95 },
{ "id": "t_door_red_frame", "fg": 110, "bg": 95 },
{ "id": "t_linoleum_gray", "fg": 111 },
{ "id": "t_door_gray_c", "fg": 112 },
{ "id": "t_door_gray_b", "fg": 113 },
{ "id": "t_door_gray_o", "fg": 114, "bg": 111 },
{ "id": "t_door_gray_frame", "fg": 115, "bg": 111 },
{ "id": "t_linoleum_white", "fg": 116 },
{ "id": "t_door_white_c", "fg": 117 },
{ "id": "t_door_white_b", "fg": 118 },
{ "id": "t_door_white_o", "fg": 119, "bg": 116 },
{ "id": "t_door_white_frame", "fg": 120, "bg": 116 },
{ "id": "t_door_green_c", "fg": 121 },
{ "id": "t_door_green_b", "fg": 122 },
{ "id": "t_door_green_o", "fg": 123, "bg": 95 },
{ "id": "t_door_green_frame", "fg": 124, "bg": 95 },
{ "id": "t_door_curtain_c", "fg": 125 },
{ "id": "t_door_curtain_o", "fg": 126 },
{ "id": "t_thconc_floor", "fg": 127 },
{ "id": "t_door_lab_c", "fg": 128 },
{ "id": "t_door_lab_b", "fg": 129 },
{ "id": "t_door_lab_o", "fg": 130, "bg": 127 },
{ "id": "t_door_lab_frame", "fg": 131, "bg": 127 },
{ "id": "t_rdoor_c", "fg": 132 },
{ "id": "t_rdoor_b", "fg": 133 },
{ "id": "t_rdoor_o", "fg": 134, "bg": 95 },
{ "id": "t_rdoor_boarded", "fg": 135 },
{ "id": "t_rdoor_boarded_damaged", "fg": 136 },
{ "id": "t_door_glass_frosted_lab_c", "fg": 137 },
{ "id": "t_door_glass_frosted_lab_o", "fg": 138, "bg": 127 },
{ "id": "t_door_glass_frosted_c", "fg": 139 },
{ "id": "t_door_glass_frosted_o", "fg": 140, "bg": 143 },
{ "id": "t_door_metal_lab_c", "fg": 141 },
{ "id": "t_door_metal_lab_o", "fg": 142, "bg": 127 },
{ "id": "bg_metal_block", "fg": 143 },
{ "id": "t_laminated_door_glass_c", "fg": 144 },
{ "id": "t_laminated_door_glass_o", "fg": 145, "bg": 127 },
{ "id": "t_ballistic_door_glass_c", "fg": 146 },
{ "id": "t_ballistic_door_glass_o", "fg": 147, "bg": 127 },
{ "id": "t_reinforced_door_glass_c", "fg": 148 },
{ "id": "t_reinforced_door_glass_o", "fg": 149, "bg": 127 },
{ "id": "t_reinforced_door_glass_lab_c", "fg": 150 },
{ "id": "t_reinforced_door_glass_lab_o", "fg": 151, "bg": 127 },
{ "id": "t_door_makeshift_c", "fg": 152 },
{ "id": "t_door_makeshift_o", "fg": 153, "bg": 95 },
{ "id": "t_door_metal_locked", "fg": 154 },
{ "id": "t_door_metal_locked_o", "fg": 155, "bg": 127 },
{
"id": "t_concrete",
"fg": [
{ "weight": 90, "sprite": 157 },
{ "weight": 90, "sprite": 158 },
{ "weight": 90, "sprite": 159 },
{ "weight": 90, "sprite": 160 }
],
"bg": 156
},
{ "id": "t_floor_waxed", "fg": 161 },
{ "id": "t_floor_waxed_y", "fg": 162 }
{ "id": "t_shrub_strawberry_season_summer", "fg": 22 }
],
"sprite_width": 32,
"sprite_height": 32
Expand Down
Binary file modified data/json/external_tileset/External_Tileset_DP_terrain_normal.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 0 additions & 14 deletions doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@ Links to relevant pull requests, for content covered below:
[#5398](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5398)
- Harvested cattails: [#5445](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5445)
- Niter beds: [#5446](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5446)
- Extended blood visuals: [#5630](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5630)
- Animated portals: [#5640](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5640)
- Reimplemented bone armor: [#5646](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5646)
- Extended sidewalk visuals: [#5657](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5657)
- New Brick wall sprites: [#5657](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5664)
- New/Updated door sprites: [#5674](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5674)

## Undead People

Expand Down Expand Up @@ -103,23 +99,13 @@ Ultica are planned for the future.
- Makeshift cannon, item and vehiclepart sprite. Item specific to BN.
- Explosive cannonshells and sprites for readied cannon ammo. Items specific to BN.
- Harvested state for cattails, including winter variation. Furniture specific to BN.
- Additional blood splat tiles.
- Animated portal sprites.
- Sprites for bone cuirass and greaves. Reimplementation of previously-obsoleted bone armor specific
to BN.
- New sprites for generated sidewalks. Specific to BN.
- Updated sprites for brick walls.
- Updated/New sprites for most doors.
- New Cursor/Target/Trail sprites.

### External_Tileset_DP_terrain_normal.png

- Rice paddies. Terrain specific to BN.
- Niter beds. Terrain specific to BN.
- New sprites for generated sidewalks. Specific to BN.
- Updated sprites for brick walls.
- Updated/New sprites for most doors.
- New floor sprites for linoleum, concrete and waxed floors.

### External_Tileset_DP_Tall.png

Expand Down
Loading