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

Small adjustments

Browse Source
This commit is contained in:
Michal Sroczynski 2023-08-11 14:09:31 +02:00
parent daa1e1b00d
commit 3a6c3ac669
7 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/common/loot_tables/creature/biped_large/dullahan.ron
View File

@ -1,9 +1,9 @@
[ [
(1.9, All([ (1.8, All([
MultiDrop(Item("common.items.utility.coins"), 200, 500), MultiDrop(Item("common.items.utility.coins"), 200, 500),
MultiDrop(Item("common.items.mineral.ingot.bloodsteel"), 2, 4), MultiDrop(Item("common.items.mineral.ingot.bloodsteel"), 2, 4),
MultiDrop(Item("common.items.mineral.ingot.silver"), 0, 2), MultiDrop(Item("common.items.mineral.ingot.silver"), 0, 2),
], ])),
)), (0.1, Item("common.items.glider.morpho")),
(0.1, Item("common.items.weapons.sword.caladbolg")), (0.1, Item("common.items.weapons.sword.caladbolg")),
] ]

2
assets/common/loot_tables/dungeon/adlet/elder.ron
View File

@ -1,6 +1,8 @@
[ [
(1, All([ (1, All([
Item("common.items.keys.bone_key"), Item("common.items.keys.bone_key"),
MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 1, 2),
MultiDrop(Item("common.items.crafting_ing.leather.thick_leather"), 1, 2),
LootTable("common.loot_tables.dungeon.adlet.elder_extra"), LootTable("common.loot_tables.dungeon.adlet.elder_extra"),
], ],
)), )),

4
assets/common/loot_tables/dungeon/adlet/elder_extra.ron
View File

@ -1,8 +1,8 @@
[ [
// Weapons // Weapons
(4.0, LootTable("common.loot_tables.weapons.tier-2")), (4.0, LootTable("common.loot_tables.weapons.tier-3")),
// Armor // Armor
(4.0, LootTable("common.loot_tables.armor.tier-2")), (4.0, LootTable("common.loot_tables.armor.tier-3")),
// Misc // Misc
(2.0, Item("common.items.armor.misc.neck.pendant_of_protection")), (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
(0.5, Item("common.items.tool.instruments.wildskin_drum")), (0.5, Item("common.items.tool.instruments.wildskin_drum")),

3
assets/common/loot_tables/dungeon/adlet/yeti.ron
View File

@ -1,11 +1,10 @@
[ [
(1.5, All([ (1.6, All([
MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 6), MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 6),
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 3), MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2, 4), MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2, 4),
MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 6), MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 6),
])), ])),
(0.1, Item("common.items.glider.morpho")),
(0.2, Item("common.items.armor.misc.head.bear_bonnet")), (0.2, Item("common.items.armor.misc.head.bear_bonnet")),
(0.2, Item("common.items.armor.misc.head.howl_cowl")), (0.2, Item("common.items.armor.misc.head.howl_cowl")),
] ]

4
assets/common/loot_tables/dungeon/cultist/mindflayer.ron
View File

@ -1,12 +1,10 @@
[ [
// TODO: Make this loot table less cluttered
// tier equipment (technically worse than other weapons here until modular weapons)
(5.0, LootTable("common.loot_tables.weapons.cultist")), (5.0, LootTable("common.loot_tables.weapons.cultist")),
(10.0, LootTable("common.loot_tables.armor.cultist")), (10.0, LootTable("common.loot_tables.armor.cultist")),
// Rare misc items // Rare misc items
(1.0, Item("common.items.boss_drops.lantern")), (1.0, Item("common.items.boss_drops.lantern")),
(1.0, Item("common.items.glider.skullgrin")), (1.0, Item("common.items.glider.skullgrin")),
(0.01, Item("common.items.armor.misc.neck.ankh_of_life")), (0.5, Item("common.items.armor.misc.neck.ankh_of_life")),
// Legendary weapons // Legendary weapons
(1.0, Item("common.items.weapons.staff.laevateinn")), (1.0, Item("common.items.weapons.staff.laevateinn")),
// Crafting material // Crafting material

4
assets/common/loot_tables/dungeon/gnarling/chieftain.ron
View File

@ -1,8 +1,8 @@
[ [
// Weapons // Weapons
(5.0, LootTable("common.loot_tables.weapons.tier-1")), (5.0, LootTable("common.loot_tables.weapons.tier-2")),
// Armor // Armor
(5.0, LootTable("common.loot_tables.armor.tier-1")), (5.0, LootTable("common.loot_tables.armor.tier-2")),
// Misc // Misc
(3.0, Item("common.items.armor.misc.neck.scratched")), (3.0, Item("common.items.armor.misc.neck.scratched")),
(2.0, Item("common.items.armor.misc.head.wanderers_hat")), (2.0, Item("common.items.armor.misc.head.wanderers_hat")),

6
common/src/comp/inventory/trade_pricing.rs
View File

@ -1170,12 +1170,6 @@ mod tests {
let lootsum3 = loot3.iter().fold(0.0, |s, i| s + i.0); let lootsum3 = loot3.iter().fold(0.0, |s, i| s + i.0);
//tracing::trace!("{:?} {}", loot3, lootsum3); //tracing::trace!("{:?} {}", loot3, lootsum3);
assert!((lootsum3 - 1.0).abs() < 1e-5); assert!((lootsum3 - 1.0).abs() < 1e-5);
// includes tier-5 modular weapons
let loot4 = expand_loot_table("common.loot_tables.dungeon.myrmidon.minotaur");
let lootsum4 = loot4.iter().fold(0.0, |s, i| s + i.0);
//tracing::trace!("{:?} {}", loot4, lootsum4);
assert!((lootsum4 - 1.0).abs() < 1e-5);
} }
#[test] #[test]