Skip to content

Commit

Permalink
v2.10.17
Browse files Browse the repository at this point in the history
  • Loading branch information
smell-of-curry committed Jul 21, 2024
1 parent ff3b45e commit 45146d4
Show file tree
Hide file tree
Showing 13 changed files with 388 additions and 84 deletions.
50 changes: 41 additions & 9 deletions entity/pokemon/armarouge.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,53 @@
"description": {
"identifier": "pokemon:armarouge",
"materials": {
"default": "zombie"
"default": "entity_emissive_alpha",
"aura": "charged_creeper"
},
"textures": {
"default": "textures/sprites/default/armarouge",
"shiny": "textures/sprites/default/armarouge",
"default_male": "textures/sprites/default/armarouge",
"default_female": "textures/sprites/default/armarouge",
"shiny_male": "textures/sprites/default/armarouge",
"shiny_female": "textures/sprites/default/armarouge"
"default": "textures/entity/pokemon/armarouge/armarouge",
"default_male": "textures/entity/pokemon/armarouge/armarouge",
"default_female": "textures/entity/pokemon/armarouge/armarouge",
"shiny": "textures/entity/pokemon/armarouge/shiny_armarouge",
"shiny_male": "textures/entity/pokemon/armarouge/shiny_armarouge",
"shiny_female": "textures/entity/pokemon/armarouge/shiny_armarouge",
"evo_aura": "textures/entity/evolving"
},
"geometry": {
"default": "geometry.substitute"
"default": "geometry.armarouge"
},
"scripts": {
"animate": [
"controller",
{
"blink": "math.random(0.0, 25.0) <= 0.25"
}
]
},
"animations": {
"blink": "animation.armarouge.blink",
"ground_idle": "animation.armarouge.ground_idle",
"air_idle": "animation.armarouge.ground_idle",
"water_idle": "animation.armarouge.ground_idle",
"walking": "animation.armarouge.walking",
"flying": "animation.armarouge.walking",
"swimming": "animation.armarouge.walking",
"sleeping": "animation.armarouge.ground_idle",
"attack": "animation.armarouge.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
"tail_flame": "pokeb:tail_flame"
},
"render_controllers": [
"controller.render.pokemon"
{
"controller.render.pokemon:armarouge": "query.variant==0"
},
{
"controller.render.evolve": "query.variant==1"
}
],
"spawn_egg": {
"texture": "armarouge",
Expand Down
50 changes: 41 additions & 9 deletions entity/pokemon/charcadet.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,53 @@
"description": {
"identifier": "pokemon:charcadet",
"materials": {
"default": "zombie"
"default": "entity_emissive_alpha",
"aura": "charged_creeper"
},
"textures": {
"default": "textures/sprites/default/charcadet",
"shiny": "textures/sprites/default/charcadet",
"default_male": "textures/sprites/default/charcadet",
"default_female": "textures/sprites/default/charcadet",
"shiny_male": "textures/sprites/default/charcadet",
"shiny_female": "textures/sprites/default/charcadet"
"default": "textures/entity/pokemon/charcadet/charcadet",
"default_male": "textures/entity/pokemon/charcadet/charcadet",
"default_female": "textures/entity/pokemon/charcadet/charcadet",
"shiny": "textures/entity/pokemon/charcadet/shiny_charcadet",
"shiny_male": "textures/entity/pokemon/charcadet/shiny_charcadet",
"shiny_female": "textures/entity/pokemon/charcadet/shiny_charcadet",
"evo_aura": "textures/entity/evolving"
},
"geometry": {
"default": "geometry.substitute"
"default": "geometry.charcadet"
},
"scripts": {
"animate": [
"controller",
{
"blink": "math.random(0.0, 25.0) <= 0.25"
}
]
},
"animations": {
"blink": "animation.charcadet.blink",
"ground_idle": "animation.charcadet.ground_idle",
"air_idle": "animation.charcadet.ground_idle",
"water_idle": "animation.charcadet.ground_idle",
"walking": "animation.charcadet.walking",
"flying": "animation.charcadet.walking",
"swimming": "animation.charcadet.walking",
"sleeping": "animation.charcadet.ground_idle",
"attack": "animation.charcadet.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
"tail_flame": "pokeb:tail_flame"
},
"render_controllers": [
"controller.render.pokemon"
{
"controller.render.pokemon:charcadet": "query.variant==0"
},
{
"controller.render.evolve": "query.variant==1"
}
],
"spawn_egg": {
"texture": "charcadet",
Expand Down
5 changes: 1 addition & 4 deletions entity/pokemon/lucario.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
"sleeping": "animation.lucario.ground_idle",
"attack": "animation.lucario.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon",
"animation.lucario.swimming": "animation.${pokemonTypeId}.ground_idle",
"animation.lucario.water_idle": "animation.${pokemonTypeId}.ground_idle",
"animation.lucario.sleeping": "animation.${pokemonTypeId}.ground_idle"
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
Expand Down
50 changes: 41 additions & 9 deletions entity/pokemon/lucariomega.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,53 @@
"description": {
"identifier": "pokemon:lucariomega",
"materials": {
"default": "zombie"
"default": "entity_emissive_alpha",
"aura": "charged_creeper"
},
"textures": {
"default": "textures/sprites/default/lucariomega",
"shiny": "textures/sprites/default/lucariomega",
"default_male": "textures/sprites/default/lucariomega",
"default_female": "textures/sprites/default/lucariomega",
"shiny_male": "textures/sprites/default/lucariomega",
"shiny_female": "textures/sprites/default/lucariomega"
"default": "textures/entity/pokemon/lucariomega/lucariomega",
"default_male": "textures/entity/pokemon/lucariomega/lucariomega",
"default_female": "textures/entity/pokemon/lucariomega/lucariomega",
"shiny": "textures/entity/pokemon/lucariomega/shiny_lucariomega",
"shiny_male": "textures/entity/pokemon/lucariomega/shiny_lucariomega",
"shiny_female": "textures/entity/pokemon/lucariomega/shiny_lucariomega",
"evo_aura": "textures/entity/evolving"
},
"geometry": {
"default": "geometry.substitute"
"default": "geometry.lucariomega"
},
"scripts": {
"animate": [
"controller",
{
"blink": "math.random(0.0, 25.0) <= 0.25"
}
]
},
"animations": {
"blink": "animation.lucariomega.blink",
"ground_idle": "animation.lucariomega.ground_idle",
"air_idle": "animation.lucariomega.ground_idle",
"water_idle": "animation.lucariomega.ground_idle",
"walking": "animation.lucariomega.walking",
"flying": "animation.lucariomega.walking",
"swimming": "animation.lucariomega.walking",
"sleeping": "animation.lucariomega.ground_idle",
"attack": "animation.lucariomega.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
"tail_flame": "pokeb:tail_flame"
},
"render_controllers": [
"controller.render.pokemon"
{
"controller.render.pokemon:lucariomega": "query.variant==0"
},
{
"controller.render.evolve": "query.variant==1"
}
],
"spawn_egg": {
"texture": "lucariomega",
Expand Down
50 changes: 41 additions & 9 deletions entity/pokemon/pikachualola.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,53 @@
"description": {
"identifier": "pokemon:pikachualola",
"materials": {
"default": "zombie"
"default": "entity_emissive_alpha",
"aura": "charged_creeper"
},
"textures": {
"default": "textures/sprites/default/pikachualola",
"shiny": "textures/sprites/default/pikachualola",
"default_male": "textures/sprites/default/pikachualola",
"default_female": "textures/sprites/default/pikachualola",
"shiny_male": "textures/sprites/default/pikachualola",
"shiny_female": "textures/sprites/default/pikachualola"
"default": "textures/entity/pokemon/pikachualola/pikachualola",
"default_male": "textures/entity/pokemon/pikachualola/pikachualola",
"default_female": "textures/entity/pokemon/pikachualola/pikachualola",
"shiny": "textures/entity/pokemon/pikachualola/shiny_pikachualola",
"shiny_male": "textures/entity/pokemon/pikachualola/shiny_pikachualola",
"shiny_female": "textures/entity/pokemon/pikachualola/shiny_pikachualola",
"evo_aura": "textures/entity/evolving"
},
"geometry": {
"default": "geometry.substitute"
"default": "geometry.pikachualola"
},
"scripts": {
"animate": [
"controller",
{
"blink": "math.random(0.0, 25.0) <= 0.25"
}
]
},
"animations": {
"blink": "animation.pikachualola.blink",
"ground_idle": "animation.pikachualola.ground_idle",
"air_idle": "animation.pikachualola.ground_idle",
"water_idle": "animation.pikachualola.ground_idle",
"walking": "animation.pikachualola.walking",
"flying": "animation.pikachualola.walking",
"swimming": "animation.pikachualola.walking",
"sleeping": "animation.pikachualola.ground_idle",
"attack": "animation.pikachualola.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
"tail_flame": "pokeb:tail_flame"
},
"render_controllers": [
"controller.render.pokemon"
{
"controller.render.pokemon:pikachualola": "query.variant==0"
},
{
"controller.render.evolve": "query.variant==1"
}
],
"spawn_egg": {
"texture": "pikachualola",
Expand Down
50 changes: 41 additions & 9 deletions entity/pokemon/pikachuhoenn.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,53 @@
"description": {
"identifier": "pokemon:pikachuhoenn",
"materials": {
"default": "zombie"
"default": "entity_emissive_alpha",
"aura": "charged_creeper"
},
"textures": {
"default": "textures/sprites/default/pikachuhoenn",
"shiny": "textures/sprites/default/pikachuhoenn",
"default_male": "textures/sprites/default/pikachuhoenn",
"default_female": "textures/sprites/default/pikachuhoenn",
"shiny_male": "textures/sprites/default/pikachuhoenn",
"shiny_female": "textures/sprites/default/pikachuhoenn"
"default": "textures/entity/pokemon/pikachuhoenn/pikachuhoenn",
"default_male": "textures/entity/pokemon/pikachuhoenn/pikachuhoenn",
"default_female": "textures/entity/pokemon/pikachuhoenn/pikachuhoenn",
"shiny": "textures/entity/pokemon/pikachuhoenn/shiny_pikachuhoenn",
"shiny_male": "textures/entity/pokemon/pikachuhoenn/shiny_pikachuhoenn",
"shiny_female": "textures/entity/pokemon/pikachuhoenn/shiny_pikachuhoenn",
"evo_aura": "textures/entity/evolving"
},
"geometry": {
"default": "geometry.substitute"
"default": "geometry.pikachuhoenn"
},
"scripts": {
"animate": [
"controller",
{
"blink": "math.random(0.0, 25.0) <= 0.25"
}
]
},
"animations": {
"blink": "animation.pikachuhoenn.blink",
"ground_idle": "animation.pikachuhoenn.ground_idle",
"air_idle": "animation.pikachuhoenn.ground_idle",
"water_idle": "animation.pikachuhoenn.ground_idle",
"walking": "animation.pikachuhoenn.walking",
"flying": "animation.pikachuhoenn.walking",
"swimming": "animation.pikachuhoenn.walking",
"sleeping": "animation.pikachuhoenn.ground_idle",
"attack": "animation.pikachuhoenn.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
"tail_flame": "pokeb:tail_flame"
},
"render_controllers": [
"controller.render.pokemon"
{
"controller.render.pokemon:pikachuhoenn": "query.variant==0"
},
{
"controller.render.evolve": "query.variant==1"
}
],
"spawn_egg": {
"texture": "pikachuhoenn",
Expand Down
50 changes: 41 additions & 9 deletions entity/pokemon/pikachuoriginal.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,53 @@
"description": {
"identifier": "pokemon:pikachuoriginal",
"materials": {
"default": "zombie"
"default": "entity_emissive_alpha",
"aura": "charged_creeper"
},
"textures": {
"default": "textures/sprites/default/pikachuoriginal",
"shiny": "textures/sprites/default/pikachuoriginal",
"default_male": "textures/sprites/default/pikachuoriginal",
"default_female": "textures/sprites/default/pikachuoriginal",
"shiny_male": "textures/sprites/default/pikachuoriginal",
"shiny_female": "textures/sprites/default/pikachuoriginal"
"default": "textures/entity/pokemon/pikachuoriginal/pikachuoriginal",
"default_male": "textures/entity/pokemon/pikachuoriginal/pikachuoriginal",
"default_female": "textures/entity/pokemon/pikachuoriginal/pikachuoriginal",
"shiny": "textures/entity/pokemon/pikachuoriginal/shiny_pikachuoriginal",
"shiny_male": "textures/entity/pokemon/pikachuoriginal/shiny_pikachuoriginal",
"shiny_female": "textures/entity/pokemon/pikachuoriginal/shiny_pikachuoriginal",
"evo_aura": "textures/entity/evolving"
},
"geometry": {
"default": "geometry.substitute"
"default": "geometry.pikachuoriginal"
},
"scripts": {
"animate": [
"controller",
{
"blink": "math.random(0.0, 25.0) <= 0.25"
}
]
},
"animations": {
"blink": "animation.pikachuoriginal.blink",
"ground_idle": "animation.pikachuoriginal.ground_idle",
"air_idle": "animation.pikachuoriginal.ground_idle",
"water_idle": "animation.pikachuoriginal.ground_idle",
"walking": "animation.pikachuoriginal.walking",
"flying": "animation.pikachuoriginal.walking",
"swimming": "animation.pikachuoriginal.walking",
"sleeping": "animation.pikachuoriginal.ground_idle",
"attack": "animation.pikachuoriginal.attack",
"look_at_target": "animation.pokemon.look_at_target",
"controller": "controller.animation.pokemon"
},
"particle_effects": {
"poison_smoke": "pokeb:posion_smoke",
"tail_flame": "pokeb:tail_flame"
},
"render_controllers": [
"controller.render.pokemon"
{
"controller.render.pokemon:pikachuoriginal": "query.variant==0"
},
{
"controller.render.evolve": "query.variant==1"
}
],
"spawn_egg": {
"texture": "pikachuoriginal",
Expand Down
Loading

0 comments on commit 45146d4

Please sign in to comment.