Skip to content

Commit 3ffeaf0

Browse files
nelson137nelson137
authored
feat: migrate the rest of the hats (#912)
Migrate the rest of the hats in `old_assets/`.
1 parent 461b21a commit 3ffeaf0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+172
-184
lines changed

‎assets/game.yaml

+19-2
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,25 @@ core:
272272
alarm: /player/emotes/alarm.emote.yaml
273273

274274
player_hats:
275-
- /player/hats/pirate.hat.yaml
276-
- /player/hats/straw.hat.yaml
275+
- /player/hats/bonnet/bonnet.hat.yaml
276+
- /player/hats/bow/bow.hat.yaml
277+
- /player/hats/bucket/bucket.hat.yaml
278+
- /player/hats/chef/chef.hat.yaml
279+
- /player/hats/chest/chest.hat.yaml
280+
- /player/hats/cowboy/cowboy.hat.yaml
281+
- /player/hats/crown/crown.hat.yaml
282+
- /player/hats/diving_goggles/diving_goggles.hat.yaml
283+
- /player/hats/fisherman/fisherman.hat.yaml
284+
- /player/hats/pineapple/pineapple.hat.yaml
285+
- /player/hats/pirate/pirate.hat.yaml
286+
- /player/hats/pot/pot.hat.yaml
287+
- /player/hats/pufferfish/pufferfish.hat.yaml
288+
- /player/hats/spicy_lobster/spicy_lobster.hat.yaml
289+
- /player/hats/straw/straw.hat.yaml
290+
- /player/hats/topper/topper.hat.yaml
291+
- /player/hats/unicorn/unicorn.hat.yaml
292+
- /player/hats/viking/viking.hat.yaml
293+
- /player/hats/water_lily/water_lily.hat.yaml
277294

278295
stable_maps:
279296
- /map/levels/level_1.map.yaml

‎assets/player/hats/bonnet/bonnet.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./bonnet.png
2+
tile_size: [35, 25]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/bonnet/bonnet.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Bonnet Hat
2+
atlas: ./bonnet.atlas.yaml
3+
4+
offset: [-11, 28]
5+
body_size: [35, 25]

‎old_assets/textures/items/hats/bonnet hat.png ‎assets/player/hats/bonnet/bonnet.png

File renamed without changes.

‎assets/player/hats/bow/bow.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./bow.png
2+
tile_size: [23, 19]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/bow/bow.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Bow Hat
2+
atlas: ./bow.atlas.yaml
3+
4+
offset: [-10, 28]
5+
body_size: [23, 19]

‎old_assets/textures/items/hats/bow hat.png ‎assets/player/hats/bow/bow.png

File renamed without changes.

‎assets/player/hats/bucket/bucket.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./bucket.png
2+
tile_size: [34, 33]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/bucket/bucket.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Bucket Hat
2+
atlas: ./bucket.atlas.yaml
3+
4+
offset: [-3, 31]
5+
body_size: [34, 33]

‎old_assets/textures/items/hats/bucket hat.png ‎assets/player/hats/bucket/bucket.png

File renamed without changes.

‎assets/player/hats/chef/chef.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./chef.png
2+
tile_size: [35, 28]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/chef/chef.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Chef Hat
2+
atlas: ./chef.atlas.yaml
3+
4+
offset: [-6, 36]
5+
body_size: [35, 28]

‎old_assets/textures/items/hats/chef's hat.png ‎assets/player/hats/chef/chef.png

File renamed without changes.

‎assets/player/hats/chest/chest.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./chest.png
2+
tile_size: [36, 31]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/chest/chest.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Chest Hat
2+
atlas: ./chest.atlas.yaml
3+
4+
offset: [-3, 40]
5+
body_size: [36, 31]

‎old_assets/textures/items/hats/chest hat.png ‎assets/player/hats/chest/chest.png

File renamed without changes.

‎assets/player/hats/cowboy/cowboy.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./cowboy.png
2+
tile_size: [49, 25]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/cowboy/cowboy.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Cowboy Hat
2+
atlas: ./cowboy.atlas.yaml
3+
4+
offset: [-5, 27]
5+
body_size: [49, 25]

‎old_assets/textures/items/hats/cowboy hat.png ‎assets/player/hats/cowboy/cowboy.png

File renamed without changes.

‎assets/player/hats/crown/crown.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./crown.png
2+
tile_size: [32, 28]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/crown/crown.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Crown Hat
2+
atlas: ./crown.atlas.yaml
3+
4+
offset: [-4, 31]
5+
body_size: [32, 28]

‎old_assets/textures/items/hats/crown hat.png ‎assets/player/hats/crown/crown.png

File renamed without changes.

‎assets/player/hats/diving_goggles/diving_goggles.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./diving_goggles.png
2+
tile_size: [36, 23]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/diving_goggles/diving_goggles.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Diving Goggles Hat
2+
atlas: ./diving_goggles.atlas.yaml
3+
4+
offset: [-1, 28]
5+
body_size: [36, 23]

‎old_assets/textures/items/hats/diving goggles hat.png ‎assets/player/hats/diving_goggles/diving_goggles.png

File renamed without changes.

‎assets/player/hats/fisherman/fisherman.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./fisherman.png
2+
tile_size: [37, 28]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/fisherman/fisherman.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Fisherman Hat
2+
atlas: ./fisherman.atlas.yaml
3+
4+
offset: [-2, 26]
5+
body_size: [37, 28]

‎old_assets/textures/items/hats/fisherman hat.png ‎assets/player/hats/fisherman/fisherman.png

File renamed without changes.

‎assets/player/hats/pineapple/pineapple.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./pineapple.png
2+
tile_size: [34, 39]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/pineapple/pineapple.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Pineapple Hat
2+
atlas: ./pineapple.atlas.yaml
3+
4+
offset: [-4, 40]
5+
body_size: [34, 39]

‎old_assets/textures/items/hats/pineapple hat.png ‎assets/player/hats/pineapple/pineapple.png

File renamed without changes.

‎assets/player/hats/pirate.atlas.yaml ‎assets/player/hats/pirate/pirate.atlas.yaml

File renamed without changes.

‎assets/player/hats/pirate.hat.yaml ‎assets/player/hats/pirate/pirate.hat.yaml

File renamed without changes.

‎assets/player/hats/pirate.png ‎assets/player/hats/pirate/pirate.png

File renamed without changes.

‎assets/player/hats/pot/pot.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./pot.png
2+
tile_size: [38, 40]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/pot/pot.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Pot Hat
2+
atlas: ./pot.atlas.yaml
3+
4+
offset: [-2, 36]
5+
body_size: [38, 40]

‎old_assets/textures/items/hats/pot hat.png ‎assets/player/hats/pot/pot.png

File renamed without changes.

‎assets/player/hats/pufferfish/pufferfish.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./pufferfish.png
2+
tile_size: [41, 39]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/pufferfish/pufferfish.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Pufferfish Hat
2+
atlas: ./pufferfish.atlas.yaml
3+
4+
offset: [-2, 32]
5+
body_size: [41, 39]

‎old_assets/textures/items/hats/pufferfish hat.png ‎assets/player/hats/pufferfish/pufferfish.png

File renamed without changes.

‎assets/player/hats/spicy_lobster/spicy_lobster.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./spicy_lobster.png
2+
tile_size: [50, 34]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/spicy_lobster/spicy_lobster.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Spicy Lobster Hat
2+
atlas: ./spicy_lobster.atlas.yaml
3+
4+
offset: [-3, 30]
5+
body_size: [50, 34]

‎old_assets/textures/items/hats/spicy lobster hat.png ‎assets/player/hats/spicy_lobster/spicy_lobster.png

File renamed without changes.

‎assets/player/hats/straw.atlas.yaml ‎assets/player/hats/straw/straw.atlas.yaml

File renamed without changes.

‎assets/player/hats/straw.hat.yaml ‎assets/player/hats/straw/straw.hat.yaml

File renamed without changes.

‎assets/player/hats/straw.png ‎assets/player/hats/straw/straw.png

File renamed without changes.

‎assets/player/hats/topper/topper.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./topper.png
2+
tile_size: [31, 34]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/topper/topper.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Topper Hat
2+
atlas: ./topper.atlas.yaml
3+
4+
offset: [0, 42]
5+
body_size: [31, 34]

‎old_assets/textures/items/hats/topper hat.png ‎assets/player/hats/topper/topper.png

File renamed without changes.

‎assets/player/hats/unicorn/unicorn.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./unicorn.png
2+
tile_size: [30, 37]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/unicorn/unicorn.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Unicorn Hat
2+
atlas: ./unicorn.atlas.yaml
3+
4+
offset: [-4, 26]
5+
body_size: [30, 37]

‎old_assets/textures/items/hats/unicorn hat.png ‎assets/player/hats/unicorn/unicorn.png

File renamed without changes.

‎assets/player/hats/viking/viking.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./viking.png
2+
tile_size: [37, 28]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/viking/viking.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Viking Hat
2+
atlas: ./viking.atlas.yaml
3+
4+
offset: [-11, 30]
5+
body_size: [37, 28]

‎old_assets/textures/items/hats/viking hat.png ‎assets/player/hats/viking/viking.png

File renamed without changes.

‎assets/player/hats/water_lily/water_lily.atlas.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
image: ./water_lily.png
2+
tile_size: [50, 23]
3+
columns: 1
4+
rows: 1

‎assets/player/hats/water_lily/water_lily.hat.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: Water Lily Hat
2+
atlas: ./water_lily.atlas.yaml
3+
4+
offset: [-1, 29]
5+
body_size: [50, 23]

‎old_assets/textures/items/hats/water lily hat.png ‎assets/player/hats/water_lily/water_lily.png

File renamed without changes.

‎old_assets/items/bonnet_hat.json

-26
This file was deleted.

‎old_assets/items/bucket_hat.json

-26
This file was deleted.

‎old_assets/items/chefs_hat.json

-26
This file was deleted.

‎old_assets/items/chest_hat.json

-26
This file was deleted.

‎old_assets/items/cowboy_hat.json

-26
This file was deleted.

‎old_assets/items/crown_hat.json

-26
This file was deleted.

0 commit comments

Comments
 (0)