From f9b71750cae33fb173a0483f84c0cd524f26b6d1 Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Sun, 27 Jun 2021 15:12:10 +0300 Subject: [PATCH] Make cultist great again - Change cultist set stats to mixed dragonscale (hands and feet), sunsilk (belt, pants and shoulders) and orichalcum (chest and cape) Distribute cultist set stats as hybrid set. - Make cultist cape count towards npc aggro - Remove unused staff skilltree from cultist - Remove spin number skill from sword cultist skillset --- assets/common/items/armor/cultist/belt.ron | 12 +++++------ assets/common/items/armor/cultist/chest.ron | 12 +++++------ assets/common/items/armor/cultist/foot.ron | 12 +++++------ assets/common/items/armor/cultist/hand.ron | 12 +++++------ assets/common/items/armor/cultist/pants.ron | 12 +++++------ .../common/items/armor/cultist/shoulder.ron | 12 +++++------ .../items/armor/misc/back/dungeon_purple.ron | 16 +++++++------- .../common/skillset/dungeon/tier-5/enemy.ron | 1 - .../common/skillset/dungeon/tier-5/staff.ron | 21 ------------------- .../common/skillset/dungeon/tier-5/sword.ron | 5 ++--- assets/server/manifests/kits.ron | 9 ++++++++ 11 files changed, 56 insertions(+), 68 deletions(-) delete mode 100644 assets/common/skillset/dungeon/tier-5/staff.ron diff --git a/assets/common/items/armor/cultist/belt.ron b/assets/common/items/armor/cultist/belt.ron index 55d4758882..89619d4ac0 100644 --- a/assets/common/items/armor/cultist/belt.ron +++ b/assets/common/items/armor/cultist/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Cultist"), stats: ( - protection: Normal(6.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(8.0), + poise_resilience: Normal(1.0), + energy_max: 20, + energy_reward: 0.025, + crit_power: 0.02, stealth: 0.0, ), )), @@ -16,4 +16,4 @@ ItemDef( tags: [ Cultist, ], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index acfc5dac59..a20727ed72 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Cultist"), stats: ( - protection: Normal(30.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(48.0), + poise_resilience: Normal(6.0), + energy_max: 135, + energy_reward: 0.135, + crit_power: 0.125, stealth: 0.0, ), )), @@ -16,4 +16,4 @@ ItemDef( tags: [ Cultist, ], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/cultist/foot.ron b/assets/common/items/armor/cultist/foot.ron index 41f4f572c7..0e396bf4f1 100644 --- a/assets/common/items/armor/cultist/foot.ron +++ b/assets/common/items/armor/cultist/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Cultist"), stats: ( - protection: Normal(6.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(16.0), + poise_resilience: Normal(2.0), + energy_max: 45, + energy_reward: 0.045, + crit_power: 0.04, stealth: 0.0, ), )), @@ -16,4 +16,4 @@ ItemDef( tags: [ Cultist, ], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/cultist/hand.ron b/assets/common/items/armor/cultist/hand.ron index 4b5939dafb..f9e140b28f 100644 --- a/assets/common/items/armor/cultist/hand.ron +++ b/assets/common/items/armor/cultist/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Cultist"), stats: ( - protection: Normal(12.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(16.0), + poise_resilience: Normal(2.0), + energy_max: 45, + energy_reward: 0.045, + crit_power: 0.04, stealth: 0.0, ), )), @@ -16,4 +16,4 @@ ItemDef( tags: [ Cultist, ], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index 8461be9c53..022ce3e037 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Cultist"), stats: ( - protection: Normal(24.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(32.0), + poise_resilience: Normal(4.0), + energy_max: 90, + energy_reward: 0.1, + crit_power: 0.08, stealth: 0.0, ), )), @@ -16,4 +16,4 @@ ItemDef( tags: [ Cultist, ], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index d88bd22f51..8aa550f853 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Cultist"), stats: ( - protection: Normal(18.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(32.0), + poise_resilience: Normal(5.0), + energy_max: 90, + energy_reward: 0.1, + crit_power: 0.08, stealth: 0.0, ), )), @@ -16,4 +16,4 @@ ItemDef( tags: [ Cultist, ], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/misc/back/dungeon_purple.ron b/assets/common/items/armor/misc/back/dungeon_purple.ron index e143979c07..7f7a7dd305 100644 --- a/assets/common/items/armor/misc/back/dungeon_purple.ron +++ b/assets/common/items/armor/misc/back/dungeon_purple.ron @@ -4,14 +4,16 @@ ItemDef( kind: Armor(( kind: Back("DungeonPurple"), stats: ( - protection: Normal(3.0), - poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, - crit_power: 0.0, + protection: Normal(8.0), + poise_resilience: Normal(1.0), + energy_max: 20, + energy_reward: 0.025, + crit_power: 0.02, stealth: 0.0, ), )), quality: Epic, - tags: [], -) \ No newline at end of file + tags: [ + Cultist, + ], +) diff --git a/assets/common/skillset/dungeon/tier-5/enemy.ron b/assets/common/skillset/dungeon/tier-5/enemy.ron index 0e5ff1c8e5..d0ee8c79f6 100644 --- a/assets/common/skillset/dungeon/tier-5/enemy.ron +++ b/assets/common/skillset/dungeon/tier-5/enemy.ron @@ -4,5 +4,4 @@ Tree("common.skillset.dungeon.tier-5.axe"), Tree("common.skillset.dungeon.tier-5.hammer"), Tree("common.skillset.dungeon.tier-5.bow"), - Tree("common.skillset.dungeon.tier-5.staff"), ]) diff --git a/assets/common/skillset/dungeon/tier-5/staff.ron b/assets/common/skillset/dungeon/tier-5/staff.ron deleted file mode 100644 index 4c3dc1af3a..0000000000 --- a/assets/common/skillset/dungeon/tier-5/staff.ron +++ /dev/null @@ -1,21 +0,0 @@ -([ - Group(Weapon(Staff)), - - // Fireball - Skill((Staff(BDamage), Some(1))), - Skill((Staff(BRegen), Some(1))), - Skill((Staff(BRadius), Some(1))), - - // Flamethrower - Skill((Staff(FRange), Some(1))), - Skill((Staff(FDrain), Some(1))), - Skill((Staff(FDamage), Some(1))), - 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))), -]) diff --git a/assets/common/skillset/dungeon/tier-5/sword.ron b/assets/common/skillset/dungeon/tier-5/sword.ron index 2f945fc42f..653b99296f 100644 --- a/assets/common/skillset/dungeon/tier-5/sword.ron +++ b/assets/common/skillset/dungeon/tier-5/sword.ron @@ -13,7 +13,6 @@ // Spin of death Skill((Sword(UnlockSpin), None)), - Skill((Sword(SDamage), Some(1))), - Skill((Sword(SSpins), Some(2))), - Skill((Sword(SCost), Some(1))), + Skill((Sword(SDamage), Some(2))), + Skill((Sword(SCost), Some(2))), ]) diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 1c1e45d206..2b0c8b0da2 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -314,6 +314,15 @@ ("common.items.armor.ferocious.back",1), ("common.items.weapons.sword.bloodsteel-1",1), ], + "cultist": [ + ("common.items.armor.cultist.chest",1), + ("common.items.armor.cultist.pants",1), + ("common.items.armor.cultist.hand",1), + ("common.items.armor.cultist.foot",1), + ("common.items.armor.cultist.shoulder",1), + ("common.items.armor.cultist.belt",1), + ("common.items.armor.misc.back.dungeon_purple",1), + ], "admin_cosmetics": [ ("common.items.debug.cultist_belt",1), ("common.items.debug.cultist_boots",1),