From 7b5d92f5fb801dee31a0a530ee91574493eb5b7f Mon Sep 17 00:00:00 2001 From: UncomfySilence Date: Sun, 7 Nov 2021 11:56:41 +0100 Subject: [PATCH] + Made sure that abilities in staff simple match abilities in the staff skillset. + If anything happened to chests then no more! (Don't question it) + Bosses have a ~4% chance to drop higher tiered gear + Organized T2 boss ron --- .../common/loot_tables/dungeon/tier-0/chest.ron | 16 +++++++--------- .../common/loot_tables/dungeon/tier-1/boss.ron | 2 -- .../common/loot_tables/dungeon/tier-1/chest.ron | 16 +++++++--------- .../common/loot_tables/dungeon/tier-2/boss.ron | 2 -- .../common/loot_tables/dungeon/tier-2/chest.ron | 16 +++++++--------- .../common/loot_tables/dungeon/tier-3/boss.ron | 2 -- .../common/loot_tables/dungeon/tier-3/chest.ron | 16 +++++++--------- assets/common/skillset/dungeon/tier-1/bow.ron | 2 -- assets/common/skillset/dungeon/tier-2/bow.ron | 6 +----- assets/common/skillset/dungeon/tier-2/staff.ron | 2 -- assets/common/skillset/dungeon/tier-3/bow.ron | 13 +------------ assets/common/skillset/dungeon/tier-3/staff.ron | 12 +++--------- 12 files changed, 33 insertions(+), 72 deletions(-) diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron index 82b3f709f2..4f7a653e59 100644 --- a/assets/common/loot_tables/dungeon/tier-0/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron @@ -1,15 +1,13 @@ [ // Gear - (2.0, LootTable("common.loot_tables.weapons.tier-0")), - (2.0, LootTable("common.loot_tables.armor.tier-0")), - (0.5, LootTable("common.loot_tables.armor.tier-1")), - (0.5, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.tier-0")), + (1.0, LootTable("common.loot_tables.armor.tier-0")), // Currency - (6.0, ItemQuantity("common.items.utility.coins", 10, 20)), + (3.0, ItemQuantity("common.items.utility.coins", 10, 20)), // Materials - (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)), - (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)), - (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)), + (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 - (4.0, LootTable("common.loot_tables.consumable.poor")), + (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 5f63d6e35f..4c1381707a 100644 --- a/assets/common/loot_tables/dungeon/tier-1/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron @@ -2,11 +2,9 @@ // Weapons (4.0, LootTable("common.loot_tables.weapons.tier-1")), (0.5, LootTable("common.loot_tables.weapons.tier-2")), - (0.1, LootTable("common.loot_tables.weapons.tier-3")), // Armor (4.0, LootTable("common.loot_tables.armor.tier-1")), (0.5, LootTable("common.loot_tables.armor.tier-2")), - (0.1, LootTable("common.loot_tables.armor.tier-3")), // Misc (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron index 556c8ec915..e8f758e40e 100644 --- a/assets/common/loot_tables/dungeon/tier-1/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron @@ -1,15 +1,13 @@ [ // Gear - (2.0, LootTable("common.loot_tables.weapons.tier-1")), - (2.0, LootTable("common.loot_tables.armor.tier-1")), - (0.5, LootTable("common.loot_tables.weapons.tier-2")), - (0.5, LootTable("common.loot_tables.armor.tier-2")), + (1.0, LootTable("common.loot_tables.weapons.tier-1")), + (1.0, LootTable("common.loot_tables.armor.tier-1")), // Currency - (6.0, ItemQuantity("common.items.utility.coins", 20, 50)), + (3.0, ItemQuantity("common.items.utility.coins", 20, 50)), // Materials - (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)), - (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)), - (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)), + (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 - (4.0, LootTable("common.loot_tables.consumable.poor")), + (2.0, LootTable("common.loot_tables.consumable.poor")), ] diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron index 75ab36d706..5d7073558e 100644 --- a/assets/common/loot_tables/dungeon/tier-2/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron @@ -2,11 +2,9 @@ // Weapons (5.0, LootTable("common.loot_tables.weapons.tier-2")), (0.5, LootTable("common.loot_tables.weapons.tier-3")), - (0.1, LootTable("common.loot_tables.weapons.tier-4")), // Armor (5.0, LootTable("common.loot_tables.armor.tier-2")), (0.5, LootTable("common.loot_tables.armor.tier-3")), - (0.1, LootTable("common.loot_tables.armor.tier-4")), // Misc (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")), // Special Loot diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron index 23312096f2..a0c0557b60 100644 --- a/assets/common/loot_tables/dungeon/tier-2/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron @@ -1,15 +1,13 @@ [ // Gear - (2.0, LootTable("common.loot_tables.weapons.tier-2")), - (2.0, LootTable("common.loot_tables.armor.tier-2")), - (0.5, LootTable("common.loot_tables.weapons.tier-3")), - (0.5, LootTable("common.loot_tables.armor.tier-3")), + (1.0, LootTable("common.loot_tables.weapons.tier-2")), + (1.0, LootTable("common.loot_tables.armor.tier-2")), // Currency - (6.0, ItemQuantity("common.items.utility.coins", 50, 100)), + (3.0, ItemQuantity("common.items.utility.coins", 50, 100)), // Materials - (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)), - (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)), - (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)), + (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 - (4.0, LootTable("common.loot_tables.consumable.moderate")), + (2.0, LootTable("common.loot_tables.consumable.moderate")), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron index f2417530a1..45d78dfa20 100644 --- a/assets/common/loot_tables/dungeon/tier-3/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron @@ -2,11 +2,9 @@ // Weapons (3.0, LootTable("common.loot_tables.weapons.tier-3")), (1.0, LootTable("common.loot_tables.weapons.tier-4")), - (0.5, LootTable("common.loot_tables.weapons.tier-5")), // Armor (3.0, LootTable("common.loot_tables.armor.tier-3")), (1.0, LootTable("common.loot_tables.armor.tier-4")), - (0.5, LootTable("common.loot_tables.armor.tier-5")), // Misc (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index 8f92fd9427..cae94ddc30 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron @@ -1,15 +1,13 @@ [ // Gear - (2.0, LootTable("common.loot_tables.weapons.tier-3")), - (2.0, LootTable("common.loot_tables.armor.tier-3")), - (0.5, LootTable("common.loot_tables.weapons.tier-4")), - (0.5, LootTable("common.loot_tables.armor.tier-4")), + (1.0, LootTable("common.loot_tables.weapons.tier-3")), + (1.0, LootTable("common.loot_tables.armor.tier-3")), // Currency - (6.0, ItemQuantity("common.items.utility.coins", 100, 200)), + (3.0, ItemQuantity("common.items.utility.coins", 100, 200)), // Materials - (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)), - (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)), - (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)), + (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 - (4.0, LootTable("common.loot_tables.consumable.moderate")), + (2.0, LootTable("common.loot_tables.consumable.moderate")), ] diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron index 53f1155a57..521acd6260 100644 --- a/assets/common/skillset/dungeon/tier-1/bow.ron +++ b/assets/common/skillset/dungeon/tier-1/bow.ron @@ -7,6 +7,4 @@ Skill((Bow(CSpeed), Some(1))), Skill((Bow(CMove), Some(1))), - // Repeater - Skill((Bow(RDamage), Some(1))), ]) diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron index 7a87349fa6..369bb83f81 100644 --- a/assets/common/skillset/dungeon/tier-2/bow.ron +++ b/assets/common/skillset/dungeon/tier-2/bow.ron @@ -4,12 +4,8 @@ // Charged Skill((Bow(CDamage), Some(2))), Skill((Bow(CKnockback), Some(2))), - Skill((Bow(CSpeed), Some(1))), + Skill((Bow(CSpeed), Some(2))), Skill((Bow(CMove), Some(1))), - // Repeater - Skill((Bow(RDamage), Some(2))), - Skill((Bow(RCost), Some(2))), - Skill((Bow(RSpeed), Some(1))), ]) diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron index 30eedf312e..ce6f3ea287 100644 --- a/assets/common/skillset/dungeon/tier-2/staff.ron +++ b/assets/common/skillset/dungeon/tier-2/staff.ron @@ -9,7 +9,5 @@ // Flamethrower Skill((Staff(FRange), Some(2))), Skill((Staff(FDamage), Some(2))), - Skill((Staff(FDrain), Some(1))), - Skill((Staff(FVelocity), Some(1))), ]) \ No newline at end of file diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron index bef5d56116..50ee426093 100644 --- a/assets/common/skillset/dungeon/tier-3/bow.ron +++ b/assets/common/skillset/dungeon/tier-3/bow.ron @@ -2,21 +2,10 @@ Group(Weapon(Bow)), // Charged - Skill((Bow(CDamage), Some(3))), + Skill((Bow(CDamage), Some(2))), Skill((Bow(CRegen), Some(2))), Skill((Bow(CKnockback), Some(2))), Skill((Bow(CSpeed), Some(2))), Skill((Bow(CMove), Some(2))), - // Repeater - Skill((Bow(RDamage), Some(2))), - Skill((Bow(RCost), Some(2))), - Skill((Bow(RSpeed), Some(2))), - - // Shotgun - Skill((Bow(UnlockShotgun), None)), - Skill((Bow(SDamage), Some(1))), - Skill((Bow(SSpread), Some(1))), - Skill((Bow(SArrows), Some(1))), - Skill((Bow(SCost), Some(1))), ]) \ No newline at end of file diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron index 2a9405874d..d5e92082fa 100644 --- a/assets/common/skillset/dungeon/tier-3/staff.ron +++ b/assets/common/skillset/dungeon/tier-3/staff.ron @@ -2,20 +2,14 @@ Group(Weapon(Staff)), // Fireball - Skill((Staff(BDamage), Some(3))), + Skill((Staff(BDamage), Some(2))), Skill((Staff(BRegen), Some(2))), - Skill((Staff(BRadius), Some(3))), + Skill((Staff(BRadius), Some(2))), // Flamethrower Skill((Staff(FRange), Some(2))), Skill((Staff(FDamage), Some(3))), Skill((Staff(FDrain), Some(2))), - Skill((Staff(FVelocity), Some(2))), + Skill((Staff(FVelocity), Some(1))), - // Shockwave - Skill((Staff(UnlockShockwave), None)), - Skill((Staff(SDamage), Some(1))), - Skill((Staff(SKnockback), Some(1))), - Skill((Staff(SRange), Some(1))), - Skill((Staff(SCost), Some(1))), ]) \ No newline at end of file