diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron index b1584492bb..e7d2477d7f 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(2.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 4.4, ======= energy_max: 5.4, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 4.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.054, crit_power: 0.05, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron index 0dac431a0d..292bed528e 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(38.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 5.0, ======= energy_max: 10.8, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 5.0, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.108, crit_power: 0.1, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron index ad3a5054fc..92ba62bb55 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 5.0, ======= energy_max: 3.6, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 5.0, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.036, crit_power: 0.032, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron index 105a6a0cb0..a1ee9e2f88 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 5.0, ======= energy_max: 3.6, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 5.0, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.036, crit_power: 0.032, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron index 8e9770c5fb..a72a31b1e6 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(19.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 5.0, ======= energy_max: 7.2, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 5.0, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.08, crit_power: 0.064, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron index a61242a2f0..55e62f4a92 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(19.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 5.0, ======= energy_max: 7.2, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 5.0, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.08, crit_power: 0.064, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron index aa359f17f4..9751c9c36f 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(26.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 3.4, ======= energy_max: 8.1, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 3.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.81, crit_power: 0.075, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron index fed5425874..06da3b66e3 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(7.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 3.4, ======= energy_max: 2.7, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 3.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.027, crit_power: 0.024, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron index 27828f84e7..3f705ceb47 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(7.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 3.4, ======= energy_max: 2.7, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 3.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.027, crit_power: 0.024, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron index 50eae4c203..826ab044e4 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(13.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 3.4, ======= energy_max: 5.4, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 3.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.06, crit_power: 0.048, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron index 3758b32b97..d9fec1e6bb 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(13.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 3.4, ======= energy_max: 5.4, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 3.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.06, crit_power: 0.048, stealth: 0.0, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron index 7693d4b6a2..eef2995a8e 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron @@ -6,11 +6,15 @@ ItemDef( stats: ( protection: Normal(5.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD <<<<<<< HEAD energy_max: 3.4, ======= energy_max: 1.2, >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) +======= + energy_max: 3.4, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) energy_reward: 0.015, crit_power: 0.012, stealth: 0.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron index b7968b73c6..430e84fee7 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 0.8, + power: 0.7, effect_power: 0.8, - speed: 0.6, + speed: 0.7, crit_chance: 0.08406594, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron index 07a5270aa1..4588d5c1e2 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 0.8, + power: 0.7, effect_power: 0.8, - speed: 0.7, + speed: 0.6, crit_chance: 0.05059524, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron index c27a4282d8..7ea0f637f2 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 0.8, + power: 0.7, effect_power: 1.0, speed: 1.0, crit_chance: 0.07589286, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron index d2e4d1bb68..f3a87da8b1 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron @@ -8,8 +8,8 @@ ItemDef( equip_time_secs: 0.0, power: 0.3, effect_power: 0.8, - speed: 0.5, - crit_chance: 0.26764706, + speed: 0.6, + crit_chance: 0.13541667, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron index de4c29dcf7..226837bf9f 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron @@ -8,8 +8,8 @@ ItemDef( equip_time_secs: 0.0, power: 0.3, effect_power: 0.8, - speed: 0.6, - crit_chance: 0.12037037, + speed: 0.5, + crit_chance: 0.26764706, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron index 2b9cf3c98c..05e4841754 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron @@ -6,9 +6,13 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 1.8, + power: 1.6, effect_power: 0.8, +<<<<<<< HEAD speed: 0.7, +======= + speed: 0.9, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) crit_chance: 0.043827, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron index 5a2c62c527..f3e0c2bdd7 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron @@ -8,7 +8,11 @@ ItemDef( equip_time_secs: 0.0, power: 1.6, effect_power: 0.8, +<<<<<<< HEAD speed: 0.8, +======= + speed: 0.9, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) crit_chance: 0.043827, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron index be326e45e2..d8601fbf77 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron @@ -8,7 +8,11 @@ ItemDef( equip_time_secs: 0.0, power: 1.2, effect_power: 0.8, +<<<<<<< HEAD speed: 0.7, +======= + speed: 0.9, +>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons) crit_chance: 0.05965909, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron index 8c2d95a94b..0e6fee696c 100644 --- a/assets/common/loot_tables/dungeon/tier-0/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron @@ -5,11 +5,11 @@ (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.tier-1")), // Currency - (3.0, ItemQuantity("common.items.utility.coins", 10, 20)), + (6.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)), + (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)), // Consumables - (2.0, LootTable("common.loot_tables.consumable.poor")), + (4.0, LootTable("common.loot_tables.consumable.poor")), ] diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron index 1ce2682e47..422288308d 100644 --- a/assets/common/loot_tables/dungeon/tier-1/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron @@ -6,11 +6,11 @@ (1.0, LootTable("common.loot_tables.armor.tier-2")), (0.5, Item("common.items.armor.misc.head.hog_hood")), // Currency - (3.0, ItemQuantity("common.items.utility.coins", 20, 50)), + (6.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)), + (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)), // Consumables - (2.0, LootTable("common.loot_tables.consumable.poor")), + (4.0, LootTable("common.loot_tables.consumable.poor")), ] diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron index 37a023898c..1e6f582b93 100644 --- a/assets/common/loot_tables/dungeon/tier-2/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron @@ -5,11 +5,11 @@ (1.0, LootTable("common.loot_tables.weapons.tier-3")), (1.0, LootTable("common.loot_tables.armor.tier-3")), // Currency - (3.0, ItemQuantity("common.items.utility.coins", 50, 100)), + (6.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)), + (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)), // Consumables - (2.0, LootTable("common.loot_tables.consumable.moderate")), + (4.0, LootTable("common.loot_tables.consumable.moderate")), ] diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index 33bc1a208e..fae2e74d80 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron @@ -5,11 +5,11 @@ (1.0, LootTable("common.loot_tables.weapons.tier-4")), (1.0, LootTable("common.loot_tables.armor.tier-4")), // Currency - (3.0, ItemQuantity("common.items.utility.coins", 100, 200)), + (6.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)), + (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)), // Consumables - (2.0, LootTable("common.loot_tables.consumable.moderate")), + (4.0, LootTable("common.loot_tables.consumable.moderate")), ]