Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched loot tables from declaring each weapon individually to just referencing a different loot table.

Browse Source
This commit is contained in:
Sam 2021-03-31 17:49:08 -04:00
parent 67916b44a7
commit 31e69021cb
29 changed files with 111 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/common/item_price_calculation.ron
View File

@ -20,9 +20,6 @@ loot_tables: [
(1,"common.loot_tables.fallback"),
(0.04,"common.loot_tables.saurok"),
(0.05,"common.loot_tables.villager"),
(1,"common.loot_tables.weapon_common"),
(0.008,"common.loot_tables.weapon_rare"),
(0.01,"common.loot_tables.weapon_uncommon"),
// we probably want to include all the scattered scatter information
//(0.5,"common.cave_scatter"),
],

2
assets/common/items/weapons/hammer/stone_hammer-0.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.7,
power: 0.6,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.07589286,

4
assets/common/items/weapons/hammer/stone_hammer-1.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.7,
power: 0.5,
poise_strength: 1.0,
speed: 1.0,
speed: 1.1,
crit_chance: 0.07589286,
crit_mult: 2.0756302,
)),

2
assets/common/items/weapons/hammer/stone_hammer-2.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 0.5,
power: 0.7,
poise_strength: 1.0,
speed: 1.0,
speed: 0.9,
crit_chance: 0.07589286,
crit_mult: 2.0756302,
)),

2
assets/common/items/weapons/hammer/stone_hammer-3.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.7,
power: 0.6,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.07589286,

2
assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.85,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12242647,

4
assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.85,
power: 0.9,
poise_strength: 1.0,
speed: 1.0,
speed: 0.9,
crit_chance: 0.12242647,
crit_mult: 1.6864007,
)),

4
assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.85,
power: 0.7,
poise_strength: 1.0,
speed: 1.0,
speed: 1.1,
crit_chance: 0.12242647,
crit_mult: 1.6864007,
)),

2
assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.85,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12242647,

81
assets/common/loot_tables/cave_large.ron
View File

@ -9,81 +9,8 @@
(0.05, Item("common.items.glider.glider_moth")),
(0.05, Item("common.items.armor.misc.ring.gold")),
(0.1, Item("common.items.lantern.geode_purp")),
// swords
(0.03, Item("common.items.weapons.sword.steel-0")),
(0.03, Item("common.items.weapons.sword.steel-1")),
(0.03, Item("common.items.weapons.sword.steel-2")),
(0.03, Item("common.items.weapons.sword.steel-3")),
(0.03, Item("common.items.weapons.sword.steel-4")),
(0.03, Item("common.items.weapons.sword.steel-5")),
(0.03, Item("common.items.weapons.sword.steel-6")),
(0.03, Item("common.items.weapons.sword.steel-7")),
(0.03, Item("common.items.weapons.sword.steel-8")),
(0.02, Item("common.items.weapons.sword.cobalt-0")),
(0.02, Item("common.items.weapons.sword.cobalt-1")),
(0.02, Item("common.items.weapons.sword.cobalt-2")),
(0.02, Item("common.items.weapons.sword.cobalt-3")),
(0.01, Item("common.items.weapons.sword.bloodsteel-0")),
(0.01, Item("common.items.weapons.sword.bloodsteel-1")),
(0.01, Item("common.items.weapons.sword.bloodsteel-2")),
// axes
(0.02, Item("common.items.weapons.axe.bloodsteel_axe-0")),
(0.02, Item("common.items.weapons.axe.bloodsteel_axe-1")),
(0.02, Item("common.items.weapons.axe.bloodsteel_axe-2")),
(0.01, Item("common.items.weapons.axe.cobalt_axe-0")),
(0.01, Item("common.items.weapons.axe.cobalt_axe-1")),
(0.001, Item("common.items.weapons.axe.malachite_axe-0")),
(0.04, Item("common.items.weapons.axe.iron_axe-7")),
(0.04, Item("common.items.weapons.axe.iron_axe-8")),
(0.04, Item("common.items.weapons.axe.iron_axe-9")),
(0.04, Item("common.items.weapons.axe.steel_axe-0")),
(0.04, Item("common.items.weapons.axe.steel_axe-1")),
(0.04, Item("common.items.weapons.axe.steel_axe-2")),
(0.04, Item("common.items.weapons.axe.steel_axe-3")),
(0.04, Item("common.items.weapons.axe.steel_axe-4")),
(0.04, Item("common.items.weapons.axe.steel_axe-5")),
(0.04, Item("common.items.weapons.axe.steel_axe-6")),
// healing sceptre
(0.2, Item("common.items.weapons.sceptre.staff_nature")),
(0.1, Item("common.items.weapons.sceptre.fork0")),
(0.1, Item("common.items.weapons.sceptre.emerald")),
(0.1, Item("common.items.weapons.sceptre.coralline_cane")),
(0.001, Item("common.items.weapons.sceptre.sceptre_velorite_0")),
// staves
(0.2, Item("common.items.weapons.staff.bone_staff")),
(0.2, Item("common.items.weapons.staff.ley_seeker")),
(0.10, Item("common.items.weapons.staff.fiery_wishing_rod")),
(0.10, Item("common.items.weapons.staff.heated_arm")),
(0.10, Item("common.items.weapons.staff.golden_khakkara")),
(0.10, Item("common.items.weapons.staff.crimson_eye")),
(0.10, Item("common.items.weapons.staff.solar")),
(0.05, Item("common.items.weapons.staff.lava_rod")),
(0.05, Item("common.items.weapons.staff.dragon_tongue")),
(0.01, Item("common.items.weapons.staff.orc_iron")),
// hammers
(0.3, Item("common.items.weapons.hammer.cobalt_hammer-0")),
(0.3, Item("common.items.weapons.hammer.cobalt_hammer-1")),
(0.15, Item("common.items.weapons.hammer.runic_hammer")),
(0.15, Item("common.items.weapons.hammer.ramshead_hammer")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-7")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-8")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-0")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-1")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-2")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-3")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-4")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-5")),
// bows
(0.03, Item("common.items.weapons.bow.metal-0")),
(0.03, Item("common.items.weapons.bow.metal-1")),
(0.03, Item("common.items.weapons.bow.metal-2")),
(0.03, Item("common.items.weapons.bow.metal-3")),
(0.03, Item("common.items.weapons.bow.metal-4")),
(0.02, Item("common.items.weapons.bow.frostwood-0")),
(0.02, Item("common.items.weapons.bow.frostwood-1")),
(0.02, Item("common.items.weapons.bow.frostwood-2")),
(0.01, Item("common.items.weapons.bow.eldwood-0")),
(0.01, Item("common.items.weapons.bow.eldwood-1")),
(0.01, Item("common.items.weapons.bow.eldwood-2")),
(0.001, Item("common.items.weapons.bow.velorite")),
(2.0, LootTable("common.loot_tables.weapons.tier-3")),
(1.5, LootTable("common.loot_tables.weapons.tier-4")),
(1.0, LootTable("common.loot_tables.weapons.tier-5")),
(0.05, LootTable("common.loot_tables.weapons.cave")),
]

