That's one heck of a commit you've got there...

I may have got a bit behind with version control. A lot behind, in fact. Maybe I'll go back and split this sometime - then again, I probably won't. But hey, at least it's here!
This commit is contained in:
Electroblob77
2019-08-18 00:04:18 +01:00
parent 2680d02304
commit f37812be3e
1564 changed files with 47652 additions and 12984 deletions
@@ -3,34 +3,34 @@
{
"name": "wizardry",
"rolls": {
"min": 3,
"max": 7
"min": 1,
"max": 3
},
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/novice_wands",
"weight": 3
"name": "ebwizardry:subsets/elemental_crystals",
"weight": 6
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/wizard_armour",
"weight": 6
"weight": 10
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/arcane_tomes",
"weight": 6
"weight": 8
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/wand_upgrades",
"weight": 2
"weight": 4
},
{
"type": "item",
"name": "ebwizardry:magic_crystal",
"weight": 5,
"weight": 10,
"functions": [
{
"function": "set_count",
@@ -44,23 +44,57 @@
{
"type": "item",
"name": "ebwizardry:spell_book",
"weight": 20,
"weight": 40,
"functions": [
{
"function": "ebwizardry:random_spell"
"function": "ebwizardry:random_spell",
"undiscovered_bias": 0.3
}
]
},
{
"type": "item",
"name": "ebwizardry:scroll",
"weight": 10,
"weight": 14,
"functions": [
{
"function": "ebwizardry:random_spell"
"function": "ebwizardry:random_spell",
"undiscovered_bias": 0.3
},
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "ebwizardry:identification_scroll",
"weight": 6
},
{
"type": "item",
"name": "ebwizardry:firebomb",
"weight": 8
},
{
"type": "item",
"name": "ebwizardry:poison_bomb",
"weight": 8
},
{
"type": "item",
"name": "ebwizardry:smoke_bomb",
"weight": 8
},
{
"type": "item",
"name": "ebwizardry:spark_bomb",
"weight": 8
},
{
"type": "item",
"name": "ebwizardry:armour_upgrade",
@@ -68,23 +102,18 @@
},
{
"type": "item",
"name": "ebwizardry:identification_scroll",
"weight": 3
"name": "ebwizardry:astral_diamond",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:firebomb",
"weight": 4
"name": "ebwizardry:purifying_elixir",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:poison_bomb",
"weight": 4
},
{
"type": "item",
"name": "ebwizardry:smoke_bomb",
"weight": 4
"name": "ebwizardry:grand_crystal",
"weight": 1
}
]
}
@@ -0,0 +1,65 @@
{
"pools": [
{
"name": "wizardry_dispenser",
"rolls": 1,
"conditions": [
{
"condition": "random_chance",
"chance": 0.4
}
],
"entries": [
{
"type": "item",
"name": "ebwizardry:scroll",
"weight": 1,
"functions": [
{
"function": "ebwizardry:random_spell",
"spells": [
"magic_missile",
"arc",
"thunderbolt",
"summon_zombie",
"dart",
"ice_shard",
"firebolt",
"poison",
"flame_ray",
"frost_ray"
]
},
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "ebwizardry:firebomb",
"weight": 3
},
{
"type": "item",
"name": "ebwizardry:poison_bomb",
"weight": 3
},
{
"type": "item",
"name": "ebwizardry:smoke_bomb",
"weight": 3
},
{
"type": "item",
"name": "ebwizardry:spark_bomb",
"weight": 3
}
]
}
]
}
@@ -0,0 +1,195 @@
{
"pools": [
{
"name": "high_value",
"rolls": {
"min": 1,
"max": 1
},
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/arcane_tomes",
"weight": 3
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/wand_upgrades",
"weight": 2
},
{
"type": "item",
"name": "ebwizardry:spell_book",
"weight": 20,
"functions": [
{
"function": "ebwizardry:random_spell",
"tiers": [
"novice",
"apprentice",
"advanced"
],
"undiscovered_bias": 0.3
}
]
},
{
"type": "item",
"name": "ebwizardry:scroll",
"weight": 7,
"functions": [
{
"function": "ebwizardry:random_spell",
"tiers": [
"novice",
"apprentice",
"advanced"
],
"undiscovered_bias": 0.3
},
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "ebwizardry:identification_scroll",
"weight": 3
},
{
"type": "item",
"name": "minecraft:gold_nugget",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 4
}
}
]
},
{
"type": "item",
"name": "minecraft:emerald",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:grand_crystal",
"weight": 1
}
]
},
{
"name": "low_value",
"rolls": {
"min": 3,
"max": 5
},
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/elemental_crystals",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:magic_crystal",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 4
}
}
]
},
{
"type": "item",
"name": "ebwizardry:firebomb",
"weight": 4
},
{
"type": "item",
"name": "ebwizardry:poison_bomb",
"weight": 4
},
{
"type": "item",
"name": "ebwizardry:smoke_bomb",
"weight": 4
},
{
"type": "item",
"name": "ebwizardry:spark_bomb",
"weight": 4
},
{
"type": "item",
"name": "minecraft:book",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "item",
"name": "minecraft:string",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "minecraft:paper",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "ebwizardry:crystal_shard",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
}
]
}
]
}
@@ -0,0 +1,210 @@
{
"pools": [
{
"name": "artefact",
"rolls": 1,
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/uncommon_artefacts",
"weight": 5
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/rare_artefacts",
"weight": 3
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/epic_artefacts",
"weight": 1
}
]
},
{
"name": "high_value",
"rolls": {
"min": 1,
"max": 2
},
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/arcane_tomes",
"weight": 6
},
{
"type": "loot_table",
"name": "ebwizardry:subsets/wand_upgrades",
"weight": 4
},
{
"type": "item",
"name": "ebwizardry:spell_book",
"weight": 40,
"functions": [
{
"function": "ebwizardry:random_spell",
"undiscovered_bias": 0.3
}
]
},
{
"type": "item",
"name": "ebwizardry:scroll",
"weight": 14,
"functions": [
{
"function": "ebwizardry:random_spell",
"undiscovered_bias": 0.3
},
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "ebwizardry:identification_scroll",
"weight": 6
},
{
"type": "item",
"name": "minecraft:gold_ingot",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 6
}
}
]
},
{
"type": "item",
"name": "minecraft:emerald",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 3
}
}
]
},
{
"type": "item",
"name": "ebwizardry:armour_upgrade",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:astral_diamond",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:purifying_elixir",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:grand_crystal",
"weight": 1
}
]
},
{
"name": "low_value",
"rolls": {
"min": 2,
"max": 4
},
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/elemental_crystals",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:magic_crystal",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 12
}
}
]
},
{
"type": "item",
"name": "minecraft:book",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "item",
"name": "minecraft:string",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "minecraft:paper",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
{
"type": "item",
"name": "ebwizardry:crystal_shard",
"weight": 2,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
}
]
}
]
}
@@ -9,7 +9,7 @@
"entries": [
{
"type": "loot_table",
"name": "ebwizardry:subsets/novice_wands",
"name": "ebwizardry:subsets/elemental_crystals",
"weight": 3
},
{
@@ -20,7 +20,7 @@
{
"type": "loot_table",
"name": "ebwizardry:subsets/arcane_tomes",
"weight": 6
"weight": 4
},
{
"type": "loot_table",
@@ -47,17 +47,26 @@
"weight": 20,
"functions": [
{
"function": "ebwizardry:random_spell"
"function": "ebwizardry:random_spell",
"undiscovered_bias": 0.3
}
]
},
{
"type": "item",
"name": "ebwizardry:scroll",
"weight": 10,
"weight": 7,
"functions": [
{
"function": "ebwizardry:random_spell"
"function": "ebwizardry:random_spell",
"undiscovered_bias": 0.3
},
{
"function": "set_count",
"count": {
"min": 1,
"max": 5
}
}
]
},
@@ -1,6 +1,7 @@
{
"pools": [
{
"name": "wizardry",
"conditions": [
{
"condition": "killed_by_player"
@@ -19,7 +20,12 @@
"weight": 1,
"functions": [
{
"function": "ebwizardry:random_spell"
"function": "ebwizardry:random_spell",
"tiers": [
"novice",
"apprentice",
"advanced"
]
}
]
}
@@ -0,0 +1,24 @@
{
"pools": [
{
"name": "crystals",
"rolls": 1,
"entries": [
{
"type": "item",
"name": "ebwizardry:magic_crystal",
"weight": 1,
"functions": [
{
"function": "set_data",
"data": {
"min": 1,
"max": 7
}
}
]
}
]
}
]
}
@@ -0,0 +1,75 @@
{
"pools": [
{
"name": "epic_artefacts",
"rolls": 1,
"entries": [
{
"type": "item",
"name": "ebwizardry:ring_combustion",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_arcane_frost",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_seeking",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_hammer",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_mana_return",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_interdiction",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_ice_immunity",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_wither_immunity",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_glide",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_resurrection",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_experience_tome",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_silk_touch",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_stop_time",
"weight": 1
}
]
}
]
}
@@ -1,50 +0,0 @@
{
"pools": [
{
"name": "wands",
"rolls": 1,
"entries": [
{
"type": "item",
"name": "ebwizardry:magic_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_fire_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_ice_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_lightning_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_necromancy_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_earth_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_sorcery_wand",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:basic_healing_wand",
"weight": 1
}
]
}
]
}
@@ -0,0 +1,145 @@
{
"pools": [
{
"name": "rare_artefacts",
"rolls": 1,
"entries": [
{
"type": "item",
"name": "ebwizardry:ring_condensing",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_battlemage",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_disintegration",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_shattering",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_storm",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_soulbinding",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_leeching",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_mind_control",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_poison",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_full_moon",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_blockwrangler",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_conjurer",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_defender",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_arcane_defence",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_wisdom",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_fire_cloaking",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_potential",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_anchoring",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_transience",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_auto_shield",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_haggler",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_auto_smelt",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_storm",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_minion_variants",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_flight",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_abseiling",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_light",
"weight": 1
}
]
}
]
}
@@ -0,0 +1,115 @@
{
"pools": [
{
"name": "uncommon_artefacts",
"rolls": 1,
"entries": [
{
"type": "item",
"name": "ebwizardry:ring_siphoning",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_fire_melee",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_fire_biome",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_ice_melee",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_ice_biome",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_lightning_melee",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_necromancy_melee",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_earth_melee",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_earth_biome",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_extraction",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:ring_paladin",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_warding",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_fire_protection",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_ice_protection",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_channeling",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_lich",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_banishing",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:amulet_recovery",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_minion_health",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_growth",
"weight": 1
},
{
"type": "item",
"name": "ebwizardry:charm_feeding",
"weight": 1
}
]
}
]
}
@@ -43,7 +43,12 @@
"type": "item",
"name": "ebwizardry:attunement_upgrade",
"weight": 1
}
},
{
"type": "item",
"name": "ebwizardry:melee_upgrade",
"weight": 1
}
]
}
]