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

fmt

Browse Source
This commit is contained in:
juliancoffee 2021-05-25 01:23:13 +03:00
parent 2da8d96ec9
commit c618ec7222
12 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/item_price_calculation.ron
View File

@ -31,7 +31,7 @@ loot_tables: [
(0.4, true, "common.loot_tables.food.wild_ingredients"), (0.4, true, "common.loot_tables.food.wild_ingredients"),
(0.2, true, "common.loot_tables.food.prepared"), (0.2, true, "common.loot_tables.food.prepared"),
// TODO: Change consumables and split them up // TODO: Change consumables and split them up
(1.0, true, "common.loot_tables.consumables.default"), (1.0, true, "common.loot_tables.consumable.default"),
(0.5, false, "common.loot_tables.trading"), (0.5, false, "common.loot_tables.trading"),
], ],
// this is the amount of that good the most common item represents // this is the amount of that good the most common item represents

5
assets/common/loot_tables/consumable/default.ron Normal file
View File

@ -0,0 +1,5 @@
[
(2.0, LootTable("common.loot_tables.consumable.potion")),
(0.5, LootTable("common.loot_tables.consumable.throwable")),
(1.0, LootTable("common.loot_tables.consumable.misc")),
]

0
assets/common/loot_tables/consumables/fireworks.ron → assets/common/loot_tables/consumable/firework.ron
View File

5
assets/common/loot_tables/consumable/misc.ron Normal file
View File

@ -0,0 +1,5 @@
[
// misc
(0.1, Item("common.items.utility.collar")),
(1.0, LootTable("common.loot_tables.consumable.firework")),
]

0
assets/common/loot_tables/consumables/potions.ron → assets/common/loot_tables/consumable/potion.ron
View File

0
assets/common/loot_tables/consumables/throwables.ron → assets/common/loot_tables/consumable/throwable.ron
View File

5
assets/common/loot_tables/consumables/default.ron
View File

@ -1,5 +0,0 @@
[
(2.0, LootTable("common.loot_tables.consumables.potions")),
(0.5, LootTable("common.loot_tables.consumables.throwables")),
(1.0, LootTable("common.loot_tables.consumables.misc")),
]

5
assets/common/loot_tables/consumables/misc.ron
View File

@ -1,5 +0,0 @@
[
// misc
(0.1, Item("common.items.utility.collar")),
(1.0, LootTable("common.loot_tables.consumables.fireworks")),
]

2
assets/common/loot_tables/dungeon/tier-0/miniboss.ron
View File

@ -1,5 +1,5 @@
[ [
(1.0, LootTable("common.loot_tables.armor.cloth")), (1.0, LootTable("common.loot_tables.armor.cloth")),
(2.0, LootTable("common.loot_tables.weapons.tier-0")), (2.0, LootTable("common.loot_tables.weapons.tier-0")),
(2.0, LootTable("common.loot_tables.consumables.potions")), (2.0, LootTable("common.loot_tables.consumable.potion")),
] ]

2
assets/common/loot_tables/dungeon/tier-5/enemy.ron
View File

@ -14,5 +14,5 @@
(0.1, Item("common.items.glider.glider_blue")), (0.1, Item("common.items.glider.glider_blue")),
(0.001, Item("common.items.armor.misc.back.backpack")), (0.001, Item("common.items.armor.misc.back.backpack")),
(0.1, Item("common.items.armor.misc.bag.heavy_seabag")), (0.1, Item("common.items.armor.misc.bag.heavy_seabag")),
(1.0, LootTable("common.loot_tables.consumables.default")), (1.0, LootTable("common.loot_tables.consumable.default")),
] ]

2
assets/common/loot_tables/dungeon/tier-5/minion.ron
View File

@ -5,5 +5,5 @@
(3.0, LootTable("common.loot_tables.food.wild_ingredients")), (3.0, LootTable("common.loot_tables.food.wild_ingredients")),
(0.5, LootTable("common.loot_tables.food.prepared")), (0.5, LootTable("common.loot_tables.food.prepared")),
// Consumables // Consumables
(0.5, LootTable("common.loot_tables.consumables.default")), (0.5, LootTable("common.loot_tables.consumable.default")),
] ]

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

@ -741,7 +741,9 @@ impl Item {
SpriteKind::Seashells => "common.items.crafting_ing.seashells", SpriteKind::Seashells => "common.items.crafting_ing.seashells",
// Containers // Containers
// IMPORTANT: Add any new container to `SpriteKind::is_container` // IMPORTANT: Add any new container to `SpriteKind::is_container`
container @ (SpriteKind::DungeonChest0 container
@
(SpriteKind::DungeonChest0
| SpriteKind::DungeonChest1 | SpriteKind::DungeonChest1
| SpriteKind::DungeonChest2 | SpriteKind::DungeonChest2
| SpriteKind::DungeonChest3 | SpriteKind::DungeonChest3