From 0461178cd8c38f2175762ca0f446a73980f4acca Mon Sep 17 00:00:00 2001 From: UncomfySilence Date: Sat, 6 Nov 2021 17:45:02 +0100 Subject: [PATCH] + Gnarling armor count - 7 previous being 7 + Adlet-bow armor count - 39 previous being 62 + Sahagin armor count - 71 previous being 88 + Haniwa armor count - 96 previous being 91 + Myrmidon armor count - 152 previous being 161 + Although an overall decrease in armor there's an increase in poise res, crit power, energy, and other stats. + Gave everything staff an ability set in skillset, and linked them all --- .../npc_armor/biped_small/adlet/chest/adlet_bow.ron | 4 ++++ .../npc_armor/biped_small/haniwa/chest/haniwa.ron | 4 ++++ .../npc_armor/biped_small/haniwa/foot/haniwa.ron | 4 ++++ .../npc_armor/biped_small/haniwa/hand/haniwa.ron | 4 ++++ .../npc_armor/biped_small/haniwa/head/haniwa.ron | 4 ++++ .../npc_armor/biped_small/haniwa/pants/haniwa.ron | 4 ++++ .../npc_armor/biped_small/sahagin/chest/sahagin.ron | 4 ++++ .../npc_armor/biped_small/sahagin/foot/sahagin.ron | 4 ++++ .../npc_armor/biped_small/sahagin/hand/sahagin.ron | 4 ++++ .../npc_armor/biped_small/sahagin/head/sahagin.ron | 4 ++++ .../npc_armor/biped_small/sahagin/pants/sahagin.ron | 4 ++++ .../npc_armor/biped_small/sahagin/tail/sahagin.ron | 4 ++++ .../npc_weapons/biped_small/adlet/adlet_bow.ron | 2 +- .../npc_weapons/biped_small/adlet/gnoll_staff.ron | 2 +- .../npc_weapons/biped_small/adlet/wooden_spear.ron | 2 +- .../npc_weapons/biped_small/gnarling/adlet_bow.ron | 2 +- .../biped_small/gnarling/gnoll_staff.ron | 2 +- .../npc_weapons/biped_small/haniwa/adlet_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 +++++++++--- 22 files changed, 82 insertions(+), 11 deletions(-) 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 8fdfc77329..b1584492bb 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(14.0), poise_resilience: Normal(2.0), +<<<<<<< HEAD energy_max: 4.4, +======= + energy_max: 5.4, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 f7c2400300..0dac431a0d 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(38.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD energy_max: 5.0, +======= + energy_max: 10.8, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 eebdb949c6..ad3a5054fc 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD energy_max: 5.0, +======= + energy_max: 3.6, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 a73b06e8c0..105a6a0cb0 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(10.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD energy_max: 5.0, +======= + energy_max: 3.6, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 53753c9e89..8e9770c5fb 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(19.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD energy_max: 5.0, +======= + energy_max: 7.2, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 d8deeeb3bb..a61242a2f0 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(19.0), poise_resilience: Normal(5.0), +<<<<<<< HEAD energy_max: 5.0, +======= + energy_max: 7.2, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 dbc76fd21a..aa359f17f4 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(26.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD energy_max: 3.4, +======= + energy_max: 8.1, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 6e679be98a..fed5425874 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(7.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD energy_max: 3.4, +======= + energy_max: 2.7, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 3606ca4783..27828f84e7 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(7.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD energy_max: 3.4, +======= + energy_max: 2.7, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 a5d7099154..50eae4c203 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(13.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD energy_max: 3.4, +======= + energy_max: 5.4, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 f9a1b9d51c..3758b32b97 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(13.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD energy_max: 3.4, +======= + energy_max: 5.4, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 368ae49a5e..7693d4b6a2 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,7 +6,11 @@ ItemDef( stats: ( protection: Normal(5.0), poise_resilience: Normal(4.0), +<<<<<<< HEAD energy_max: 3.4, +======= + energy_max: 1.2, +>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7) 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 e560436fe9..b7968b73c6 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,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 0.7, + power: 0.8, effect_power: 0.8, speed: 0.6, crit_chance: 0.08406594, 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 f3e2191a33..07a5270aa1 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,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 0.7, + power: 0.8, effect_power: 0.8, speed: 0.7, crit_chance: 0.05059524, 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 7ea0f637f2..c27a4282d8 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.7, + power: 0.8, 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 d927326c31..d2e4d1bb68 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 @@ -9,7 +9,7 @@ ItemDef( power: 0.3, effect_power: 0.8, speed: 0.5, - crit_chance: 0.13541667, + 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/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron index d0e96ded3e..de4c29dcf7 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 @@ -9,7 +9,7 @@ ItemDef( power: 0.3, effect_power: 0.8, speed: 0.6, - crit_chance: 0.26764706, + crit_chance: 0.12037037, 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 775f7bb67f..2b9cf3c98c 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,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.0, - power: 1.6, + power: 1.8, effect_power: 0.8, speed: 0.7, crit_chance: 0.043827, diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron index 369bb83f81..7a87349fa6 100644 --- a/assets/common/skillset/dungeon/tier-2/bow.ron +++ b/assets/common/skillset/dungeon/tier-2/bow.ron @@ -4,8 +4,12 @@ // Charged Skill((Bow(CDamage), Some(2))), Skill((Bow(CKnockback), Some(2))), - Skill((Bow(CSpeed), Some(2))), + Skill((Bow(CSpeed), Some(1))), 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 ce6f3ea287..30eedf312e 100644 --- a/assets/common/skillset/dungeon/tier-2/staff.ron +++ b/assets/common/skillset/dungeon/tier-2/staff.ron @@ -9,5 +9,7 @@ // 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 50ee426093..bef5d56116 100644 --- a/assets/common/skillset/dungeon/tier-3/bow.ron +++ b/assets/common/skillset/dungeon/tier-3/bow.ron @@ -2,10 +2,21 @@ Group(Weapon(Bow)), // Charged - Skill((Bow(CDamage), Some(2))), + Skill((Bow(CDamage), Some(3))), 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 d5e92082fa..2a9405874d 100644 --- a/assets/common/skillset/dungeon/tier-3/staff.ron +++ b/assets/common/skillset/dungeon/tier-3/staff.ron @@ -2,14 +2,20 @@ Group(Weapon(Staff)), // Fireball - Skill((Staff(BDamage), Some(2))), + Skill((Staff(BDamage), Some(3))), Skill((Staff(BRegen), Some(2))), - Skill((Staff(BRadius), Some(2))), + Skill((Staff(BRadius), Some(3))), // Flamethrower Skill((Staff(FRange), Some(2))), Skill((Staff(FDamage), Some(3))), Skill((Staff(FDrain), Some(2))), - Skill((Staff(FVelocity), Some(1))), + Skill((Staff(FVelocity), Some(2))), + // 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