Skip to content

Commit

Permalink
feat: migrate the rest of the hats (#912)
Browse files Browse the repository at this point in the history 
Migrate the rest of the hats in `old_assets/`.
  • Loading branch information
@nelson137
nelson137 authored Jan 26, 2024
1 parent 461b21a commit 3ffeaf0
Show file tree
Hide file tree
Showing 68 changed files with 172 additions and 184 deletions.
21 changes: 19 additions & 2 deletions assets/game.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,25 @@ core:
alarm: /player/emotes/alarm.emote.yaml

player_hats:
- /player/hats/pirate.hat.yaml
- /player/hats/straw.hat.yaml
- /player/hats/bonnet/bonnet.hat.yaml
- /player/hats/bow/bow.hat.yaml
- /player/hats/bucket/bucket.hat.yaml
- /player/hats/chef/chef.hat.yaml
- /player/hats/chest/chest.hat.yaml
- /player/hats/cowboy/cowboy.hat.yaml
- /player/hats/crown/crown.hat.yaml
- /player/hats/diving_goggles/diving_goggles.hat.yaml
- /player/hats/fisherman/fisherman.hat.yaml
- /player/hats/pineapple/pineapple.hat.yaml
- /player/hats/pirate/pirate.hat.yaml
- /player/hats/pot/pot.hat.yaml
- /player/hats/pufferfish/pufferfish.hat.yaml
- /player/hats/spicy_lobster/spicy_lobster.hat.yaml
- /player/hats/straw/straw.hat.yaml
- /player/hats/topper/topper.hat.yaml
- /player/hats/unicorn/unicorn.hat.yaml
- /player/hats/viking/viking.hat.yaml
- /player/hats/water_lily/water_lily.hat.yaml

stable_maps:
- /map/levels/level_1.map.yaml
Expand Down
4 changes: 4 additions & 0 deletions assets/player/hats/bonnet/bonnet.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./bonnet.png
tile_size: [35, 25]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/bonnet/bonnet.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Bonnet Hat
atlas: ./bonnet.atlas.yaml

offset: [-11, 28]
body_size: [35, 25]
0 ...assets/textures/items/hats/bonnet hat.png → assets/player/hats/bonnet/bonnet.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/bow/bow.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./bow.png
tile_size: [23, 19]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/bow/bow.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Bow Hat
atlas: ./bow.atlas.yaml

offset: [-10, 28]
body_size: [23, 19]
0 old_assets/textures/items/hats/bow hat.png → assets/player/hats/bow/bow.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/bucket/bucket.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./bucket.png
tile_size: [34, 33]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/bucket/bucket.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Bucket Hat
atlas: ./bucket.atlas.yaml

offset: [-3, 31]
body_size: [34, 33]
0 ...assets/textures/items/hats/bucket hat.png → assets/player/hats/bucket/bucket.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/chef/chef.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./chef.png
tile_size: [35, 28]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/chef/chef.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Chef Hat
atlas: ./chef.atlas.yaml

offset: [-6, 36]
body_size: [35, 28]
0 ...assets/textures/items/hats/chef's hat.png → assets/player/hats/chef/chef.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/chest/chest.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./chest.png
tile_size: [36, 31]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/chest/chest.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Chest Hat
atlas: ./chest.atlas.yaml

offset: [-3, 40]
body_size: [36, 31]
0 old_assets/textures/items/hats/chest hat.png → assets/player/hats/chest/chest.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/cowboy/cowboy.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./cowboy.png
tile_size: [49, 25]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/cowboy/cowboy.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Cowboy Hat
atlas: ./cowboy.atlas.yaml

offset: [-5, 27]
body_size: [49, 25]
0 ...assets/textures/items/hats/cowboy hat.png → assets/player/hats/cowboy/cowboy.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/crown/crown.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./crown.png
tile_size: [32, 28]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/crown/crown.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Crown Hat
atlas: ./crown.atlas.yaml

offset: [-4, 31]
body_size: [32, 28]
0 old_assets/textures/items/hats/crown hat.png → assets/player/hats/crown/crown.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/diving_goggles/diving_goggles.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./diving_goggles.png
tile_size: [36, 23]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/diving_goggles/diving_goggles.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Diving Goggles Hat
atlas: ./diving_goggles.atlas.yaml

offset: [-1, 28]
body_size: [36, 23]
0 ...extures/items/hats/diving goggles hat.png → ...er/hats/diving_goggles/diving_goggles.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/fisherman/fisherman.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./fisherman.png
tile_size: [37, 28]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/fisherman/fisherman.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Fisherman Hat
atlas: ./fisherman.atlas.yaml

offset: [-2, 26]
body_size: [37, 28]
0 ...ets/textures/items/hats/fisherman hat.png → assets/player/hats/fisherman/fisherman.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/pineapple/pineapple.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./pineapple.png
tile_size: [34, 39]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/pineapple/pineapple.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Pineapple Hat
atlas: ./pineapple.atlas.yaml

offset: [-4, 40]
body_size: [34, 39]
0 ...ets/textures/items/hats/pineapple hat.png → assets/player/hats/pineapple/pineapple.png
View file
File renamed without changes
0 assets/player/hats/pirate.atlas.yaml → assets/player/hats/pirate/pirate.atlas.yaml
View file
File renamed without changes.
0 assets/player/hats/pirate.hat.yaml → assets/player/hats/pirate/pirate.hat.yaml
View file
File renamed without changes.
0 assets/player/hats/pirate.png → assets/player/hats/pirate/pirate.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/pot/pot.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./pot.png
tile_size: [38, 40]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/pot/pot.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Pot Hat
atlas: ./pot.atlas.yaml

offset: [-2, 36]
body_size: [38, 40]
0 old_assets/textures/items/hats/pot hat.png → assets/player/hats/pot/pot.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/pufferfish/pufferfish.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./pufferfish.png
tile_size: [41, 39]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/pufferfish/pufferfish.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Pufferfish Hat
atlas: ./pufferfish.atlas.yaml

offset: [-2, 32]
body_size: [41, 39]
0 ...ts/textures/items/hats/pufferfish hat.png → assets/player/hats/pufferfish/pufferfish.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/spicy_lobster/spicy_lobster.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./spicy_lobster.png
tile_size: [50, 34]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/spicy_lobster/spicy_lobster.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Spicy Lobster Hat
atlas: ./spicy_lobster.atlas.yaml

offset: [-3, 30]
body_size: [50, 34]
0 ...textures/items/hats/spicy lobster hat.png → ...ayer/hats/spicy_lobster/spicy_lobster.png
View file
File renamed without changes
0 assets/player/hats/straw.atlas.yaml → assets/player/hats/straw/straw.atlas.yaml
View file
File renamed without changes.
0 assets/player/hats/straw.hat.yaml → assets/player/hats/straw/straw.hat.yaml
View file
File renamed without changes.
0 assets/player/hats/straw.png → assets/player/hats/straw/straw.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/topper/topper.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./topper.png
tile_size: [31, 34]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/topper/topper.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Topper Hat
atlas: ./topper.atlas.yaml

offset: [0, 42]
body_size: [31, 34]
0 ...assets/textures/items/hats/topper hat.png → assets/player/hats/topper/topper.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/unicorn/unicorn.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./unicorn.png
tile_size: [30, 37]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/unicorn/unicorn.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Unicorn Hat
atlas: ./unicorn.atlas.yaml

offset: [-4, 26]
body_size: [30, 37]
0 ...ssets/textures/items/hats/unicorn hat.png → assets/player/hats/unicorn/unicorn.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/viking/viking.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./viking.png
tile_size: [37, 28]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/viking/viking.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Viking Hat
atlas: ./viking.atlas.yaml

offset: [-11, 30]
body_size: [37, 28]
0 ...assets/textures/items/hats/viking hat.png → assets/player/hats/viking/viking.png
View file
File renamed without changes
4 changes: 4 additions & 0 deletions assets/player/hats/water_lily/water_lily.atlas.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./water_lily.png
tile_size: [50, 23]
columns: 1
rows: 1
5 changes: 5 additions & 0 deletions assets/player/hats/water_lily/water_lily.hat.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: Water Lily Hat
atlas: ./water_lily.atlas.yaml

offset: [-1, 29]
body_size: [50, 23]
0 ...ts/textures/items/hats/water lily hat.png → assets/player/hats/water_lily/water_lily.png
View file
File renamed without changes
26 changes: 0 additions & 26 deletions old_assets/items/bonnet_hat.json
View file

This file was deleted.

26 changes: 0 additions & 26 deletions old_assets/items/bucket_hat.json
View file

This file was deleted.

26 changes: 0 additions & 26 deletions old_assets/items/chefs_hat.json
View file

This file was deleted.

26 changes: 0 additions & 26 deletions old_assets/items/chest_hat.json
View file

This file was deleted.

26 changes: 0 additions & 26 deletions old_assets/items/cowboy_hat.json
View file

This file was deleted.

26 changes: 0 additions & 26 deletions old_assets/items/crown_hat.json
View file

This file was deleted.

Loading

0 comments on commit 3ffeaf0

Please sign in to comment.