144
assets/common/loot_tables/cultists.ron
View File

@ -20,142 +20,10 @@
(2.0, LootTable("common.loot_tables.armor.steel")),
(0.001, Item("common.items.armor.misc.back.backpack")),
(0.1, Item("common.items.armor.misc.bag.heavy_seabag")),
(0.1, Item("common.items.weapons.sword.wood-0")),
(0.1, Item("common.items.weapons.sword.wood-1")),
(0.1, Item("common.items.weapons.sword.wood-2")),
(0.1, Item("common.items.weapons.sword.stone-0")),
(0.1, Item("common.items.weapons.sword.stone-1")),
(0.1, Item("common.items.weapons.sword.stone-2")),
(0.05, Item("common.items.weapons.sword.bronze-0")),
(0.05, Item("common.items.weapons.sword.bronze-1")),
(0.05, Item("common.items.weapons.sword.bronze-2")),
(0.2, Item("common.items.weapons.axe.orc_axe-0")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-0")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-1")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-2")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-3")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-4")),
(0.25, Item("common.items.weapons.sceptre.staff_nature")),
(0.15, Item("common.items.weapons.hammer.flimsy_hammer")),
(0.1, Item("common.items.weapons.hammer.wood_hammer-0")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-0")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-1")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-2")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-3")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-0")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-1")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-2")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-3")),
(0.2, Item("common.items.weapons.bow.rawwood-0")),
(0.2, Item("common.items.weapons.bow.rawwood-1")),
(0.1, Item("common.items.weapons.bow.wood-0")),
(0.1, Item("common.items.weapons.bow.wood-1")),
(0.1, Item("common.items.weapons.bow.wood-2")),
(0.1, Item("common.items.weapons.bow.wood-3")),
(0.1, Item("common.items.weapons.bow.wood-4")),
(0.05, Item("common.items.weapons.bow.bone-0")),
(0.05, Item("common.items.weapons.bow.bone-1")),
(0.05, Item("common.items.weapons.bow.bone-2")),
(0.05, Item("common.items.weapons.bow.bone-3")),
(0.04, Item("common.items.weapons.sword.iron-0")),
(0.04, Item("common.items.weapons.sword.iron-1")),
(0.04, Item("common.items.weapons.sword.iron-2")),
(0.04, Item("common.items.weapons.sword.iron-3")),
(0.04, Item("common.items.weapons.sword.iron-4")),
(0.04, Item("common.items.weapons.sword.iron-5")),
(0.04, Item("common.items.weapons.sword.iron-6")),
(0.04, Item("common.items.weapons.sword.iron-7")),
(0.04, Item("common.items.weapons.sword.iron-8")),
(0.04, Item("common.items.weapons.sword.iron-9")),
(0.04, Item("common.items.weapons.sword.iron-10")),
(0.03, Item("common.items.weapons.sword.steel-0")),
(0.03, Item("common.items.weapons.sword.steel-1")),
(0.03, Item("common.items.weapons.sword.steel-2")),
(0.03, Item("common.items.weapons.sword.steel-3")),
(0.03, Item("common.items.weapons.sword.steel-4")),
(0.03, Item("common.items.weapons.sword.steel-5")),
(0.03, Item("common.items.weapons.sword.steel-6")),
(0.03, Item("common.items.weapons.sword.steel-7")),
(0.03, Item("common.items.weapons.sword.steel-8")),
(0.15, Item("common.items.weapons.axe.bronze_axe-0")),
(0.15, Item("common.items.weapons.axe.bronze_axe-1")),
(0.15, Item("common.items.weapons.axe.bronze_axe-2")),
(0.04, Item("common.items.weapons.axe.iron_axe-0")),
(0.04, Item("common.items.weapons.axe.iron_axe-1")),
(0.04, Item("common.items.weapons.axe.iron_axe-2")),
(0.04, Item("common.items.weapons.axe.iron_axe-3")),
(0.04, Item("common.items.weapons.axe.iron_axe-4")),
(0.04, Item("common.items.weapons.axe.iron_axe-5")),
(0.04, Item("common.items.weapons.axe.iron_axe-6")),
(0.04, Item("common.items.weapons.axe.iron_axe-7")),
(0.04, Item("common.items.weapons.axe.iron_axe-8")),
(0.04, Item("common.items.weapons.axe.iron_axe-9")),
(0.04, Item("common.items.weapons.axe.steel_axe-0")),
(0.04, Item("common.items.weapons.axe.steel_axe-1")),
(0.04, Item("common.items.weapons.axe.steel_axe-2")),
(0.04, Item("common.items.weapons.axe.steel_axe-3")),
(0.04, Item("common.items.weapons.axe.steel_axe-4")),
(0.04, Item("common.items.weapons.axe.steel_axe-5")),
(0.04, Item("common.items.weapons.axe.steel_axe-6")),
(0.5, Item("common.items.weapons.sceptre.staff_nature")),
(0.4, Item("common.items.weapons.staff.bone_staff")),
(0.40, Item("common.items.weapons.staff.crimson_eye")),
(0.2, Item("common.items.weapons.staff.aurora")),
(0.20, Item("common.items.weapons.staff.frostwood_torch")),
(0.15, Item("common.items.weapons.hammer.bronze_hammer-0")),
(0.15, Item("common.items.weapons.hammer.bronze_hammer-1")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-0")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-1")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-2")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-3")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-4")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-5")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-6")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-7")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-8")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-0")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-1")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-2")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-3")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-4")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-5")),
(0.04, Item("common.items.weapons.bow.hardwood-0")),
(0.04, Item("common.items.weapons.bow.hardwood-1")),
(0.04, Item("common.items.weapons.bow.hardwood-2")),
(0.04, Item("common.items.weapons.bow.hardwood-3")),
(0.04, Item("common.items.weapons.bow.hardwood-4")),
(0.04, Item("common.items.weapons.bow.hardwood-5")),
(0.03, Item("common.items.weapons.bow.metal-0")),
(0.03, Item("common.items.weapons.bow.metal-1")),
(0.03, Item("common.items.weapons.bow.metal-2")),
(0.03, Item("common.items.weapons.bow.metal-3")),
(0.03, Item("common.items.weapons.bow.metal-4")),
(0.2, Item("common.items.weapons.sword.cobalt-0")),
(0.2, Item("common.items.weapons.sword.cobalt-1")),
(0.2, Item("common.items.weapons.sword.cobalt-2")),
(0.2, Item("common.items.weapons.sword.cobalt-3")),
(0.1, Item("common.items.weapons.sword.bloodsteel-0")),
(0.1, Item("common.items.weapons.sword.bloodsteel-1")),
(0.1, Item("common.items.weapons.sword.bloodsteel-2")),
(0.2, Item("common.items.weapons.axe.bloodsteel_axe-0")),
(0.2, Item("common.items.weapons.axe.bloodsteel_axe-1")),
(0.2, Item("common.items.weapons.axe.bloodsteel_axe-2")),
(0.25, Item("common.items.weapons.sceptre.staff_nature")),
(0.2, Item("common.items.weapons.staff.infused_tower")),
(0.10, Item("common.items.weapons.staff.lava_rod")),
(0.10, Item("common.items.weapons.staff.dragon_tongue")),
(0.1, Item("common.items.weapons.staff.flamethrower_0")),
(0.04, Item("common.items.weapons.staff.bent_fuse")),
(0.04, Item("common.items.weapons.sceptre.emerald")),
(0.04, Item("common.items.weapons.staff.orc_iron")),
(0.01, Item("common.items.weapons.hammer.cobalt_hammer-0")),
(0.01, Item("common.items.weapons.hammer.cobalt_hammer-1")),
(0.01, Item("common.items.weapons.hammer.runic_hammer")),
(0.1, Item("common.items.weapons.hammer.ramshead_hammer")),
(0.2, Item("common.items.weapons.bow.frostwood-0")),
(0.2, Item("common.items.weapons.bow.frostwood-1")),
(0.2, Item("common.items.weapons.bow.frostwood-2")),
(0.1, Item("common.items.weapons.bow.eldwood-0")),
(0.1, Item("common.items.weapons.bow.eldwood-1")),
(0.1, Item("common.items.weapons.bow.eldwood-2")),
(1.0, LootTable("common.loot_tables.weapons.tier-0")),
(2.0, LootTable("common.loot_tables.weapons.tier-1")),
(3.0, LootTable("common.loot_tables.weapons.tier-2")),
(4.0, LootTable("common.loot_tables.weapons.tier-3")),
(4.0, LootTable("common.loot_tables.weapons.tier-4")),
(3.0, LootTable("common.loot_tables.weapons.tier-5")),
]

