mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'qsto/instruments-recipes-fix' into 'master'
Instruments recipes fix See merge request veloren/veloren!4034
This commit is contained in:
commit
90e33e96bd
@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Tweaked Archaeos, Basilisk, Dreadhorn, Dullahan, Mammoth, Ngoubou, Ntouka and Roshwalr loot tables to be a bit more rewarding
|
||||
- Removed weapon and armor drops from standard NPCs
|
||||
- Tweaked dungeons mobs and chests loot tables to be more balanced and rewarding
|
||||
- Changed iron ore to iron ingots in the instruments' recipes
|
||||
|
||||
### Removed
|
||||
|
||||
|
@ -2174,7 +2174,7 @@
|
||||
(Item("common.items.log.hardwood"), 6, false),
|
||||
(Item("common.items.crafting_ing.resin"), 3, false),
|
||||
(Item("common.items.flowers.plant_fiber"), 4, false),
|
||||
(Item("common.items.mineral.ore.iron"), 2, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 1, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2194,7 +2194,7 @@
|
||||
(Item("common.items.log.hardwood"), 4, false),
|
||||
(Item("common.items.crafting_ing.resin"), 2, false),
|
||||
(Item("common.items.flowers.plant_fiber"), 6, false),
|
||||
(Item("common.items.mineral.ore.iron"), 4, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 2, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2205,7 +2205,7 @@
|
||||
(Item("common.items.log.hardwood"), 3, false),
|
||||
(Item("common.items.crafting_ing.resin"), 2, false),
|
||||
(Item("common.items.flowers.plant_fiber"), 5, false),
|
||||
(Item("common.items.mineral.ore.iron"), 1, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 1, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2215,7 +2215,7 @@
|
||||
inputs: [
|
||||
(Item("common.items.log.hardwood"), 2, false),
|
||||
(Item("common.items.crafting_ing.resin"), 1, false),
|
||||
(Item("common.items.mineral.ore.iron"), 8, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 4, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2226,7 +2226,7 @@
|
||||
(Item("common.items.log.hardwood"), 2, false),
|
||||
(Item("common.items.crafting_ing.resin"), 1, false),
|
||||
(Item("common.items.flowers.plant_fiber"), 3, false),
|
||||
(Item("common.items.mineral.ore.iron"), 1, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 1, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2236,7 +2236,7 @@
|
||||
inputs: [
|
||||
(Item("common.items.log.hardwood"), 1, false),
|
||||
(Item("common.items.crafting_ing.resin"), 1, false),
|
||||
(Item("common.items.mineral.ore.tin"), 2, false),
|
||||
(Item("common.items.mineral.ingot.tin"), 1, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2246,9 +2246,9 @@
|
||||
inputs: [
|
||||
(Item("common.items.log.hardwood"), 2, false),
|
||||
(Item("common.items.crafting_ing.resin"), 1, false),
|
||||
(Item("common.items.mineral.ore.copper"), 2, false),
|
||||
(Item("common.items.mineral.ore.tin"), 2, false),
|
||||
(Item("common.items.mineral.ore.iron"), 2, false),
|
||||
(Item("common.items.mineral.ingot.copper"), 1, false),
|
||||
(Item("common.items.mineral.ingot.tin"), 1, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 1, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
@ -2258,8 +2258,8 @@
|
||||
inputs: [
|
||||
(Item("common.items.log.hardwood"), 4, false),
|
||||
(Item("common.items.crafting_ing.resin"), 2, false),
|
||||
(Item("common.items.mineral.ore.iron"), 2, false),
|
||||
(Item("common.items.mineral.ore.silver"), 12, false),
|
||||
(Item("common.items.mineral.ingot.iron"), 1, false),
|
||||
(Item("common.items.mineral.ingot.silver"), 6, false),
|
||||
],
|
||||
craft_sprite: Some(CraftingBench),
|
||||
is_recycling: false,
|
||||
|
Loading…
Reference in New Issue
Block a user