diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_black.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_black.particle.json index eb3f54df1c..f0d0e1a270 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_black.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_black.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_black", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_blue.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_blue.particle.json index c6254b1bd5..2311116aea 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_blue.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_blue.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_blue", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_brown.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_brown.particle.json index 96d4ca4e01..a0ef2b6eed 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_brown.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_brown.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_brown", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_cyan.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_cyan.particle.json index 723dbd7133..ade06fd5f4 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_cyan.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_cyan.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_cyan", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_gray.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_gray.particle.json index 87b94dde43..8fd90ed535 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_gray.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_gray.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_gray", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_green.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_green.particle.json index a704506184..2794af4a12 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_green.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_green.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_green", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_blue.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_blue.particle.json index 6f4fe085c6..cf906d4f63 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_blue.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_blue.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_light_blue", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_gray.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_gray.particle.json index f534c52872..d4b1188276 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_gray.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_gray.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_light_gray", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_lime.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_lime.particle.json index d01bae6c09..cb6ea0d9c8 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_lime.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_lime.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_lime", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_magenta.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_magenta.particle.json index bb3dd2f994..cbf3e0b17b 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_magenta.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_magenta.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_magenta", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_orange.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_orange.particle.json index 48171dbda7..29e1cdf934 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_orange.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_orange.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_orange", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_particles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_particles.particle.json new file mode 100644 index 0000000000..fc614f31db --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_particles.particle.json @@ -0,0 +1,47 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poodle_hair_particles", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/generic/confetti" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 12, + "max_particles": 100 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.5 + }, + "minecraft:emitter_shape_sphere": { + "radius": 0.4, + "direction": ["math.random(-3,3)", "math.random(0,3)", "math.random(-3,3)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": 9, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -12, 0], + "linear_drag_coefficient": 4 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.05, 0.05], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 16, + "uv": [0, 0], + "uv_size": [16, 16] + } + }, + "minecraft:particle_motion_collision": { + "collision_drag": 5, + "collision_radius": 0.01 + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_pink.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_pink.particle.json index 711c16010a..2ad79e2c2a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_pink.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_pink.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_pink", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_purple.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_purple.particle.json index b817f80dd1..f5ca7f0ee0 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_purple.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_purple.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_purple", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_red.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_red.particle.json index e94c12eb8a..912a372d2f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_red.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_red.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_red", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_white.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_white.particle.json index b4dde1dde9..78adadd9f9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_white.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_white.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_white", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], @@ -57,8 +64,7 @@ "minecraft:particle_motion_collision": { "collision_drag": 5, "collision_radius": 0.1 - }, - "minecraft:particle_appearance_lighting": {} + } } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_yellow.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_yellow.particle.json index 7bbe59ab3c..9664b802fc 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_yellow.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_yellow.particle.json @@ -4,25 +4,32 @@ "description": { "identifier": "cobblemon:poodle_hair_yellow", "basic_render_parameters": { - "material": "particles_alpha", + "material": "particles_blend", "texture": "textures/particles/generic/cotton" } }, "events": { "event_sound": { - "expression": "q.sound('minecraft:entity.sheep.shear', math.random(0.8,1.2))" + "expression": "q.sound('minecraft:entity.sheep.shear', 1, math.random(0.9,1.1))", + "particle_effect": { + "effect": "cobblemon:poodle_hair_particles", + "type": "particle" + } } }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 64, - "max_particles": 32 + "max_particles": 64 }, "minecraft:emitter_lifetime_once": { "active_time": 0.8 }, "minecraft:emitter_lifetime_events": { - "creation_event": "event_sound" + "timeline": { + "0.10": "event_sound", + "0.30": "event_sound" + } }, "minecraft:emitter_shape_point": { "offset": [0, "math.random(-0.3,0.8)", 0], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0676_furfrou/furfrou.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0676_furfrou/furfrou.json index d861344c0d..22c716c064 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0676_furfrou/furfrou.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0676_furfrou/furfrou.json @@ -20,7 +20,7 @@ "q.look('neck_base', 1, 1, 18, -9, 60, -60)", "q.look('head', 1, 1, 45, -45, 10, -10)", "q.bedrock('furfrou', 'ground_idle')", - "q.quadruped_walk(1, 1.5, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')" + "q.quadruped_walk(1, 1.2, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')" ], "quirks": ["q.bedrock_quirk('furfrou', 'blink')"] } diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/generic/cotton.png b/common/src/main/resources/assets/cobblemon/textures/particle/generic/cotton.png index dccfa01749..8cb6682ca5 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/particle/generic/cotton.png and b/common/src/main/resources/assets/cobblemon/textures/particle/generic/cotton.png differ