diff --git a/particles/damage_indicator_single.particle.json b/particles/damage_indicator.particle.json similarity index 86% rename from particles/damage_indicator_single.particle.json rename to particles/damage_indicator.particle.json index ce01fa6..8f647f4 100644 --- a/particles/damage_indicator_single.particle.json +++ b/particles/damage_indicator.particle.json @@ -2,7 +2,7 @@ "format_version": "1.10.0", "particle_effect": { "description": { - "identifier": "geyseropt:damage_indicator_single", + "identifier": "geyseropt:damage_indicator", "basic_render_parameters": { "material": "particles_alpha", "texture": "textures/particle/damage" @@ -21,7 +21,7 @@ }, "minecraft:particle_initial_speed": 0.1, "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, "(variable.particle_age - 0.5) * -25", 0] + "linear_acceleration": [0, "math.pow(6.5, -2.5 * variable.particle_age) * (1 - 6*variable.particle_age)*50", 0] }, "minecraft:particle_appearance_billboard": { "size": [0.2, 0.2], diff --git a/particles/damage_indicator_multiple.particle.json b/particles/damage_indicator_multiple.particle.json deleted file mode 100644 index 28dff48..0000000 --- a/particles/damage_indicator_multiple.particle.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "geyseropt:damage_indicator_multiple", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/particle/damage" - } - }, - "components": { - "minecraft:emitter_local_space": { - "position": true, - "rotation": true, - "velocity": true - }, - "minecraft:emitter_rate_steady": { - "spawn_rate": 8, - "max_particles": 100 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 1 - }, - "minecraft:emitter_shape_entity_aabb": { - "direction": "outwards" - }, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 1 - }, - "minecraft:particle_initial_speed": 0.3, - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, "(variable.particle_age - 0.3) * -75", 0], - "linear_drag_coefficient": 1 - }, - "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 8, - "texture_height": 8, - "uv": [0, 0], - "uv_size": [8, 8] - } - }, - "minecraft:particle_appearance_tinting": { - "color": { - "interpolant": "variable.particle_age / variable.particle_lifetime", - "gradient": { - "0.0": "#FFC66464", - "1.0": "#FF4C0000" - } - } - } - } - } -} diff --git a/particles/nautilus.particle.json b/particles/nautilus.particle.json index 48fee0a..6556a3a 100644 --- a/particles/nautilus.particle.json +++ b/particles/nautilus.particle.json @@ -31,10 +31,10 @@ "size": ["v.size", "v.size"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 16, - "texture_height": 16, + "texture_width": 8, + "texture_height": 8, "uv": [0, 0], - "uv_size": ["nautilus", "nautilus"] + "uv_size": [8, 8] } } }