mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-27 04:26:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Poodle trimmin tweaks.

Browse Source
This commit is contained in:
Tyzillion
2025-09-09 13:35:09 -04:00
parent 3ff536dc02
commit 8a685cefc0
19 changed files with 225 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_black.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_blue.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_brown.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_cyan.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_gray.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_green.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_blue.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_light_gray.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_lime.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_magenta.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_orange.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_particles.particle.json
+47
View File
@@ -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
}
}
}
}
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_pink.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_purple.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_red.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_white.particle.json
+12 -6
View File
@@ -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": {}
}
}
}
}
common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/furfrou/poodle_hair_yellow.particle.json
+11 -4
View File
@@ -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],
common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0676_furfrou/furfrou.json
+1 -1
View File
@@ -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')"]
}
common/src/main/resources/assets/cobblemon/textures/particle/generic/cotton.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB