From 196bf42fb627c0baeee373b0d01cae967cff0556 Mon Sep 17 00:00:00 2001 From: Tyzillion Date: Mon, 18 Nov 2024 22:02:34 -0500 Subject: [PATCH 1/3] Tweaked obscuring molang formula to better obscure Pokemon based on hitbox volume and scale. --- .../cobblemon/bedrock/particles/evo_obscuring.particle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json index 3a73f60a78..b9b772746c 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json @@ -20,7 +20,7 @@ "active_time": 5 }, "minecraft:emitter_shape_sphere": { - "radius": "math.max(q.entity_size, 1) * 2", + "radius": "math.clamp((q.entity_height * q.entity_width),0.5,1) * (q.entity_scale <= 1 ? 5.5 : 1.5)", "surface_only": true, "direction": "inwards" }, @@ -30,10 +30,10 @@ "minecraft:particle_initial_spin": { "rotation": "math.random_integer(1,4) * 90" }, - "minecraft:particle_initial_speed": "7 + math.clamp(q.entity_size,1,4) * v.particle_random_1", + "minecraft:particle_initial_speed": "7 + math.clamp(q.entity_size,1,3) * v.particle_random_1", "minecraft:particle_motion_dynamic": { "linear_acceleration": ["math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3 "], - "linear_drag_coefficient": "6.2 - math.max(q.entity_size,1)" + "linear_drag_coefficient": "6.2 - math.clamp(q.entity_size, 1, 3)" }, "minecraft:particle_appearance_billboard": { "size": ["0.175 * math.max(q.entity_size,1)", "0.175 * math.max(q.entity_size,1)"], From a5675aedcb3f47019f1a9313181b296ffe55ccea Mon Sep 17 00:00:00 2001 From: Tyzillion Date: Mon, 18 Nov 2024 22:46:00 -0500 Subject: [PATCH 2/3] Tweaked the formula further to better account for middle stage evos. --- .../cobblemon/bedrock/particles/evo_obscuring.particle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json index b9b772746c..8f3919034f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json @@ -20,7 +20,7 @@ "active_time": 5 }, "minecraft:emitter_shape_sphere": { - "radius": "math.clamp((q.entity_height * q.entity_width),0.5,1) * (q.entity_scale <= 1 ? 5.5 : 1.5)", + "radius": "math.clamp((q.entity_height * q.entity_width),0.5,1) * (q.entity_scale <= 1 ? 7.1 - (math.clamp(q.entity_size,0,1) * 3) : 1.5)", "surface_only": true, "direction": "inwards" }, @@ -30,10 +30,10 @@ "minecraft:particle_initial_spin": { "rotation": "math.random_integer(1,4) * 90" }, - "minecraft:particle_initial_speed": "7 + math.clamp(q.entity_size,1,3) * v.particle_random_1", + "minecraft:particle_initial_speed": "7 + math.clamp(q.entity_size,1,2) * v.particle_random_1", "minecraft:particle_motion_dynamic": { "linear_acceleration": ["math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3 "], - "linear_drag_coefficient": "6.2 - math.clamp(q.entity_size, 1, 3)" + "linear_drag_coefficient": "6.2 - math.clamp(q.entity_size, 1, 2)" }, "minecraft:particle_appearance_billboard": { "size": ["0.175 * math.max(q.entity_size,1)", "0.175 * math.max(q.entity_size,1)"], From 739d31a9caf449c3f4da2e86e45b6d4a828aeea8 Mon Sep 17 00:00:00 2001 From: Tyzillion Date: Mon, 18 Nov 2024 23:45:22 -0500 Subject: [PATCH 3/3] I'M LOSING MY MIND... Anyways, more tweaks to the obscure particle. --- .../bedrock/particles/evo_obscuring.particle.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json index 8f3919034f..7bccf1e6fd 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json @@ -20,7 +20,7 @@ "active_time": 5 }, "minecraft:emitter_shape_sphere": { - "radius": "math.clamp((q.entity_height * q.entity_width),0.5,1) * (q.entity_scale <= 1 ? 7.1 - (math.clamp(q.entity_size,0,1) * 3) : 1.5)", + "radius": "math.clamp(q.entity_size,0.5,2) * 3 / (q.entity_scale * (q.entity_scale < 1 ? 1.5 : 1.2))", "surface_only": true, "direction": "inwards" }, @@ -30,13 +30,13 @@ "minecraft:particle_initial_spin": { "rotation": "math.random_integer(1,4) * 90" }, - "minecraft:particle_initial_speed": "7 + math.clamp(q.entity_size,1,2) * v.particle_random_1", + "minecraft:particle_initial_speed": "math.clamp(q.entity_size,0.5,2) * 10", "minecraft:particle_motion_dynamic": { - "linear_acceleration": ["math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1, 1.5) * 1.3 "], - "linear_drag_coefficient": "6.2 - math.clamp(q.entity_size, 1, 2)" + "linear_acceleration": ["math.random(-1,1) * q.entity_scale", "math.random(-1,1) * q.entity_scale", "math.random(-1,1) * q.entity_scale"], + "linear_drag_coefficient": 6 }, "minecraft:particle_appearance_billboard": { - "size": ["0.175 * math.max(q.entity_size,1)", "0.175 * math.max(q.entity_size,1)"], + "size": ["0.175 * math.clamp(q.entity_size,1,2) * 1.5", "0.175 * math.clamp(q.entity_size,1,2) * 1.5"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8,