17
assets/common/loot_tables/humanoids.ron
View File

@ -15,17 +15,8 @@
(0.1, Item("common.items.food.apple_stick")),
(0.1, Item("common.items.food.mushroom_stick")),
// Weapons
(0.1, Item("common.items.weapons.sword.wood-0")),
(0.1, Item("common.items.weapons.sword.wood-1")),
(0.1, Item("common.items.weapons.sword.wood-2")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-0")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-1")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-2")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-3")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-4")),
(0.25, Item("common.items.weapons.sceptre.staff_nature")),
(0.15, Item("common.items.weapons.hammer.flimsy_hammer")),
(0.1, Item("common.items.weapons.hammer.wood_hammer-0")),
(0.15, Item("common.items.weapons.bow.rawwood-0")),
(0.15, Item("common.items.weapons.bow.rawwood-1")),
(0.5, LootTable("common.loot_tables.sword.wood")),
(0.5, LootTable("common.loot_tables.hammer.stone")),
(0.5, LootTable("common.loot_tables.bow.rawwood")),
(0.5, LootTable("common.loot_tables.starter")),
]

11
assets/common/loot_tables/mindflayer.ron
View File

@ -1,15 +1,8 @@
[
// Crafting material
(2.0, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
(1.0, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
// Legendary weapons
(1.0, Item("common.items.weapons.sword.caladbolg")),
(1.0, Item("common.items.weapons.axe.parashu")),
(1.0, Item("common.items.weapons.hammer.mjolnir")),
(1.0, Item("common.items.weapons.bow.sagitta")),
(0.5, Item("common.items.weapons.staff.phoenix")),
(0.5, Item("common.items.weapons.staff.laevateinn")),
(0.5, Item("common.items.weapons.sceptre.root_evil")),
(0.5, Item("common.items.weapons.sceptre.caduceus")),
(4.0, LootTable("common.loot_tables.weapons.legendary")),
// Rare misc items
(0.5, Item("common.items.boss_drops.lantern")),
(0.5, Item("common.items.glider.glider_purp")),

4
assets/common/loot_tables/miniboss.ron
View File

@ -4,7 +4,5 @@
(1.0, Item("common.items.armor.misc.back.dungeon_purple")),
(1.0, Item("common.items.armor.misc.ring.skull")),
// weapons
(1.0, Item("common.items.weapons.staff.cultist_staff")),
(1.0, Item("common.items.weapons.hammer.cultist_purp_2h-0")),
(1.0, Item("common.items.weapons.sword.cultist")),
(3.0, LootTable("common.loot_tables.weapons.cultist")),
]

29
assets/common/loot_tables/villager.ron
View File

@ -7,17 +7,7 @@
// Consumables
(0.2, Item("common.items.consumable.potion_minor")),
// Armour
(1.0, Item("common.items.armor.misc.chest.worker_green_0")),
(1.0, Item("common.items.armor.misc.chest.worker_green_1")),
(1.0, Item("common.items.armor.misc.chest.worker_orange_0")),
(1.0, Item("common.items.armor.misc.chest.worker_orange_1")),
(1.0, Item("common.items.armor.misc.chest.worker_purple_0")),
(1.0, Item("common.items.armor.misc.chest.worker_purple_1")),
(1.0, Item("common.items.armor.misc.chest.worker_red_0")),
(1.0, Item("common.items.armor.misc.chest.worker_red_1")),
(1.0, Item("common.items.armor.misc.chest.worker_yellow_0")),
(1.0, Item("common.items.armor.misc.chest.worker_yellow_1")),
(1.0, Item("common.items.armor.misc.pants.worker_blue")),
(10.0, LootTable("common.loot_tables.armor.cloth")),
// Utility
(0.05, Item("common.items.utility.collar")),
// Food
@ -29,17 +19,8 @@
(0.1, Item("common.items.food.apple_stick")),
(0.1, Item("common.items.food.mushroom_stick")),
// Weapons
(0.15, Item("common.items.weapons.sword.wood-0")),
(0.15, Item("common.items.weapons.sword.wood-1")),
(0.15, Item("common.items.weapons.sword.wood-2")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-0")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-1")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-2")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-3")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-4")),
(0.25, Item("common.items.weapons.sceptre.staff_nature")),
(0.15, Item("common.items.weapons.hammer.flimsy_hammer")),
(0.1, Item("common.items.weapons.hammer.wood_hammer-0")),
(0.15, Item("common.items.weapons.bow.rawwood-0")),
(0.15, Item("common.items.weapons.bow.rawwood-1")),
(0.5, LootTable("common.loot_tables.sword.wood")),
(0.5, LootTable("common.loot_tables.hammer.stone")),
(0.5, LootTable("common.loot_tables.bow.rawwood")),
(0.5, LootTable("common.loot_tables.starter")),
]

