+ 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
2024-08-30 18:12:32 +00:00 · 2021-11-06 17:45:02 +01:00 · 2021-11-06 17:45:02 +01:00 · 0461178cd8
commit 0461178cd8
parent 1b1fee4f0b
22 changed files with 82 additions and 11 deletions
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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))),
 ])

--- 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))),

 ])
--- 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))),
 ])
--- 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))),
 ])