diff --git a/assets/items.json b/assets/items.json index 47976c630f..7124c289db 100644 --- a/assets/items.json +++ b/assets/items.json @@ -8,6 +8,7 @@ "items/musket.json", "items/sniper_rifle.json", "items/sword.json", + "items/trident.json", "items/kick_bomb.json", "items/turtle_shell.json", "items/crate.json", diff --git a/assets/items/trident.json b/assets/items/trident.json new file mode 100644 index 0000000000..289757426a --- /dev/null +++ b/assets/items/trident.json @@ -0,0 +1,50 @@ +{ + "id": "trident", + "name": "Trident", + "type": "weapon", + "cooldown": 0.5, + "sound_effect": "sword", + "effects": [ + { + "type": "rect_collider", + "width": 40, + "height": 35 + } + ], + "collider_size": { + "x": 60, + "y": 20 + }, + "mount_offset": { + "x": -35, + "y": -5 + }, + "effect_offset": { + "x": 55, + "y": 0 + }, + "sprite": { + "texture": "trident", + "autoplay_id": "ground", + "animations": [ + { + "id": "ground", + "row": 2, + "frames": 1, + "fps": 1 + }, + { + "id": "idle", + "row": 0, + "frames": 1, + "fps": 1 + }, + { + "id": "attack", + "row": 1, + "frames": 3, + "fps": 15 + } + ] + } +} diff --git a/assets/maps/test_level.json b/assets/maps/test_level.json index 9e15811b5e..77e60eb5a2 100644 --- a/assets/maps/test_level.json +++ b/assets/maps/test_level.json @@ -792,6 +792,14 @@ "kind": "object_layer", "has_collision": false, "objects": [ + { + "id": "trident", + "kind": "item", + "position": { + "x": 786.3906, + "y": 677.3542 + } + }, { "id": "crown_hat", "kind": "item", @@ -812,7 +820,7 @@ "id": "chest_hat", "kind": "item", "position": { - "x": 423.5, + "x": 421.5, "y": 372.0 } }, @@ -1030,22 +1038,22 @@ ], "tilesets": [ { - "id": "tileset", - "texture_id": "default_tileset", + "id": "decorations1", + "texture_id": "default_decoration", "texture_size": { - "x": 224, - "y": 288 + "x": 240, + "y": 102 }, "tile_size": { - "x": 32.0, - "y": 32.0 + "x": 48.0, + "y": 51.0 }, "grid_size": { - "x": 7, - "y": 9 + "x": 5, + "y": 2 }, - "first_tile_id": 1, - "tile_cnt": 63, + "first_tile_id": 64, + "tile_cnt": 10, "tile_subdivisions": { "x": 3, "y": 3 @@ -1140,6 +1148,31 @@ false, false, false, + false + ] + }, + { + "id": "tileset", + "texture_id": "default_tileset", + "texture_size": { + "x": 224, + "y": 288 + }, + "tile_size": { + "x": 32.0, + "y": 32.0 + }, + "grid_size": { + "x": 7, + "y": 9 + }, + "first_tile_id": 1, + "tile_cnt": 63, + "tile_subdivisions": { + "x": 3, + "y": 3 + }, + "autotile_mask": [ false, false, false, @@ -1617,42 +1650,6 @@ false, false, false, - false - ], - "tile_attributes": { - "60": [ - "jumpthrough" - ], - "58": [ - "jumpthrough" - ], - "56": [ - "jumpthrough" - ] - } - }, - { - "id": "decorations1", - "texture_id": "default_decoration", - "texture_size": { - "x": 240, - "y": 102 - }, - "tile_size": { - "x": 48.0, - "y": 51.0 - }, - "grid_size": { - "x": 5, - "y": 2 - }, - "first_tile_id": 64, - "tile_cnt": 10, - "tile_subdivisions": { - "x": 3, - "y": 3 - }, - "autotile_mask": [ false, false, false, @@ -1743,7 +1740,18 @@ false, false, false - ] + ], + "tile_attributes": { + "56": [ + "jumpthrough" + ], + "60": [ + "jumpthrough" + ], + "58": [ + "jumpthrough" + ] + } } ], "spawn_points": [ diff --git a/assets/textures.json b/assets/textures.json index 3ff74bf204..045db1e186 100644 --- a/assets/textures.json +++ b/assets/textures.json @@ -436,6 +436,15 @@ "y": 93 } }, + { + "id": "trident", + "path": "textures/items/Trident(288x96).png", + "type": "spritesheet", + "sprite_size": { + "x": 96, + "y": 32 + } + }, { "id": "turtle_shell", "path": "textures/items/TurtleShell(32x32).png", diff --git a/assets/textures/items/Trident(288x96).png b/assets/textures/items/Trident(288x96).png new file mode 100644 index 0000000000..6b95a0d844 Binary files /dev/null and b/assets/textures/items/Trident(288x96).png differ