45
assets/common/loot_tables/weapon_common.ron
View File

@ -1,45 +0,0 @@
[
// swords
(0.15, Item("common.items.weapons.sword.starter")),
(0.1, Item("common.items.weapons.sword.wood-0")),
(0.1, Item("common.items.weapons.sword.wood-1")),
(0.1, Item("common.items.weapons.sword.wood-2")),
(0.05, Item("common.items.weapons.sword.stone-0")),
(0.05, Item("common.items.weapons.sword.stone-1")),
(0.05, Item("common.items.weapons.sword.stone-2")),
// axes
(0.3, Item("common.items.weapons.axe.starter_axe")),
(0.2, Item("common.items.weapons.axe.orc_axe-0")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-0")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-1")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-2")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-3")),
(0.1, Item("common.items.weapons.axe.worn_iron_axe-4")),
// healing staff
(0.3, Item("common.items.weapons.sceptre.starter_sceptre")),
(0.10, Item("common.items.weapons.sceptre.moon0")),
(0.10, Item("common.items.weapons.sceptre.druids_arbor")),
// staves
(1.0, Item("common.items.weapons.staff.starter_staff")),
// hammers
(0.15, Item("common.items.weapons.hammer.starter_hammer")),
(0.15, Item("common.items.weapons.hammer.flimsy_hammer")),
(0.1, Item("common.items.weapons.hammer.wood_hammer-0")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-0")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-1")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-2")),
(0.1, Item("common.items.weapons.hammer.stone_hammer-3")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-0")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-1")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-2")),
(0.05, Item("common.items.weapons.hammer.worn_iron_hammer-3")),
// bows
(0.15, Item("common.items.weapons.bow.starter")),
(0.1, Item("common.items.weapons.bow.rawwood-0")),
(0.1, Item("common.items.weapons.bow.rawwood-1")),
(0.05, Item("common.items.weapons.bow.wood-0")),
(0.05, Item("common.items.weapons.bow.wood-1")),
(0.05, Item("common.items.weapons.bow.wood-2")),
(0.05, Item("common.items.weapons.bow.wood-3")),
(0.05, Item("common.items.weapons.bow.wood-4")),
]

