Merge branch 'type_alpha_drops' into 'main'

Alphas also drop items based on the pokemon types

See merge request cable-mc/cobblemon!2295
This commit is contained in:
Polymeta
2026-05-31 08:58:53 +00:00
38 changed files with 1279 additions and 1 deletions
@@ -109,7 +109,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
DoubleValue(pokemon.species.nationalPokedexNumber.toDouble())
}
map["types"] = {
pokemon.form.types.map { it.toString() }.asArrayValue(::StringValue)
pokemon.form.types.map { it.showdownId }.asArrayValue(::StringValue)
}
map["gender_ratio"] = {
DoubleValue(pokemon.form.maleRatio.toDouble())
@@ -17,5 +17,23 @@ c.pokemon.actor.is_wild ? {
};
t.world.spawn_loot_table_items(t.loot_table, t.pokemon_entity.x, t.pokemon_entity.y, t.pokemon_entity.z);
t.pokemon_types = t.pokemon.types;
t.types[0] = t.pokemon_types[0];
t.type_tier = (t.pokemon.level >= 51) ? 2 : 1;
q.length(t.types) == 1 ? {
t.types[1] = t.types[0];
} : {
t.types[1] = t.pokemon_types[1];
};
(math.random_integer(1, 2) == 1) ? {
t.type_name = t.types[0];
t.world.spawn_loot_table_items('cobblemon:alpha/types/' + t.type_name + '_rewards_tier' + t.type_tier, t.pokemon_entity.x, t.pokemon_entity.y, t.pokemon_entity.z);
};
(math.random_integer(1, 2) == 1) ? {
t.type_name = t.types[1];
t.world.spawn_loot_table_items('cobblemon:alpha/types/' + t.type_name + '_rewards_tier' + t.type_tier, t.pokemon_entity.x, t.pokemon_entity.y, t.pokemon_entity.z);
};
};
};
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:bug_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:tanga_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:bug_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:tanga_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:dark_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:colbur_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:dark_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:colbur_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:dragon_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:haban_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:dragon_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:haban_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:electric_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:wacan_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:electric_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:wacan_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:fairy_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:roseli_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:fairy_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:roseli_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:fighting_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:chople_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:fighting_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:chople_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:fire_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:occa_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:fire_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:occa_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:flying_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:coba_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:flying_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:coba_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:ghost_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:kasib_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:ghost_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:kasib_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:grass_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:rindo_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:grass_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:rindo_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:ground_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:shuca_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:ground_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:shuca_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:ice_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:yache_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:ice_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:yache_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:normal_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:chilan_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:normal_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:chilan_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:poison_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:kebia_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:poison_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:kebia_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:psychic_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:payapa_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:psychic_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:payapa_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:rock_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:charti_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:rock_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:charti_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:steel_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:babiri_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:steel_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:babiri_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:water_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:passho_berry",
"weight": 25
}
]
}
]
}
@@ -0,0 +1,40 @@
{
"type": "minecraft:generic",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "cobblemon:water_gem",
"weight": 75,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 2,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "cobblemon:passho_berry",
"weight": 25,
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 2
}
}
]
}
]
}
]
}