From 2142fa5a7729cb34aeb6360331efc4fc4fd05003 Mon Sep 17 00:00:00 2001 From: legendiguess Date: Mon, 18 Apr 2022 05:08:18 +0500 Subject: [PATCH 1/5] Fix blunderbuss effect offset and animations --- assets/items/blunderbuss.json | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/assets/items/blunderbuss.json b/assets/items/blunderbuss.json index 90b50d2970..4d28f83a67 100644 --- a/assets/items/blunderbuss.json +++ b/assets/items/blunderbuss.json @@ -13,7 +13,7 @@ }, "effect_offset": { "x": 64, - "y": 25 + "y": 8 }, "mount_offset": { "x": -34, @@ -141,12 +141,6 @@ "frames": 1, "fps": 1, "is_looping": true - }, - { - "id": "attack", - "row": 1, - "frames": 3, - "fps": 15 } ] }, @@ -155,9 +149,9 @@ "animations": [ { "id": "attack", - "row": 2, - "frames": 4, - "fps": 12 + "row": 0, + "frames": 1, + "fps": 1 } ] } From ad4cb261472d90f8a241345418078a43896c2098 Mon Sep 17 00:00:00 2001 From: legendiguess Date: Mon, 18 Apr 2022 05:18:13 +0500 Subject: [PATCH 2/5] Tweak blunderbuss mount offset --- assets/items/blunderbuss.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/items/blunderbuss.json b/assets/items/blunderbuss.json index 4d28f83a67..528e7247cf 100644 --- a/assets/items/blunderbuss.json +++ b/assets/items/blunderbuss.json @@ -16,8 +16,8 @@ "y": 8 }, "mount_offset": { - "x": -34, - "y": -2 + "x": -24, + "y": -6 }, "effects": [ { From dfb3b3cea2c339303bbdd3c05634a8c7943bf066 Mon Sep 17 00:00:00 2001 From: legendiguess Date: Tue, 19 Apr 2022 00:32:09 +0500 Subject: [PATCH 3/5] Add particles for the blunderbuss and a bullet texture for it --- assets/items/blunderbuss.json | 99 ++++++++++-------- assets/particle_effects.json | 8 ++ .../blunderbuss_bullet_smoke.json | 69 ++++++++++++ .../blunderbuss_muzzle_smoke.json | 69 ++++++++++++ assets/textures.json | 9 ++ assets/textures/items/BlunderbussBullet.png | Bin 0 -> 158 bytes 6 files changed, 208 insertions(+), 46 deletions(-) create mode 100644 assets/particle_effects/blunderbuss_bullet_smoke.json create mode 100644 assets/particle_effects/blunderbuss_muzzle_smoke.json create mode 100644 assets/textures/items/BlunderbussBullet.png diff --git a/assets/items/blunderbuss.json b/assets/items/blunderbuss.json index 528e7247cf..0e0993a08e 100644 --- a/assets/items/blunderbuss.json +++ b/assets/items/blunderbuss.json @@ -7,6 +7,13 @@ "attack_duration": 1.0, "recoil": 5.5, "sound_effect": "shoot", + "particles": [ + { + "particle_effect": "blunderbuss_muzzle_smoke", + "interval": 0.04, + "emissions": 6 + } + ], "collider_size": { "x": 64, "y": 25 @@ -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 } @@ -155,4 +162,4 @@ } ] } -} +} \ No newline at end of file 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..b4c43a15ce --- /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.8, + "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.5, + "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 0000000000000000000000000000000000000000..dc444106c11f8489c6bf7a8d9787066e5ae7dfe9 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XJ3i-X*q7}lMWc?sl1c)B=-aLkPD z-N@TuAi%7z!7J^eA?jL{A@Sh(KhXvLvJ3A&$`ooTNS&`MxhqI-UeU*ij~g~|GH~Us zZL@f=M{Y^2W0mE{iF3cdUc6OGB*yB3_r|cpyMN5L{~a&$HZ3>wD$ouFPgg&ebxsLQ E09jWz@&Et; literal 0 HcmV?d00001 From ad0b4e1f49056e96cae5d677de5628fe4300e24b Mon Sep 17 00:00:00 2001 From: legendiguess Date: Tue, 19 Apr 2022 01:09:07 +0500 Subject: [PATCH 4/5] Tweak blunderbuss muzzle smoke --- assets/items/blunderbuss.json | 4 ++-- assets/particle_effects/blunderbuss_muzzle_smoke.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/items/blunderbuss.json b/assets/items/blunderbuss.json index 0e0993a08e..4df4e24602 100644 --- a/assets/items/blunderbuss.json +++ b/assets/items/blunderbuss.json @@ -10,8 +10,8 @@ "particles": [ { "particle_effect": "blunderbuss_muzzle_smoke", - "interval": 0.04, - "emissions": 6 + "interval": 0.01, + "emissions": 16 } ], "collider_size": { diff --git a/assets/particle_effects/blunderbuss_muzzle_smoke.json b/assets/particle_effects/blunderbuss_muzzle_smoke.json index b4c43a15ce..ee00029328 100644 --- a/assets/particle_effects/blunderbuss_muzzle_smoke.json +++ b/assets/particle_effects/blunderbuss_muzzle_smoke.json @@ -2,7 +2,7 @@ "local_coords": false, "emission_shape": "Point", "one_shot": true, - "lifetime": 0.8, + "lifetime": 0.5, "lifetime_randomness": 0, "explosiveness": 1, "amount": 1, @@ -20,7 +20,7 @@ "initial_velocity": 54.300003, "initial_velocity_randomness": 0.4, "linear_accel": -0.89999986, - "size": 4.5, + "size": 4.0, "size_randomness": 0, "size_curve": { "points": [ From e2aa54e93b713ecf8e4915723600bdbe9d42bc1d Mon Sep 17 00:00:00 2001 From: legendiguess Date: Tue, 19 Apr 2022 01:10:21 +0500 Subject: [PATCH 5/5] Add blunderbuss to test level --- assets/maps/test_level.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,