42
assets/common/loot_tables/weapon_rare.ron
View File

@ -1,42 +0,0 @@
[
// swords
(0.2, Item("common.items.weapons.sword.cobalt-0")),
(0.2, Item("common.items.weapons.sword.cobalt-1")),
(0.2, Item("common.items.weapons.sword.cobalt-2")),
(0.2, Item("common.items.weapons.sword.cobalt-3")),
(0.1, Item("common.items.weapons.sword.bloodsteel-0")),
(0.1, Item("common.items.weapons.sword.bloodsteel-1")),
(0.1, Item("common.items.weapons.sword.bloodsteel-2")),
// axes
(0.2, Item("common.items.weapons.axe.bloodsteel_axe-0")),
(0.2, Item("common.items.weapons.axe.bloodsteel_axe-1")),
(0.2, Item("common.items.weapons.axe.bloodsteel_axe-2")),
(0.3, Item("common.items.weapons.axe.cobalt_axe-0")),
(0.3, Item("common.items.weapons.axe.cobalt_axe-1")),
(0.1, Item("common.items.weapons.axe.malachite_axe-0")),
// healing sceptre
(0.15, Item("common.items.weapons.sceptre.loops0")),
(0.1, Item("common.items.weapons.sceptre.fork0")),
(0.10, Item("common.items.weapons.sceptre.emerald")),
(0.10, Item("common.items.weapons.sceptre.coralline_cane")),
// staves
(1.00, Item("common.items.weapons.staff.crimson_eye")),
(0.7, Item("common.items.weapons.staff.aurora")),
(0.7, Item("common.items.weapons.staff.frostwood_torch")),
(0.5, Item("common.items.weapons.staff.lava_rod")),
(0.5, Item("common.items.weapons.staff.dragon_tongue")),
(0.75, Item("common.items.weapons.staff.infused_tower")),
(0.5, Item("common.items.weapons.staff.flamethrower_0")),
// hammers
(0.3, Item("common.items.weapons.hammer.cobalt_hammer-0")),
(0.3, Item("common.items.weapons.hammer.cobalt_hammer-1")),
(0.15, Item("common.items.weapons.hammer.runic_hammer")),
(0.15, Item("common.items.weapons.hammer.ramshead_hammer")),
// bows
(0.2, Item("common.items.weapons.bow.frostwood-0")),
(0.2, Item("common.items.weapons.bow.frostwood-1")),
(0.2, Item("common.items.weapons.bow.frostwood-2")),
(0.1, Item("common.items.weapons.bow.eldwood-0")),
(0.1, Item("common.items.weapons.bow.eldwood-1")),
(0.1, Item("common.items.weapons.bow.eldwood-2")),
]

91
assets/common/loot_tables/weapon_uncommon.ron
View File

