From daf287a469700bea949ce1dd92605098fe1b81b6 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 1 Sep 2021 23:50:17 -0400 Subject: [PATCH] Small loot rebalance. --- .../common/entity/spot/dwarf_grave_robber.ron | 2 +- assets/common/entity/spot/grim_salvager.ron | 2 +- assets/common/entity/spot/witch_dark.ron | 2 +- assets/common/entity/template.ron | 2 +- .../loot_tables/armor/cloth/lifecloth.ron | 9 +++++++ .../common/loot_tables/armor/cloth/linen.ron | 9 +++++++ .../loot_tables/armor/cloth/moonweave.ron | 9 +++++++ .../common/loot_tables/armor/cloth/silk.ron | 9 +++++++ .../loot_tables/armor/cloth/sunsilk.ron | 9 +++++++ .../common/loot_tables/armor/cloth/wool.ron | 9 +++++++ .../loot_tables/armor/hide/carapace.ron | 9 +++++++ .../loot_tables/armor/hide/dragonscale.ron | 9 +++++++ .../loot_tables/armor/{ => hide}/leather.ron | 1 + .../common/loot_tables/armor/hide/plate.ron | 9 +++++++ .../loot_tables/armor/{ => hide}/rawhide.ron | 0 .../common/loot_tables/armor/hide/scale.ron | 9 +++++++ .../loot_tables/armor/metal/bloodsteel.ron | 9 +++++++ .../common/loot_tables/armor/metal/bronze.ron | 9 +++++++ .../common/loot_tables/armor/metal/cobalt.ron | 9 +++++++ .../common/loot_tables/armor/metal/iron.ron | 9 +++++++ .../loot_tables/armor/metal/orichalcum.ron | 9 +++++++ .../common/loot_tables/armor/metal/steel.ron | 9 +++++++ assets/common/loot_tables/armor/tier-0.ron | 5 ++++ assets/common/loot_tables/armor/tier-1.ron | 5 ++++ assets/common/loot_tables/armor/tier-2.ron | 5 ++++ assets/common/loot_tables/armor/tier-3.ron | 5 ++++ assets/common/loot_tables/armor/tier-4.ron | 5 ++++ assets/common/loot_tables/armor/tier-5.ron | 5 ++++ .../common/loot_tables/consumable/default.ron | 5 ---- .../loot_tables/consumable/firework.ron | 8 ------- assets/common/loot_tables/consumable/good.ron | 14 +++++++++++ assets/common/loot_tables/consumable/misc.ron | 5 ---- .../loot_tables/consumable/moderate.ron | 14 +++++++++++ assets/common/loot_tables/consumable/poor.ron | 14 +++++++++++ .../common/loot_tables/consumable/potion.ron | 6 ----- .../loot_tables/consumable/throwable.ron | 4 ---- .../creature/biped_large/mindflayer.ron | 9 ------- .../common/loot_tables/creature/humanoid.ron | 20 +++++++++++++--- .../loot_tables/dungeon/tier-0/boss.ron | 1 + .../loot_tables/dungeon/tier-0/chest.ron | 17 +++++++------ .../loot_tables/dungeon/tier-0/enemy.ron | 9 ++++--- .../loot_tables/dungeon/tier-0/miniboss.ron | 9 ++++--- .../loot_tables/dungeon/tier-1/boss.ron | 1 + .../loot_tables/dungeon/tier-1/chest.ron | 20 +++++++--------- .../loot_tables/dungeon/tier-1/enemy.ron | 12 ++++++---- .../loot_tables/dungeon/tier-2/boss.ron | 6 ++++- .../loot_tables/dungeon/tier-2/chest.ron | 20 +++++++--------- .../loot_tables/dungeon/tier-2/enemy.ron | 8 +++++-- .../loot_tables/dungeon/tier-3/boss.ron | 1 + .../loot_tables/dungeon/tier-3/chest.ron | 21 +++++++--------- .../loot_tables/dungeon/tier-3/enemy.ron | 10 +++++--- .../loot_tables/dungeon/tier-4/boss.ron | 1 + .../loot_tables/dungeon/tier-4/chest.ron | 21 +++++++--------- .../loot_tables/dungeon/tier-4/enemy.ron | 10 +++++--- .../loot_tables/dungeon/tier-4/miniboss.ron | 12 ++++++---- .../loot_tables/dungeon/tier-5/boss.ron | 24 +++++++++++-------- .../loot_tables/dungeon/tier-5/chest.ron | 21 +++++++--------- .../loot_tables/dungeon/tier-5/enemy.ron | 20 ++++------------ .../loot_tables/dungeon/tier-5/miniboss.ron | 18 +++++++------- .../loot_tables/dungeon/tier-5/minion.ron | 12 ++++------ assets/common/loot_tables/humanoids.ron | 18 -------------- .../loot_tables/sprite/chest-buried.ron | 1 - assets/common/loot_tables/sprite/chest.ron | 1 - assets/common/loot_tables/villager.ron | 19 --------------- .../common/trading/item_price_calculation.ron | 2 -- 65 files changed, 376 insertions(+), 221 deletions(-) create mode 100644 assets/common/loot_tables/armor/cloth/lifecloth.ron create mode 100644 assets/common/loot_tables/armor/cloth/linen.ron create mode 100644 assets/common/loot_tables/armor/cloth/moonweave.ron create mode 100644 assets/common/loot_tables/armor/cloth/silk.ron create mode 100644 assets/common/loot_tables/armor/cloth/sunsilk.ron create mode 100644 assets/common/loot_tables/armor/cloth/wool.ron create mode 100644 assets/common/loot_tables/armor/hide/carapace.ron create mode 100644 assets/common/loot_tables/armor/hide/dragonscale.ron rename assets/common/loot_tables/armor/{ => hide}/leather.ron (85%) create mode 100644 assets/common/loot_tables/armor/hide/plate.ron rename assets/common/loot_tables/armor/{ => hide}/rawhide.ron (100%) create mode 100644 assets/common/loot_tables/armor/hide/scale.ron create mode 100644 assets/common/loot_tables/armor/metal/bloodsteel.ron create mode 100644 assets/common/loot_tables/armor/metal/bronze.ron create mode 100644 assets/common/loot_tables/armor/metal/cobalt.ron create mode 100644 assets/common/loot_tables/armor/metal/iron.ron create mode 100644 assets/common/loot_tables/armor/metal/orichalcum.ron create mode 100644 assets/common/loot_tables/armor/metal/steel.ron create mode 100644 assets/common/loot_tables/armor/tier-0.ron create mode 100644 assets/common/loot_tables/armor/tier-1.ron create mode 100644 assets/common/loot_tables/armor/tier-2.ron create mode 100644 assets/common/loot_tables/armor/tier-3.ron create mode 100644 assets/common/loot_tables/armor/tier-4.ron create mode 100644 assets/common/loot_tables/armor/tier-5.ron delete mode 100644 assets/common/loot_tables/consumable/default.ron delete mode 100644 assets/common/loot_tables/consumable/firework.ron create mode 100644 assets/common/loot_tables/consumable/good.ron delete mode 100644 assets/common/loot_tables/consumable/misc.ron create mode 100644 assets/common/loot_tables/consumable/moderate.ron create mode 100644 assets/common/loot_tables/consumable/poor.ron delete mode 100644 assets/common/loot_tables/consumable/potion.ron delete mode 100644 assets/common/loot_tables/consumable/throwable.ron delete mode 100644 assets/common/loot_tables/creature/biped_large/mindflayer.ron delete mode 100644 assets/common/loot_tables/humanoids.ron delete mode 100644 assets/common/loot_tables/villager.ron diff --git a/assets/common/entity/spot/dwarf_grave_robber.ron b/assets/common/entity/spot/dwarf_grave_robber.ron index 19dc7aa711..236e4d74c5 100644 --- a/assets/common/entity/spot/dwarf_grave_robber.ron +++ b/assets/common/entity/spot/dwarf_grave_robber.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("dwarf"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.humanoids"), + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")), diff --git a/assets/common/entity/spot/grim_salvager.ron b/assets/common/entity/spot/grim_salvager.ron index 58466ce51d..4c599aad84 100644 --- a/assets/common/entity/spot/grim_salvager.ron +++ b/assets/common/entity/spot/grim_salvager.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.humanoids"), + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-0")), diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron index deb2ca0d77..15451c7db4 100644 --- a/assets/common/entity/spot/witch_dark.ron +++ b/assets/common/entity/spot/witch_dark.ron @@ -13,7 +13,7 @@ EntityConfig ( ))), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.humanoids"), + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")), diff --git a/assets/common/entity/template.ron b/assets/common/entity/template.ron index 0b9adba264..232df63200 100644 --- a/assets/common/entity/template.ron +++ b/assets/common/entity/template.ron @@ -7,7 +7,7 @@ EntityConfig ( alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.humanoids"), + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Item("common.items.weapons.sword.cultist")), diff --git a/assets/common/loot_tables/armor/cloth/lifecloth.ron b/assets/common/loot_tables/armor/cloth/lifecloth.ron new file mode 100644 index 0000000000..3d28ad47ce --- /dev/null +++ b/assets/common/loot_tables/armor/cloth/lifecloth.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.cloth.druid.back")), + (1.0, Item("common.items.armor.cloth.druid.belt")), + (1.0, Item("common.items.armor.cloth.druid.chest")), + (1.0, Item("common.items.armor.cloth.druid.foot")), + (1.0, Item("common.items.armor.cloth.druid.hand")), + (1.0, Item("common.items.armor.cloth.druid.pants")), + (1.0, Item("common.items.armor.cloth.druid.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/cloth/linen.ron b/assets/common/loot_tables/armor/cloth/linen.ron new file mode 100644 index 0000000000..dd7a51f155 --- /dev/null +++ b/assets/common/loot_tables/armor/cloth/linen.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.cloth.linen.back")), + (1.0, Item("common.items.armor.cloth.linen.belt")), + (1.0, Item("common.items.armor.cloth.linen.chest")), + (1.0, Item("common.items.armor.cloth.linen.foot")), + (1.0, Item("common.items.armor.cloth.linen.hand")), + (1.0, Item("common.items.armor.cloth.linen.pants")), + (1.0, Item("common.items.armor.cloth.linen.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/cloth/moonweave.ron b/assets/common/loot_tables/armor/cloth/moonweave.ron new file mode 100644 index 0000000000..b72d6b9eda --- /dev/null +++ b/assets/common/loot_tables/armor/cloth/moonweave.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.cloth.moonweave.back")), + (1.0, Item("common.items.armor.cloth.moonweave.belt")), + (1.0, Item("common.items.armor.cloth.moonweave.chest")), + (1.0, Item("common.items.armor.cloth.moonweave.foot")), + (1.0, Item("common.items.armor.cloth.moonweave.hand")), + (1.0, Item("common.items.armor.cloth.moonweave.pants")), + (1.0, Item("common.items.armor.cloth.moonweave.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/cloth/silk.ron b/assets/common/loot_tables/armor/cloth/silk.ron new file mode 100644 index 0000000000..19f9d1c077 --- /dev/null +++ b/assets/common/loot_tables/armor/cloth/silk.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.cloth.silken.back")), + (1.0, Item("common.items.armor.cloth.silken.belt")), + (1.0, Item("common.items.armor.cloth.silken.chest")), + (1.0, Item("common.items.armor.cloth.silken.foot")), + (1.0, Item("common.items.armor.cloth.silken.hand")), + (1.0, Item("common.items.armor.cloth.silken.pants")), + (1.0, Item("common.items.armor.cloth.silken.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/cloth/sunsilk.ron b/assets/common/loot_tables/armor/cloth/sunsilk.ron new file mode 100644 index 0000000000..a146aed350 --- /dev/null +++ b/assets/common/loot_tables/armor/cloth/sunsilk.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.cloth.sunsilk.back")), + (1.0, Item("common.items.armor.cloth.sunsilk.belt")), + (1.0, Item("common.items.armor.cloth.sunsilk.chest")), + (1.0, Item("common.items.armor.cloth.sunsilk.foot")), + (1.0, Item("common.items.armor.cloth.sunsilk.hand")), + (1.0, Item("common.items.armor.cloth.sunsilk.pants")), + (1.0, Item("common.items.armor.cloth.sunsilk.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/cloth/wool.ron b/assets/common/loot_tables/armor/cloth/wool.ron new file mode 100644 index 0000000000..198c772a5f --- /dev/null +++ b/assets/common/loot_tables/armor/cloth/wool.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.cloth.woolen.back")), + (1.0, Item("common.items.armor.cloth.woolen.belt")), + (1.0, Item("common.items.armor.cloth.woolen.chest")), + (1.0, Item("common.items.armor.cloth.woolen.foot")), + (1.0, Item("common.items.armor.cloth.woolen.hand")), + (1.0, Item("common.items.armor.cloth.woolen.pants")), + (1.0, Item("common.items.armor.cloth.woolen.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/hide/carapace.ron b/assets/common/loot_tables/armor/hide/carapace.ron new file mode 100644 index 0000000000..f90d367663 --- /dev/null +++ b/assets/common/loot_tables/armor/hide/carapace.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.hide.carapace.back")), + (1.0, Item("common.items.armor.hide.carapace.belt")), + (1.0, Item("common.items.armor.hide.carapace.chest")), + (1.0, Item("common.items.armor.hide.carapace.foot")), + (1.0, Item("common.items.armor.hide.carapace.hand")), + (1.0, Item("common.items.armor.hide.carapace.pants")), + (1.0, Item("common.items.armor.hide.carapace.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/hide/dragonscale.ron b/assets/common/loot_tables/armor/hide/dragonscale.ron new file mode 100644 index 0000000000..b5e71c9fcd --- /dev/null +++ b/assets/common/loot_tables/armor/hide/dragonscale.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.hide.dragonscale.back")), + (1.0, Item("common.items.armor.hide.dragonscale.belt")), + (1.0, Item("common.items.armor.hide.dragonscale.chest")), + (1.0, Item("common.items.armor.hide.dragonscale.foot")), + (1.0, Item("common.items.armor.hide.dragonscale.hand")), + (1.0, Item("common.items.armor.hide.dragonscale.pants")), + (1.0, Item("common.items.armor.hide.dragonscale.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/leather.ron b/assets/common/loot_tables/armor/hide/leather.ron similarity index 85% rename from assets/common/loot_tables/armor/leather.ron rename to assets/common/loot_tables/armor/hide/leather.ron index c3035dc72c..708c1b7c15 100644 --- a/assets/common/loot_tables/armor/leather.ron +++ b/assets/common/loot_tables/armor/hide/leather.ron @@ -1,4 +1,5 @@ [ + (1.0, Item("common.items.armor.hide.leather.back")), (1.0, Item("common.items.armor.hide.leather.belt")), (1.0, Item("common.items.armor.hide.leather.chest")), (1.0, Item("common.items.armor.hide.leather.foot")), diff --git a/assets/common/loot_tables/armor/hide/plate.ron b/assets/common/loot_tables/armor/hide/plate.ron new file mode 100644 index 0000000000..8a27176af0 --- /dev/null +++ b/assets/common/loot_tables/armor/hide/plate.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.hide.primal.back")), + (1.0, Item("common.items.armor.hide.primal.belt")), + (1.0, Item("common.items.armor.hide.primal.chest")), + (1.0, Item("common.items.armor.hide.primal.foot")), + (1.0, Item("common.items.armor.hide.primal.hand")), + (1.0, Item("common.items.armor.hide.primal.pants")), + (1.0, Item("common.items.armor.hide.primal.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/rawhide.ron b/assets/common/loot_tables/armor/hide/rawhide.ron similarity index 100% rename from assets/common/loot_tables/armor/rawhide.ron rename to assets/common/loot_tables/armor/hide/rawhide.ron diff --git a/assets/common/loot_tables/armor/hide/scale.ron b/assets/common/loot_tables/armor/hide/scale.ron new file mode 100644 index 0000000000..ca1ef653cc --- /dev/null +++ b/assets/common/loot_tables/armor/hide/scale.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.hide.scale.back")), + (1.0, Item("common.items.armor.hide.scale.belt")), + (1.0, Item("common.items.armor.hide.scale.chest")), + (1.0, Item("common.items.armor.hide.scale.foot")), + (1.0, Item("common.items.armor.hide.scale.hand")), + (1.0, Item("common.items.armor.hide.scale.pants")), + (1.0, Item("common.items.armor.hide.scale.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/metal/bloodsteel.ron b/assets/common/loot_tables/armor/metal/bloodsteel.ron new file mode 100644 index 0000000000..3c814a8f2e --- /dev/null +++ b/assets/common/loot_tables/armor/metal/bloodsteel.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.mail.bloodsteel.back")), + (1.0, Item("common.items.armor.mail.bloodsteel.belt")), + (1.0, Item("common.items.armor.mail.bloodsteel.chest")), + (1.0, Item("common.items.armor.mail.bloodsteel.foot")), + (1.0, Item("common.items.armor.mail.bloodsteel.hand")), + (1.0, Item("common.items.armor.mail.bloodsteel.pants")), + (1.0, Item("common.items.armor.mail.bloodsteel.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/metal/bronze.ron b/assets/common/loot_tables/armor/metal/bronze.ron new file mode 100644 index 0000000000..1c1c5d2eed --- /dev/null +++ b/assets/common/loot_tables/armor/metal/bronze.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.mail.bronze.back")), + (1.0, Item("common.items.armor.mail.bronze.belt")), + (1.0, Item("common.items.armor.mail.bronze.chest")), + (1.0, Item("common.items.armor.mail.bronze.foot")), + (1.0, Item("common.items.armor.mail.bronze.hand")), + (1.0, Item("common.items.armor.mail.bronze.pants")), + (1.0, Item("common.items.armor.mail.bronze.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/metal/cobalt.ron b/assets/common/loot_tables/armor/metal/cobalt.ron new file mode 100644 index 0000000000..b78d890827 --- /dev/null +++ b/assets/common/loot_tables/armor/metal/cobalt.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.mail.cobalt.back")), + (1.0, Item("common.items.armor.mail.cobalt.belt")), + (1.0, Item("common.items.armor.mail.cobalt.chest")), + (1.0, Item("common.items.armor.mail.cobalt.foot")), + (1.0, Item("common.items.armor.mail.cobalt.hand")), + (1.0, Item("common.items.armor.mail.cobalt.pants")), + (1.0, Item("common.items.armor.mail.cobalt.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/metal/iron.ron b/assets/common/loot_tables/armor/metal/iron.ron new file mode 100644 index 0000000000..798b6294d7 --- /dev/null +++ b/assets/common/loot_tables/armor/metal/iron.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.mail.iron.back")), + (1.0, Item("common.items.armor.mail.iron.belt")), + (1.0, Item("common.items.armor.mail.iron.chest")), + (1.0, Item("common.items.armor.mail.iron.foot")), + (1.0, Item("common.items.armor.mail.iron.hand")), + (1.0, Item("common.items.armor.mail.iron.pants")), + (1.0, Item("common.items.armor.mail.iron.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/metal/orichalcum.ron b/assets/common/loot_tables/armor/metal/orichalcum.ron new file mode 100644 index 0000000000..2e5afea9de --- /dev/null +++ b/assets/common/loot_tables/armor/metal/orichalcum.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.mail.orichalcum.back")), + (1.0, Item("common.items.armor.mail.orichalcum.belt")), + (1.0, Item("common.items.armor.mail.orichalcum.chest")), + (1.0, Item("common.items.armor.mail.orichalcum.foot")), + (1.0, Item("common.items.armor.mail.orichalcum.hand")), + (1.0, Item("common.items.armor.mail.orichalcum.pants")), + (1.0, Item("common.items.armor.mail.orichalcum.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/metal/steel.ron b/assets/common/loot_tables/armor/metal/steel.ron new file mode 100644 index 0000000000..2b8e761f60 --- /dev/null +++ b/assets/common/loot_tables/armor/metal/steel.ron @@ -0,0 +1,9 @@ +[ + (1.0, Item("common.items.armor.mail.steel.back")), + (1.0, Item("common.items.armor.mail.steel.belt")), + (1.0, Item("common.items.armor.mail.steel.chest")), + (1.0, Item("common.items.armor.mail.steel.foot")), + (1.0, Item("common.items.armor.mail.steel.hand")), + (1.0, Item("common.items.armor.mail.steel.pants")), + (1.0, Item("common.items.armor.mail.steel.shoulder")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/tier-0.ron b/assets/common/loot_tables/armor/tier-0.ron new file mode 100644 index 0000000000..d52e93db8c --- /dev/null +++ b/assets/common/loot_tables/armor/tier-0.ron @@ -0,0 +1,5 @@ +[ + (1.0, LootTable("common.loot_tables.armor.cloth.linen")), + (1.0, LootTable("common.loot_tables.armor.hide.rawhide")), + (1.0, LootTable("common.loot_tables.armor.metal.bronze")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/tier-1.ron b/assets/common/loot_tables/armor/tier-1.ron new file mode 100644 index 0000000000..ff3bac2fdb --- /dev/null +++ b/assets/common/loot_tables/armor/tier-1.ron @@ -0,0 +1,5 @@ +[ + (1.0, LootTable("common.loot_tables.armor.cloth.wool")), + (1.0, LootTable("common.loot_tables.armor.hide.leather")), + (1.0, LootTable("common.loot_tables.armor.metal.iron")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/tier-2.ron b/assets/common/loot_tables/armor/tier-2.ron new file mode 100644 index 0000000000..8d2182e658 --- /dev/null +++ b/assets/common/loot_tables/armor/tier-2.ron @@ -0,0 +1,5 @@ +[ + (1.0, LootTable("common.loot_tables.armor.cloth.silk")), + (1.0, LootTable("common.loot_tables.armor.hide.scale")), + (1.0, LootTable("common.loot_tables.armor.metal.steel")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/tier-3.ron b/assets/common/loot_tables/armor/tier-3.ron new file mode 100644 index 0000000000..ada8e37e57 --- /dev/null +++ b/assets/common/loot_tables/armor/tier-3.ron @@ -0,0 +1,5 @@ +[ + (1.0, LootTable("common.loot_tables.armor.cloth.lifecloth")), + (1.0, LootTable("common.loot_tables.armor.hide.carapace")), + (1.0, LootTable("common.loot_tables.armor.metal.cobalt")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/tier-4.ron b/assets/common/loot_tables/armor/tier-4.ron new file mode 100644 index 0000000000..7caf29dd18 --- /dev/null +++ b/assets/common/loot_tables/armor/tier-4.ron @@ -0,0 +1,5 @@ +[ + (1.0, LootTable("common.loot_tables.armor.cloth.moonweave")), + (1.0, LootTable("common.loot_tables.armor.hide.plate")), + (1.0, LootTable("common.loot_tables.armor.metal.bloodsteel")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/armor/tier-5.ron b/assets/common/loot_tables/armor/tier-5.ron new file mode 100644 index 0000000000..6ca08216f5 --- /dev/null +++ b/assets/common/loot_tables/armor/tier-5.ron @@ -0,0 +1,5 @@ +[ + (1.0, LootTable("common.loot_tables.armor.cloth.sunsilk")), + (1.0, LootTable("common.loot_tables.armor.hide.dragonscale")), + (1.0, LootTable("common.loot_tables.armor.metal.orichalcum")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/consumable/default.ron b/assets/common/loot_tables/consumable/default.ron deleted file mode 100644 index 88738054df..0000000000 --- a/assets/common/loot_tables/consumable/default.ron +++ /dev/null @@ -1,5 +0,0 @@ -[ - (2.0, LootTable("common.loot_tables.consumable.potion")), - (0.5, LootTable("common.loot_tables.consumable.throwable")), - (1.0, LootTable("common.loot_tables.consumable.misc")), -] diff --git a/assets/common/loot_tables/consumable/firework.ron b/assets/common/loot_tables/consumable/firework.ron deleted file mode 100644 index cbc01fc4b5..0000000000 --- a/assets/common/loot_tables/consumable/firework.ron +++ /dev/null @@ -1,8 +0,0 @@ -[ - (0.1, Item("common.items.utility.firework_blue")), - (0.1, Item("common.items.utility.firework_green")), - (0.1, Item("common.items.utility.firework_purple")), - (0.1, Item("common.items.utility.firework_red")), - (0.1, Item("common.items.utility.firework_white")), - (0.1, Item("common.items.utility.firework_yellow")), -] diff --git a/assets/common/loot_tables/consumable/good.ron b/assets/common/loot_tables/consumable/good.ron new file mode 100644 index 0000000000..4c1e8f8304 --- /dev/null +++ b/assets/common/loot_tables/consumable/good.ron @@ -0,0 +1,14 @@ +[ + // Fireworks + (1.0, ItemQuantity("common.items.utility.firework_blue", 8, 10)), + (1.0, ItemQuantity("common.items.utility.firework_green", 8, 10)), + (1.0, ItemQuantity("common.items.utility.firework_purple", 8, 10)), + (1.0, ItemQuantity("common.items.utility.firework_red", 8, 10)), + (1.0, ItemQuantity("common.items.utility.firework_white", 8, 10)), + (1.0, ItemQuantity("common.items.utility.firework_yellow", 8, 10)), + // Potions + (10.0, ItemQuantity("common.items.consumable.potion_big", 2, 5)), + // Misc + (5.0, ItemQuantity("common.items.utility.collar", 2, 3)), + (5.0, ItemQuantity("common.items.utility.bomb", 8, 10)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/consumable/misc.ron b/assets/common/loot_tables/consumable/misc.ron deleted file mode 100644 index 02b2c9c0c7..0000000000 --- a/assets/common/loot_tables/consumable/misc.ron +++ /dev/null @@ -1,5 +0,0 @@ -[ - // misc - (0.1, Item("common.items.utility.collar")), - (1.0, LootTable("common.loot_tables.consumable.firework")), -] diff --git a/assets/common/loot_tables/consumable/moderate.ron b/assets/common/loot_tables/consumable/moderate.ron new file mode 100644 index 0000000000..5756588c3e --- /dev/null +++ b/assets/common/loot_tables/consumable/moderate.ron @@ -0,0 +1,14 @@ +[ + // Fireworks + (1.0, ItemQuantity("common.items.utility.firework_blue", 3, 5)), + (1.0, ItemQuantity("common.items.utility.firework_green", 3, 5)), + (1.0, ItemQuantity("common.items.utility.firework_purple", 3, 5)), + (1.0, ItemQuantity("common.items.utility.firework_red", 3, 5)), + (1.0, ItemQuantity("common.items.utility.firework_white", 3, 5)), + (1.0, ItemQuantity("common.items.utility.firework_yellow", 3, 5)), + // Potions + (10.0, ItemQuantity("common.items.consumable.potion_med", 2, 5)), + // Misc + (5.0, ItemQuantity("common.items.utility.collar", 1, 2)), + (5.0, ItemQuantity("common.items.utility.bomb", 3, 5)), +] \ No newline at end of file diff --git a/assets/common/loot_tables/consumable/poor.ron b/assets/common/loot_tables/consumable/poor.ron new file mode 100644 index 0000000000..674298958b --- /dev/null +++ b/assets/common/loot_tables/consumable/poor.ron @@ -0,0 +1,14 @@ +[ + // Fireworks + (1.0, Item("common.items.utility.firework_blue")), + (1.0, Item("common.items.utility.firework_green")), + (1.0, Item("common.items.utility.firework_purple")), + (1.0, Item("common.items.utility.firework_red")), + (1.0, Item("common.items.utility.firework_white")), + (1.0, Item("common.items.utility.firework_yellow")), + // Potions + (10.0, ItemQuantity("common.items.consumable.potion_minor", 2, 5)), + // Misc + (5.0, Item("common.items.utility.collar")), + (5.0, Item("common.items.utility.bomb")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/consumable/potion.ron b/assets/common/loot_tables/consumable/potion.ron deleted file mode 100644 index 75fb6b66ea..0000000000 --- a/assets/common/loot_tables/consumable/potion.ron +++ /dev/null @@ -1,6 +0,0 @@ -[ - // potions - (1.0, Item("common.items.consumable.potion_minor")), - (0.5, Item("common.items.consumable.potion_med")), - (0.2, Item("common.items.consumable.potion_big")), -] diff --git a/assets/common/loot_tables/consumable/throwable.ron b/assets/common/loot_tables/consumable/throwable.ron deleted file mode 100644 index 984662026f..0000000000 --- a/assets/common/loot_tables/consumable/throwable.ron +++ /dev/null @@ -1,4 +0,0 @@ -[ - // bombs - (1.0, ItemQuantity("common.items.utility.bomb", 1, 3)), -] diff --git a/assets/common/loot_tables/creature/biped_large/mindflayer.ron b/assets/common/loot_tables/creature/biped_large/mindflayer.ron deleted file mode 100644 index 41cce60a47..0000000000 --- a/assets/common/loot_tables/creature/biped_large/mindflayer.ron +++ /dev/null @@ -1,9 +0,0 @@ -[ - // Crafting material - (1.0, Item("common.items.crafting_ing.mindflayer_bag_damaged")), - // Legendary weapons - (4.0, LootTable("common.loot_tables.weapons.legendary")), - // Rare misc items - (0.5, Item("common.items.boss_drops.lantern")), - (0.5, Item("common.items.glider.glider_purp")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/creature/humanoid.ron index 3364f9c097..04b0ae6193 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/assets/common/loot_tables/creature/humanoid.ron @@ -1,6 +1,20 @@ [ - (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.leather")), + // Crafting Ingredients + (5.0, LootTable("common.loot_tables.materials.common")), + // Consumables + (0.2, Item("common.items.consumable.potion_minor")), + // Armor (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.weapons.starter")), + // Ring + (0.02, Item("common.items.armor.misc.ring.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 + (0.5, LootTable("common.loot_tables.weapons.sword.wood")), + (0.5, LootTable("common.loot_tables.weapons.hammer.stone")), + (0.5, LootTable("common.loot_tables.weapons.bow.rawwood")), + (0.5, LootTable("common.loot_tables.weapons.starter")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron index 61eb15dd68..1f5a4c51cb 100644 --- a/assets/common/loot_tables/dungeon/tier-0/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron @@ -1,3 +1,4 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-0")), + (1.0, LootTable("common.loot_tables.armor.tier-0")), ] diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron index a322ba9b3c..4f7a653e59 100644 --- a/assets/common/loot_tables/dungeon/tier-0/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron @@ -1,14 +1,13 @@ [ // Gear - (0.5, LootTable("common.loot_tables.weapons.tier-0")), - (0.5, LootTable("common.loot_tables.armor.cloth")), + (1.0, LootTable("common.loot_tables.weapons.tier-0")), + (1.0, LootTable("common.loot_tables.armor.tier-0")), // Currency - (2.0, ItemQuantity("common.items.utility.coins", 10, 20)), + (3.0, ItemQuantity("common.items.utility.coins", 10, 20)), + // Materials + (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)), + (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)), + (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)), // Consumables - (1.0, Item("common.items.consumable.potion_minor")), - // Food - (1.0, Item("common.items.food.cheese")), - (1.0, Item("common.items.food.plainsalad")), - (0.5, Item("common.items.food.apple_stick")), - (0.5, Item("common.items.food.mushroom_stick")), + (2.0, LootTable("common.loot_tables.consumable.poor")), ] diff --git a/assets/common/loot_tables/dungeon/tier-0/enemy.ron b/assets/common/loot_tables/dungeon/tier-0/enemy.ron index 854138e052..a28a7b1aed 100644 --- a/assets/common/loot_tables/dungeon/tier-0/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-0/enemy.ron @@ -1,5 +1,8 @@ [ - (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.cloth")), - (2.0, LootTable("common.loot_tables.weapons.tier-0")), + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 5, 10)), + // Food + (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + // Nothing + (2.0, None), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/miniboss.ron b/assets/common/loot_tables/dungeon/tier-0/miniboss.ron index 910575b7e0..38fed04d45 100644 --- a/assets/common/loot_tables/dungeon/tier-0/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-0/miniboss.ron @@ -1,5 +1,8 @@ [ - (1.0, LootTable("common.loot_tables.armor.cloth")), - (2.0, LootTable("common.loot_tables.weapons.tier-0")), - (2.0, LootTable("common.loot_tables.consumable.potion")), + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 10, 20)), + // Food + (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + // Consumables + (2.0, LootTable("common.loot_tables.consumable.poor")), ] diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron index e8aeabe107..65fc15182b 100644 --- a/assets/common/loot_tables/dungeon/tier-1/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron @@ -1,3 +1,4 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.armor.tier-1")), ] diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron index c355a5c8ea..e8f758e40e 100644 --- a/assets/common/loot_tables/dungeon/tier-1/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron @@ -1,17 +1,13 @@ [ // Gear - // Don't put progression items until we have progression gates - // such as skill requirements or opening chest animations - + (1.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.armor.tier-1")), // Currency - (2.0, ItemQuantity("common.items.utility.coins", 20, 50)), + (3.0, ItemQuantity("common.items.utility.coins", 20, 50)), + // Materials + (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)), + (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)), + (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)), // Consumables - (1.0, Item("common.items.consumable.potion_minor")), - (0.2, Item("common.items.consumable.potion_med")), - // Food - (1.0, Item("common.items.food.cheese")), - (1.0, Item("common.items.food.tomatosalad")), - (0.5, Item("common.items.food.apple_stick")), - (0.5, Item("common.items.food.mushroom_stick")), - (0.1, Item("common.items.food.sunflower_icetea")), + (2.0, LootTable("common.loot_tables.consumable.poor")), ] diff --git a/assets/common/loot_tables/dungeon/tier-1/enemy.ron b/assets/common/loot_tables/dungeon/tier-1/enemy.ron index 1450cef0e2..1f74d7c77a 100644 --- a/assets/common/loot_tables/dungeon/tier-1/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-1/enemy.ron @@ -1,6 +1,10 @@ [ - (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.armor.leather")), - (2.0, LootTable("common.loot_tables.weapons.tier-1")), - (1.5, Item("common.items.crafting_ing.sticky_thread")), + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 10, 25)), + // Food + (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + // Nothing + (2.0, None), + // Placeholder Drop Location + (1.0, Item("common.items.crafting_ing.sticky_thread")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron index b3f1438a9d..c2b4b7ccb2 100644 --- a/assets/common/loot_tables/dungeon/tier-2/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron @@ -1,3 +1,7 @@ [ - (1.0, LootTable("common.loot_tables.weapons.tier-2")), + // Equipment + (5.0, LootTable("common.loot_tables.weapons.tier-2")), + (5.0, LootTable("common.loot_tables.armor.tier-2")), + // Special Loot + (1.0, Item("common.items.armor.misc.bag.heavy_seabag")), ] diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron index 17cbf8f811..a0c0557b60 100644 --- a/assets/common/loot_tables/dungeon/tier-2/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron @@ -1,17 +1,13 @@ [ // Gear - // Don't put progression items until we have progression gates - // such as skill requirements or opening chest animations - + (1.0, LootTable("common.loot_tables.weapons.tier-2")), + (1.0, LootTable("common.loot_tables.armor.tier-2")), // Currency - (2.0, ItemQuantity("common.items.utility.coins", 50, 100)), + (3.0, ItemQuantity("common.items.utility.coins", 50, 100)), + // Materials + (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)), + (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)), + (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)), // Consumables - (1.0, ItemQuantity("common.items.consumable.potion_minor", 1, 2)), - (0.2, Item("common.items.consumable.potion_med")), - // Food - (1.0, ItemQuantity("common.items.food.cheese", 1, 3)), - (1.0, ItemQuantity("common.items.food.tomatosalad", 1, 3)), - (0.5, ItemQuantity("common.items.food.apple_stick", 1, 2)), - (0.5, ItemQuantity("common.items.food.mushroom_stick", 1, 2)), - (0.1, Item("common.items.food.sunflower_icetea")), + (2.0, LootTable("common.loot_tables.consumable.moderate")), ] diff --git a/assets/common/loot_tables/dungeon/tier-2/enemy.ron b/assets/common/loot_tables/dungeon/tier-2/enemy.ron index 65ca40674b..ce4da6e403 100644 --- a/assets/common/loot_tables/dungeon/tier-2/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-2/enemy.ron @@ -1,4 +1,8 @@ [ - (1.0, LootTable("common.loot_tables.humanoids")), - (2.0, LootTable("common.loot_tables.weapons.tier-2")), + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 25, 50)), + // Food + (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + // Nothing + (2.0, None), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron index d62f2d530b..015c4df215 100644 --- a/assets/common/loot_tables/dungeon/tier-3/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron @@ -1,3 +1,4 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-3")), + (1.0, LootTable("common.loot_tables.armor.tier-3")), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index ecfd9d6db8..cae94ddc30 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron @@ -1,18 +1,13 @@ [ // Gear - // Don't put progression items until we have progression gates - // such as skill requirements or opening chest animations - + (1.0, LootTable("common.loot_tables.weapons.tier-3")), + (1.0, LootTable("common.loot_tables.armor.tier-3")), // Currency - (2.0, ItemQuantity("common.items.utility.coins", 100, 500)), + (3.0, ItemQuantity("common.items.utility.coins", 100, 200)), + // Materials + (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)), + (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)), + (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)), // Consumables - (1.0, ItemQuantity("common.items.consumable.potion_minor", 1, 3)), - (0.5, ItemQuantity("common.items.consumable.potion_minor", 1, 2)), - (0.1, Item("common.items.consumable.potion_big")), - // Food - (1.0, ItemQuantity("common.items.food.cheese", 1, 4)), - (1.0, ItemQuantity("common.items.food.tomatosalad", 1, 3)), - (0.5, ItemQuantity("common.items.food.apple_stick", 1, 2)), - (0.5, ItemQuantity("common.items.food.mushroom_stick", 1, 2)), - (0.1, Item("common.items.food.sunflower_icetea")), + (2.0, LootTable("common.loot_tables.consumable.moderate")), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/enemy.ron b/assets/common/loot_tables/dungeon/tier-3/enemy.ron index 9a6f17240e..abe65e857b 100644 --- a/assets/common/loot_tables/dungeon/tier-3/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-3/enemy.ron @@ -1,4 +1,8 @@ [ - (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.weapons.tier-3")), -] + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 50, 100)), + // Food + (1.0, LootTable("common.loot_tables.food.prepared")), + // Nothing + (2.0, None), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-4/boss.ron b/assets/common/loot_tables/dungeon/tier-4/boss.ron index 971386273b..c477318860 100644 --- a/assets/common/loot_tables/dungeon/tier-4/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/boss.ron @@ -1,3 +1,4 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-4")), + (1.0, LootTable("common.loot_tables.armor.tier-4")), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron index 1ec6061bc2..f3c7ab2047 100644 --- a/assets/common/loot_tables/dungeon/tier-4/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron @@ -1,18 +1,13 @@ [ // Gear - // Don't put progression items until we have progression gates - // such as skill requirements or opening chest animations - + (1.0, LootTable("common.loot_tables.weapons.tier-4")), + (1.0, LootTable("common.loot_tables.armor.tier-4")), // Currency - (2.0, ItemQuantity("common.items.utility.coins", 200, 800)), + (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), + // Materials + (1.0, ItemQuantity("common.items.crafting_ing.cloth.moonweave", 3, 10)), + (1.0, ItemQuantity("common.items.crafting_ing.hide.plate", 3, 10)), + (1.0, ItemQuantity("common.items.mineral.ingot.bloodsteel", 3, 10)), // Consumables - (1.0, ItemQuantity("common.items.consumable.potion_minor", 2, 4)), - (0.5, ItemQuantity("common.items.consumable.potion_minor", 1, 2)), - (0.1, Item("common.items.consumable.potion_big")), - // Food - (1.0, ItemQuantity("common.items.food.cheese", 1, 5)), - (1.0, ItemQuantity("common.items.food.tomatosalad", 1, 3)), - (0.5, ItemQuantity("common.items.food.apple_stick", 1, 2)), - (0.5, ItemQuantity("common.items.food.mushroom_stick", 1, 2)), - (0.5, Item("common.items.food.sunflower_icetea")), + (2.0, LootTable("common.loot_tables.consumable.good")), ] diff --git a/assets/common/loot_tables/dungeon/tier-4/enemy.ron b/assets/common/loot_tables/dungeon/tier-4/enemy.ron index c41fd9819e..c94d909763 100644 --- a/assets/common/loot_tables/dungeon/tier-4/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-4/enemy.ron @@ -1,4 +1,8 @@ [ - (1.0, LootTable("common.loot_tables.humanoids")), - (1.0, LootTable("common.loot_tables.weapons.tier-4")), -] + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 100, 250)), + // Food + (1.0, LootTable("common.loot_tables.food.prepared")), + // Nothing + (2.0, None), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index 81239f6e8d..5bd71fc85f 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron @@ -1,8 +1,10 @@ [ - // weapons - (3.0, LootTable("common.loot_tables.weapons.tier-4")), + // Currency + (10.0, ItemQuantity("common.items.utility.coins", 200, 500)), + // Food + (5.0, LootTable("common.loot_tables.food.prepared")), + // Consumables + (5.0, LootTable("common.loot_tables.consumable.good")), // lantern - (0.05, Item("common.items.lantern.blue_0")), - // materials - (1.0, LootTable("common.loot_tables.materials.underground")), + (1.0, Item("common.items.lantern.blue_0")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/boss.ron b/assets/common/loot_tables/dungeon/tier-5/boss.ron index 382c152ca0..5228785a27 100644 --- a/assets/common/loot_tables/dungeon/tier-5/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-5/boss.ron @@ -1,12 +1,16 @@ [ - (2.0, LootTable("common.loot_tables.creature.biped_large.mindflayer")), - // miniboss part - // armour - (0.25, Item("common.items.armor.misc.back.dungeon_purple")), - (0.5, Item("common.items.armor.misc.ring.skull")), - // weapons - (1.5, LootTable("common.loot_tables.weapons.cultist")), - (1.5, LootTable("common.loot_tables.weapons.cave")), - (4.0, ItemQuantity("common.items.crafting_ing.hide.dragon_scale", 2, 7)), - + // TODO: Make this loot table less cluttered + // tier equipment (technically worse than other weapons here until modular weapons) + (10.0, LootTable("common.loot_tables.weapons.tier-5")), + (10.0, LootTable("common.loot_tables.armor.tier-5")), + // weapons (find somewhere better to put these) + (1.0, LootTable("common.loot_tables.weapons.cultist")), + (1.0, LootTable("common.loot_tables.weapons.cave")), + // Rare misc items + (1.0, Item("common.items.boss_drops.lantern")), + (1.0, Item("common.items.glider.glider_purp")), + // Legendary weapons + (1.0, LootTable("common.loot_tables.weapons.legendary")), + // Crafting material + (1.0, Item("common.items.crafting_ing.mindflayer_bag_damaged")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index 2e6f58fc66..126ab7a5bc 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -1,18 +1,13 @@ [ // Gear - // Don't put progression items until we have progression gates - // such as skill requirements or opening chest animations - + (1.0, LootTable("common.loot_tables.weapons.tier-5")), + (1.0, LootTable("common.loot_tables.armor.tier-5")), // Currency - (2.0, ItemQuantity("common.items.utility.coins", 200, 1000)), + (3.0, ItemQuantity("common.items.utility.coins", 500, 1000)), + // Materials + (1.0, ItemQuantity("common.items.crafting_ing.cloth.sunsilk", 3, 10)), + (1.0, ItemQuantity("common.items.crafting_ing.hide.dragon_scale", 3, 10)), + (1.0, ItemQuantity("common.items.mineral.ingot.orichalcum", 3, 10)), // Consumables - (1.5, ItemQuantity("common.items.consumable.potion_med", 1, 2)), - (0.5, Item("common.items.consumable.potion_big")), - // Food - (1.0, ItemQuantity("common.items.food.cheese", 1, 5)), - (1.0, ItemQuantity("common.items.food.tomatosalad", 1, 3)), - (0.5, ItemQuantity("common.items.food.apple_stick", 1, 2)), - (0.5, ItemQuantity("common.items.food.mushroom_stick", 1, 2)), - (0.5, Item("common.items.food.sunflower_icetea")), - (0.5, Item("common.items.food.apple_mushroom_curry")), + (2.0, LootTable("common.loot_tables.consumable.good")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/enemy.ron b/assets/common/loot_tables/dungeon/tier-5/enemy.ron index 168307b1a5..e37f3568f2 100644 --- a/assets/common/loot_tables/dungeon/tier-5/enemy.ron +++ b/assets/common/loot_tables/dungeon/tier-5/enemy.ron @@ -1,18 +1,8 @@ [ - // Materials - (1.0, LootTable("common.loot_tables.materials.common")), - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + // Currency + (1.0, ItemQuantity("common.items.utility.coins", 200, 500)), + // Food (1.0, LootTable("common.loot_tables.food.prepared")), - (5.0, Item("common.items.food.cheese")), - // Gear - (3.0, LootTable("common.loot_tables.weapons.tier-5")), - (0.25, Item("common.items.armor.misc.neck.plain_1")), - (0.5, Item("common.items.armor.misc.ring.gold")), - (0.25, Item("common.items.armor.misc.ring.skull")), - // Misc - (0.1, Item("common.items.glider.glider_blue")), - (0.001, Item("common.items.armor.misc.back.backpack")), - (0.1, Item("common.items.armor.misc.bag.heavy_seabag")), - (1.0, LootTable("common.loot_tables.consumable.default")), - (4.0, Item("common.items.crafting_ing.hide.dragon_scale")), + // Cheese + (2.0, ItemQuantity("common.items.food.cheese", 3, 5)), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron b/assets/common/loot_tables/dungeon/tier-5/miniboss.ron index 91bd8115de..d79eee93ed 100644 --- a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-5/miniboss.ron @@ -1,10 +1,12 @@ [ - // armor - (0.25, Item("common.items.armor.misc.back.dungeon_purple")), - (0.5, Item("common.items.armor.misc.ring.skull")), - // weapons - (1.5, LootTable("common.loot_tables.weapons.cultist")), - (1.5, LootTable("common.loot_tables.weapons.cave")), - // to not get boring from getting OP loot - (6.0, LootTable("common.loot_tables.dungeon.tier-5.enemy")), + // Currency + (10.0, ItemQuantity("common.items.utility.coins", 500, 1000)), + // Food + (5.0, LootTable("common.loot_tables.food.prepared")), + // Consumables + (5.0, LootTable("common.loot_tables.consumable.good")), + // Cosmetic items + (1.0, Item("common.items.armor.misc.back.dungeon_purple")), + (1.0, Item("common.items.armor.misc.ring.skull")), + (1.0, Item("common.items.glider.glider_blue")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/minion.ron b/assets/common/loot_tables/dungeon/tier-5/minion.ron index 35d6a38dfb..b35a11ef9c 100644 --- a/assets/common/loot_tables/dungeon/tier-5/minion.ron +++ b/assets/common/loot_tables/dungeon/tier-5/minion.ron @@ -1,10 +1,8 @@ [ - // Crafting Ingredients - (100.0, LootTable("common.loot_tables.materials.common")), - // Food - (100.0, LootTable("common.loot_tables.food.wild_ingredients")), - (15.0, LootTable("common.loot_tables.food.prepared")), - // Utilities - (15.0, LootTable("common.loot_tables.consumable.default")), + // Currency + (50.0, ItemQuantity("common.items.utility.coins", 100, 300)), + // Nothing + (50.0, None), + // Special (1.0, Item("common.items.food.spore_corruption")), ] diff --git a/assets/common/loot_tables/humanoids.ron b/assets/common/loot_tables/humanoids.ron deleted file mode 100644 index e82bc54c84..0000000000 --- a/assets/common/loot_tables/humanoids.ron +++ /dev/null @@ -1,18 +0,0 @@ -[ - // Crafting Ingredients - (5.0, LootTable("common.loot_tables.materials.common")), - // Consumables - (0.2, Item("common.items.consumable.potion_minor")), - // Ring - (0.02, Item("common.items.armor.misc.ring.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 - (0.5, LootTable("common.loot_tables.weapons.sword.wood")), - (0.5, LootTable("common.loot_tables.weapons.hammer.stone")), - (0.5, LootTable("common.loot_tables.weapons.bow.rawwood")), - (0.5, LootTable("common.loot_tables.weapons.starter")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index 26af68dc76..91979faf46 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -1,5 +1,4 @@ [ (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.armor.leather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 4ed06d22c4..3fadca566d 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -2,5 +2,4 @@ (1.0, LootTable("common.loot_tables.weapons.tier-0")), (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), - (1.0, LootTable("common.loot_tables.armor.leather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/villager.ron b/assets/common/loot_tables/villager.ron deleted file mode 100644 index a97dc022f4..0000000000 --- a/assets/common/loot_tables/villager.ron +++ /dev/null @@ -1,19 +0,0 @@ -[ - // Crafting Ingredients - (4.0, LootTable("common.loot_tables.materials.common")), - // Consumables - (0.2, Item("common.items.consumable.potion_minor")), - // Armour - (10.0, LootTable("common.loot_tables.armor.cloth")), - // Utility - (0.05, Item("common.items.utility.collar")), - // Food - (2.0, LootTable("common.loot_tables.food.farm_ingredients")), - (0.25, LootTable("common.loot_tables.food.prepared")), - // Weapons - (0.5, LootTable("common.loot_tables.weapons.sword.wood")), - (0.5, LootTable("common.loot_tables.weapons.axe.wood")), - (0.5, LootTable("common.loot_tables.weapons.hammer.wood")), - (0.5, LootTable("common.loot_tables.weapons.bow.rawwood")), - (0.5, LootTable("common.loot_tables.weapons.starter")), -] \ 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 91a49da8da..0e50811b28 100644 --- a/assets/common/trading/item_price_calculation.ron +++ b/assets/common/trading/item_price_calculation.ron @@ -38,8 +38,6 @@ loot_tables: [ // Place them back we will have better situation with potions // and economy. // - // Misc - (0.1, true, "common.loot_tables.consumable.throwable"), // Collections (0.00001, false, "common.trading.collection"), // Manual balance