diff --git a/CHANGELOG.md b/CHANGELOG.md index 82edf8ce37..165a49fbb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [1.5.1](#1-5-1) +### Additions +- Added unique send out particles for Cherish, Dream, Beast, and Ancient Origin balls. + ### Fixes - Fixed a bug in which adding organic material to the fossil tank via right click was adding the full count of the stack currently in hand - Fixed a niche issue where some properties of entities were not initialized correctly, causing Pokémon that appeared to be level 1 until you battle them. diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json index 2350089402..367e7b3445 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json @@ -5,30 +5,32 @@ "identifier": "cobblemon:ancientoriginball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/originball/originballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 22, + "max_particles": 24 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], + "offset": [0, 2, 0], "radius": "math.random(0.5,1.5)*1.5", "surface_only": true, - "direction": [0, 1, 0] + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, "minecraft:particle_initial_speed": 0.75, - "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], + "size": [0.175, 0.175], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 36, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json index f0b62063eb..3b1180242f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json @@ -5,25 +5,30 @@ "identifier": "cobblemon:ancientoriginball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/originball/originballsendsparkle" } }, "components": { - "minecraft:emitter_rate_instant": { - "num_particles": 8 + "minecraft:emitter_initialization": { + "per_update_expression": "variable.radius = 0.6;" + }, + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 16 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.05,4)*4+0.5", "math.random(-10,10)"] + "radius": "variable.radius*math.cos(variable.emitter_age*2080)", + "direction": ["math.random(-5,5)*1.75", "math.random(-0.05,6)*3+0.5", "math.random(-5,5)*1.75"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(3,7)*4", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], + "linear_acceleration": [0, "-math.random(5,8)", 0], "linear_drag_coefficient": 4 }, "minecraft:particle_appearance_billboard": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json index dc9e6bf2c5..f12170cb87 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json @@ -5,40 +5,58 @@ "identifier": "cobblemon:ancientoriginball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/originball/originballsparks" + } + }, + "curves": { + "variable.sizefunny": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [1, 1, 1, 0.98, 0.93, 0.83, 0.58, -0.01, 0, 0] } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 20 }, "minecraft:emitter_lifetime_once": { - "active_time": 1 + "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.25", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_speed": "math.random(3.1,4.8)*3.5", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_acceleration": ["math.random(-3.5,3.5)*10", "math.random(-2.5,2.5)*10", "math.random(-3.5,3.5)*10"], + "linear_drag_coefficient": 3.5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": ["(0.225-(variable.particle_random_3*0.1))*v.sizefunny", "(0.225-(variable.particle_random_3*0.1))*v.sizefunny"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 80, - "texture_height": 8, + "texture_width": 90, + "texture_height": 9, "flipbook": { - "base_UV": [0, 0], - "size_UV": [8, 8], - "step_UV": [8, 0], - "frames_per_second": 18, + "base_UV": ["math.random_integer(0,10)*9", 0], + "size_UV": [9, 9], + "step_UV": [9, 0], "max_frame": 10 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.14": "#ffffffff", + "0.43": "#FFFF0000", + "0.71": "#FF7B0000" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json index aede1dcd6f..fde432370a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:ancientoriginball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/originball/battle/originsendflash" } }, "components": { @@ -27,14 +27,14 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json index cf41d6db57..6e1f6b0f35 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:ancientoriginball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/originball/originballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json index 55b3587946..fcc3d17f31 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json @@ -5,40 +5,58 @@ "identifier": "cobblemon:ancientoriginball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/originball/originballsparks" + } + }, + "curves": { + "variable.sizefunny": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [1, 1, 1, 0.98, 0.93, 0.83, 0.58, -0.01, 0, 0, 0] } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 5 + "num_particles": 10 }, "minecraft:emitter_lifetime_once": { - "active_time": 1 + "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.25", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_speed": "math.random(3.1,4.8)*2.5", "minecraft:particle_motion_dynamic": { + "linear_acceleration": ["math.random(-3.5,3.5)*10", "math.random(-2.5,2.5)*10", "math.random(-3.5,3.5)*10"], "linear_drag_coefficient": 3.5 }, "minecraft:particle_appearance_billboard": { - "size": [0.1, 0.1], + "size": ["(0.175-(variable.particle_random_3*0.1))*v.sizefunny", "(0.175-(variable.particle_random_3*0.1))*v.sizefunny"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 80, - "texture_height": 8, + "texture_width": 90, + "texture_height": 9, "flipbook": { - "base_UV": [0, 0], - "size_UV": [8, 8], - "step_UV": [8, 0], - "frames_per_second": 18, + "base_UV": ["math.random_integer(0,10)*9", 0], + "size_UV": [9, 9], + "step_UV": [9, 0], "max_frame": 10 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.14": "#ffffffff", + "0.33": "#FFFF0000", + "0.61": "#FF7B0000" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json index fe9385fa33..5eda29abc0 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:ancientoriginball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/originball/casual/originsendcasual" } }, "components": { @@ -27,14 +27,14 @@ "size": [1.25, 1.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 384, + "texture_width": 416, "texture_height": 32, "flipbook": { "base_UV": [0, 0], "size_UV": [32, 32], "step_UV": [32, 0], "frames_per_second": 24, - "max_frame": 12 + "max_frame": 13 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json index eb588e0ccb..2f18d74671 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json @@ -5,30 +5,32 @@ "identifier": "cobblemon:beastball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/beastball/beastballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 24, + "max_particles": 18 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], - "radius": "math.random(0.5,1.5)*1.5", + "offset": [0, 1.75, 0], + "radius": 1.25, "surface_only": true, - "direction": [0, 1, 0] + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, "minecraft:particle_initial_speed": 0.75, - "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], + "size": [0.15, 0.15], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 36, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json index 7029f19c15..4071d379e1 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:beastball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/beastball/beastballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 8 + "num_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,13 +21,13 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(4,7)*4.5", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], - "linear_drag_coefficient": 4 + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": [0.125, 0.125], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 99, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json index 3b41076eac..693eca2362 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json @@ -5,28 +5,32 @@ "identifier": "cobblemon:beastball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/beastball/beastballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 20 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.5,5)*5+0.5", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_acceleration": [0, -20, 0], + "linear_drag_coefficient": 2 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": ["0.075+0.075*v.particle_random_2", "0.075+0.075*v.particle_random_2"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 80, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json index 0e44886fb1..be146005dd 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:beastball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/beastball/battle/beastsendflash" } }, "components": { @@ -27,14 +27,14 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json index 8f32774eba..44b69c9462 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:beastball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/beastball/beastballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json index bf05dbf81f..eaf0e48784 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json @@ -5,28 +5,32 @@ "identifier": "cobblemon:beastball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/beastball/beastballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 5 + "num_particles": 12 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.5,5)*5+0.5", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(3,7)*2", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 3.5 + "linear_acceleration": [0, -15, 0], + "linear_drag_coefficient": 2 }, "minecraft:particle_appearance_billboard": { - "size": [0.1, 0.1], + "size": ["0.05+0.075*v.particle_random_2", "0.05+0.075*v.particle_random_2"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 80, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json index 07575a5f3d..315047a086 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:beastball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/beastball/casual/beastsendcasual" } }, "components": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json index f1e576c3c2..fc122995cb 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json @@ -5,30 +5,32 @@ "identifier": "cobblemon:cherishball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/cherishball/cherishballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 24, + "max_particles": 18 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], - "radius": "math.random(0.5,1.5)*1.5", + "offset": [0, 1.75, 0], + "radius": 1.25, "surface_only": true, - "direction": [0, 1, 0] + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, "minecraft:particle_initial_speed": 0.75, - "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], + "size": [0.15, 0.15], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 36, @@ -41,6 +43,15 @@ "max_frame": 4 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFFFF", + "0.19": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json index c33b38cea1..6c472fd11c 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:cherishball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/cherishball/cherishballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 8 + "num_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,13 +21,13 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(4,7)*4.5", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], - "linear_drag_coefficient": 4 + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": [0.125, 0.125], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 99, @@ -40,6 +40,17 @@ "max_frame": 11 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json index aed1eb4a2b..de4511dc04 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:cherishball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/cherishball/cherishballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 8 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3.75", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { "size": [0.15, 0.15], @@ -39,6 +39,17 @@ "max_frame": 10 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json index 0e4c935796..92ab713702 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:cherishball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/cherishball/battle/cherishsendflash" } }, "components": { @@ -27,14 +27,25 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json index 5ecd5b8690..e089532483 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:cherishball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/cherishball/cherishballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 @@ -40,6 +40,17 @@ "max_frame": 11 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json index 723bd2fa00..45ff834a13 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:cherishball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/cherishball/cherishballsparks" } }, "components": { @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_speed": "math.random(3,7)*2", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 3.5 + "linear_drag_coefficient": 3 }, "minecraft:particle_appearance_billboard": { "size": [0.1, 0.1], @@ -39,6 +39,17 @@ "max_frame": 10 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json index c13e61e1eb..5667445a0e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:cherishball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/cherishball/casual/cherishsendcasual" } }, "components": { @@ -27,14 +27,25 @@ "size": [1.25, 1.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 384, + "texture_width": 416, "texture_height": 32, "flipbook": { "base_UV": [0, 0], "size_UV": [32, 32], "step_UV": [32, 0], "frames_per_second": 24, - "max_frame": 12 + "max_frame": 13 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json index ec4534de09..35feb44810 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json @@ -5,22 +5,22 @@ "identifier": "cobblemon:dreamball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/dreamball/dreamballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 20, + "max_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], - "radius": "math.random(0.5,1.5)*1.5", + "offset": [0, 1.25, 0], + "radius": "1.25", "surface_only": true, - "direction": [0, 1, 0] + "direction": "outwards" }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json index 652f36f308..e1a75a1d3b 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:dreamball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/dreamball/dreamballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 8 + "num_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,13 +21,13 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(4,7)*4.5", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], - "linear_drag_coefficient": 4 + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": [0.125, 0.125], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 99, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json index 76e2468074..64ee639c17 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:dreamball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/dreamball/dreamballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 8 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3.75", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { "size": [0.15, 0.15], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json index a9af38dd9a..97faa0236d 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:dreamball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/dreamball/battle/dreamsendflash" } }, "components": { @@ -27,14 +27,14 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json index dcc6ac3fc2..a717bb6be9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:dreamball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/dreamball/dreamballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json index bd6910237c..b5e04c789d 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:dreamball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/dreamball/dreamballsparks" } }, "components": { @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_speed": "math.random(3,7)*2", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 3.5 + "linear_drag_coefficient": 3 }, "minecraft:particle_appearance_billboard": { "size": [0.1, 0.1], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json index 8d9af57028..0eb4b84ab6 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:dreamball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/dreamball/casual/dreamsendcasual" } }, "components": { diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/battle/beastsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/battle/beastsendflash.png new file mode 100644 index 0000000000..fc0efd937f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/battle/beastsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsendsparkle.png new file mode 100644 index 0000000000..96d2fb983e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparkle.png new file mode 100644 index 0000000000..a625b62b11 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparks.png new file mode 100644 index 0000000000..4ec867ce11 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/casual/beastsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/casual/beastsendcasual.png new file mode 100644 index 0000000000..458effebfc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/casual/beastsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/battle/cherishsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/battle/cherishsendflash.png new file mode 100644 index 0000000000..4d252c7d8b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/battle/cherishsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/casual/cherishsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/casual/cherishsendcasual.png new file mode 100644 index 0000000000..5d694f0056 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/casual/cherishsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsendsparkle.png new file mode 100644 index 0000000000..43d74fcb31 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparkle.png new file mode 100644 index 0000000000..7d4510be5a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparks.png new file mode 100644 index 0000000000..209b254e4d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/battle/dreamsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/battle/dreamsendflash.png new file mode 100644 index 0000000000..c501aa1f24 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/battle/dreamsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/casual/dreamsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/casual/dreamsendcasual.png new file mode 100644 index 0000000000..09ed9545d0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/casual/dreamsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsendsparkle.png new file mode 100644 index 0000000000..f1825127da Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparkle.png new file mode 100644 index 0000000000..277bc26e1b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparks.png new file mode 100644 index 0000000000..3ff42cfae6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/battle/originsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/battle/originsendflash.png new file mode 100644 index 0000000000..cbb24f8943 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/battle/originsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/casual/originsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/casual/originsendcasual.png new file mode 100644 index 0000000000..273798bb21 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/casual/originsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsendsparkle.png new file mode 100644 index 0000000000..88efc9a103 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparkle.png new file mode 100644 index 0000000000..6361c0c909 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparks.png new file mode 100644 index 0000000000..60926ca6f8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparks.png differ