@ -1,91 +0,0 @@
[
// swords
(0.15, Item("common.items.weapons.sword.bronze-0")),
(0.15, Item("common.items.weapons.sword.bronze-1")),
(0.15, Item("common.items.weapons.sword.bronze-2")),
(0.04, Item("common.items.weapons.sword.iron-0")),
(0.04, Item("common.items.weapons.sword.iron-1")),
(0.04, Item("common.items.weapons.sword.iron-2")),
(0.04, Item("common.items.weapons.sword.iron-3")),
(0.04, Item("common.items.weapons.sword.iron-4")),
(0.04, Item("common.items.weapons.sword.iron-5")),
(0.04, Item("common.items.weapons.sword.iron-6")),
(0.04, Item("common.items.weapons.sword.iron-7")),
(0.04, Item("common.items.weapons.sword.iron-8")),
(0.04, Item("common.items.weapons.sword.iron-9")),
(0.04, Item("common.items.weapons.sword.iron-10")),
(0.03, Item("common.items.weapons.sword.steel-0")),
(0.03, Item("common.items.weapons.sword.steel-1")),
(0.03, Item("common.items.weapons.sword.steel-2")),
(0.03, Item("common.items.weapons.sword.steel-3")),
(0.03, Item("common.items.weapons.sword.steel-4")),
(0.03, Item("common.items.weapons.sword.steel-5")),
(0.03, Item("common.items.weapons.sword.steel-6")),
(0.03, Item("common.items.weapons.sword.steel-7")),
(0.03, Item("common.items.weapons.sword.steel-8")),
// axes
(0.15, Item("common.items.weapons.axe.bronze_axe-0")),
(0.15, Item("common.items.weapons.axe.bronze_axe-1")),
(0.15, Item("common.items.weapons.axe.bronze_axe-2")),
(0.04, Item("common.items.weapons.axe.iron_axe-0")),
(0.04, Item("common.items.weapons.axe.iron_axe-1")),
(0.04, Item("common.items.weapons.axe.iron_axe-2")),
(0.04, Item("common.items.weapons.axe.iron_axe-3")),
(0.04, Item("common.items.weapons.axe.iron_axe-4")),
(0.04, Item("common.items.weapons.axe.iron_axe-5")),
(0.04, Item("common.items.weapons.axe.iron_axe-6")),
(0.04, Item("common.items.weapons.axe.iron_axe-7")),
(0.04, Item("common.items.weapons.axe.iron_axe-8")),
(0.04, Item("common.items.weapons.axe.iron_axe-9")),
(0.04, Item("common.items.weapons.axe.steel_axe-0")),
(0.04, Item("common.items.weapons.axe.steel_axe-1")),
(0.04, Item("common.items.weapons.axe.steel_axe-2")),
(0.04, Item("common.items.weapons.axe.steel_axe-3")),
(0.04, Item("common.items.weapons.axe.steel_axe-4")),
(0.04, Item("common.items.weapons.axe.steel_axe-5")),
(0.04, Item("common.items.weapons.axe.steel_axe-6")),
// healing sceptre
(0.5, Item("common.items.weapons.sceptre.staff_nature")),
(0.15, Item("common.items.weapons.sceptre.root_green0")),
(0.25, Item("common.items.weapons.sceptre.totem_green")),
// staves
(1.0, Item("common.items.weapons.staff.bone_staff")),
(0.7, Item("common.items.weapons.staff.heated_arm")),
(0.7, Item("common.items.weapons.staff.golden_khakkara")),
(0.7, Item("common.items.weapons.staff.fiery_wishing_rod")),
(0.7, Item("common.items.weapons.staff.solar")),
// hammers
(0.15, Item("common.items.weapons.hammer.bronze_hammer-0")),
(0.15, Item("common.items.weapons.hammer.bronze_hammer-1")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-0")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-1")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-2")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-3")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-4")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-5")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-6")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-7")),
(0.04, Item("common.items.weapons.hammer.iron_hammer-8")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-0")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-1")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-2")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-3")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-4")),
(0.05, Item("common.items.weapons.hammer.steel_hammer-5")),
// bows
(0.15, Item("common.items.weapons.bow.bone-0")),
(0.15, Item("common.items.weapons.bow.bone-1")),
(0.15, Item("common.items.weapons.bow.bone-2")),
(0.15, Item("common.items.weapons.bow.bone-3")),
(0.04, Item("common.items.weapons.bow.hardwood-0")),
(0.04, Item("common.items.weapons.bow.hardwood-1")),
(0.04, Item("common.items.weapons.bow.hardwood-2")),
(0.04, Item("common.items.weapons.bow.hardwood-3")),
(0.04, Item("common.items.weapons.bow.hardwood-4")),
(0.04, Item("common.items.weapons.bow.hardwood-5")),
(0.03, Item("common.items.weapons.bow.metal-0")),
(0.03, Item("common.items.weapons.bow.metal-1")),
(0.03, Item("common.items.weapons.bow.metal-2")),
(0.03, Item("common.items.weapons.bow.metal-3")),
(0.03, Item("common.items.weapons.bow.metal-4")),
]

3
assets/common/loot_tables/weapons/hammer/wood.ron
View File

@ -1,3 +0,0 @@
[
(1.0, Item("common.items.weapons.hammer.wood_hammer-0")),
]

7
assets/common/loot_tables/weapons/tier-0.ron Normal file
View File

@ -0,0 +1,7 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.stone")),
(1.0, LootTable("common.loot_tables.weapons.axe.worn-iron")),
(1.0, LootTable("common.loot_tables.weapons.hammer.worn-iron")),
(1.0, LootTable("common.loot_tables.weapons.bow.wood")),
(1.0, LootTable("common.loot_tables.weapons.staff.wood")),
]

