diff --git a/assets/items/blunderbuss.json b/assets/items/blunderbuss.json index 90b50d2970..4df4e24602 100644 --- a/assets/items/blunderbuss.json +++ b/assets/items/blunderbuss.json @@ -7,17 +7,24 @@ "attack_duration": 1.0, "recoil": 5.5, "sound_effect": "shoot", + "particles": [ + { + "particle_effect": "blunderbuss_muzzle_smoke", + "interval": 0.01, + "emissions": 16 + } + ], "collider_size": { "x": 64, "y": 25 }, "effect_offset": { "x": 64, - "y": 25 + "y": 8 }, "mount_offset": { - "x": -34, - "y": -2 + "x": -24, + "y": -6 }, "effects": [ { @@ -26,19 +33,19 @@ "projectile": { "type": "sprite", "sprite": { - "texture": "small_projectile", + "texture": "blunderbuss_bullet", "size": { - "x": 8, - "y": 4 - }, - "tint": { - "r": 0.9, - "g": 0.75, - "b": 0.12, - "a": 1.0 + "x": 6, + "y": 6 } } }, + "particles": [ + { + "particle_effect": "blunderbuss_bullet_smoke", + "interval": 0.01 + } + ], "range": 280.0, "speed": 9.0 }, @@ -48,19 +55,19 @@ "projectile": { "type": "sprite", "sprite": { - "texture": "small_projectile", + "texture": "blunderbuss_bullet", "size": { - "x": 8, - "y": 4 - }, - "tint": { - "r": 0.9, - "g": 0.75, - "b": 0.12, - "a": 1.0 + "x": 6, + "y": 6 } } }, + "particles": [ + { + "particle_effect": "blunderbuss_bullet_smoke", + "interval": 0.01 + } + ], "range": 280.0, "speed": 9.0 }, @@ -70,19 +77,19 @@ "projectile": { "type": "sprite", "sprite": { - "texture": "small_projectile", + "texture": "blunderbuss_bullet", "size": { - "x": 8, - "y": 4 - }, - "tint": { - "r": 0.9, - "g": 0.75, - "b": 0.12, - "a": 1.0 + "x": 6, + "y": 6 } } }, + "particles": [ + { + "particle_effect": "blunderbuss_bullet_smoke", + "interval": 0.01 + } + ], "range": 280.0, "speed": 9.0 }, @@ -92,19 +99,19 @@ "projectile": { "type": "sprite", "sprite": { - "texture": "small_projectile", + "texture": "blunderbuss_bullet", "size": { - "x": 8, - "y": 4 - }, - "tint": { - "r": 0.9, - "g": 0.75, - "b": 0.12, - "a": 1.0 + "x": 6, + "y": 6 } } }, + "particles": [ + { + "particle_effect": "blunderbuss_bullet_smoke", + "interval": 0.01 + } + ], "range": 280.0, "speed": 9.0 }, @@ -114,19 +121,19 @@ "projectile": { "type": "sprite", "sprite": { - "texture": "small_projectile", + "texture": "blunderbuss_bullet", "size": { - "x": 8, - "y": 4 - }, - "tint": { - "r": 0.9, - "g": 0.75, - "b": 0.12, - "a": 1.0 + "x": 6, + "y": 6 } } }, + "particles": [ + { + "particle_effect": "blunderbuss_bullet_smoke", + "interval": 0.01 + } + ], "range": 280.0, "speed": 9.0 } @@ -141,12 +148,6 @@ "frames": 1, "fps": 1, "is_looping": true - }, - { - "id": "attack", - "row": 1, - "frames": 3, - "fps": 15 } ] }, @@ -155,10 +156,10 @@ "animations": [ { "id": "attack", - "row": 2, - "frames": 4, - "fps": 12 + "row": 0, + "frames": 1, + "fps": 1 } ] } -} +} \ No newline at end of file diff --git a/assets/maps/test_level.json b/assets/maps/test_level.json index a0218c4917..e8247d663e 100644 --- a/assets/maps/test_level.json +++ b/assets/maps/test_level.json @@ -1034,7 +1034,7 @@ } }, { - "id": "kick_bomb", + "id": "blunderbuss", "kind": "item", "position": { "x": 176.682, diff --git a/assets/particle_effects.json b/assets/particle_effects.json index 6fbc6c2f68..0845ad31c5 100644 --- a/assets/particle_effects.json +++ b/assets/particle_effects.json @@ -62,5 +62,13 @@ { "id": "cannon_cannonball_smoke", "path": "particle_effects/cannon_cannonball_smoke.json" + }, + { + "id": "blunderbuss_muzzle_smoke", + "path": "particle_effects/blunderbuss_muzzle_smoke.json" + }, + { + "id": "blunderbuss_bullet_smoke", + "path": "particle_effects/blunderbuss_bullet_smoke.json" } ] diff --git a/assets/particle_effects/blunderbuss_bullet_smoke.json b/assets/particle_effects/blunderbuss_bullet_smoke.json new file mode 100644 index 0000000000..61ceee2897 --- /dev/null +++ b/assets/particle_effects/blunderbuss_bullet_smoke.json @@ -0,0 +1,69 @@ +{ + "local_coords": false, + "emission_shape": "Point", + "one_shot": true, + "lifetime": 0.4, + "lifetime_randomness": 0, + "explosiveness": 1, + "amount": 1, + "shape": { + "Circle": { + "subdivisions": 20 + } + }, + "emitting": false, + "initial_direction": { + "x": 0, + "y": -1 + }, + "initial_direction_spread": 0.3, + "initial_velocity": 0, + "initial_velocity_randomness": 0, + "linear_accel": 0.00000017881393, + "size": 2, + "size_randomness": 0, + "size_curve": { + "points": [ + [ + 0, + 2 + ], + [ + 0.48, + 1 + ], + [ + 1, + 0 + ] + ], + "interpolation": "Linear", + "resolution": 30 + }, + "blend_mode": "Alpha", + "colors_curve": { + "start": { + "r": 0.8863636, + "g": 0.8863636, + "b": 0.8863636, + "a": 1 + }, + "mid": { + "r": 0.59090906, + "g": 0.59090906, + "b": 0.59090906, + "a": 1 + }, + "end": { + "r": 0.4090909, + "g": 0.4090909, + "b": 0.4090909, + "a": 1 + } + }, + "gravity": { + "x": 0, + "y": 0.0000011920929 + }, + "post_processing": {} +} \ No newline at end of file diff --git a/assets/particle_effects/blunderbuss_muzzle_smoke.json b/assets/particle_effects/blunderbuss_muzzle_smoke.json new file mode 100644 index 0000000000..ee00029328 --- /dev/null +++ b/assets/particle_effects/blunderbuss_muzzle_smoke.json @@ -0,0 +1,69 @@ +{ + "local_coords": false, + "emission_shape": "Point", + "one_shot": true, + "lifetime": 0.5, + "lifetime_randomness": 0, + "explosiveness": 1, + "amount": 1, + "shape": { + "Circle": { + "subdivisions": 20 + } + }, + "emitting": false, + "initial_direction": { + "x": 0, + "y": -1 + }, + "initial_direction_spread": 0.3, + "initial_velocity": 54.300003, + "initial_velocity_randomness": 0.4, + "linear_accel": -0.89999986, + "size": 4.0, + "size_randomness": 0, + "size_curve": { + "points": [ + [ + 0, + 1.64 + ], + [ + 0.49, + 1.88 + ], + [ + 1, + 0 + ] + ], + "interpolation": "Linear", + "resolution": 30 + }, + "blend_mode": "Alpha", + "colors_curve": { + "start": { + "r": 0.75, + "g": 0.75, + "b": 0.75, + "a": 1 + }, + "mid": { + "r": 0.90909094, + "g": 0.90909094, + "b": 0.90909094, + "a": 1 + }, + "end": { + "r": 1, + "g": 1, + "b": 1, + "a": 1 + } + }, + "gravity": { + "x": 0, + "y": -54.1 + }, + "post_processing": {} +} \ No newline at end of file diff --git a/assets/textures.json b/assets/textures.json index d4493e961e..b84220fbc8 100644 --- a/assets/textures.json +++ b/assets/textures.json @@ -621,5 +621,14 @@ "x": 128, "y": 128 } + }, + { + "id": "blunderbuss_bullet", + "path": "textures/items/BlunderbussBullet.png", + "type": "spritesheet", + "sprite_size": { + "x": 6, + "y": 6 + } } ] diff --git a/assets/textures/items/BlunderbussBullet.png b/assets/textures/items/BlunderbussBullet.png new file mode 100644 index 0000000000..dc444106c1 Binary files /dev/null and b/assets/textures/items/BlunderbussBullet.png differ