From 3f747b5ab3af553b147d4d79120e45334163a67f Mon Sep 17 00:00:00 2001 From: JCoxeye Date: Sun, 24 Dec 2023 16:29:49 -0500 Subject: [PATCH] Reverted grim salvager loot table changes, added bandanas and hoods to misc_armor, and roughly adjusted file weighting accordingly. --- assets/common/loot_tables/armor/salvager.ron | 6 ------ assets/common/loot_tables/humanoids/grim_salvager.ron | 5 ++++- assets/common/trading/item_price_calculation.ron | 3 +-- assets/common/trading/misc_armor.ron | 6 ++++++ 4 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 assets/common/loot_tables/armor/salvager.ron diff --git a/assets/common/loot_tables/armor/salvager.ron b/assets/common/loot_tables/armor/salvager.ron deleted file mode 100644 index 369491cad8..0000000000 --- a/assets/common/loot_tables/armor/salvager.ron +++ /dev/null @@ -1,6 +0,0 @@ -[ - (1.0, Item("common.items.armor.misc.head.bandana.thief")), - (1.0, Item("common.items.armor.misc.head.bandana.red")), - (1.0, Item("common.items.armor.misc.head.hood")), - (1.0, 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 index ba25e09e28..cd1d959272 100644 --- a/assets/common/loot_tables/humanoids/grim_salvager.ron +++ b/assets/common/loot_tables/humanoids/grim_salvager.ron @@ -10,5 +10,8 @@ // Necklace (0.05, Item("common.items.armor.misc.neck.gold")), // Armor - (1.6, LootTable("common.loot_tables.armor.salvager")), + (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/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron index a60aae24f6..ec9dc5804b 100644 --- a/assets/common/trading/item_price_calculation.ron +++ b/assets/common/trading/item_price_calculation.ron @@ -12,8 +12,7 @@ loot_tables: [ (6.0, true, "common.loot_tables.armor.twigs"), (6.0, true, "common.loot_tables.armor.twigsflowers"), (6.0, true, "common.loot_tables.armor.twigsleaves"), - (4.0, false, "common.trading.misc_armor"), - (2.0, false, "common.loot_tables.armor.salvager"), + (6.0, false, "common.trading.misc_armor"), (0.09, false, "common.loot_tables.armor.cultist"), (0.08, false, "common.loot_tables.armor.boreal"), diff --git a/assets/common/trading/misc_armor.ron b/assets/common/trading/misc_armor.ron index cc3580d030..6a8ef62a99 100644 --- a/assets/common/trading/misc_armor.ron +++ b/assets/common/trading/misc_armor.ron @@ -17,6 +17,12 @@ (0.4, Item("common.items.armor.misc.ring.gold")), (0.4, Item("common.items.armor.misc.neck.gold")), + // Grim Salvager + (2.0, Item("common.items.armor.misc.head.bandana.thief")), + (2.0, Item("common.items.armor.misc.head.bandana.red")), + (2.0, Item("common.items.armor.misc.head.hood")), + (2.0, Item("common.items.armor.misc.head.hood_dark")), + // Pirate (0.05, Item("common.items.armor.misc.head.crown")), (0.05, Item("common.items.armor.pirate.hat")),