8
assets/common/loot_tables/weapons/tier-1.ron Normal file
View File

@ -0,0 +1,8 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.bronze")),
(1.0, LootTable("common.loot_tables.weapons.axe.bronze")),
(1.0, LootTable("common.loot_tables.weapons.hammer.bronze")),
(1.0, LootTable("common.loot_tables.weapons.bow.bone")),
(1.0, LootTable("common.loot_tables.weapons.staff.bamboo")),
(1.0, LootTable("common.loot_tables.weapons.sceptre.bamboo")),
]

8
assets/common/loot_tables/weapons/tier-2.ron Normal file
View File

@ -0,0 +1,8 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.iron")),
(1.0, LootTable("common.loot_tables.weapons.axe.iron")),
(1.0, LootTable("common.loot_tables.weapons.hammer.iron")),
(1.0, LootTable("common.loot_tables.weapons.bow.hardwood")),
(1.0, LootTable("common.loot_tables.weapons.staff.hardwood")),
(1.0, LootTable("common.loot_tables.weapons.sceptre.hardwood")),
]

8
assets/common/loot_tables/weapons/tier-3.ron Normal file
View File

@ -0,0 +1,8 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.steel")),
(1.0, LootTable("common.loot_tables.weapons.axe.steel")),
(1.0, LootTable("common.loot_tables.weapons.hammer.steel")),
(1.0, LootTable("common.loot_tables.weapons.bow.metal")),
(1.0, LootTable("common.loot_tables.weapons.staff.ironwood")),
(1.0, LootTable("common.loot_tables.weapons.sceptre.ironwood")),
]

8
assets/common/loot_tables/weapons/tier-4.ron Normal file
View File

@ -0,0 +1,8 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.cobalt")),
(1.0, LootTable("common.loot_tables.weapons.axe.cobalt")),
(1.0, LootTable("common.loot_tables.weapons.hammer.cobalt")),
(1.0, LootTable("common.loot_tables.weapons.bow.frostwood")),
(1.0, LootTable("common.loot_tables.weapons.staff.frostwood")),
(1.0, LootTable("common.loot_tables.weapons.sceptre.frostwood")),
]

8
assets/common/loot_tables/weapons/tier-5.ron Normal file
View File

@ -0,0 +1,8 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.bloodsteel")),
(1.0, LootTable("common.loot_tables.weapons.axe.bloodsteel")),
(1.0, LootTable("common.loot_tables.weapons.hammer.bloodsteel")),
(1.0, LootTable("common.loot_tables.weapons.bow.eldwood")),
(1.0, LootTable("common.loot_tables.weapons.staff.eldwood")),
(1.0, LootTable("common.loot_tables.weapons.sceptre.eldwood")),
]

5
common/src/bin/csv_import/main.rs
View File

@ -404,7 +404,10 @@ fn loot_table(loot_table: &str) -> Result<(), Box<dyn Error>> {
.to_string(),
),
"CreatureMaterial" => LootSpec::CreatureMaterial,
a => panic!("Loot specifier kind must be either \"Item\" or \"LootTable\"\n{}", a),
a => panic!(
"Loot specifier kind must be either \"Item\" or \"LootTable\"\n{}",
a
),
};
let chance: f32 = record
.get(headers["Relative Chance"])

8
common/src/comp/inventory/item/mod.rs
View File

