diff --git a/assets/common/entity/dungeon/tier-4/bow.ron b/assets/common/entity/dungeon/tier-4/bow.ron index f56692f884..287c849c9a 100644 --- a/assets/common/entity/dungeon/tier-4/bow.ron +++ b/assets/common/entity/dungeon/tier-4/bow.ron @@ -9,6 +9,6 @@ EntityConfig ( meta: [ LoadoutAsset("common.loadout.dungeon.tier-4.myrmidon"), - SkillSetAsset("common.skillset.dungeon.tier-4.bow"), + SkillSetAsset("common.skillset.dungeon.tier-4.enemy"), ], ) diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index 1e5d89c5ff..381f06c508 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -18,7 +18,7 @@ EntityConfig ( hands: Paired(Item("common.items.weapons.sword_1h.iron-2")), meta: [ - SkillSetAsset("common.skillset.dungeon.tier-5.sword"), + SkillSetAsset("common.skillset.dungeon.tier-3.sword"), LoadoutAsset("common.loadout.spots.pirate"), ], ) diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron index 4d62184240..8b4d39a009 100644 --- a/assets/common/entity/spot/witch_dark.ron +++ b/assets/common/entity/spot/witch_dark.ron @@ -18,7 +18,7 @@ EntityConfig ( hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")), meta: [ - SkillSetAsset("common.skillset.dungeon.tier-5.sceptre"), + SkillSetAsset("common.skillset.dungeon.tier-3.sceptre"), LoadoutAsset("common.loadout.spots.witch"), ], ) diff --git a/assets/common/skillset/dungeon/tier-0/bow.ron b/assets/common/skillset/dungeon/tier-0/bow.ron index 5a99b61b66..368cf79286 100644 --- a/assets/common/skillset/dungeon/tier-0/bow.ron +++ b/assets/common/skillset/dungeon/tier-0/bow.ron @@ -7,6 +7,4 @@ Skill((Bow(CSpeed), Some(1))), Skill((Bow(CMove), Some(1))), - // Repeater - Skill((Bow(RDamage), Some(1))), ]) diff --git a/assets/common/skillset/dungeon/tier-0/enemy.ron b/assets/common/skillset/dungeon/tier-0/enemy.ron new file mode 100644 index 0000000000..f3b680f683 --- /dev/null +++ b/assets/common/skillset/dungeon/tier-0/enemy.ron @@ -0,0 +1,4 @@ +([ + //You can always add more :P + Tree("common.skillset.dungeon.tier-0.bow"), +]) \ No newline at end of file diff --git a/assets/common/skillset/dungeon/tier-1/enemy.ron b/assets/common/skillset/dungeon/tier-1/enemy.ron new file mode 100644 index 0000000000..e815920cfc --- /dev/null +++ b/assets/common/skillset/dungeon/tier-1/enemy.ron @@ -0,0 +1,4 @@ +([ + //You can always add more :P + Tree("common.skillset.dungeon.tier-1.bow"), +]) \ No newline at end of file diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron index 5a99b61b66..2b1dfbd825 100644 --- a/assets/common/skillset/dungeon/tier-2/bow.ron +++ b/assets/common/skillset/dungeon/tier-2/bow.ron @@ -9,4 +9,7 @@ // Repeater Skill((Bow(RDamage), Some(1))), + Skill((Bow(RCost), Some(1))), + Skill((Bow(RSpeed), Some(1))), ]) + diff --git a/assets/common/skillset/dungeon/tier-2/enemy.ron b/assets/common/skillset/dungeon/tier-2/enemy.ron new file mode 100644 index 0000000000..0d93f8900a --- /dev/null +++ b/assets/common/skillset/dungeon/tier-2/enemy.ron @@ -0,0 +1,4 @@ +([ + //You can always add more :P + Tree("common.skillset.dungeon.tier-2.bow"), +]) \ 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 5a99b61b66..2344f7494a 100644 --- a/assets/common/skillset/dungeon/tier-3/bow.ron +++ b/assets/common/skillset/dungeon/tier-3/bow.ron @@ -3,10 +3,19 @@ // Charged Skill((Bow(CDamage), Some(1))), + Skill((Bow(CRegen), Some(1))), Skill((Bow(CKnockback), Some(1))), Skill((Bow(CSpeed), Some(1))), Skill((Bow(CMove), Some(1))), // Repeater Skill((Bow(RDamage), Some(1))), -]) + Skill((Bow(RSpeed), Some(1))), + + // 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/enemy.ron b/assets/common/skillset/dungeon/tier-3/enemy.ron new file mode 100644 index 0000000000..53c4c60e76 --- /dev/null +++ b/assets/common/skillset/dungeon/tier-3/enemy.ron @@ -0,0 +1,4 @@ +([ + //You can always add more :P + Tree("common.skillset.dungeon.tier-3.bow"), +]) \ No newline at end of file diff --git a/assets/common/skillset/dungeon/tier-5/sceptre.ron b/assets/common/skillset/dungeon/tier-3/sceptre.ron similarity index 100% rename from assets/common/skillset/dungeon/tier-5/sceptre.ron rename to assets/common/skillset/dungeon/tier-3/sceptre.ron diff --git a/assets/common/skillset/dungeon/tier-5/sword.ron b/assets/common/skillset/dungeon/tier-3/sword.ron similarity index 100% rename from assets/common/skillset/dungeon/tier-5/sword.ron rename to assets/common/skillset/dungeon/tier-3/sword.ron diff --git a/assets/common/skillset/dungeon/tier-4/bow.ron b/assets/common/skillset/dungeon/tier-4/bow.ron deleted file mode 100644 index 5a99b61b66..0000000000 --- a/assets/common/skillset/dungeon/tier-4/bow.ron +++ /dev/null @@ -1,12 +0,0 @@ -([ - Group(Weapon(Bow)), - - // Charged - Skill((Bow(CDamage), Some(1))), - Skill((Bow(CKnockback), Some(1))), - Skill((Bow(CSpeed), Some(1))), - Skill((Bow(CMove), Some(1))), - - // Repeater - Skill((Bow(RDamage), Some(1))), -]) diff --git a/assets/common/skillset/dungeon/tier-4/enemy.ron b/assets/common/skillset/dungeon/tier-4/enemy.ron new file mode 100644 index 0000000000..937fa30b79 --- /dev/null +++ b/assets/common/skillset/dungeon/tier-4/enemy.ron @@ -0,0 +1,4 @@ +([ + //You can always add more :P + Tree("common.skillset.preset.max.bow"), +]) \ No newline at end of file diff --git a/assets/common/skillset/dungeon/tier-5/axe.ron b/assets/common/skillset/dungeon/tier-5/axe.ron deleted file mode 100644 index abfcaae590..0000000000 --- a/assets/common/skillset/dungeon/tier-5/axe.ron +++ /dev/null @@ -1,21 +0,0 @@ -([ - Group(Weapon(Axe)), - - // DoubleStrike - Skill((Axe(DsCombo), None)), - Skill((Axe(DsDamage), Some(1))), - Skill((Axe(DsSpeed), Some(1))), - Skill((Axe(DsRegen), Some(1))), - - // Spin - Skill((Axe(SInfinite), None)), - Skill((Axe(SHelicopter), None)), - Skill((Axe(SDamage), Some(1))), - Skill((Axe(SSpeed), Some(1))), - - // Leap - Skill((Axe(UnlockLeap), None)), - Skill((Axe(LDamage), Some(1))), - Skill((Axe(LKnockback), Some(1))), - Skill((Axe(LDistance), Some(1))), -]) diff --git a/assets/common/skillset/dungeon/tier-5/bow.ron b/assets/common/skillset/dungeon/tier-5/bow.ron deleted file mode 100644 index a1cd8b0def..0000000000 --- a/assets/common/skillset/dungeon/tier-5/bow.ron +++ /dev/null @@ -1,21 +0,0 @@ -([ - Group(Weapon(Bow)), - - // Charged - Skill((Bow(CDamage), Some(1))), - Skill((Bow(CRegen), Some(1))), - Skill((Bow(CKnockback), Some(1))), - Skill((Bow(CSpeed), Some(1))), - Skill((Bow(CMove), Some(1))), - - // Repeater - Skill((Bow(RDamage), Some(1))), - Skill((Bow(RSpeed), Some(1))), - - // 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))), -]) diff --git a/assets/common/skillset/dungeon/tier-5/enemy.ron b/assets/common/skillset/dungeon/tier-5/enemy.ron index 4adcb390e3..63dcbf0d84 100644 --- a/assets/common/skillset/dungeon/tier-5/enemy.ron +++ b/assets/common/skillset/dungeon/tier-5/enemy.ron @@ -1,8 +1,8 @@ ([ // Just gather everything - Tree("common.skillset.dungeon.tier-5.sword"), - 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.sceptre"), + Tree("common.skillset.preset.max.sword"), + Tree("common.skillset.preset.max.axe"), + Tree("common.skillset.preset.max.hammer"), + Tree("common.skillset.preset.max.bow"), + Tree("common.skillset.preset.max.sceptre"), ]) diff --git a/assets/common/skillset/dungeon/tier-5/hammer.ron b/assets/common/skillset/dungeon/tier-5/hammer.ron deleted file mode 100644 index 5f0e7561a3..0000000000 --- a/assets/common/skillset/dungeon/tier-5/hammer.ron +++ /dev/null @@ -1,21 +0,0 @@ -([ - Group(Weapon(Hammer)), - - // Single Strike, as single as you are - Skill((Hammer(SsKnockback), Some(1))), - Skill((Hammer(SsDamage), Some(1))), - Skill((Hammer(SsSpeed), Some(1))), - Skill((Hammer(SsRegen), Some(1))), - - // Charged - Skill((Hammer(CKnockback), Some(1))), - Skill((Hammer(CDamage), Some(1))), - Skill((Hammer(CDrain), Some(1))), - - // Leap - Skill((Hammer(UnlockLeap), None)), - Skill((Hammer(LDamage), Some(1))), - Skill((Hammer(LDistance), Some(1))), - Skill((Hammer(LKnockback), Some(1))), - Skill((Hammer(LRange), Some(1))), -]) 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 59d5e9ae24..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(FDamage), Some(1))), - Skill((Staff(FRange), Some(1))), - Skill((Staff(FDrain), 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/village/guard.ron b/assets/common/skillset/village/guard.ron index 9ea3d18f37..d355af1cde 100644 --- a/assets/common/skillset/village/guard.ron +++ b/assets/common/skillset/village/guard.ron @@ -1,5 +1,5 @@ ([ - Tree("common.skillset.dungeon.tier-5.sword"), - Tree("common.skillset.dungeon.tier-5.bow"), - Tree("common.skillset.dungeon.tier-5.axe"), + Tree("common.skillset.preset.max.sword"), + Tree("common.skillset.preset.max.bow"), + Tree("common.skillset.preset.max.axe"), ])