From 88b4035729321766598b3a0bba121f418dce2233 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 16 Dec 2021 01:16:51 -0500 Subject: [PATCH] last tweaks --- assets/common/entity/dungeon/tier-0/staff.ron | 1 - assets/common/entity/dungeon/tier-1/staff.ron | 2 +- assets/common/entity/dungeon/tier-2/staff.ron | 2 +- assets/common/entity/dungeon/tier-3/staff.ron | 2 +- assets/common/skillset/preset/rank2/staff.ron | 8 +++----- assets/common/skillset/preset/rank3/sceptre.ron | 13 ------------- assets/common/skillset/preset/rank3/sword.ron | 9 ++++----- assets/common/skillset/preset/rank4/bow.ron | 6 +++--- 8 files changed, 13 insertions(+), 30 deletions(-) diff --git a/assets/common/entity/dungeon/tier-0/staff.ron b/assets/common/entity/dungeon/tier-0/staff.ron index e1825cf2ec..cbcd59a973 100644 --- a/assets/common/entity/dungeon/tier-0/staff.ron +++ b/assets/common/entity/dungeon/tier-0/staff.ron @@ -9,6 +9,5 @@ EntityConfig ( meta: [ LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"), - SkillSetAsset("common.skillset.dungeon.tier-0.staff"), ], ) diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/staff.ron index 8420431780..668397373d 100644 --- a/assets/common/entity/dungeon/tier-1/staff.ron +++ b/assets/common/entity/dungeon/tier-1/staff.ron @@ -9,6 +9,6 @@ EntityConfig ( meta: [ LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"), - SkillSetAsset("common.skillset.dungeon.tier-1.staff"), + SkillSetAsset("common.skillset.preset.rank1.fullskill"), ], ) diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/staff.ron index 4357fa4539..2b3d964709 100644 --- a/assets/common/entity/dungeon/tier-2/staff.ron +++ b/assets/common/entity/dungeon/tier-2/staff.ron @@ -9,6 +9,6 @@ EntityConfig ( meta: [ LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"), - SkillSetAsset("common.skillset.dungeon.tier-2.staff"), + SkillSetAsset("common.skillset.preset.rank2.fullskill"), ], ) diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/staff.ron index 6d65b13dab..d9bed3b37f 100644 --- a/assets/common/entity/dungeon/tier-3/staff.ron +++ b/assets/common/entity/dungeon/tier-3/staff.ron @@ -9,6 +9,6 @@ EntityConfig ( meta: [ LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"), - SkillSetAsset("common.skillset.dungeon.tier-3.staff"), + SkillSetAsset("common.skillset.preset.rank3.fullskill"), ], ) diff --git a/assets/common/skillset/preset/rank2/staff.ron b/assets/common/skillset/preset/rank2/staff.ron index a972fa9e67..6316e9e71b 100644 --- a/assets/common/skillset/preset/rank2/staff.ron +++ b/assets/common/skillset/preset/rank2/staff.ron @@ -2,14 +2,12 @@ Group(Weapon(Staff)), // Fireball - Skill((Staff(BDamage), Some(1))), + Skill((Staff(BDamage), Some(2))), Skill((Staff(BRegen), Some(2))), Skill((Staff(BRadius), Some(1))), // Flamethrower - Skill((Staff(FRange), Some(1))), - Skill((Staff(FDamage), Some(1))), - Skill((Staff(FDrain), Some(1))), - Skill((Staff(FVelocity), Some(1))), + Skill((Staff(FRange), Some(2))), + Skill((Staff(FDamage), Some(2))), ]) diff --git a/assets/common/skillset/preset/rank3/sceptre.ron b/assets/common/skillset/preset/rank3/sceptre.ron index 7644df403a..73ad0437b6 100644 --- a/assets/common/skillset/preset/rank3/sceptre.ron +++ b/assets/common/skillset/preset/rank3/sceptre.ron @@ -2,18 +2,6 @@ Group(Weapon(Sceptre)), // Beam -<<<<<<< HEAD:assets/common/skillset/dungeon/tier-3/sceptre.ron - Skill((Sceptre(LDamage), Some(3))), - Skill((Sceptre(LRange), Some(2))), - Skill((Sceptre(LLifesteal), Some(2))), - Skill((Sceptre(LRegen), Some(2))), - - // Heal - Skill((Sceptre(HHeal), Some(2))), - Skill((Sceptre(HDuration), Some(2))), - Skill((Sceptre(HRange), Some(2))), - Skill((Sceptre(HCost), Some(2))), -======= Skill((Sceptre(LDamage), Some(2))), Skill((Sceptre(LRange), Some(2))), Skill((Sceptre(LLifesteal), Some(1))), @@ -24,7 +12,6 @@ Skill((Sceptre(HDuration), Some(1))), Skill((Sceptre(HRange), Some(1))), Skill((Sceptre(HCost), Some(1))), ->>>>>>> 6a6884ddb... simplification:assets/common/skillset/preset/rank3/sceptre.ron // Ward Skill((Sceptre(UnlockAura), None)), Skill((Sceptre(AStrength), Some(1))), diff --git a/assets/common/skillset/preset/rank3/sword.ron b/assets/common/skillset/preset/rank3/sword.ron index 5bc6c82267..a2cf9a4eac 100644 --- a/assets/common/skillset/preset/rank3/sword.ron +++ b/assets/common/skillset/preset/rank3/sword.ron @@ -6,16 +6,15 @@ // TripleStrike Skill((Sword(TsCombo), None)), Skill((Sword(TsDamage), Some(2))), - Skill((Sword(TsRegen), Some(1))), - Skill((Sword(TsSpeed), Some(2))), + Skill((Sword(TsRegen), Some(2))), + Skill((Sword(TsSpeed), Some(1))), // Dash - Skill((Sword(DCost), Some(1))), + Skill((Sword(DCost), Some(2))), Skill((Sword(DDrain), Some(2))), Skill((Sword(DDamage), Some(1))), - Skill((Sword(DScaling), Some(2))), + Skill((Sword(DScaling), Some(1))), Skill((Sword(DSpeed), None)), - Skill((Sword(DInfinite), None)), // Spin of death Skill((Sword(UnlockSpin), None)), diff --git a/assets/common/skillset/preset/rank4/bow.ron b/assets/common/skillset/preset/rank4/bow.ron index 88b8c9f965..04e6187283 100644 --- a/assets/common/skillset/preset/rank4/bow.ron +++ b/assets/common/skillset/preset/rank4/bow.ron @@ -6,9 +6,9 @@ // Charged Skill((Bow(CDamage), Some(2))), - Skill((Bow(CKnockback), Some(1))), - Skill((Bow(CSpeed), Some(1))), - Skill((Bow(CRegen), Some(2))), + Skill((Bow(CKnockback), Some(2))), + Skill((Bow(CSpeed), Some(2))), + Skill((Bow(CRegen), Some(1))), Skill((Bow(CMove), Some(1))), // Repeater