@ -602,8 +602,8 @@ impl Item {
// IMPORTANT: Add any new container to `SpriteKind::is_container`
SpriteKind::Chest => {
chosen = Lottery::<LootSpec>::load_expect(match rng.gen_range(0..7) {
0 => "common.loot_tables.weapon_uncommon",
1 => "common.loot_tables.weapon_common",
0 => "common.loot_tables.weapons.tier-0",
1 => "common.loot_tables.weapons.tier-1",
2 => "common.loot_tables.armor.swift",
3 => "common.loot_tables.armor.cloth",
4 => "common.loot_tables.armor.plate",
@ -614,7 +614,7 @@ impl Item {
},
SpriteKind::ChestBurried => {
chosen = Lottery::<LootSpec>::load_expect(match rng.gen_range(0..7) {
1 => "common.loot_tables.weapon_common",
1 => "common.loot_tables.weapons.tier-1",
2 => "common.loot_tables.armor.swift",
3 => "common.loot_tables.armor.cloth",
_ => "common.loot_tables.fallback",
@ -625,7 +625,7 @@ impl Item {
SpriteKind::Mud => {
chosen = Lottery::<LootSpec>::load_expect(match rng.gen_range(0..5) {
0 => "common.loot_tables.crafting",
1 => "common.loot_tables.weapon_common",
1 => "common.loot_tables.weapons.tier-0",
2 => "common.loot_tables.fallback",
_ => "common.loot_tables.rocks",
})

16
server/src/events/entity_manipulation.rs
View File

@ -345,7 +345,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.armor.swift",
2 => "common.loot_tables.armor.cloth",
3 => "common.loot_tables.weapon_common",
3 => "common.loot_tables.weapons.starter",
4 => "common.loot_tables.humanoids",
_ => "common.loots_tables.fallback",
},
@ -376,13 +376,13 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
biped_large::Species::Wendigo => match rng.gen_range(0..7) {
0 => "common.loot_tables.food",
1 => "common.loot_tables.wild_animal",
2 => "common.loot_tables.weapon_uncommon",
2 => "common.loot_tables.weapons.tier-2",
_ => "common.loot_tables.cave_large",
},
biped_large::Species::Troll => match rng.gen_range(0..10) {
biped_large::Species::Troll => match rng.gen_range(0..8) {
0 => "common.loot_tables.food",
1 => "common.loot_tables.cave_large",
2 => "common.loot_tables.weapon_uncommon",
2 => "common.loot_tables.weapons.tier-2",
_ => "common.loot_tables.wild_animal",
},
biped_large::Species::Occultsaurok
@ -396,13 +396,13 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
Some(common::comp::Body::Golem(_)) => match rng.gen_range(0..5) {
0 => "common.loot_tables.food",
1 => "common.loot_tables.armor.steel",
2 => "common.loot_tables.weapon_common",
3 => "common.loot_tables.weapon_uncommon",
4 => "common.loot_tables.weapon_rare",
2 => "common.loot_tables.weapons.tier-1",
3 => "common.loot_tables.weapons.tier-2",
4 => "common.loot_tables.weapons.tier-3",
_ => "common.loot_tables.fallback",
},
Some(common::comp::Body::Theropod(_)) => "common.loot_tables.wild_animal",
Some(common::comp::Body::Dragon(_)) => "common.loot_tables.weapon_rare",
Some(common::comp::Body::Dragon(_)) => "common.loot_tables.weapons.tier-5",
Some(common::comp::Body::QuadrupedLow(quadruped_low)) => {
match quadruped_low.species {
quadruped_low::Species::Maneater => "common.loot_tables.maneater",

33
world/src/site/dungeon/mod.rs
View File

@ -556,28 +556,28 @@ impl Floor {
match dynamic_rng.gen_range(0..4) {
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.armor.cloth",
_ => "common.loot_tables.weapon_common",
_ => "common.loot_tables.weapons.tier-0",
},
),
1 => Lottery::<LootSpec>::load_expect(
match dynamic_rng.gen_range(0..4) {
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.armor.swift",
_ => "common.loot_tables.weapon_uncommon",
_ => "common.loot_tables.weapons.tier-1",
},
),
2 => Lottery::<LootSpec>::load_expect(
match dynamic_rng.gen_range(0..4) {
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.armor.plate",
_ => "common.loot_tables.weapon_rare",
_ => "common.loot_tables.weapons.tier-2",
},
),
3 => Lottery::<LootSpec>::load_expect(
match dynamic_rng.gen_range(0..10) {
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.armor.steel",
2 => "common.loot_tables.weapon_rare",
2 => "common.loot_tables.weapons.tier-3",
_ => "common.loot_tables.cultists",
},
),
@ -585,7 +585,7 @@ impl Floor {
match dynamic_rng.gen_range(0..6) {
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.fallback",
2 => "common.loot_tables.weapon_rare",
2 => "common.loot_tables.weapons.tier-4",
_ => "common.loot_tables.cultists",
},
),
@ -593,7 +593,7 @@ impl Floor {
match dynamic_rng.gen_range(0..5) {
0 => "common.loot_tables.humanoids",
1 => "common.loot_tables.fallback",
2 => "common.loot_tables.weapon_rare",
2 => "common.loot_tables.weapons.tier-5",
_ => "common.loot_tables.cultists",
},
),
@ -838,23 +838,20 @@ impl Floor {
if tile_pos == boss_spawn_tile && tile_wcenter.xy() == wpos2d {
let chosen = match room.difficulty {
0 => Lottery::<LootSpec>::load_expect(
"common.loot_tables.weapon_uncommon",
"common.loot_tables.weapons.tier-0",
),
1 => Lottery::<LootSpec>::load_expect(
"common.loot_tables.weapon_uncommon",
"common.loot_tables.weapons.tier-1",
),
2 => Lottery::<LootSpec>::load_expect(
match dynamic_rng.gen_range(0..3) {
0 => "common.loot_tables.armor.steel",
_ => "common.loot_tables.armor.plate",
},
"common.loot_tables.weapons.tier-2",
),
3 => Lottery::<LootSpec>::load_expect(
"common.loot_tables.weapon_rare",
"common.loot_tables.weapons.tier-3",
),
4 => Lottery::<LootSpec>::load_expect(
"common.loot_tables.weapons.tier-4",
),
4 => {
Lottery::<LootSpec>::load_expect("common.loot_tables.miniboss")
},
5 => Lottery::<LootSpec>::load_expect(
match dynamic_rng.gen_range(0..3) {
0 => "common.loot_tables.mindflayer",
@ -1009,10 +1006,10 @@ impl Floor {
"common.loot_tables.wild_animal",
),
3 => Lottery::<LootSpec>::load_expect(
"common.loot_tables.weapon_rare",
"common.loot_tables.weapons.tier-3",
),
4 => Lottery::<LootSpec>::load_expect(
"common.loot_tables.weapon_rare",
"common.loot_tables.weapons.tier-4",
),
5 => Lottery::<LootSpec>::load_expect("common.loot_tables.husk"),
_ => {