Merge branch 'main' into implement_pokemon

This commit is contained in:
FrankTheFarmer committed 2024-11-19 20:52:17 +10:00
commit 3f289b1deb
1 file changed
+5 -5
@@ -20,7 +20,7 @@
"active_time": 5
},
"minecraft:emitter_shape_sphere": {
"radius": "math.max(q.entity_size, 1) * 2",
"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,4) * 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.max(q.entity_size,1)"
"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,