diff --git a/CHANGELOG.md b/CHANGELOG.md index c5aec983db..47d8833613 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,21 +8,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added - -- Esperanto translation -- Item quantity sort in player inventory. +- Recipe for twigs from wooden logs +- First version of multisalvage that allows to obtain more than one piece of material from salvage ### Changed - -- Plugins now target wasm32-unknown-wasi and all wasm cfgs are gone -- Slightly reduced quantities of ingredients needed to craft cooked foods -- Improved and cleaned loot tables for T1 and T2 dungeons as well as large cave monsters (Good bye, Bowls and Stones!) +- Made helmets, necklaces, rings, twig armors and some gliders salvageable +- Tweaked stats on some foods so they generally increase a tiny bit more HP +- Reduced idle time after consumption from 5 to 4 seconds +- Reduced interaction time for harvestable and collectible items to smooth the gameplay +- Gliders no longer drop from cave creatures +- 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 ### Removed -- Plugins can no longer prevent users from logging in -- Removed fallback support for old save folder pre 0.8.0 - ### Fixed ## [0.15.0] - 2023-07-01 @@ -73,9 +73,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Durability free areas (`/area_add no_durability ...`) - Added Brazilian Portuguese translation. - Added additional confirmation when trading for nothing. -- Dwarven-Mine themed dungeon -- Multiple item types can be dropped from enemies and chests now -- Readable signs +- Esperanto translation +- Item quantity sort in player inventory. ### Changed @@ -97,9 +96,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The language identifiers used by the i18n translation system have been converted to IETF BCP 47 (RFC 5646) language tags. - Improved particle performance for lava and leaves - The wander-radius of entities can be defined in their .ron config now +- Dwarven-Mine themed dungeon +- Multiple item types can be dropped from enemies and chests now +- Readable signs +- Plugins now target wasm32-unknown-wasi and all wasm cfgs are gone +- Slightly reduced quantities of ingredients needed to craft cooked foods +- Improved and cleaned loot tables for T1 and T2 dungeons as well as large cave monsters (Good bye, Bowls and Stones!) +- Added coastal towns ### Removed +- Plugins can no longer prevent users from logging in + ### Fixed - Doors diff --git a/assets/common/entity/dungeon/adlet/elder.ron b/assets/common/entity/dungeon/adlet/elder.ron index c88884ae00..ea1399089b 100644 --- a/assets/common/entity/dungeon/adlet/elder.ron +++ b/assets/common/entity/dungeon/adlet/elder.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("adlet_elder"), alignment: Alignment(Enemy), - loot: MultiDrop(LootTable("common.loot_tables.dungeon.tier-1.elder"), 2, 2), + loot: MultiDrop(LootTable("common.loot_tables.dungeon.adlet.elder"), 2, 2), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/dungeon/adlet/hunter.ron b/assets/common/entity/dungeon/adlet/hunter.ron index 4a5b5dcaf9..3b9b165d2e 100644 --- a/assets/common/entity/dungeon/adlet/hunter.ron +++ b/assets/common/entity/dungeon/adlet/hunter.ron @@ -3,7 +3,7 @@ name: Name("Adlet Hunter"), body: RandomWith("adlet"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-1.hunter"), + loot: LootTable("common.loot_tables.dungeon.adlet.hunter"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.adlet.hunter"), diff --git a/assets/common/entity/dungeon/adlet/icepicker.ron b/assets/common/entity/dungeon/adlet/icepicker.ron index effbd67e94..dada16269a 100644 --- a/assets/common/entity/dungeon/adlet/icepicker.ron +++ b/assets/common/entity/dungeon/adlet/icepicker.ron @@ -3,7 +3,7 @@ name: Name("Adlet Icepicker"), body: RandomWith("adlet"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-1.icepicker"), + loot: LootTable("common.loot_tables.dungeon.adlet.icepicker"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.adlet.icepicker"), diff --git a/assets/common/entity/dungeon/adlet/tracker.ron b/assets/common/entity/dungeon/adlet/tracker.ron index 5e3314430b..76b6fb5e21 100644 --- a/assets/common/entity/dungeon/adlet/tracker.ron +++ b/assets/common/entity/dungeon/adlet/tracker.ron @@ -3,7 +3,7 @@ name: Name("Adlet Tracker"), body: RandomWith("adlet"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-1.tracker"), + loot: LootTable("common.loot_tables.dungeon.adlet.tracker"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.adlet.tracker"), diff --git a/assets/common/entity/dungeon/adlet/yeti.ron b/assets/common/entity/dungeon/adlet/yeti.ron index 5f78176b3c..9d494b805e 100644 --- a/assets/common/entity/dungeon/adlet/yeti.ron +++ b/assets/common/entity/dungeon/adlet/yeti.ron @@ -3,7 +3,7 @@ name: Name("Yeti"), body: RandomWith("yeti"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-1.boss"), + loot: LootTable("common.loot_tables.dungeon.adlet.boss"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/dungeon/dwarven_quarry/mine_guard.ron b/assets/common/entity/dungeon/dwarven_quarry/mine_guard.ron index 7d3176fa0b..6e56a28964 100644 --- a/assets/common/entity/dungeon/dwarven_quarry/mine_guard.ron +++ b/assets/common/entity/dungeon/dwarven_quarry/mine_guard.ron @@ -3,7 +3,8 @@ name: Name("Mine Guard"), body: RandomWith("dwarf"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.bandit"), + // TODO Add custom loot table + loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.dwarven_quarry.mine_guard"), diff --git a/assets/common/entity/dungeon/dwarven_quarry/miner.ron b/assets/common/entity/dungeon/dwarven_quarry/miner.ron index 92079967e4..d8b72b2aa4 100644 --- a/assets/common/entity/dungeon/dwarven_quarry/miner.ron +++ b/assets/common/entity/dungeon/dwarven_quarry/miner.ron @@ -3,7 +3,8 @@ name: Name("Greedy Miner"), body: RandomWith("dwarf"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.bandit"), + // TODO Add custom loot table + loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.dwarven_quarry.greedy_miner"), diff --git a/assets/common/entity/dungeon/dwarven_quarry/miner_draugr.ron b/assets/common/entity/dungeon/dwarven_quarry/miner_draugr.ron index c67db80755..482987bd30 100644 --- a/assets/common/entity/dungeon/dwarven_quarry/miner_draugr.ron +++ b/assets/common/entity/dungeon/dwarven_quarry/miner_draugr.ron @@ -3,7 +3,8 @@ name: Name("Greedy Miner"), body: RandomWith("draugr"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.bandit"), + // TODO Add custom loot table + loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.dwarven_quarry.greedy_miner"), diff --git a/assets/common/entity/dungeon/gnarling/chieftain.ron b/assets/common/entity/dungeon/gnarling/chieftain.ron index 56c4ff1047..bca94f2d04 100644 --- a/assets/common/entity/dungeon/gnarling/chieftain.ron +++ b/assets/common/entity/dungeon/gnarling/chieftain.ron @@ -4,7 +4,7 @@ name: Name("Gnarling Chieftain"), body: RandomWith("gnarling"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.chieftain"), + loot: LootTable("common.loot_tables.dungeon.gnarling.chieftain"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.gnarling.chieftain"), diff --git a/assets/common/entity/dungeon/gnarling/harvester.ron b/assets/common/entity/dungeon/gnarling/harvester.ron index 0fd0f58557..76100f5696 100644 --- a/assets/common/entity/dungeon/gnarling/harvester.ron +++ b/assets/common/entity/dungeon/gnarling/harvester.ron @@ -3,7 +3,7 @@ name: Name("Harvester"), body: RandomWith("harvester"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.harvester"), + loot: LootTable("common.loot_tables.dungeon.gnarling.harvester"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/dungeon/gnarling/logger.ron b/assets/common/entity/dungeon/gnarling/logger.ron index 5f42fa4441..fcd91a1cce 100644 --- a/assets/common/entity/dungeon/gnarling/logger.ron +++ b/assets/common/entity/dungeon/gnarling/logger.ron @@ -3,7 +3,7 @@ name: Name("Gnarling Logger"), body: RandomWith("gnarling"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.logger"), + loot: LootTable("common.loot_tables.dungeon.gnarling.logger"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.gnarling.logger"), diff --git a/assets/common/entity/dungeon/gnarling/mandragora.ron b/assets/common/entity/dungeon/gnarling/mandragora.ron index d4c6bf32f5..5952a2285a 100644 --- a/assets/common/entity/dungeon/gnarling/mandragora.ron +++ b/assets/common/entity/dungeon/gnarling/mandragora.ron @@ -3,7 +3,7 @@ name: Name("Mandragora"), body: RandomWith("mandragora"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.mandragora"), + loot: LootTable("common.loot_tables.dungeon.gnarling.mandragora"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.gnarling.mandragora"), diff --git a/assets/common/entity/dungeon/gnarling/mugger.ron b/assets/common/entity/dungeon/gnarling/mugger.ron index ca69f5dafd..461bd339b0 100644 --- a/assets/common/entity/dungeon/gnarling/mugger.ron +++ b/assets/common/entity/dungeon/gnarling/mugger.ron @@ -3,7 +3,7 @@ name: Name("Gnarling Mugger"), body: RandomWith("gnarling"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.mugger"), + loot: LootTable("common.loot_tables.dungeon.gnarling.mugger"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.gnarling.mugger"), diff --git a/assets/common/entity/dungeon/gnarling/stalker.ron b/assets/common/entity/dungeon/gnarling/stalker.ron index d1c5190281..c45b403163 100644 --- a/assets/common/entity/dungeon/gnarling/stalker.ron +++ b/assets/common/entity/dungeon/gnarling/stalker.ron @@ -3,7 +3,7 @@ name: Name("Gnarling Stalker"), body: RandomWith("gnarling"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.stalker"), + loot: LootTable("common.loot_tables.dungeon.gnarling.stalker"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.dungeon.gnarling.stalker"), diff --git a/assets/common/entity/dungeon/gnarling/woodgolem.ron b/assets/common/entity/dungeon/gnarling/woodgolem.ron index d2bc5c056a..f2c0172dcc 100644 --- a/assets/common/entity/dungeon/gnarling/woodgolem.ron +++ b/assets/common/entity/dungeon/gnarling/woodgolem.ron @@ -3,7 +3,7 @@ name: Name("Wooden Golem"), body: RandomWith("woodgolem"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-0.woodgolem"), + loot: LootTable("common.loot_tables.dungeon.gnarling.woodgolem"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/spot/dwarf_grave_robber.ron b/assets/common/entity/spot/dwarf_grave_robber.ron index 6d3a1d743f..793fb700ad 100644 --- a/assets/common/entity/spot/dwarf_grave_robber.ron +++ b/assets/common/entity/spot/dwarf_grave_robber.ron @@ -3,7 +3,7 @@ name: Name("Grave Robber"), body: RandomWith("dwarf"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.bandit"), + loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.spots.dwarf_graverobber"), diff --git a/assets/common/entity/spot/grim_salvager.ron b/assets/common/entity/spot/grim_salvager.ron index a9fae6dc96..1cbcded794 100644 --- a/assets/common/entity/spot/grim_salvager.ron +++ b/assets/common/entity/spot/grim_salvager.ron @@ -3,7 +3,7 @@ name: Name("Grim Salvager"), body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.bandit"), + loot: LootTable("common.loot_tables.humanoids.grim_salvager"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.spots.dwarf_graverobber"), diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index f37b378bef..af696288fb 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -3,7 +3,7 @@ name: Name("Pirate"), body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.pirate"), + loot: LootTable("common.loot_tables.humanoids.pirate"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.spots.pirate"), diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron index 42c25da96a..944d784328 100644 --- a/assets/common/entity/spot/witch_dark.ron +++ b/assets/common/entity/spot/witch_dark.ron @@ -3,7 +3,7 @@ name: Name("Witch"), body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.spots.witch"), + loot: LootTable("common.loot_tables.humanoids.witch"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.spots.witch"), diff --git a/assets/common/entity/template.ron b/assets/common/entity/template.ron index a31f3af5f4..c8cd4d77b6 100644 --- a/assets/common/entity/template.ron +++ b/assets/common/entity/template.ron @@ -5,7 +5,7 @@ name: Name("Paddy"), body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.humanoids.humanoid"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.village.merchant"), diff --git a/assets/common/entity/wild/aggressive/archaeos.ron b/assets/common/entity/wild/aggressive/archaeos.ron index f7f1230752..c1199c3614 100644 --- a/assets/common/entity/wild/aggressive/archaeos.ron +++ b/assets/common/entity/wild/aggressive/archaeos.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("archaeos"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.theropod.plate"), + loot: LootTable("common.loot_tables.creature.theropod.archaeos"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/aggressive/cyclops.ron b/assets/common/entity/wild/aggressive/cyclops.ron index 7f7ebe2a1d..040d3f1b38 100644 --- a/assets/common/entity/wild/aggressive/cyclops.ron +++ b/assets/common/entity/wild/aggressive/cyclops.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("cyclops"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.dungeon.tier-4.miniboss"), + loot: LootTable("common.loot_tables.creature.biped_large.cyclops"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/aggressive/dullahan.ron b/assets/common/entity/wild/aggressive/dullahan.ron index 23b6e2380d..59616ea8ab 100644 --- a/assets/common/entity/wild/aggressive/dullahan.ron +++ b/assets/common/entity/wild/aggressive/dullahan.ron @@ -3,7 +3,7 @@ name: Name("Dullahan"), body: RandomWith("dullahan"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.biped_large.default"), + loot: LootTable("common.loot_tables.creature.biped_large.dullahan"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/aggressive/ntouka.ron b/assets/common/entity/wild/aggressive/ntouka.ron index a051b349df..928adecf36 100644 --- a/assets/common/entity/wild/aggressive/ntouka.ron +++ b/assets/common/entity/wild/aggressive/ntouka.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("ntouka"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.theropod.plate"), + loot: LootTable("common.loot_tables.creature.theropod.ntouka"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/items/armor/assassin/belt.ron b/assets/common/items/armor/assassin/belt.ron index 1a8ff20c8d..f850010c3c 100644 --- a/assets/common/items/armor/assassin/belt.ron +++ b/assets/common/items/armor/assassin/belt.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) diff --git a/assets/common/items/armor/assassin/chest.ron b/assets/common/items/armor/assassin/chest.ron index da39459f32..e4e104bae5 100644 --- a/assets/common/items/armor/assassin/chest.ron +++ b/assets/common/items/armor/assassin/chest.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/foot.ron b/assets/common/items/armor/assassin/foot.ron index ad90eec795..aa6ca25d93 100644 --- a/assets/common/items/armor/assassin/foot.ron +++ b/assets/common/items/armor/assassin/foot.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/hand.ron b/assets/common/items/armor/assassin/hand.ron index 00f5e307dc..e46342d513 100644 --- a/assets/common/items/armor/assassin/hand.ron +++ b/assets/common/items/armor/assassin/hand.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/head.ron b/assets/common/items/armor/assassin/head.ron index d87e777480..fc0f901540 100644 --- a/assets/common/items/armor/assassin/head.ron +++ b/assets/common/items/armor/assassin/head.ron @@ -9,6 +9,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/pants.ron b/assets/common/items/armor/assassin/pants.ron index 36db88be36..c82ccdd66c 100644 --- a/assets/common/items/armor/assassin/pants.ron +++ b/assets/common/items/armor/assassin/pants.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/shoulder.ron b/assets/common/items/armor/assassin/shoulder.ron index 031eca6283..f150ef8136 100644 --- a/assets/common/items/armor/assassin/shoulder.ron +++ b/assets/common/items/armor/assassin/shoulder.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/belt.ron b/assets/common/items/armor/bonerattler/belt.ron index 5aebef259e..c19f9ac9b9 100644 --- a/assets/common/items/armor/bonerattler/belt.ron +++ b/assets/common/items/armor/bonerattler/belt.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/chest.ron b/assets/common/items/armor/bonerattler/chest.ron index ec03a8861e..c33c1aa675 100644 --- a/assets/common/items/armor/bonerattler/chest.ron +++ b/assets/common/items/armor/bonerattler/chest.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/foot.ron b/assets/common/items/armor/bonerattler/foot.ron index 351acafd5a..c4cc8efa96 100644 --- a/assets/common/items/armor/bonerattler/foot.ron +++ b/assets/common/items/armor/bonerattler/foot.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/hand.ron b/assets/common/items/armor/bonerattler/hand.ron index 616bc797a2..4c86ead39e 100644 --- a/assets/common/items/armor/bonerattler/hand.ron +++ b/assets/common/items/armor/bonerattler/hand.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/pants.ron b/assets/common/items/armor/bonerattler/pants.ron index 3dccb1a024..55c165fcfc 100644 --- a/assets/common/items/armor/bonerattler/pants.ron +++ b/assets/common/items/armor/bonerattler/pants.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/shoulder.ron b/assets/common/items/armor/bonerattler/shoulder.ron index a0698677f6..d6f1bf06c0 100644 --- a/assets/common/items/armor/bonerattler/shoulder.ron +++ b/assets/common/items/armor/bonerattler/shoulder.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/back.ron b/assets/common/items/armor/cloth/druid/back.ron index a40337e89b..7012e5e3a3 100644 --- a/assets/common/items/armor/cloth/druid/back.ron +++ b/assets/common/items/armor/cloth/druid/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/belt.ron b/assets/common/items/armor/cloth/druid/belt.ron index 9a58232388..75ef20e219 100644 --- a/assets/common/items/armor/cloth/druid/belt.ron +++ b/assets/common/items/armor/cloth/druid/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/chest.ron b/assets/common/items/armor/cloth/druid/chest.ron index 1300ab75c0..fa7e7f8237 100644 --- a/assets/common/items/armor/cloth/druid/chest.ron +++ b/assets/common/items/armor/cloth/druid/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/foot.ron b/assets/common/items/armor/cloth/druid/foot.ron index 04f19a6d2c..d978dd380e 100644 --- a/assets/common/items/armor/cloth/druid/foot.ron +++ b/assets/common/items/armor/cloth/druid/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/hand.ron b/assets/common/items/armor/cloth/druid/hand.ron index fa0a1487e9..d92f1cd38b 100644 --- a/assets/common/items/armor/cloth/druid/hand.ron +++ b/assets/common/items/armor/cloth/druid/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/pants.ron b/assets/common/items/armor/cloth/druid/pants.ron index 1313557a4f..8da4cadf09 100644 --- a/assets/common/items/armor/cloth/druid/pants.ron +++ b/assets/common/items/armor/cloth/druid/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/shoulder.ron b/assets/common/items/armor/cloth/druid/shoulder.ron index 290e4e930f..cd52de1616 100644 --- a/assets/common/items/armor/cloth/druid/shoulder.ron +++ b/assets/common/items/armor/cloth/druid/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Lifecloth), - SalvageInto(Lifecloth), + SalvageInto(Lifecloth, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/back.ron b/assets/common/items/armor/cloth/linen/back.ron index 81554f4cd1..39320bb8aa 100644 --- a/assets/common/items/armor/cloth/linen/back.ron +++ b/assets/common/items/armor/cloth/linen/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/belt.ron b/assets/common/items/armor/cloth/linen/belt.ron index 7f30c346b1..4687537a8e 100644 --- a/assets/common/items/armor/cloth/linen/belt.ron +++ b/assets/common/items/armor/cloth/linen/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/chest.ron b/assets/common/items/armor/cloth/linen/chest.ron index 6294a7afaa..9febe477ab 100644 --- a/assets/common/items/armor/cloth/linen/chest.ron +++ b/assets/common/items/armor/cloth/linen/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/foot.ron b/assets/common/items/armor/cloth/linen/foot.ron index 99639158b3..adc36e1a9f 100644 --- a/assets/common/items/armor/cloth/linen/foot.ron +++ b/assets/common/items/armor/cloth/linen/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/hand.ron b/assets/common/items/armor/cloth/linen/hand.ron index b4e2cfe1c7..69a4a95682 100644 --- a/assets/common/items/armor/cloth/linen/hand.ron +++ b/assets/common/items/armor/cloth/linen/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/pants.ron b/assets/common/items/armor/cloth/linen/pants.ron index d1f56c3337..628051583f 100644 --- a/assets/common/items/armor/cloth/linen/pants.ron +++ b/assets/common/items/armor/cloth/linen/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/shoulder.ron b/assets/common/items/armor/cloth/linen/shoulder.ron index e78612f823..e0cc2fe5f7 100644 --- a/assets/common/items/armor/cloth/linen/shoulder.ron +++ b/assets/common/items/armor/cloth/linen/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/back.ron b/assets/common/items/armor/cloth/moonweave/back.ron index 7b3fe04fc1..a7dadf0bf0 100644 --- a/assets/common/items/armor/cloth/moonweave/back.ron +++ b/assets/common/items/armor/cloth/moonweave/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/belt.ron b/assets/common/items/armor/cloth/moonweave/belt.ron index 4799e78f73..6bc8b31f17 100644 --- a/assets/common/items/armor/cloth/moonweave/belt.ron +++ b/assets/common/items/armor/cloth/moonweave/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/chest.ron b/assets/common/items/armor/cloth/moonweave/chest.ron index 7434648d3d..fd6bad4e98 100644 --- a/assets/common/items/armor/cloth/moonweave/chest.ron +++ b/assets/common/items/armor/cloth/moonweave/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/foot.ron b/assets/common/items/armor/cloth/moonweave/foot.ron index f6f78973b0..3dbee0c253 100644 --- a/assets/common/items/armor/cloth/moonweave/foot.ron +++ b/assets/common/items/armor/cloth/moonweave/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/hand.ron b/assets/common/items/armor/cloth/moonweave/hand.ron index 762bff327a..8324fd1c5a 100644 --- a/assets/common/items/armor/cloth/moonweave/hand.ron +++ b/assets/common/items/armor/cloth/moonweave/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/pants.ron b/assets/common/items/armor/cloth/moonweave/pants.ron index 7fbebcecd7..b159db5ee0 100644 --- a/assets/common/items/armor/cloth/moonweave/pants.ron +++ b/assets/common/items/armor/cloth/moonweave/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/shoulder.ron b/assets/common/items/armor/cloth/moonweave/shoulder.ron index c2e4198fdf..44bf9cbcf0 100644 --- a/assets/common/items/armor/cloth/moonweave/shoulder.ron +++ b/assets/common/items/armor/cloth/moonweave/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Moonweave), - SalvageInto(Moonweave), + SalvageInto(Moonweave, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/back.ron b/assets/common/items/armor/cloth/silken/back.ron index 88c8b3c0e6..db8db346a1 100644 --- a/assets/common/items/armor/cloth/silken/back.ron +++ b/assets/common/items/armor/cloth/silken/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/belt.ron b/assets/common/items/armor/cloth/silken/belt.ron index df3f2e6cda..d2cbbf5634 100644 --- a/assets/common/items/armor/cloth/silken/belt.ron +++ b/assets/common/items/armor/cloth/silken/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/chest.ron b/assets/common/items/armor/cloth/silken/chest.ron index 42009d9050..cc80c1a8f6 100644 --- a/assets/common/items/armor/cloth/silken/chest.ron +++ b/assets/common/items/armor/cloth/silken/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/foot.ron b/assets/common/items/armor/cloth/silken/foot.ron index ee77086448..0f9f960748 100644 --- a/assets/common/items/armor/cloth/silken/foot.ron +++ b/assets/common/items/armor/cloth/silken/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/hand.ron b/assets/common/items/armor/cloth/silken/hand.ron index 2327aa11ed..74e7b6eab4 100644 --- a/assets/common/items/armor/cloth/silken/hand.ron +++ b/assets/common/items/armor/cloth/silken/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/pants.ron b/assets/common/items/armor/cloth/silken/pants.ron index fbfbeaa18f..29726bc5cc 100644 --- a/assets/common/items/armor/cloth/silken/pants.ron +++ b/assets/common/items/armor/cloth/silken/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/shoulder.ron b/assets/common/items/armor/cloth/silken/shoulder.ron index a13902d07a..66236e9e45 100644 --- a/assets/common/items/armor/cloth/silken/shoulder.ron +++ b/assets/common/items/armor/cloth/silken/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Silk), - SalvageInto(Silk), + SalvageInto(Silk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/back.ron b/assets/common/items/armor/cloth/sunsilk/back.ron index c342619520..a5e84a1ae7 100644 --- a/assets/common/items/armor/cloth/sunsilk/back.ron +++ b/assets/common/items/armor/cloth/sunsilk/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/belt.ron b/assets/common/items/armor/cloth/sunsilk/belt.ron index 1628c04073..eda42a7b95 100644 --- a/assets/common/items/armor/cloth/sunsilk/belt.ron +++ b/assets/common/items/armor/cloth/sunsilk/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/chest.ron b/assets/common/items/armor/cloth/sunsilk/chest.ron index 2a52797564..9db73d73f5 100644 --- a/assets/common/items/armor/cloth/sunsilk/chest.ron +++ b/assets/common/items/armor/cloth/sunsilk/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/foot.ron b/assets/common/items/armor/cloth/sunsilk/foot.ron index 457eedfe80..f0f084671c 100644 --- a/assets/common/items/armor/cloth/sunsilk/foot.ron +++ b/assets/common/items/armor/cloth/sunsilk/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/hand.ron b/assets/common/items/armor/cloth/sunsilk/hand.ron index 9bdf2b6aaf..af51017070 100644 --- a/assets/common/items/armor/cloth/sunsilk/hand.ron +++ b/assets/common/items/armor/cloth/sunsilk/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/pants.ron b/assets/common/items/armor/cloth/sunsilk/pants.ron index a1c59ab70e..cbc0fb0529 100644 --- a/assets/common/items/armor/cloth/sunsilk/pants.ron +++ b/assets/common/items/armor/cloth/sunsilk/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/shoulder.ron b/assets/common/items/armor/cloth/sunsilk/shoulder.ron index 83c2081dcd..553663054d 100644 --- a/assets/common/items/armor/cloth/sunsilk/shoulder.ron +++ b/assets/common/items/armor/cloth/sunsilk/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Sunsilk), - SalvageInto(Sunsilk), + SalvageInto(Sunsilk, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/back.ron b/assets/common/items/armor/cloth/woolen/back.ron index 63ac05f837..0555914239 100644 --- a/assets/common/items/armor/cloth/woolen/back.ron +++ b/assets/common/items/armor/cloth/woolen/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/belt.ron b/assets/common/items/armor/cloth/woolen/belt.ron index a24c1cdd51..8287bff732 100644 --- a/assets/common/items/armor/cloth/woolen/belt.ron +++ b/assets/common/items/armor/cloth/woolen/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/chest.ron b/assets/common/items/armor/cloth/woolen/chest.ron index 1dbe953b21..47ec62be52 100644 --- a/assets/common/items/armor/cloth/woolen/chest.ron +++ b/assets/common/items/armor/cloth/woolen/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/foot.ron b/assets/common/items/armor/cloth/woolen/foot.ron index 5b761ba6a0..e406fdd993 100644 --- a/assets/common/items/armor/cloth/woolen/foot.ron +++ b/assets/common/items/armor/cloth/woolen/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/hand.ron b/assets/common/items/armor/cloth/woolen/hand.ron index 25c71d48e8..dc013e92c6 100644 --- a/assets/common/items/armor/cloth/woolen/hand.ron +++ b/assets/common/items/armor/cloth/woolen/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/pants.ron b/assets/common/items/armor/cloth/woolen/pants.ron index 1f1ca1d10a..69d67e68f7 100644 --- a/assets/common/items/armor/cloth/woolen/pants.ron +++ b/assets/common/items/armor/cloth/woolen/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/shoulder.ron b/assets/common/items/armor/cloth/woolen/shoulder.ron index 751d2949f9..1c7b66edea 100644 --- a/assets/common/items/armor/cloth/woolen/shoulder.ron +++ b/assets/common/items/armor/cloth/woolen/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Wool), - SalvageInto(Wool), + SalvageInto(Wool, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/belt.ron b/assets/common/items/armor/cloth_blue/belt.ron index 5865b79b69..cd8ec95cc5 100644 --- a/assets/common/items/armor/cloth_blue/belt.ron +++ b/assets/common/items/armor/cloth_blue/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/chest.ron b/assets/common/items/armor/cloth_blue/chest.ron index 6af5468f7e..4c75cd0f6a 100644 --- a/assets/common/items/armor/cloth_blue/chest.ron +++ b/assets/common/items/armor/cloth_blue/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/foot.ron b/assets/common/items/armor/cloth_blue/foot.ron index 351f04bc5e..6a9dd5af66 100644 --- a/assets/common/items/armor/cloth_blue/foot.ron +++ b/assets/common/items/armor/cloth_blue/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/hand.ron b/assets/common/items/armor/cloth_blue/hand.ron index dfa3026b65..70de693153 100644 --- a/assets/common/items/armor/cloth_blue/hand.ron +++ b/assets/common/items/armor/cloth_blue/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/pants.ron b/assets/common/items/armor/cloth_blue/pants.ron index 180d74388a..1087e782f4 100644 --- a/assets/common/items/armor/cloth_blue/pants.ron +++ b/assets/common/items/armor/cloth_blue/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/shoulder_0.ron b/assets/common/items/armor/cloth_blue/shoulder_0.ron index a9aefee0e2..8c619a4e30 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_0.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_0.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/shoulder_1.ron b/assets/common/items/armor/cloth_blue/shoulder_1.ron index 15c781c7e1..0b2ecfe491 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_1.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_1.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/belt.ron b/assets/common/items/armor/cloth_green/belt.ron index 9197a6a3ba..1fcfc99ff2 100644 --- a/assets/common/items/armor/cloth_green/belt.ron +++ b/assets/common/items/armor/cloth_green/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/chest.ron b/assets/common/items/armor/cloth_green/chest.ron index 755326baac..68a78756a4 100644 --- a/assets/common/items/armor/cloth_green/chest.ron +++ b/assets/common/items/armor/cloth_green/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/foot.ron b/assets/common/items/armor/cloth_green/foot.ron index f215777783..42fd812bac 100644 --- a/assets/common/items/armor/cloth_green/foot.ron +++ b/assets/common/items/armor/cloth_green/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/hand.ron b/assets/common/items/armor/cloth_green/hand.ron index 816e634156..16ee51d5c7 100644 --- a/assets/common/items/armor/cloth_green/hand.ron +++ b/assets/common/items/armor/cloth_green/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/pants.ron b/assets/common/items/armor/cloth_green/pants.ron index 1bc22bbd4f..590b3377f8 100644 --- a/assets/common/items/armor/cloth_green/pants.ron +++ b/assets/common/items/armor/cloth_green/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/shoulder.ron b/assets/common/items/armor/cloth_green/shoulder.ron index 252bd5c2d9..092508c305 100644 --- a/assets/common/items/armor/cloth_green/shoulder.ron +++ b/assets/common/items/armor/cloth_green/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/belt.ron b/assets/common/items/armor/cloth_purple/belt.ron index a67f23bf81..b1a8e25395 100644 --- a/assets/common/items/armor/cloth_purple/belt.ron +++ b/assets/common/items/armor/cloth_purple/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/chest.ron b/assets/common/items/armor/cloth_purple/chest.ron index a470bfb153..eabb39535f 100644 --- a/assets/common/items/armor/cloth_purple/chest.ron +++ b/assets/common/items/armor/cloth_purple/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/foot.ron b/assets/common/items/armor/cloth_purple/foot.ron index 9d2dc25c3b..a8283fe2c0 100644 --- a/assets/common/items/armor/cloth_purple/foot.ron +++ b/assets/common/items/armor/cloth_purple/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/hand.ron b/assets/common/items/armor/cloth_purple/hand.ron index 8df308c1ef..ecc8f41298 100644 --- a/assets/common/items/armor/cloth_purple/hand.ron +++ b/assets/common/items/armor/cloth_purple/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/pants.ron b/assets/common/items/armor/cloth_purple/pants.ron index aa88a3e3ca..1533d65ce6 100644 --- a/assets/common/items/armor/cloth_purple/pants.ron +++ b/assets/common/items/armor/cloth_purple/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/shoulder.ron b/assets/common/items/armor/cloth_purple/shoulder.ron index f4fc7da738..c6815e2c50 100644 --- a/assets/common/items/armor/cloth_purple/shoulder.ron +++ b/assets/common/items/armor/cloth_purple/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron index da04e5f403..abec198dc1 100644 --- a/assets/common/items/armor/hide/carapace/back.ron +++ b/assets/common/items/armor/hide/carapace/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron index fe1982f927..1dd4e13184 100644 --- a/assets/common/items/armor/hide/carapace/belt.ron +++ b/assets/common/items/armor/hide/carapace/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron index 7483ef8ce1..0b24271d7d 100644 --- a/assets/common/items/armor/hide/carapace/chest.ron +++ b/assets/common/items/armor/hide/carapace/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron index 5d57b06ab4..154690e0d7 100644 --- a/assets/common/items/armor/hide/carapace/foot.ron +++ b/assets/common/items/armor/hide/carapace/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron index eacb63bc8c..052db20f6e 100644 --- a/assets/common/items/armor/hide/carapace/hand.ron +++ b/assets/common/items/armor/hide/carapace/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron index 0cbbe046cc..5b40ea0947 100644 --- a/assets/common/items/armor/hide/carapace/pants.ron +++ b/assets/common/items/armor/hide/carapace/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron index 9796dc072c..06768a0d8d 100644 --- a/assets/common/items/armor/hide/carapace/shoulder.ron +++ b/assets/common/items/armor/hide/carapace/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Carapace), - SalvageInto(Carapace), + SalvageInto(Carapace, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron index febd71ef5e..18eaed1cc5 100644 --- a/assets/common/items/armor/hide/dragonscale/back.ron +++ b/assets/common/items/armor/hide/dragonscale/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron index db4f9e90d8..fbeab82ef8 100644 --- a/assets/common/items/armor/hide/dragonscale/belt.ron +++ b/assets/common/items/armor/hide/dragonscale/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron index 5a90705f8d..40a9315ed6 100644 --- a/assets/common/items/armor/hide/dragonscale/chest.ron +++ b/assets/common/items/armor/hide/dragonscale/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron index 98315fbc8a..9d5a39bbd9 100644 --- a/assets/common/items/armor/hide/dragonscale/foot.ron +++ b/assets/common/items/armor/hide/dragonscale/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron index 01f2bd728d..d6d228b042 100644 --- a/assets/common/items/armor/hide/dragonscale/hand.ron +++ b/assets/common/items/armor/hide/dragonscale/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron index 28f68ced8e..733553708f 100644 --- a/assets/common/items/armor/hide/dragonscale/pants.ron +++ b/assets/common/items/armor/hide/dragonscale/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron index 3b320fb5f4..b6353ed649 100644 --- a/assets/common/items/armor/hide/dragonscale/shoulder.ron +++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Dragonscale), - SalvageInto(Dragonscale), + SalvageInto(Dragonscale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/back.ron b/assets/common/items/armor/hide/leather/back.ron index 0b75471cca..48a473438c 100644 --- a/assets/common/items/armor/hide/leather/back.ron +++ b/assets/common/items/armor/hide/leather/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/belt.ron b/assets/common/items/armor/hide/leather/belt.ron index d99194f516..a4e7b37944 100644 --- a/assets/common/items/armor/hide/leather/belt.ron +++ b/assets/common/items/armor/hide/leather/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/chest.ron b/assets/common/items/armor/hide/leather/chest.ron index eb02994efe..d5802ac866 100644 --- a/assets/common/items/armor/hide/leather/chest.ron +++ b/assets/common/items/armor/hide/leather/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/foot.ron b/assets/common/items/armor/hide/leather/foot.ron index 3feb9ba69f..f5f2bf2bfa 100644 --- a/assets/common/items/armor/hide/leather/foot.ron +++ b/assets/common/items/armor/hide/leather/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/hand.ron b/assets/common/items/armor/hide/leather/hand.ron index 02ed49162c..ff418e1ab6 100644 --- a/assets/common/items/armor/hide/leather/hand.ron +++ b/assets/common/items/armor/hide/leather/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/head.ron b/assets/common/items/armor/hide/leather/head.ron index 03f079baf0..d5d174f559 100644 --- a/assets/common/items/armor/hide/leather/head.ron +++ b/assets/common/items/armor/hide/leather/head.ron @@ -10,6 +10,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/pants.ron b/assets/common/items/armor/hide/leather/pants.ron index 3be47c210b..b8c41eeec3 100644 --- a/assets/common/items/armor/hide/leather/pants.ron +++ b/assets/common/items/armor/hide/leather/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/shoulder.ron b/assets/common/items/armor/hide/leather/shoulder.ron index 244df35fe3..eaebecf2dd 100644 --- a/assets/common/items/armor/hide/leather/shoulder.ron +++ b/assets/common/items/armor/hide/leather/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/back.ron b/assets/common/items/armor/hide/primal/back.ron index bcf2e5f20c..ed558bd344 100644 --- a/assets/common/items/armor/hide/primal/back.ron +++ b/assets/common/items/armor/hide/primal/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/belt.ron b/assets/common/items/armor/hide/primal/belt.ron index fe5c4c22b6..a448f952a7 100644 --- a/assets/common/items/armor/hide/primal/belt.ron +++ b/assets/common/items/armor/hide/primal/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/chest.ron b/assets/common/items/armor/hide/primal/chest.ron index c560c76059..6ea0f5a659 100644 --- a/assets/common/items/armor/hide/primal/chest.ron +++ b/assets/common/items/armor/hide/primal/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/foot.ron b/assets/common/items/armor/hide/primal/foot.ron index 65b5179465..0f0e90786f 100644 --- a/assets/common/items/armor/hide/primal/foot.ron +++ b/assets/common/items/armor/hide/primal/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/hand.ron b/assets/common/items/armor/hide/primal/hand.ron index f8de941d8f..81acf23c20 100644 --- a/assets/common/items/armor/hide/primal/hand.ron +++ b/assets/common/items/armor/hide/primal/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/pants.ron b/assets/common/items/armor/hide/primal/pants.ron index 35459d5f75..57919eb5ad 100644 --- a/assets/common/items/armor/hide/primal/pants.ron +++ b/assets/common/items/armor/hide/primal/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/shoulder.ron b/assets/common/items/armor/hide/primal/shoulder.ron index 0bcc44707a..c734b9e71b 100644 --- a/assets/common/items/armor/hide/primal/shoulder.ron +++ b/assets/common/items/armor/hide/primal/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Plate), - SalvageInto(Plate), + SalvageInto(Plate, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/back.ron b/assets/common/items/armor/hide/rawhide/back.ron index 9e2305d5dc..28bd644d9b 100644 --- a/assets/common/items/armor/hide/rawhide/back.ron +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron index 0b07a3ea1b..0cf0a5b1f0 100644 --- a/assets/common/items/armor/hide/rawhide/belt.ron +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron index 1b4aa2ea12..92e8520213 100644 --- a/assets/common/items/armor/hide/rawhide/chest.ron +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron index cfde177e58..e9c24201a7 100644 --- a/assets/common/items/armor/hide/rawhide/foot.ron +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron index 077bdb8cf5..31c7bc841f 100644 --- a/assets/common/items/armor/hide/rawhide/hand.ron +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron index 7c61204d04..4608b845d5 100644 --- a/assets/common/items/armor/hide/rawhide/pants.ron +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron index 39384b414b..1da0b95d14 100644 --- a/assets/common/items/armor/hide/rawhide/shoulder.ron +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Rawhide), - SalvageInto(Rawhide), + SalvageInto(Rawhide, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron index d7d2149b22..6c4c7f32de 100644 --- a/assets/common/items/armor/hide/scale/back.ron +++ b/assets/common/items/armor/hide/scale/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron index ac50922579..e440102d34 100644 --- a/assets/common/items/armor/hide/scale/belt.ron +++ b/assets/common/items/armor/hide/scale/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron index fd63d11048..1cc83bb302 100644 --- a/assets/common/items/armor/hide/scale/chest.ron +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron index fe6d4c41f0..7a2ac62756 100644 --- a/assets/common/items/armor/hide/scale/foot.ron +++ b/assets/common/items/armor/hide/scale/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron index 1a8f5010c3..201faaa557 100644 --- a/assets/common/items/armor/hide/scale/hand.ron +++ b/assets/common/items/armor/hide/scale/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron index d663584755..3cd7d4279e 100644 --- a/assets/common/items/armor/hide/scale/pants.ron +++ b/assets/common/items/armor/hide/scale/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron index f36d421ce7..52b97493b7 100644 --- a/assets/common/items/armor/hide/scale/shoulder.ron +++ b/assets/common/items/armor/hide/scale/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Scale), - SalvageInto(Scale), + SalvageInto(Scale, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron index 5d79eff754..679aee0f71 100644 --- a/assets/common/items/armor/leather_plate/belt.ron +++ b/assets/common/items/armor/leather_plate/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron index a7c0bd954a..c83330e9a9 100644 --- a/assets/common/items/armor/leather_plate/chest.ron +++ b/assets/common/items/armor/leather_plate/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron index 20c9a8a14b..0285683f84 100644 --- a/assets/common/items/armor/leather_plate/foot.ron +++ b/assets/common/items/armor/leather_plate/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron index ef2a25893f..8250cee62a 100644 --- a/assets/common/items/armor/leather_plate/hand.ron +++ b/assets/common/items/armor/leather_plate/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/helmet.ron b/assets/common/items/armor/leather_plate/helmet.ron index 7c4c466bc4..1ccf2add06 100644 --- a/assets/common/items/armor/leather_plate/helmet.ron +++ b/assets/common/items/armor/leather_plate/helmet.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron index 919d6988ed..114538f6e3 100644 --- a/assets/common/items/armor/leather_plate/pants.ron +++ b/assets/common/items/armor/leather_plate/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron index 1359971d08..3c27743702 100644 --- a/assets/common/items/armor/leather_plate/shoulder.ron +++ b/assets/common/items/armor/leather_plate/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/back.ron b/assets/common/items/armor/mail/bloodsteel/back.ron index a2c0e843ed..dfc43bc304 100644 --- a/assets/common/items/armor/mail/bloodsteel/back.ron +++ b/assets/common/items/armor/mail/bloodsteel/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/belt.ron b/assets/common/items/armor/mail/bloodsteel/belt.ron index 45527fc71d..b356d71b50 100644 --- a/assets/common/items/armor/mail/bloodsteel/belt.ron +++ b/assets/common/items/armor/mail/bloodsteel/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/chest.ron b/assets/common/items/armor/mail/bloodsteel/chest.ron index 26d49647af..2a9c43f638 100644 --- a/assets/common/items/armor/mail/bloodsteel/chest.ron +++ b/assets/common/items/armor/mail/bloodsteel/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/foot.ron b/assets/common/items/armor/mail/bloodsteel/foot.ron index 6d20bcf2e9..52e10a4be6 100644 --- a/assets/common/items/armor/mail/bloodsteel/foot.ron +++ b/assets/common/items/armor/mail/bloodsteel/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/hand.ron b/assets/common/items/armor/mail/bloodsteel/hand.ron index e7ccccec14..3a80673dd3 100644 --- a/assets/common/items/armor/mail/bloodsteel/hand.ron +++ b/assets/common/items/armor/mail/bloodsteel/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/pants.ron b/assets/common/items/armor/mail/bloodsteel/pants.ron index 7340c1a2e1..5a8cd37887 100644 --- a/assets/common/items/armor/mail/bloodsteel/pants.ron +++ b/assets/common/items/armor/mail/bloodsteel/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/shoulder.ron b/assets/common/items/armor/mail/bloodsteel/shoulder.ron index d3ed50f3f5..eb455c7257 100644 --- a/assets/common/items/armor/mail/bloodsteel/shoulder.ron +++ b/assets/common/items/armor/mail/bloodsteel/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Epic, tags: [ Material(Bloodsteel), - SalvageInto(Bloodsteel), + SalvageInto(Bloodsteel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/back.ron b/assets/common/items/armor/mail/bronze/back.ron index 84eb05a591..d5c64af2a1 100644 --- a/assets/common/items/armor/mail/bronze/back.ron +++ b/assets/common/items/armor/mail/bronze/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/belt.ron b/assets/common/items/armor/mail/bronze/belt.ron index 7499ec33f8..3c35293660 100644 --- a/assets/common/items/armor/mail/bronze/belt.ron +++ b/assets/common/items/armor/mail/bronze/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/chest.ron b/assets/common/items/armor/mail/bronze/chest.ron index 90a42331ef..97f4c280b4 100644 --- a/assets/common/items/armor/mail/bronze/chest.ron +++ b/assets/common/items/armor/mail/bronze/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/foot.ron b/assets/common/items/armor/mail/bronze/foot.ron index 777aec3869..25f74fab85 100644 --- a/assets/common/items/armor/mail/bronze/foot.ron +++ b/assets/common/items/armor/mail/bronze/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/hand.ron b/assets/common/items/armor/mail/bronze/hand.ron index 44297bab33..b2bec53991 100644 --- a/assets/common/items/armor/mail/bronze/hand.ron +++ b/assets/common/items/armor/mail/bronze/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/pants.ron b/assets/common/items/armor/mail/bronze/pants.ron index 4542414ed7..9ba052496b 100644 --- a/assets/common/items/armor/mail/bronze/pants.ron +++ b/assets/common/items/armor/mail/bronze/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/shoulder.ron b/assets/common/items/armor/mail/bronze/shoulder.ron index 7f2b008ada..5a38a1c271 100644 --- a/assets/common/items/armor/mail/bronze/shoulder.ron +++ b/assets/common/items/armor/mail/bronze/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Low, tags: [ Material(Bronze), - SalvageInto(Bronze), + SalvageInto(Bronze, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/back.ron b/assets/common/items/armor/mail/cobalt/back.ron index f0aa201f6f..acee1abc44 100644 --- a/assets/common/items/armor/mail/cobalt/back.ron +++ b/assets/common/items/armor/mail/cobalt/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/belt.ron b/assets/common/items/armor/mail/cobalt/belt.ron index 05ad53cecf..69a35dc1e4 100644 --- a/assets/common/items/armor/mail/cobalt/belt.ron +++ b/assets/common/items/armor/mail/cobalt/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/chest.ron b/assets/common/items/armor/mail/cobalt/chest.ron index 51b4937cf2..262269f62e 100644 --- a/assets/common/items/armor/mail/cobalt/chest.ron +++ b/assets/common/items/armor/mail/cobalt/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/foot.ron b/assets/common/items/armor/mail/cobalt/foot.ron index f8f6fa5030..e81caf3e72 100644 --- a/assets/common/items/armor/mail/cobalt/foot.ron +++ b/assets/common/items/armor/mail/cobalt/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/hand.ron b/assets/common/items/armor/mail/cobalt/hand.ron index 219f2f5765..0c5aa6d447 100644 --- a/assets/common/items/armor/mail/cobalt/hand.ron +++ b/assets/common/items/armor/mail/cobalt/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/pants.ron b/assets/common/items/armor/mail/cobalt/pants.ron index 80fbcf6aa0..c2a1e22f3f 100644 --- a/assets/common/items/armor/mail/cobalt/pants.ron +++ b/assets/common/items/armor/mail/cobalt/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/shoulder.ron b/assets/common/items/armor/mail/cobalt/shoulder.ron index 67970b41fa..8b7927bf77 100644 --- a/assets/common/items/armor/mail/cobalt/shoulder.ron +++ b/assets/common/items/armor/mail/cobalt/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: High, tags: [ Material(Cobalt), - SalvageInto(Cobalt), + SalvageInto(Cobalt, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/back.ron b/assets/common/items/armor/mail/iron/back.ron index 6e92d626c2..2aa53b7c20 100644 --- a/assets/common/items/armor/mail/iron/back.ron +++ b/assets/common/items/armor/mail/iron/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/belt.ron b/assets/common/items/armor/mail/iron/belt.ron index 017926652d..74a987cc86 100644 --- a/assets/common/items/armor/mail/iron/belt.ron +++ b/assets/common/items/armor/mail/iron/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/chest.ron b/assets/common/items/armor/mail/iron/chest.ron index c2aba27c53..cd6aaf0a74 100644 --- a/assets/common/items/armor/mail/iron/chest.ron +++ b/assets/common/items/armor/mail/iron/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/foot.ron b/assets/common/items/armor/mail/iron/foot.ron index 2f74cd905c..e537c2c486 100644 --- a/assets/common/items/armor/mail/iron/foot.ron +++ b/assets/common/items/armor/mail/iron/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/hand.ron b/assets/common/items/armor/mail/iron/hand.ron index 7519850c10..51b803f6c4 100644 --- a/assets/common/items/armor/mail/iron/hand.ron +++ b/assets/common/items/armor/mail/iron/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/pants.ron b/assets/common/items/armor/mail/iron/pants.ron index 5b7f4c99b6..90c6d87775 100644 --- a/assets/common/items/armor/mail/iron/pants.ron +++ b/assets/common/items/armor/mail/iron/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/shoulder.ron b/assets/common/items/armor/mail/iron/shoulder.ron index c4aa2effe5..c2f5ccdc51 100644 --- a/assets/common/items/armor/mail/iron/shoulder.ron +++ b/assets/common/items/armor/mail/iron/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Common, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron index dd1aea06a1..dd2311df54 100644 --- a/assets/common/items/armor/mail/orichalcum/back.ron +++ b/assets/common/items/armor/mail/orichalcum/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron index f7b7254fc0..4fe568e1d1 100644 --- a/assets/common/items/armor/mail/orichalcum/belt.ron +++ b/assets/common/items/armor/mail/orichalcum/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron index 8b25f98981..a1647db952 100644 --- a/assets/common/items/armor/mail/orichalcum/chest.ron +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron index c47272242f..e7ac5ac6d2 100644 --- a/assets/common/items/armor/mail/orichalcum/foot.ron +++ b/assets/common/items/armor/mail/orichalcum/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron index 89063f435b..5067ca0780 100644 --- a/assets/common/items/armor/mail/orichalcum/hand.ron +++ b/assets/common/items/armor/mail/orichalcum/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron index 13e4ee578c..e09299f53e 100644 --- a/assets/common/items/armor/mail/orichalcum/pants.ron +++ b/assets/common/items/armor/mail/orichalcum/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron index add8ae13b4..50dea44ecd 100644 --- a/assets/common/items/armor/mail/orichalcum/shoulder.ron +++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Legendary, tags: [ Material(Orichalcum), - SalvageInto(Orichalcum), + SalvageInto(Orichalcum, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/back.ron b/assets/common/items/armor/mail/steel/back.ron index 8e73db7807..d0fb40a034 100644 --- a/assets/common/items/armor/mail/steel/back.ron +++ b/assets/common/items/armor/mail/steel/back.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/belt.ron b/assets/common/items/armor/mail/steel/belt.ron index a2a54cc387..6fee9ecbf4 100644 --- a/assets/common/items/armor/mail/steel/belt.ron +++ b/assets/common/items/armor/mail/steel/belt.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/chest.ron b/assets/common/items/armor/mail/steel/chest.ron index ec5065fabd..c1e21aed4d 100644 --- a/assets/common/items/armor/mail/steel/chest.ron +++ b/assets/common/items/armor/mail/steel/chest.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/foot.ron b/assets/common/items/armor/mail/steel/foot.ron index cbf6bbe5ea..28f4adef2b 100644 --- a/assets/common/items/armor/mail/steel/foot.ron +++ b/assets/common/items/armor/mail/steel/foot.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/hand.ron b/assets/common/items/armor/mail/steel/hand.ron index f66b5bc5e6..fca4fc5f2a 100644 --- a/assets/common/items/armor/mail/steel/hand.ron +++ b/assets/common/items/armor/mail/steel/hand.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/pants.ron b/assets/common/items/armor/mail/steel/pants.ron index d488930e26..2ee918fd87 100644 --- a/assets/common/items/armor/mail/steel/pants.ron +++ b/assets/common/items/armor/mail/steel/pants.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/shoulder.ron b/assets/common/items/armor/mail/steel/shoulder.ron index aba01a5392..ff754aac8a 100644 --- a/assets/common/items/armor/mail/steel/shoulder.ron +++ b/assets/common/items/armor/mail/steel/shoulder.ron @@ -8,6 +8,6 @@ ItemDef( quality: Moderate, tags: [ Material(Steel), - SalvageInto(Steel), + SalvageInto(Steel, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/back/short_1.ron b/assets/common/items/armor/misc/back/short_1.ron index 04a72ef4d6..b8e80a8f56 100644 --- a/assets/common/items/armor/misc/back/short_1.ron +++ b/assets/common/items/armor/misc/back/short_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Common, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_green_0.ron b/assets/common/items/armor/misc/chest/worker_green_0.ron index b11a1de443..ebfffdea8d 100644 --- a/assets/common/items/armor/misc/chest/worker_green_0.ron +++ b/assets/common/items/armor/misc/chest/worker_green_0.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_green_1.ron b/assets/common/items/armor/misc/chest/worker_green_1.ron index b11a1de443..ebfffdea8d 100644 --- a/assets/common/items/armor/misc/chest/worker_green_1.ron +++ b/assets/common/items/armor/misc/chest/worker_green_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_orange_0.ron b/assets/common/items/armor/misc/chest/worker_orange_0.ron index f0cdedc600..0387b968dc 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_0.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_0.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_orange_1.ron b/assets/common/items/armor/misc/chest/worker_orange_1.ron index f0cdedc600..0387b968dc 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_1.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron index c375248ee6..1f7219f0d0 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_0.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_0.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_1.ron b/assets/common/items/armor/misc/chest/worker_purple_1.ron index f62d4ad4a0..4606e53828 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_1.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_brown.ron b/assets/common/items/armor/misc/chest/worker_purple_brown.ron index c375248ee6..1f7219f0d0 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_brown.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_brown.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_red_0.ron b/assets/common/items/armor/misc/chest/worker_red_0.ron index 1ccc5de312..13c7b09088 100644 --- a/assets/common/items/armor/misc/chest/worker_red_0.ron +++ b/assets/common/items/armor/misc/chest/worker_red_0.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_red_1.ron b/assets/common/items/armor/misc/chest/worker_red_1.ron index 1ccc5de312..13c7b09088 100644 --- a/assets/common/items/armor/misc/chest/worker_red_1.ron +++ b/assets/common/items/armor/misc/chest/worker_red_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_yellow_0.ron b/assets/common/items/armor/misc/chest/worker_yellow_0.ron index 17de8170cf..cdad0be3f0 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_0.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_0.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_yellow_1.ron b/assets/common/items/armor/misc/chest/worker_yellow_1.ron index 17de8170cf..cdad0be3f0 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_1.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron index 3bfaab5a44..3841a17a62 100644 --- a/assets/common/items/armor/misc/foot/jackalope_slippers.ron +++ b/assets/common/items/armor/misc/foot/jackalope_slippers.ron @@ -9,6 +9,6 @@ ItemDef( quality: High, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron index 05b3fc2fc7..98fd34687a 100644 --- a/assets/common/items/armor/misc/foot/sandals.ron +++ b/assets/common/items/armor/misc/foot/sandals.ron @@ -9,6 +9,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/foot/ski.ron b/assets/common/items/armor/misc/foot/ski.ron index bc09120a5e..a9ab2c0ef2 100644 --- a/assets/common/items/armor/misc/foot/ski.ron +++ b/assets/common/items/armor/misc/foot/ski.ron @@ -11,6 +11,6 @@ ItemDef( quality: Moderate, tags: [ Material(Wood), -// SalvageInto(Twigs), + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/misc/head/bamboo_twig.ron b/assets/common/items/armor/misc/head/bamboo_twig.ron index 01bcfdfb64..0a25ccdec0 100644 --- a/assets/common/items/armor/misc/head/bamboo_twig.ron +++ b/assets/common/items/armor/misc/head/bamboo_twig.ron @@ -8,5 +8,7 @@ ItemDef( )), )), quality: Common, - tags: [], + tags: [ + SalvageInto(Bamboo, 1) + ], ) diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index 37a3e4d365..793897c289 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Common, - tags: [], + tags: [ + SalvageInto(RedLinen, 3) + ], ) diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron index ac45c11eac..3cb193e589 100644 --- a/assets/common/items/armor/misc/head/bandana/thief.ron +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Common, - tags: [], + tags: [ + SalvageInto(Linen, 3) + ], ) diff --git a/assets/common/items/armor/misc/head/bear_bonnet.ron b/assets/common/items/armor/misc/head/bear_bonnet.ron index c1c1ffc2a4..369dc77fef 100644 --- a/assets/common/items/armor/misc/head/bear_bonnet.ron +++ b/assets/common/items/armor/misc/head/bear_bonnet.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(RigidLeather, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index becfbc121b..ba85e75c8b 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -11,5 +11,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Gold, 1), // TODO Multi-salvage + ], ) diff --git a/assets/common/items/armor/misc/head/gnarling_mask.ron b/assets/common/items/armor/misc/head/gnarling_mask.ron index 406dfbbd40..dbf7f32619 100644 --- a/assets/common/items/armor/misc/head/gnarling_mask.ron +++ b/assets/common/items/armor/misc/head/gnarling_mask.ron @@ -12,5 +12,6 @@ ItemDef( quality: High, tags: [ Gnarling, - ], + SalvageInto(Lifecloth, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/helmet.ron b/assets/common/items/armor/misc/head/helmet.ron index 3cc3798465..88848060b1 100644 --- a/assets/common/items/armor/misc/head/helmet.ron +++ b/assets/common/items/armor/misc/head/helmet.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Steel, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index a691274573..9ada0b1475 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Leather, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index a605f8fd5e..33231cfe1d 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Leather, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/hood_dark.ron b/assets/common/items/armor/misc/head/hood_dark.ron index 3f5d7d035b..21fcb8ebd6 100644 --- a/assets/common/items/armor/misc/head/hood_dark.ron +++ b/assets/common/items/armor/misc/head/hood_dark.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Leather, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/howl_cowl.ron b/assets/common/items/armor/misc/head/howl_cowl.ron index bd5cd34afb..93a56bb4bd 100644 --- a/assets/common/items/armor/misc/head/howl_cowl.ron +++ b/assets/common/items/armor/misc/head/howl_cowl.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(RigidLeather, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron index 987c92d612..3c1f0a57c3 100644 --- a/assets/common/items/armor/misc/head/mitre.ron +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -11,5 +11,7 @@ ItemDef( )), )), quality: High, - tags: [], + tags: [ + SalvageInto(Silver, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index db8c82dd09..82d3107425 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: High, - tags: [], + tags: [ + SalvageInto(Cobalt, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron index 783cb24a51..1736739ad0 100644 --- a/assets/common/items/armor/misc/head/straw.ron +++ b/assets/common/items/armor/misc/head/straw.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Common, - tags: [], + tags: [ + SalvageInto(PlantFiber, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index 1a616fc2c6..e1488ac7ed 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Bamboo, 1), + ], ) diff --git a/assets/common/items/armor/misc/head/winged_coronet.ron b/assets/common/items/armor/misc/head/winged_coronet.ron index ae3422996b..1fbb290b71 100644 --- a/assets/common/items/armor/misc/head/winged_coronet.ron +++ b/assets/common/items/armor/misc/head/winged_coronet.ron @@ -12,5 +12,7 @@ ItemDef( )), )), quality: High, - tags: [], + tags: [ + SalvageInto(Silver, 1), + ], ) diff --git a/assets/common/items/armor/misc/neck/amethyst.ron b/assets/common/items/armor/misc/neck/amethyst.ron index d19c188aed..c278af2a7c 100644 --- a/assets/common/items/armor/misc/neck/amethyst.ron +++ b/assets/common/items/armor/misc/neck/amethyst.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Amethyst, 1), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/diamond.ron b/assets/common/items/armor/misc/neck/diamond.ron index 4c610b6a23..05b1ce4ac9 100644 --- a/assets/common/items/armor/misc/neck/diamond.ron +++ b/assets/common/items/armor/misc/neck/diamond.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Diamond, 1), + ], ) diff --git a/assets/common/items/armor/misc/neck/emerald.ron b/assets/common/items/armor/misc/neck/emerald.ron index 643898642e..a60b1b84ad 100644 --- a/assets/common/items/armor/misc/neck/emerald.ron +++ b/assets/common/items/armor/misc/neck/emerald.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Emerald, 1), + ], ) diff --git a/assets/common/items/armor/misc/neck/gold.ron b/assets/common/items/armor/misc/neck/gold.ron index 0aa36f6a93..94dd0a313f 100644 --- a/assets/common/items/armor/misc/neck/gold.ron +++ b/assets/common/items/armor/misc/neck/gold.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Gold, 1), + ], ) diff --git a/assets/common/items/armor/misc/neck/ruby.ron b/assets/common/items/armor/misc/neck/ruby.ron index 118bd9678a..5f4bf02e92 100644 --- a/assets/common/items/armor/misc/neck/ruby.ron +++ b/assets/common/items/armor/misc/neck/ruby.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Ruby, 1), + ], ) diff --git a/assets/common/items/armor/misc/neck/sapphire.ron b/assets/common/items/armor/misc/neck/sapphire.ron index fdf8a72443..dc900afe1c 100644 --- a/assets/common/items/armor/misc/neck/sapphire.ron +++ b/assets/common/items/armor/misc/neck/sapphire.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Sapphire, 1), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/scratched.ron b/assets/common/items/armor/misc/neck/scratched.ron index 877d7de877..e9ea73f188 100644 --- a/assets/common/items/armor/misc/neck/scratched.ron +++ b/assets/common/items/armor/misc/neck/scratched.ron @@ -8,5 +8,7 @@ ItemDef( )), )), quality: Low, - tags: [], + tags: [ + SalvageInto(Bronze, 1), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/topaz.ron b/assets/common/items/armor/misc/neck/topaz.ron index b07177b5e5..59e1626f3d 100644 --- a/assets/common/items/armor/misc/neck/topaz.ron +++ b/assets/common/items/armor/misc/neck/topaz.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Common, - tags: [], + tags: [ + SalvageInto(Topaz, 1), + ], ) diff --git a/assets/common/items/armor/misc/pants/worker_blue.ron b/assets/common/items/armor/misc/pants/worker_blue.ron index c9512d1ab4..64d1853255 100644 --- a/assets/common/items/armor/misc/pants/worker_blue.ron +++ b/assets/common/items/armor/misc/pants/worker_blue.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/pants/worker_brown.ron b/assets/common/items/armor/misc/pants/worker_brown.ron index 265f86e2e1..a9f1f85514 100644 --- a/assets/common/items/armor/misc/pants/worker_brown.ron +++ b/assets/common/items/armor/misc/pants/worker_brown.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/amethyst.ron b/assets/common/items/armor/misc/ring/amethyst.ron index 0da3bc471f..ca31828c6b 100644 --- a/assets/common/items/armor/misc/ring/amethyst.ron +++ b/assets/common/items/armor/misc/ring/amethyst.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Amethyst, 1), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/diamond.ron b/assets/common/items/armor/misc/ring/diamond.ron index 125334d1a6..e38937cd99 100644 --- a/assets/common/items/armor/misc/ring/diamond.ron +++ b/assets/common/items/armor/misc/ring/diamond.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Diamond, 1), + ], ) diff --git a/assets/common/items/armor/misc/ring/emerald.ron b/assets/common/items/armor/misc/ring/emerald.ron index 270a8092e5..aaf35e17ff 100644 --- a/assets/common/items/armor/misc/ring/emerald.ron +++ b/assets/common/items/armor/misc/ring/emerald.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Emerald, 1), + ], ) diff --git a/assets/common/items/armor/misc/ring/gold.ron b/assets/common/items/armor/misc/ring/gold.ron index deafab94c0..117a884ceb 100644 --- a/assets/common/items/armor/misc/ring/gold.ron +++ b/assets/common/items/armor/misc/ring/gold.ron @@ -9,5 +9,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Gold, 1), + ], ) diff --git a/assets/common/items/armor/misc/ring/ruby.ron b/assets/common/items/armor/misc/ring/ruby.ron index fec5d08886..9e950a83c0 100644 --- a/assets/common/items/armor/misc/ring/ruby.ron +++ b/assets/common/items/armor/misc/ring/ruby.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Epic, - tags: [], + tags: [ + SalvageInto(Ruby, 1), + ], ) diff --git a/assets/common/items/armor/misc/ring/sapphire.ron b/assets/common/items/armor/misc/ring/sapphire.ron index c7b2d89ea9..c2bebeecce 100644 --- a/assets/common/items/armor/misc/ring/sapphire.ron +++ b/assets/common/items/armor/misc/ring/sapphire.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Sapphire, 1), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/scratched.ron b/assets/common/items/armor/misc/ring/scratched.ron index 728ff3847f..b407fe21f1 100644 --- a/assets/common/items/armor/misc/ring/scratched.ron +++ b/assets/common/items/armor/misc/ring/scratched.ron @@ -8,5 +8,7 @@ ItemDef( )), )), quality: Low, - tags: [], + tags: [ + SalvageInto(Bronze, 1), + ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/topaz.ron b/assets/common/items/armor/misc/ring/topaz.ron index 4d16e19a8b..9e75e278e4 100644 --- a/assets/common/items/armor/misc/ring/topaz.ron +++ b/assets/common/items/armor/misc/ring/topaz.ron @@ -10,5 +10,7 @@ ItemDef( )), )), quality: Moderate, - tags: [], + tags: [ + SalvageInto(Topaz, 1), + ], ) diff --git a/assets/common/items/armor/misc/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron index b0ea1545b0..d8993015dd 100644 --- a/assets/common/items/armor/misc/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/misc/shoulder/iron_spikes.ron @@ -10,6 +10,6 @@ ItemDef( quality: Moderate, tags: [ Material(Iron), - SalvageInto(Iron), + SalvageInto(Iron, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron index d9800d1e44..4329bda25a 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron @@ -10,6 +10,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron index be0e781ed1..450c7051c0 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron @@ -10,6 +10,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron index a4693d440f..d753422cf1 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron @@ -10,6 +10,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron index 93c5ef2a71..63bc2aac74 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron @@ -10,6 +10,6 @@ ItemDef( quality: Common, tags: [ Material(Leather), - SalvageInto(Leather), + SalvageInto(Leather, 1), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/rugged/chest.ron b/assets/common/items/armor/rugged/chest.ron index 5b08030284..aa1cb692a8 100644 --- a/assets/common/items/armor/rugged/chest.ron +++ b/assets/common/items/armor/rugged/chest.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 3), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/rugged/pants.ron b/assets/common/items/armor/rugged/pants.ron index 4fd361e911..ac16f01cd0 100644 --- a/assets/common/items/armor/rugged/pants.ron +++ b/assets/common/items/armor/rugged/pants.ron @@ -10,6 +10,6 @@ ItemDef( quality: Low, tags: [ Material(Linen), - SalvageInto(Linen), + SalvageInto(Linen, 2), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/back.ron b/assets/common/items/armor/savage/back.ron index fdf7e62cce..bbb3aa810f 100644 --- a/assets/common/items/armor/savage/back.ron +++ b/assets/common/items/armor/savage/back.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/belt.ron b/assets/common/items/armor/savage/belt.ron index fb84d39aff..3fb0cb23c6 100644 --- a/assets/common/items/armor/savage/belt.ron +++ b/assets/common/items/armor/savage/belt.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/chest.ron b/assets/common/items/armor/savage/chest.ron index 2edbe327b3..f241782dc5 100644 --- a/assets/common/items/armor/savage/chest.ron +++ b/assets/common/items/armor/savage/chest.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/foot.ron b/assets/common/items/armor/savage/foot.ron index 6afdd53a91..6831d58705 100644 --- a/assets/common/items/armor/savage/foot.ron +++ b/assets/common/items/armor/savage/foot.ron @@ -8,6 +8,5 @@ ItemDef( quality: High, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/hand.ron b/assets/common/items/armor/savage/hand.ron index 7cea3c5559..25e7d0a358 100644 --- a/assets/common/items/armor/savage/hand.ron +++ b/assets/common/items/armor/savage/hand.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/pants.ron b/assets/common/items/armor/savage/pants.ron index 0b4fe353e8..359fd5ba53 100644 --- a/assets/common/items/armor/savage/pants.ron +++ b/assets/common/items/armor/savage/pants.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/shoulder.ron b/assets/common/items/armor/savage/shoulder.ron index b51d2e39c0..a18e9cb9f7 100644 --- a/assets/common/items/armor/savage/shoulder.ron +++ b/assets/common/items/armor/savage/shoulder.ron @@ -8,6 +8,5 @@ ItemDef( quality: Moderate, tags: [ Material(Leather), - SalvageInto(Leather), ], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/belt.ron b/assets/common/items/armor/twigs/belt.ron index 96444c3432..cbc260743b 100644 --- a/assets/common/items/armor/twigs/belt.ron +++ b/assets/common/items/armor/twigs/belt.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigs/chest.ron b/assets/common/items/armor/twigs/chest.ron index 801662528a..d899c43be4 100644 --- a/assets/common/items/armor/twigs/chest.ron +++ b/assets/common/items/armor/twigs/chest.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 3), ], ) diff --git a/assets/common/items/armor/twigs/foot.ron b/assets/common/items/armor/twigs/foot.ron index 9de6ed91e4..bc44da8884 100644 --- a/assets/common/items/armor/twigs/foot.ron +++ b/assets/common/items/armor/twigs/foot.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigs/hand.ron b/assets/common/items/armor/twigs/hand.ron index c9e965e0fa..6b881c283b 100644 --- a/assets/common/items/armor/twigs/hand.ron +++ b/assets/common/items/armor/twigs/hand.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigs/pants.ron b/assets/common/items/armor/twigs/pants.ron index ffca0c2529..a3bbe723da 100644 --- a/assets/common/items/armor/twigs/pants.ron +++ b/assets/common/items/armor/twigs/pants.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 2), ], ) diff --git a/assets/common/items/armor/twigs/shoulder.ron b/assets/common/items/armor/twigs/shoulder.ron index 98b1cfa1b3..282e943691 100644 --- a/assets/common/items/armor/twigs/shoulder.ron +++ b/assets/common/items/armor/twigs/shoulder.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Common, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsflowers/belt.ron b/assets/common/items/armor/twigsflowers/belt.ron index 82d0f7e677..e1fe6b7529 100644 --- a/assets/common/items/armor/twigsflowers/belt.ron +++ b/assets/common/items/armor/twigsflowers/belt.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsflowers/chest.ron b/assets/common/items/armor/twigsflowers/chest.ron index 8bf2c6520d..c7fb797e3f 100644 --- a/assets/common/items/armor/twigsflowers/chest.ron +++ b/assets/common/items/armor/twigsflowers/chest.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 3), ], ) diff --git a/assets/common/items/armor/twigsflowers/foot.ron b/assets/common/items/armor/twigsflowers/foot.ron index 75dbc13cca..16ecff213e 100644 --- a/assets/common/items/armor/twigsflowers/foot.ron +++ b/assets/common/items/armor/twigsflowers/foot.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsflowers/hand.ron b/assets/common/items/armor/twigsflowers/hand.ron index 35152eb859..5fe59799d9 100644 --- a/assets/common/items/armor/twigsflowers/hand.ron +++ b/assets/common/items/armor/twigsflowers/hand.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsflowers/pants.ron b/assets/common/items/armor/twigsflowers/pants.ron index a541f7217f..e29bc5815f 100644 --- a/assets/common/items/armor/twigsflowers/pants.ron +++ b/assets/common/items/armor/twigsflowers/pants.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 2), ], ) diff --git a/assets/common/items/armor/twigsflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron index 2198a2b323..bca2afa3bc 100644 --- a/assets/common/items/armor/twigsflowers/shoulder.ron +++ b/assets/common/items/armor/twigsflowers/shoulder.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsleaves/belt.ron b/assets/common/items/armor/twigsleaves/belt.ron index 872823309d..41eae60a79 100644 --- a/assets/common/items/armor/twigsleaves/belt.ron +++ b/assets/common/items/armor/twigsleaves/belt.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsleaves/chest.ron b/assets/common/items/armor/twigsleaves/chest.ron index 8c929caeef..873eebc514 100644 --- a/assets/common/items/armor/twigsleaves/chest.ron +++ b/assets/common/items/armor/twigsleaves/chest.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 3), ], ) diff --git a/assets/common/items/armor/twigsleaves/foot.ron b/assets/common/items/armor/twigsleaves/foot.ron index 35c85a9b5a..f83cc52c8e 100644 --- a/assets/common/items/armor/twigsleaves/foot.ron +++ b/assets/common/items/armor/twigsleaves/foot.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsleaves/hand.ron b/assets/common/items/armor/twigsleaves/hand.ron index 4d6e0a0475..70106b5a85 100644 --- a/assets/common/items/armor/twigsleaves/hand.ron +++ b/assets/common/items/armor/twigsleaves/hand.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/armor/twigsleaves/pants.ron b/assets/common/items/armor/twigsleaves/pants.ron index 9206e21f18..45a00ba35a 100644 --- a/assets/common/items/armor/twigsleaves/pants.ron +++ b/assets/common/items/armor/twigsleaves/pants.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Moderate, tags: [ + SalvageInto(Twig, 2), ], ) diff --git a/assets/common/items/armor/twigsleaves/shoulder.ron b/assets/common/items/armor/twigsleaves/shoulder.ron index 16a8ccc847..d21804fcb3 100644 --- a/assets/common/items/armor/twigsleaves/shoulder.ron +++ b/assets/common/items/armor/twigsleaves/shoulder.ron @@ -7,5 +7,6 @@ ItemDef( )), quality: Common, tags: [ + SalvageInto(Twig, 1), ], ) diff --git a/assets/common/items/food/cactus_colada.ron b/assets/common/items/food/cactus_colada.ron index 73282b8190..d7a3e370c1 100644 --- a/assets/common/items/food/cactus_colada.ron +++ b/assets/common/items/food/cactus_colada.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.0, + strength: 5.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/carrot.ron b/assets/common/items/food/carrot.ron index 0e16bb11dd..e0d4637b74 100644 --- a/assets/common/items/food/carrot.ron +++ b/assets/common/items/food/carrot.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/cheese.ron b/assets/common/items/food/cheese.ron index 9776ad9b31..268983cf40 100644 --- a/assets/common/items/food/cheese.ron +++ b/assets/common/items/food/cheese.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.5, - duration: Some(10), + strength: 3.5, + duration: Some(7.5), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/coltsfoot.ron b/assets/common/items/food/coltsfoot.ron index ab4172d011..535499897a 100644 --- a/assets/common/items/food/coltsfoot.ron +++ b/assets/common/items/food/coltsfoot.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/garlic.ron b/assets/common/items/food/garlic.ron index 43b6aea1cb..87b9a4d118 100644 --- a/assets/common/items/food/garlic.ron +++ b/assets/common/items/food/garlic.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/lettuce.ron b/assets/common/items/food/lettuce.ron index bf01a4bb4b..f60a2cc2cd 100644 --- a/assets/common/items/food/lettuce.ron +++ b/assets/common/items/food/lettuce.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/meat/beast_large_cooked.ron b/assets/common/items/food/meat/beast_large_cooked.ron index 251f45cbf3..dc264f7f6f 100644 --- a/assets/common/items/food/meat/beast_large_cooked.ron +++ b/assets/common/items/food/meat/beast_large_cooked.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.5, + strength: 6.0, duration: Some(10), ), cat_ids: [Natural], diff --git a/assets/common/items/food/meat/beast_small_cooked.ron b/assets/common/items/food/meat/beast_small_cooked.ron index 88d05fb139..6b145b8bdf 100644 --- a/assets/common/items/food/meat/beast_small_cooked.ron +++ b/assets/common/items/food/meat/beast_small_cooked.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.5, - duration: Some(10), + strength: 3.4, + duration: Some(7.5), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/meat/bird_cooked.ron b/assets/common/items/food/meat/bird_cooked.ron index c85f79b5fe..0e2ae6b16d 100644 --- a/assets/common/items/food/meat/bird_cooked.ron +++ b/assets/common/items/food/meat/bird_cooked.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.5, - duration: Some(10), + strength: 4.0, + duration: Some(7.5), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/meat/bird_large_cooked.ron b/assets/common/items/food/meat/bird_large_cooked.ron index 637cf6b913..701a4b157b 100644 --- a/assets/common/items/food/meat/bird_large_cooked.ron +++ b/assets/common/items/food/meat/bird_large_cooked.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.5, - duration: Some(15), + strength: 9.5, + duration: Some(10), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/meat/fish_cooked.ron b/assets/common/items/food/meat/fish_cooked.ron index ce13683dd8..95d683ffb3 100644 --- a/assets/common/items/food/meat/fish_cooked.ron +++ b/assets/common/items/food/meat/fish_cooked.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.5, - duration: Some(10), + strength: 3.9, + duration: Some(7.5), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/meat/tough_cooked.ron b/assets/common/items/food/meat/tough_cooked.ron index ebe9d121d6..138d00fb18 100644 --- a/assets/common/items/food/meat/tough_cooked.ron +++ b/assets/common/items/food/meat/tough_cooked.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.0, - duration: Some(10), + strength: 4.2, + duration: Some(8.5), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/mushroom.ron b/assets/common/items/food/mushroom.ron index 30ea33d02b..1d76bf5d65 100644 --- a/assets/common/items/food/mushroom.ron +++ b/assets/common/items/food/mushroom.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/mushroom_stick.ron b/assets/common/items/food/mushroom_stick.ron index a5402dca51..b177a04da0 100644 --- a/assets/common/items/food/mushroom_stick.ron +++ b/assets/common/items/food/mushroom_stick.ron @@ -8,7 +8,7 @@ ItemDef( kind: Saturation, data: ( strength: 4.0, - duration: Some(5), + duration: Some(6), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/onion.ron b/assets/common/items/food/onion.ron index 55ee872059..1309b3a7e0 100644 --- a/assets/common/items/food/onion.ron +++ b/assets/common/items/food/onion.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/plainsalad.ron b/assets/common/items/food/plainsalad.ron index f4311d0392..d68678c6f1 100644 --- a/assets/common/items/food/plainsalad.ron +++ b/assets/common/items/food/plainsalad.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.0, + strength: 2.5, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/sage.ron b/assets/common/items/food/sage.ron index 193c82a90e..0a98b9fe8d 100644 --- a/assets/common/items/food/sage.ron +++ b/assets/common/items/food/sage.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/food/sunflower_icetea.ron b/assets/common/items/food/sunflower_icetea.ron index c3971b5434..401462ecc8 100644 --- a/assets/common/items/food/sunflower_icetea.ron +++ b/assets/common/items/food/sunflower_icetea.ron @@ -7,8 +7,8 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 2.0, - duration: Some(10), + strength: 3.5, + duration: Some(7.5), ), cat_ids: [Natural], )), diff --git a/assets/common/items/food/tomato.ron b/assets/common/items/food/tomato.ron index 4d92a5dc11..67c608ddd5 100644 --- a/assets/common/items/food/tomato.ron +++ b/assets/common/items/food/tomato.ron @@ -7,7 +7,7 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 1.0, + strength: 2.0, duration: Some(5), ), cat_ids: [Natural], diff --git a/assets/common/items/glider/basic_red.ron b/assets/common/items/glider/basic_red.ron index 10fd8d9650..6e96baaf5d 100644 --- a/assets/common/items/glider/basic_red.ron +++ b/assets/common/items/glider/basic_red.ron @@ -3,5 +3,7 @@ ItemDef( description: "A simple glider, but with a striking red color.", kind: Glider, quality: Moderate, - tags: [], + tags: [ + SalvageInto(RedLinen, 5) + ], ) diff --git a/assets/common/items/glider/basic_white.ron b/assets/common/items/glider/basic_white.ron index f2897ec2a4..4c9cc6242d 100644 --- a/assets/common/items/glider/basic_white.ron +++ b/assets/common/items/glider/basic_white.ron @@ -3,5 +3,7 @@ ItemDef( description: "Simple, but classy.", kind: Glider, quality: Moderate, - tags: [], + tags: [ + SalvageInto(Linen, 5) + ], ) diff --git a/assets/common/items/glider/butterfly3.ron b/assets/common/items/glider/butterfly3.ron index f4a547ef3b..add3bc101c 100644 --- a/assets/common/items/glider/butterfly3.ron +++ b/assets/common/items/glider/butterfly3.ron @@ -3,5 +3,7 @@ ItemDef( description: "Love is in the air.", kind: Glider, quality: Epic, - tags: [], + tags: [ + SalvageInto(Moonweave, 5) + ], ) diff --git a/assets/common/items/glider/leaves.ron b/assets/common/items/glider/leaves.ron index d8157b24de..852a6560cd 100644 --- a/assets/common/items/glider/leaves.ron +++ b/assets/common/items/glider/leaves.ron @@ -3,5 +3,7 @@ ItemDef( description: "Soar among the trees", kind: Glider, quality: Moderate, - tags: [], + tags: [ + SalvageInto(Linen, 1) + ], ) diff --git a/assets/common/items/glider/sandraptor.ron b/assets/common/items/glider/sandraptor.ron index 6fb57f2372..87dff782b3 100644 --- a/assets/common/items/glider/sandraptor.ron +++ b/assets/common/items/glider/sandraptor.ron @@ -3,5 +3,7 @@ ItemDef( description: "Take flight with the wings of a thirsty predator", kind: Glider, quality: High, - tags: [], + tags: [ + SalvageInto(Leather, 1) + ], ) diff --git a/assets/common/items/glider/sunset.ron b/assets/common/items/glider/sunset.ron index d0d3fa0921..56a22b44a3 100644 --- a/assets/common/items/glider/sunset.ron +++ b/assets/common/items/glider/sunset.ron @@ -3,5 +3,7 @@ ItemDef( description: "It isn't high noon.", kind: Glider, quality: Epic, - tags: [], + tags: [ + SalvageInto(RedLinen, 5), + ], ) diff --git a/assets/common/loot_tables/cave_large.ron b/assets/common/loot_tables/cave_large.ron index 55a4d7637a..6c4c278a1c 100644 --- a/assets/common/loot_tables/cave_large.ron +++ b/assets/common/loot_tables/cave_large.ron @@ -4,11 +4,6 @@ (0.05, Item("common.items.armor.misc.neck.gold")), // Materials (4.0, LootTable("common.loot_tables.materials.underground")), - // Gliders - (0.1, Item("common.items.glider.blue")), - (0.05, Item("common.items.glider.morpho")), - (0.05, Item("common.items.glider.monarch")), - (0.05, Item("common.items.glider.moth")), // Ring (0.05, Item("common.items.armor.misc.ring.gold")), // Lantern diff --git a/assets/common/loot_tables/creature/biped_large/cyclops.ron b/assets/common/loot_tables/creature/biped_large/cyclops.ron new file mode 100644 index 0000000000..1c32121320 --- /dev/null +++ b/assets/common/loot_tables/creature/biped_large/cyclops.ron @@ -0,0 +1,9 @@ +[ + (1, All([ + Item("common.items.keys.quarry_keys.cyclops_eye"), + MultiDrop(Item("common.items.mineral.ingot.iron"), 5, 10), + MultiDrop(Item("common.items.utility.coins"), 200, 500), + LootTable("common.loot_tables.dungeon.tier-4.miniboss"), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/dullahan.ron b/assets/common/loot_tables/creature/biped_large/dullahan.ron new file mode 100644 index 0000000000..d0e493c408 --- /dev/null +++ b/assets/common/loot_tables/creature/biped_large/dullahan.ron @@ -0,0 +1,8 @@ +[ + (1, All([ + MultiDrop(Item("common.items.utility.coins"), 200, 500), + LootTable("common.loot_tables.dungeon.tier-4.miniboss"), + MultiDrop(LootTable("common.loot_tables.gliders"), 0, 1), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/saurok.ron b/assets/common/loot_tables/creature/biped_large/saurok.ron index 30e3718624..b2a454c9be 100644 --- a/assets/common/loot_tables/creature/biped_large/saurok.ron +++ b/assets/common/loot_tables/creature/biped_large/saurok.ron @@ -3,9 +3,9 @@ // Consumables (0.5, Item("common.items.consumable.potion_minor")), // Ring - (0.2, Item("common.items.armor.misc.ring.gold")), + (0.05, Item("common.items.armor.misc.ring.gold")), // Necklace - (0.2, Item("common.items.armor.misc.neck.gold")), + (0.05, Item("common.items.armor.misc.neck.gold")), // Utility (0.1, Item("common.items.utility.collar")), // Bag diff --git a/assets/common/loot_tables/creature/biped_large/tursus.ron b/assets/common/loot_tables/creature/biped_large/tursus.ron index a6aeb3695f..1e623ec1ad 100644 --- a/assets/common/loot_tables/creature/biped_large/tursus.ron +++ b/assets/common/loot_tables/creature/biped_large/tursus.ron @@ -1,4 +1,8 @@ [ - (1.0, Item("common.items.crafting_ing.hide.rugged_hide")), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, 2)), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/basilisk.ron b/assets/common/loot_tables/creature/quad_low/basilisk.ron index c3c206eb06..e4b53504dd 100644 --- a/assets/common/loot_tables/creature/quad_low/basilisk.ron +++ b/assets/common/loot_tables/creature/quad_low/basilisk.ron @@ -1,6 +1,8 @@ [ - (1.0, Item("common.items.food.meat.tough_raw")), - (2.0, Item("common.items.crafting_ing.hide.plate")), - (2.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), - + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2), + Item("common.items.crafting_ing.animal_misc.grim_eyeball"), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron b/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron index dbdeda8a3a..db8002ae01 100644 --- a/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron +++ b/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron @@ -1,6 +1,8 @@ [ - (1.5, Item("common.items.food.meat.beast_small_raw")), - (0.5, Item("common.items.food.meat.beast_large_raw")), - (2.0, Item("common.items.crafting_ing.animal_misc.large_horn")), - (3.0, Item("common.items.crafting_ing.hide.rugged_hide")), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/mammoth.ron b/assets/common/loot_tables/creature/quad_medium/mammoth.ron index e7ff637620..124b10b7aa 100644 --- a/assets/common/loot_tables/creature/quad_medium/mammoth.ron +++ b/assets/common/loot_tables/creature/quad_medium/mammoth.ron @@ -1,4 +1,7 @@ -[ - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 2)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 2, 2)), +[ + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/ngoubou.ron b/assets/common/loot_tables/creature/quad_medium/ngoubou.ron index 96a657bd90..5b71ebe8b7 100644 --- a/assets/common/loot_tables/creature/quad_medium/ngoubou.ron +++ b/assets/common/loot_tables/creature/quad_medium/ngoubou.ron @@ -1,5 +1,8 @@ [ - (2.0, Item("common.items.crafting_ing.hide.rugged_hide")), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 2)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 2, 2)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/roshwalr.ron b/assets/common/loot_tables/creature/quad_medium/roshwalr.ron index baa9f83d7c..22c24ae5ff 100644 --- a/assets/common/loot_tables/creature/quad_medium/roshwalr.ron +++ b/assets/common/loot_tables/creature/quad_medium/roshwalr.ron @@ -1,5 +1,8 @@ [ - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 3)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 4)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 2, 2)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 0, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/archaeos.ron b/assets/common/loot_tables/creature/theropod/archaeos.ron new file mode 100644 index 0000000000..df4ad63102 --- /dev/null +++ b/assets/common/loot_tables/creature/theropod/archaeos.ron @@ -0,0 +1,9 @@ +[ + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 5), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 1), + ], + )), +] diff --git a/assets/common/loot_tables/creature/theropod/ntouka.ron b/assets/common/loot_tables/creature/theropod/ntouka.ron new file mode 100644 index 0000000000..179d0f82f9 --- /dev/null +++ b/assets/common/loot_tables/creature/theropod/ntouka.ron @@ -0,0 +1,8 @@ +[ + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), + ], + )), +] diff --git a/assets/common/loot_tables/creature/theropod/plate.ron b/assets/common/loot_tables/creature/theropod/plate.ron deleted file mode 100644 index 226b6164ac..0000000000 --- a/assets/common/loot_tables/creature/theropod/plate.ron +++ /dev/null @@ -1,4 +0,0 @@ -[ - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 3)), - (1.0, Item("common.items.crafting_ing.animal_misc.large_horn")), -] diff --git a/assets/common/loot_tables/dungeon/adlet/boss.ron b/assets/common/loot_tables/dungeon/adlet/boss.ron new file mode 100644 index 0000000000..60e89ee58b --- /dev/null +++ b/assets/common/loot_tables/dungeon/adlet/boss.ron @@ -0,0 +1,9 @@ +[ + (1, All([ + MultiDrop(LootTable("common.loot_tables.weapons.tier-3"), 0, 1), + MultiDrop(LootTable("common.loot_tables.armor.tier-3"), 0, 1), + MultiDrop(Item("common.items.armor.misc.head.bear_bonnet"), 0, 1), + MultiDrop(Item("common.items.armor.misc.head.howl_cowl"), 0, 1), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/adlet/chest.ron similarity index 78% rename from assets/common/loot_tables/dungeon/tier-1/chest.ron rename to assets/common/loot_tables/dungeon/adlet/chest.ron index 9233c1fb0a..f914679105 100644 --- a/assets/common/loot_tables/dungeon/tier-1/chest.ron +++ b/assets/common/loot_tables/dungeon/adlet/chest.ron @@ -1,8 +1,9 @@ [ // Gear - (0.5, LootTable("common.loot_tables.weapons.tier-1")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-1")), (0.5, LootTable("common.loot_tables.armor.tier-1")), - (0.5, Item("common.items.armor.misc.head.hog_hood")), + (0.25, LootTable("common.loot_tables.weapons.tier-1")), + (0.25, Item("common.items.armor.misc.head.hog_hood")), // Currency (3.0, MultiDrop(Item("common.items.utility.coins"), 50, 100)), // Materials diff --git a/assets/common/loot_tables/dungeon/adlet/elder.ron b/assets/common/loot_tables/dungeon/adlet/elder.ron new file mode 100644 index 0000000000..02b7d94323 --- /dev/null +++ b/assets/common/loot_tables/dungeon/adlet/elder.ron @@ -0,0 +1,7 @@ +[ + (1, All([ + Item("common.items.keys.bone_key"), + LootTable("common.loot_tables.dungeon.adlet.elder_extra"), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/elder_extra.ron b/assets/common/loot_tables/dungeon/adlet/elder_extra.ron similarity index 100% rename from assets/common/loot_tables/dungeon/tier-1/elder_extra.ron rename to assets/common/loot_tables/dungeon/adlet/elder_extra.ron diff --git a/assets/common/loot_tables/dungeon/tier-1/hunter.ron b/assets/common/loot_tables/dungeon/adlet/hunter.ron similarity index 69% rename from assets/common/loot_tables/dungeon/tier-1/hunter.ron rename to assets/common/loot_tables/dungeon/adlet/hunter.ron index e47a9ec7ad..847265c3a3 100644 --- a/assets/common/loot_tables/dungeon/tier-1/hunter.ron +++ b/assets/common/loot_tables/dungeon/adlet/hunter.ron @@ -2,11 +2,9 @@ // Food (1.0, LootTable("common.loot_tables.food.wild_ingredients")), // Materials - (0.50, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), + (0.25, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), (0.25, MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 1, 2)), (0.25, MultiDrop(Item("common.items.crafting_ing.leather.thick_leather"), 1, 2)), - // Weapons - (0.25, LootTable("common.loot_tables.weapons.tier-1")), // Nothing (0.75, Nothing), ] diff --git a/assets/common/loot_tables/dungeon/tier-1/icepicker.ron b/assets/common/loot_tables/dungeon/adlet/icepicker.ron similarity index 75% rename from assets/common/loot_tables/dungeon/tier-1/icepicker.ron rename to assets/common/loot_tables/dungeon/adlet/icepicker.ron index 8e4530f52d..9c018cacf7 100644 --- a/assets/common/loot_tables/dungeon/tier-1/icepicker.ron +++ b/assets/common/loot_tables/dungeon/adlet/icepicker.ron @@ -2,11 +2,9 @@ // Food (1.0, LootTable("common.loot_tables.food.wild_ingredients")), // Materials - (0.50, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), + (0.25, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), (0.25, MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 1, 2)), (0.25, MultiDrop(Item("common.items.crafting_ing.leather.thick_leather"), 1, 2)), - // Weapons - (0.25, LootTable("common.loot_tables.weapons.tier-1")), // Utilities (0.1, Item("common.items.lantern.blue_0")), (0.05, Item("common.items.tool.pickaxe_steel")), diff --git a/assets/common/loot_tables/dungeon/tier-1/tracker.ron b/assets/common/loot_tables/dungeon/adlet/tracker.ron similarity index 69% rename from assets/common/loot_tables/dungeon/tier-1/tracker.ron rename to assets/common/loot_tables/dungeon/adlet/tracker.ron index e47a9ec7ad..847265c3a3 100644 --- a/assets/common/loot_tables/dungeon/tier-1/tracker.ron +++ b/assets/common/loot_tables/dungeon/adlet/tracker.ron @@ -2,11 +2,9 @@ // Food (1.0, LootTable("common.loot_tables.food.wild_ingredients")), // Materials - (0.50, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), + (0.25, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), (0.25, MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 1, 2)), (0.25, MultiDrop(Item("common.items.crafting_ing.leather.thick_leather"), 1, 2)), - // Weapons - (0.25, LootTable("common.loot_tables.weapons.tier-1")), // Nothing (0.75, Nothing), ] diff --git a/assets/common/loot_tables/dungeon/dwarven_quarry/alligator.ron b/assets/common/loot_tables/dungeon/dwarven_quarry/alligator.ron index c118371d46..0e27c7558f 100644 --- a/assets/common/loot_tables/dungeon/dwarven_quarry/alligator.ron +++ b/assets/common/loot_tables/dungeon/dwarven_quarry/alligator.ron @@ -1,8 +1,7 @@ [ (1, All([ Item("common.items.keys.quarry_keys.smelting"), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 1), - LootTable("common.loot_tables.weapons.components.tier-4"), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/dwarven_quarry/flamekeeper.ron b/assets/common/loot_tables/dungeon/dwarven_quarry/flamekeeper.ron index 5927167198..859be42c9b 100644 --- a/assets/common/loot_tables/dungeon/dwarven_quarry/flamekeeper.ron +++ b/assets/common/loot_tables/dungeon/dwarven_quarry/flamekeeper.ron @@ -2,8 +2,7 @@ (1, All([ Item("common.items.keys.quarry_keys.flamekeeper_left"), Item("common.items.keys.quarry_keys.flamekeeper_right"), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 1), - LootTable("common.loot_tables.weapons.components.tier-4"), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/dwarven_quarry/overseer.ron b/assets/common/loot_tables/dungeon/dwarven_quarry/overseer.ron index 8c4bf74e60..a7a85bbe51 100644 --- a/assets/common/loot_tables/dungeon/dwarven_quarry/overseer.ron +++ b/assets/common/loot_tables/dungeon/dwarven_quarry/overseer.ron @@ -1,8 +1,7 @@ [ (1, All([ Item("common.items.keys.quarry_keys.overseer"), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 1), - LootTable("common.loot_tables.weapons.components.tier-2"), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/gnarling/chest.ron similarity index 79% rename from assets/common/loot_tables/dungeon/tier-0/chest.ron rename to assets/common/loot_tables/dungeon/gnarling/chest.ron index bef744466d..fb91d2d97f 100644 --- a/assets/common/loot_tables/dungeon/tier-0/chest.ron +++ b/assets/common/loot_tables/dungeon/gnarling/chest.ron @@ -1,7 +1,8 @@ [ // Gear - (0.5, LootTable("common.loot_tables.weapons.tier-0")), - (0.5, LootTable("common.loot_tables.armor.tier-0")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-0")), + (0.25, LootTable("common.loot_tables.weapons.tier-0")), + (0.25, LootTable("common.loot_tables.armor.tier-0")), // Currency (2.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)), // Materials diff --git a/assets/common/loot_tables/dungeon/tier-0/chieftain.ron b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron similarity index 100% rename from assets/common/loot_tables/dungeon/tier-0/chieftain.ron rename to assets/common/loot_tables/dungeon/gnarling/chieftain.ron diff --git a/assets/common/loot_tables/dungeon/tier-0/harvester.ron b/assets/common/loot_tables/dungeon/gnarling/harvester.ron similarity index 100% rename from assets/common/loot_tables/dungeon/tier-0/harvester.ron rename to assets/common/loot_tables/dungeon/gnarling/harvester.ron diff --git a/assets/common/loot_tables/dungeon/gnarling/logger.ron b/assets/common/loot_tables/dungeon/gnarling/logger.ron new file mode 100644 index 0000000000..34dbebb618 --- /dev/null +++ b/assets/common/loot_tables/dungeon/gnarling/logger.ron @@ -0,0 +1,8 @@ +[ + // Food + (1.25, LootTable("common.loot_tables.food.wild_ingredients")), + // Materials + (0.75, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 2)), + // Nothing + (0.75, Nothing), +] diff --git a/assets/common/loot_tables/dungeon/tier-0/mandragora.ron b/assets/common/loot_tables/dungeon/gnarling/mandragora.ron similarity index 100% rename from assets/common/loot_tables/dungeon/tier-0/mandragora.ron rename to assets/common/loot_tables/dungeon/gnarling/mandragora.ron diff --git a/assets/common/loot_tables/dungeon/gnarling/mugger.ron b/assets/common/loot_tables/dungeon/gnarling/mugger.ron new file mode 100644 index 0000000000..34dbebb618 --- /dev/null +++ b/assets/common/loot_tables/dungeon/gnarling/mugger.ron @@ -0,0 +1,8 @@ +[ + // Food + (1.25, LootTable("common.loot_tables.food.wild_ingredients")), + // Materials + (0.75, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 2)), + // Nothing + (0.75, Nothing), +] diff --git a/assets/common/loot_tables/dungeon/gnarling/stalker.ron b/assets/common/loot_tables/dungeon/gnarling/stalker.ron new file mode 100644 index 0000000000..34dbebb618 --- /dev/null +++ b/assets/common/loot_tables/dungeon/gnarling/stalker.ron @@ -0,0 +1,8 @@ +[ + // Food + (1.25, LootTable("common.loot_tables.food.wild_ingredients")), + // Materials + (0.75, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 2)), + // Nothing + (0.75, Nothing), +] diff --git a/assets/common/loot_tables/dungeon/tier-0/woodgolem.ron b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron similarity index 100% rename from assets/common/loot_tables/dungeon/tier-0/woodgolem.ron rename to assets/common/loot_tables/dungeon/gnarling/woodgolem.ron diff --git a/assets/common/loot_tables/dungeon/tier-0/logger.ron b/assets/common/loot_tables/dungeon/tier-0/logger.ron deleted file mode 100644 index 54f7fd5cf0..0000000000 --- a/assets/common/loot_tables/dungeon/tier-0/logger.ron +++ /dev/null @@ -1,11 +0,0 @@ -[ - // Food - (1.25, LootTable("common.loot_tables.food.wild_ingredients")), - // Gear - (0.25, LootTable("common.loot_tables.weapons.tier-0")), - (0.25, LootTable("common.loot_tables.armor.tier-0")), - // Materials - (0.50, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), - // Nothing - (0.75, Nothing), -] diff --git a/assets/common/loot_tables/dungeon/tier-0/mugger.ron b/assets/common/loot_tables/dungeon/tier-0/mugger.ron deleted file mode 100644 index 54f7fd5cf0..0000000000 --- a/assets/common/loot_tables/dungeon/tier-0/mugger.ron +++ /dev/null @@ -1,11 +0,0 @@ -[ - // Food - (1.25, LootTable("common.loot_tables.food.wild_ingredients")), - // Gear - (0.25, LootTable("common.loot_tables.weapons.tier-0")), - (0.25, LootTable("common.loot_tables.armor.tier-0")), - // Materials - (0.50, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), - // Nothing - (0.75, Nothing), -] diff --git a/assets/common/loot_tables/dungeon/tier-0/stalker.ron b/assets/common/loot_tables/dungeon/tier-0/stalker.ron deleted file mode 100644 index 54f7fd5cf0..0000000000 --- a/assets/common/loot_tables/dungeon/tier-0/stalker.ron +++ /dev/null @@ -1,11 +0,0 @@ -[ - // Food - (1.25, LootTable("common.loot_tables.food.wild_ingredients")), - // Gear - (0.25, LootTable("common.loot_tables.weapons.tier-0")), - (0.25, LootTable("common.loot_tables.armor.tier-0")), - // Materials - (0.50, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 1, 3)), - // Nothing - (0.75, Nothing), -] diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron deleted file mode 100644 index a07296fcfc..0000000000 --- a/assets/common/loot_tables/dungeon/tier-1/boss.ron +++ /dev/null @@ -1,9 +0,0 @@ -[ - // Weapons - (4.0, LootTable("common.loot_tables.weapons.tier-3")), - // Armor - (4.0, LootTable("common.loot_tables.armor.tier-3")), - // Misc - (1.0, Item("common.items.armor.misc.head.bear_bonnet")), - (1.0, Item("common.items.armor.misc.head.howl_cowl")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/elder.ron b/assets/common/loot_tables/dungeon/tier-1/elder.ron deleted file mode 100644 index e84bc8e7d6..0000000000 --- a/assets/common/loot_tables/dungeon/tier-1/elder.ron +++ /dev/null @@ -1,6 +0,0 @@ -[ - // Misc - (5.0, Item("common.items.keys.bone_key")), - (1.0, LootTable("common.loot_tables.dungeon.tier-1.elder_extra")), - -] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron index 3307401d0c..5cc206bf31 100644 --- a/assets/common/loot_tables/dungeon/tier-2/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron @@ -1,7 +1,8 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), - (1.0, LootTable("common.loot_tables.armor.tier-2")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-2")), + (0.5, LootTable("common.loot_tables.weapons.tier-2")), + (0.5, LootTable("common.loot_tables.armor.tier-2")), // Currency (3.0, MultiDrop(Item("common.items.utility.coins"), 100, 250)), // Materials diff --git a/assets/common/loot_tables/dungeon/tier-2/enemy.ron b/assets/common/loot_tables/dungeon/tier-2/enemy.ron index c5e44a860c..35ed8ff5e6 100644 --- a/assets/common/loot_tables/dungeon/tier-2/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-2/enemy.ron @@ -1,8 +1,11 @@ [ - // Currency - (1.0, MultiDrop(Item("common.items.utility.coins"), 10, 20)), + // Consumables + (1.0, LootTable("common.loot_tables.consumable.moderate")), // Food - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)), + (1.0, MultiDrop(LootTable("common.loot_tables.food.wild_ingredients"), 1, 2)), + // Materials + (1.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 1, 3)), // Nothing - (2.0, Nothing), + (0.75, Nothing), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index e6c42e91ec..db5ed55ad4 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron @@ -1,7 +1,8 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), - (1.0, LootTable("common.loot_tables.armor.tier-3")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-3")), + (0.5, LootTable("common.loot_tables.weapons.tier-3")), + (0.5, LootTable("common.loot_tables.armor.tier-3")), // Currency (3.0, MultiDrop(Item("common.items.utility.coins"), 250, 500)), // Materials diff --git a/assets/common/loot_tables/dungeon/tier-3/enemy.ron b/assets/common/loot_tables/dungeon/tier-3/enemy.ron index 84bdc54e23..788e055816 100644 --- a/assets/common/loot_tables/dungeon/tier-3/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-3/enemy.ron @@ -1,8 +1,9 @@ [ - // Currency - (1.0, MultiDrop(Item("common.items.utility.coins"), 20, 40)), + // Consumables + (1.0, LootTable("common.loot_tables.consumable.moderate")), // Food - (1.0, LootTable("common.loot_tables.food.prepared")), + (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)), + (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)), // Nothing - (2.0, Nothing), + (0.75, Nothing), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/boss.ron b/assets/common/loot_tables/dungeon/tier-4/boss.ron index b77ff45d5a..ad862bc127 100644 --- a/assets/common/loot_tables/dungeon/tier-4/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/boss.ron @@ -7,9 +7,7 @@ // Legendary weapons (1.0, LootTable("common.loot_tables.weapons.legendary_melee")), // Crafting material - // Allow for DS and Eldwood to have higher drops till entity droppers are implemented - (1.0, MultiDrop(Item("common.items.crafting_ing.cloth.sunsilk"), 1, 3)), + // Allow for DS and Eldwood to drop till entity droppers are implemented (1.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 3, 8)), - (1.0, MultiDrop(Item("common.items.mineral.ingot.orichalcum"), 1, 3)), (1.0, MultiDrop(Item("common.items.log.eldwood"), 2, 6)), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron index 583f6cf6d6..8859498edf 100644 --- a/assets/common/loot_tables/dungeon/tier-4/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron @@ -1,8 +1,9 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.components.tier-4")), - (1.0, LootTable("common.loot_tables.armor.tier-4")), - (1.0, Item("common.items.armor.misc.head.spikeguard")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-4")), + (0.5, LootTable("common.loot_tables.weapons.tier-4")), + (0.5, LootTable("common.loot_tables.armor.tier-4")), + (0.5, Item("common.items.armor.misc.head.spikeguard")), // Currency (3.0, MultiDrop(Item("common.items.utility.coins"), 500, 1000)), // Materials diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index e8572cfaf0..31297a16fa 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron @@ -1,12 +1,17 @@ [ - // Currency - (10.0, MultiDrop(Item("common.items.utility.coins"), 200, 500)), + // Armor + (2.0, LootTable("common.loot_tables.weapons.tier-5")), + (2.0, LootTable("common.loot_tables.armor.tier-5")), // Food (5.0, LootTable("common.loot_tables.food.prepared")), // Consumables (5.0, LootTable("common.loot_tables.consumable.good")), // lantern (1.0, Item("common.items.lantern.blue_0")), - // gear - (3.0, Item("common.items.armor.misc.head.mitre")), + // Gear + (2.0, Item("common.items.armor.misc.head.mitre")), + // Crafting material + // Allow for DS and Eldwood to drop till entity droppers are implemented + (1.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 4)), + (1.0, MultiDrop(Item("common.items.log.eldwood"), 2, 4)), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/boss.ron b/assets/common/loot_tables/dungeon/tier-5/boss.ron index 1d7e2abdbb..0e8ae80e69 100644 --- a/assets/common/loot_tables/dungeon/tier-5/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-5/boss.ron @@ -11,10 +11,8 @@ // Legendary weapons (1.0, LootTable("common.loot_tables.weapons.legendary_ranged")), // Crafting material - // Allow for DS and Eldwood to have higher drops till entity droppers are implemented + // Allow for DS and Eldwood to drop till entity droppers are implemented (1.0, Item("common.items.crafting_ing.mindflayer_bag_damaged")), - (1.0, MultiDrop(Item("common.items.crafting_ing.cloth.sunsilk"), 1, 3)), (1.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 3, 8)), - (1.0, MultiDrop(Item("common.items.mineral.ingot.orichalcum"), 1, 3)), (1.0, MultiDrop(Item("common.items.log.eldwood"), 2, 6)), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index d3205d5c97..59a571d22c 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -1,7 +1,8 @@ [ // Gear - (1.0, LootTable("common.loot_tables.weapons.components.tier-4")), - (1.0, LootTable("common.loot_tables.armor.tier-4")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-5")), + (0.5, LootTable("common.loot_tables.weapons.tier-5")), + (0.5, LootTable("common.loot_tables.armor.tier-5")), (0.1, Item("common.items.armor.cultist.bandana")), // Currency (3.0, MultiDrop(Item("common.items.utility.coins"), 1000, 5000)), diff --git a/assets/common/loot_tables/gliders.ron b/assets/common/loot_tables/gliders.ron new file mode 100644 index 0000000000..7947c0a69f --- /dev/null +++ b/assets/common/loot_tables/gliders.ron @@ -0,0 +1,6 @@ +[ + (0.1, Item("common.items.glider.blue")), + (0.05, Item("common.items.glider.morpho")), + (0.05, Item("common.items.glider.monarch")), + (0.05, Item("common.items.glider.moth")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/humanoids/dwarf_graverobber.ron b/assets/common/loot_tables/humanoids/dwarf_graverobber.ron new file mode 100644 index 0000000000..cd1d959272 --- /dev/null +++ b/assets/common/loot_tables/humanoids/dwarf_graverobber.ron @@ -0,0 +1,17 @@ +[ + // Crafting Ingredients + (4.0, LootTable("common.loot_tables.materials.common")), + // Consumables + (2.0, Item("common.items.consumable.potion_minor")), + // Gold + (2.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)), + // Ring + (0.05, Item("common.items.armor.misc.ring.gold")), + // Necklace + (0.05, Item("common.items.armor.misc.neck.gold")), + // Armor + (0.4, Item("common.items.armor.misc.head.bandana.thief")), + (0.4, Item("common.items.armor.misc.head.bandana.red")), + (0.4, Item("common.items.armor.misc.head.hood")), + (0.4, Item("common.items.armor.misc.head.hood_dark")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/humanoids/grim_salvager.ron b/assets/common/loot_tables/humanoids/grim_salvager.ron new file mode 100644 index 0000000000..cd1d959272 --- /dev/null +++ b/assets/common/loot_tables/humanoids/grim_salvager.ron @@ -0,0 +1,17 @@ +[ + // Crafting Ingredients + (4.0, LootTable("common.loot_tables.materials.common")), + // Consumables + (2.0, Item("common.items.consumable.potion_minor")), + // Gold + (2.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)), + // Ring + (0.05, Item("common.items.armor.misc.ring.gold")), + // Necklace + (0.05, Item("common.items.armor.misc.neck.gold")), + // Armor + (0.4, Item("common.items.armor.misc.head.bandana.thief")), + (0.4, Item("common.items.armor.misc.head.bandana.red")), + (0.4, Item("common.items.armor.misc.head.hood")), + (0.4, Item("common.items.armor.misc.head.hood_dark")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/humanoids/humanoid.ron similarity index 55% rename from assets/common/loot_tables/creature/humanoid.ron rename to assets/common/loot_tables/humanoids/humanoid.ron index 59486f5698..97718d5c58 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/assets/common/loot_tables/humanoids/humanoid.ron @@ -6,15 +6,12 @@ // Armor (1.0, LootTable("common.loot_tables.armor.cloth")), // Ring - (0.02, Item("common.items.armor.misc.ring.gold")), + (0.05, Item("common.items.armor.misc.ring.gold")), // Necklace - (0.02, Item("common.items.armor.misc.neck.gold")), + (0.05, Item("common.items.armor.misc.neck.gold")), // Utility (0.05, Item("common.items.utility.collar")), - // Food - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (0.25, LootTable("common.loot_tables.food.prepared")), // Weapons (1.0, LootTable("common.loot_tables.weapons.starter")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), + (1.0, LootTable("common.loot_tables.weapons.tier-0")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/spots/pirate.ron b/assets/common/loot_tables/humanoids/pirate.ron similarity index 73% rename from assets/common/loot_tables/spots/pirate.ron rename to assets/common/loot_tables/humanoids/pirate.ron index c3454b6189..3b148a5546 100644 --- a/assets/common/loot_tables/spots/pirate.ron +++ b/assets/common/loot_tables/humanoids/pirate.ron @@ -3,10 +3,12 @@ (3.0, LootTable("common.loot_tables.materials.common")), // Consumables (0.2, Item("common.items.consumable.potion_minor")), + // Gold + (2.0, MultiDrop(Item("common.items.utility.coins"), 50, 75)), // Ring - (0.02, Item("common.items.armor.misc.ring.gold")), + (0.05, Item("common.items.armor.misc.ring.gold")), // Necklace - (0.02, Item("common.items.armor.misc.neck.gold")), + (0.05, Item("common.items.armor.misc.neck.gold")), // Utility (0.05, Item("common.items.utility.collar")), // Armor diff --git a/assets/common/loot_tables/humanoids/witch.ron b/assets/common/loot_tables/humanoids/witch.ron new file mode 100644 index 0000000000..34b6a8d0df --- /dev/null +++ b/assets/common/loot_tables/humanoids/witch.ron @@ -0,0 +1,8 @@ +[ + (0.004, Item("common.items.lantern.pumpkin")), + (3.0, LootTable("common.loot_tables.materials.common")), + (0.05, Item("common.items.armor.misc.ring.gold")), + (0.5, LootTable("common.loot_tables.weapons.tier-3")), + (0.1, LootTable("common.loot_tables.weapons.tier-4")), + (0.05, Item("common.items.armor.witch.hat")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/spots/bandit.ron b/assets/common/loot_tables/spots/bandit.ron deleted file mode 100644 index 9864cdc42e..0000000000 --- a/assets/common/loot_tables/spots/bandit.ron +++ /dev/null @@ -1,18 +0,0 @@ -[ - // Crafting Ingredients - (5.0, LootTable("common.loot_tables.materials.common")), - // Consumables - (2.0, Item("common.items.consumable.potion_minor")), - // Ring - (0.4, Item("common.items.armor.misc.ring.gold")), - // Necklace - (0.4, Item("common.items.armor.misc.neck.gold")), - // Armor - (1.0, Item("common.items.armor.misc.head.bandana.thief")), - (1.0, Item("common.items.armor.misc.head.bandana.red")), - (0.4, Item("common.items.armor.misc.head.hood")), - (0.4, Item("common.items.armor.misc.head.hood_dark")), - // Food - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (0.75, LootTable("common.loot_tables.food.prepared")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/spots/witch.ron b/assets/common/loot_tables/spots/witch.ron deleted file mode 100644 index aae625fd9d..0000000000 --- a/assets/common/loot_tables/spots/witch.ron +++ /dev/null @@ -1,9 +0,0 @@ -[ - (0.004, Item("common.items.lantern.pumpkin")), - (2.0, LootTable("common.loot_tables.materials.common")), - (0.1, Item("common.items.armor.misc.ring.gold")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-3")), - (0.1, LootTable("common.loot_tables.weapons.components.tier-4")), - (1.5, LootTable("common.loot_tables.food.prepared")), - (0.05, Item("common.items.armor.witch.hat")), -] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index a7f18cb868..05114b8286 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -61,7 +61,6 @@ inputs: [ (Item("common.items.crafting_ing.leather.leather_strips"), 5, false), (Item("common.items.mineral.ingot.iron"), 1, false), - (Item("common.items.mineral.gem.ruby"), 1, false), ], craft_sprite: None, ), @@ -148,6 +147,13 @@ ], craft_sprite: Some(CraftingBench), ), + "twig": ( + output: ("common.items.crafting_ing.twigs", 4), + inputs: [ + (Item("common.items.log.wood"), 1, false), + ], + craft_sprite: Some(CraftingBench), + ), "apple_shroom_curry": ( output: ("common.items.food.apple_mushroom_curry", 1), inputs: [ @@ -489,7 +495,7 @@ "horizon_glider": ( output: ("common.items.glider.sunset", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.sunsilk"), 20, false), + (Item("common.items.crafting_ing.cloth.linen_red"), 20, false), (Item("common.items.crafting_ing.twigs"), 5, false), (Item("common.items.crafting_ing.cactus"), 8, false), (Item("common.items.mineral.gem.topaz"), 6, false), diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index a56808053d..b42363e645 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -94,6 +94,7 @@ pub trait TagExampleInfo { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, IntoStaticStr)] pub enum MaterialKind { Metal, + Gem, Wood, Stone, Cloth, @@ -110,7 +111,17 @@ pub enum Material { Steel, Cobalt, Bloodsteel, + Silver, + Gold, Orichalcum, + Topaz, + Emerald, + Sapphire, + Amethyst, + Ruby, + Diamond, + Twig, + PlantFiber, Wood, Bamboo, Hardwood, @@ -124,6 +135,7 @@ pub enum Material { Obsidian, Velorite, Linen, + RedLinen, Wool, Silk, Lifecloth, @@ -131,6 +143,7 @@ pub enum Material { Sunsilk, Rawhide, Leather, + RigidLeather, Scale, Carapace, Plate, @@ -145,8 +158,18 @@ impl Material { | Material::Steel | Material::Cobalt | Material::Bloodsteel + | Material::Silver + | Material::Gold | Material::Orichalcum => MaterialKind::Metal, + Material::Topaz + | Material::Emerald + | Material::Sapphire + | Material::Amethyst + | Material::Ruby + | Material::Diamond => MaterialKind::Gem, Material::Wood + | Material::Twig + | Material::PlantFiber | Material::Bamboo | Material::Hardwood | Material::Ironwood @@ -159,6 +182,7 @@ impl Material { | Material::Obsidian | Material::Velorite => MaterialKind::Stone, Material::Linen + | Material::RedLinen | Material::Wool | Material::Silk | Material::Lifecloth @@ -166,6 +190,7 @@ impl Material { | Material::Sunsilk => MaterialKind::Cloth, Material::Rawhide | Material::Leather + | Material::RigidLeather | Material::Scale | Material::Carapace | Material::Plate @@ -180,7 +205,17 @@ impl Material { Material::Steel => Some("common.items.mineral.ingot.steel"), Material::Cobalt => Some("common.items.mineral.ingot.cobalt"), Material::Bloodsteel => Some("common.items.mineral.ingot.bloodsteel"), + Material::Silver => Some("common.items.mineral.ingot.silver"), + Material::Gold => Some("common.items.mineral.ingot.gold"), Material::Orichalcum => Some("common.items.mineral.ingot.orichalcum"), + Material::Topaz => Some("common.items.mineral.gem.topaz"), + Material::Emerald => Some("common.items.mineral.gem.emerald"), + Material::Sapphire => Some("common.items.mineral.gem.sapphire"), + Material::Amethyst => Some("common.items.mineral.gem.amethyst"), + Material::Ruby => Some("common.items.mineral.gem.ruby"), + Material::Diamond => Some("common.items.mineral.gem.diamond"), + Material::Twig => Some("common.items.crafting_ing.twigs"), + Material::PlantFiber => Some("common.items.flowers.plant_fiber"), Material::Wood => Some("common.items.log.wood"), Material::Bamboo => Some("common.items.log.bamboo"), Material::Hardwood => Some("common.items.log.hardwood"), @@ -194,6 +229,7 @@ impl Material { | Material::Obsidian | Material::Velorite => None, Material::Linen => Some("common.items.crafting_ing.cloth.linen"), + Material::RedLinen => Some("common.items.crafting_ing.cloth.linen_red"), Material::Wool => Some("common.items.crafting_ing.cloth.wool"), Material::Silk => Some("common.items.crafting_ing.cloth.silk"), Material::Lifecloth => Some("common.items.crafting_ing.cloth.lifecloth"), @@ -201,6 +237,7 @@ impl Material { Material::Sunsilk => Some("common.items.crafting_ing.cloth.sunsilk"), Material::Rawhide => Some("common.items.crafting_ing.leather.simple_leather"), Material::Leather => Some("common.items.crafting_ing.leather.thick_leather"), + Material::RigidLeather => Some("common.items.crafting_ing.leather.rigid_leather"), Material::Scale => Some("common.items.crafting_ing.hide.scales"), Material::Carapace => Some("common.items.crafting_ing.hide.carapace"), Material::Plate => Some("common.items.crafting_ing.hide.plate"), @@ -229,7 +266,7 @@ pub enum ItemTag { CraftingTool, // Pickaxe, Craftsman-Hammer, Sewing-Set Utility, Bag, - SalvageInto(Material), + SalvageInto(Material, u32), } impl TagExampleInfo for ItemTag { @@ -245,7 +282,7 @@ impl TagExampleInfo for ItemTag { ItemTag::CraftingTool => "tool", ItemTag::Utility => "utility", ItemTag::Bag => "bag", - ItemTag::SalvageInto(_) => "salvage", + ItemTag::SalvageInto(_, _) => "salvage", } } @@ -262,7 +299,7 @@ impl TagExampleInfo for ItemTag { ItemTag::CraftingTool => None, ItemTag::Utility => None, ItemTag::Bag => None, - ItemTag::SalvageInto(_) => None, + ItemTag::SalvageInto(_, _) => None, } } } @@ -1094,13 +1131,15 @@ impl Item { pub fn is_salvageable(&self) -> bool { self.tags() .iter() - .any(|tag| matches!(tag, ItemTag::SalvageInto(_))) + .any(|tag| matches!(tag, ItemTag::SalvageInto(_, _))) } - pub fn salvage_output(&self) -> impl Iterator { + pub fn salvage_output(&self) -> impl Iterator { self.tags().into_iter().filter_map(|tag| { - if let ItemTag::SalvageInto(material) = tag { - material.asset_identifier() + if let ItemTag::SalvageInto(material, quantity) = tag { + material + .asset_identifier() + .map(|material_id| (material_id, quantity)) } else { None } diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index fceea44e18..e043a6927a 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -218,7 +218,10 @@ impl ModularBase { _ => None, }) { - vec![ItemTag::Material(material), ItemTag::SalvageInto(material)] + vec![ + ItemTag::Material(material), + ItemTag::SalvageInto(material, 1), + ] } else { Vec::new() } diff --git a/common/src/lottery.rs b/common/src/lottery.rs index 0f6eb91791..1545ac65c3 100644 --- a/common/src/lottery.rs +++ b/common/src/lottery.rs @@ -408,11 +408,6 @@ pub mod tests { }); }, LootSpec::MultiDrop(loot_spec, lower, upper) => { - assert!( - *lower > 0, - "Lower quantity must be more than 0. It is {}.", - lower - ); assert!( upper >= lower, "Upper quantity must be at least the value of lower quantity. Upper value: \ diff --git a/common/src/recipe.rs b/common/src/recipe.rs index 0db1ca695e..77ec90459e 100644 --- a/common/src/recipe.rs +++ b/common/src/recipe.rs @@ -318,7 +318,9 @@ pub fn try_salvage( let salvage_item = inv.get(slot).expect("Expected item to exist in inventory"); let salvage_output: Vec<_> = salvage_item .salvage_output() - .map(Item::new_from_asset_expect) + .flat_map(|(material, quantity)| { + std::iter::repeat(Item::new_from_asset_expect(material)).take(quantity as usize) + }) .collect(); if salvage_output.is_empty() { // If no output items, assume salvaging was a failure diff --git a/common/src/states/sprite_interact.rs b/common/src/states/sprite_interact.rs index f13db354ed..c90bac03e3 100644 --- a/common/src/states/sprite_interact.rs +++ b/common/src/states/sprite_interact.rs @@ -214,12 +214,12 @@ impl SpriteInteractKind { ), Self::Collectible => ( Duration::from_secs_f32(0.1), - Duration::from_secs_f32(0.3), + Duration::from_secs_f32(0.2), Duration::from_secs_f32(0.1), ), Self::Harvestable => ( Duration::from_secs_f32(0.3), - Duration::from_secs_f32(0.5), + Duration::from_secs_f32(0.3), Duration::from_secs_f32(0.2), ), Self::Fallback => ( diff --git a/common/src/states/use_item.rs b/common/src/states/use_item.rs index 1f6f666724..fa21ae7348 100644 --- a/common/src/states/use_item.rs +++ b/common/src/states/use_item.rs @@ -179,12 +179,12 @@ impl ItemUseKind { ), Self::Consumable(ConsumableKind::Food) => ( Duration::from_secs_f32(1.0), - Duration::from_secs_f32(5.0), + Duration::from_secs_f32(4.0), Duration::from_secs_f32(0.5), ), Self::Consumable(ConsumableKind::ComplexFood) => ( Duration::from_secs_f32(1.0), - Duration::from_secs_f32(5.0), + Duration::from_secs_f32(4.5), Duration::from_secs_f32(0.5), ), } diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index fc7dff7314..3fd129e175 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -520,8 +520,8 @@ impl SpriteKind { SpriteKind::ShortFlatCactus => item("common.items.crafting_ing.cactus"), SpriteKind::MedFlatCactus => item("common.items.crafting_ing.cactus"), SpriteKind::Bomb => item("common.items.utility.bomb"), - SpriteKind::DungeonChest0 => table("common.loot_tables.dungeon.tier-0.chest"), - SpriteKind::DungeonChest1 => table("common.loot_tables.dungeon.tier-1.chest"), + SpriteKind::DungeonChest0 => table("common.loot_tables.dungeon.gnarling.chest"), + SpriteKind::DungeonChest1 => table("common.loot_tables.dungeon.adlet.chest"), SpriteKind::DungeonChest2 => table("common.loot_tables.dungeon.tier-2.chest"), SpriteKind::DungeonChest3 => table("common.loot_tables.dungeon.tier-3.chest"), SpriteKind::DungeonChest4 => table("common.loot_tables.dungeon.tier-4.chest"), diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs index 10db81c644..522cc20e66 100644 --- a/voxygen/src/hud/bag.rs +++ b/voxygen/src/hud/bag.rs @@ -427,12 +427,10 @@ impl<'a> InventoryScroller<'a> { if self.show_salvage && item.is_salvageable() { let salvage_result: Vec<_> = item .salvage_output() - .map(Arc::::load_expect_cloned) + .map(|(material_id, _)| Arc::::load_expect_cloned(material_id)) .map(|item| item as Arc) .collect(); - // let items = core::iter::once(item as &dyn ItemDesc) - // .chain(salvage_result.iter().map(|item| item.borrow())); let items = salvage_result .iter() .map(|item| item.borrow()) diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index c29fb4a097..07d6abf896 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -93,6 +93,7 @@ pub fn kind_text<'a>(kind: &ItemKind, i18n: &'a Localization) -> Cow<'a, str> { pub fn material_kind_text<'a>(kind: &MaterialKind, i18n: &'a Localization) -> Cow<'a, str> { match kind { MaterialKind::Metal { .. } => i18n.get_msg("common-material-metal"), + MaterialKind::Gem { .. } => i18n.get_msg("common-material-gem"), MaterialKind::Wood { .. } => i18n.get_msg("common-material-wood"), MaterialKind::Stone { .. } => i18n.get_msg("common-material-stone"), MaterialKind::Cloth { .. } => i18n.get_msg("common-material-cloth"),