Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cherrypick

Browse Source
This commit is contained in:
jshipsey 2021-12-15 01:51:25 -05:00
parent 182d5cf971
commit 2f2c171a4a
69 changed files with 417 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/common/entity/dungeon/tier-0/bow.ron
View File

@ -9,6 +9,5 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
SkillSetAsset("common.skillset.dungeon.tier-0.bow"),
],
)

2
assets/common/entity/dungeon/tier-1/bow.ron
View File

@ -9,6 +9,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-1.adlet_bow"),
SkillSetAsset("common.skillset.dungeon.tier-1.bow"),
SkillSetAsset("common.skillset.preset.rank1.fullskill"),
],
)

2
assets/common/entity/dungeon/tier-2/bow.ron
View File

@ -9,6 +9,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
SkillSetAsset("common.skillset.dungeon.tier-2.bow"),
SkillSetAsset("common.skillset.preset.rank2.fullskill"),
],
)

2
assets/common/entity/dungeon/tier-3/bow.ron
View File

@ -9,6 +9,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
SkillSetAsset("common.skillset.dungeon.tier-3.bow"),
SkillSetAsset("common.skillset.preset.rank3.fullskill"),
],
)

2
assets/common/entity/dungeon/tier-4/bow.ron
View File

@ -9,6 +9,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-4.myrmidon"),
SkillSetAsset("common.skillset.dungeon.tier-4.enemy"),
SkillSetAsset("common.skillset.preset.rank4.fullskill"),
],
)

3
assets/common/entity/dungeon/tier-5/beastmaster.ron
View File

@ -13,7 +13,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-5.beastmaster"),
// TODO: make own skillset for him?
SkillSetAsset("common.skillset.dungeon.tier-5.enemy"),
SkillSetAsset("common.skillset.preset.rank5.fullskill"),
],
)

2
assets/common/entity/dungeon/tier-5/cultist.ron
View File

@ -17,6 +17,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.dungeon.tier-5.cultist"),
SkillSetAsset("common.skillset.dungeon.tier-5.enemy"),
SkillSetAsset("common.skillset.preset.rank5.fullskill"),
],
)

2
assets/common/entity/spot/dwarf_grave_robber.ron
View File

@ -8,7 +8,7 @@ EntityConfig (
hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")),
meta: [
SkillSetAsset("common.skillset.village.guard"),
LoadoutAsset("common.loadout.spots.dwarf_graverobber"),
SkillSetAsset("common.skillset.preset.rank3.fullskill"),
],
)

2
assets/common/entity/spot/grim_salvager.ron
View File

@ -8,7 +8,7 @@ EntityConfig (
hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-0")),
meta: [
SkillSetAsset("common.skillset.village.guard"),
LoadoutAsset("common.loadout.spots.dwarf_graverobber"),
SkillSetAsset("common.skillset.preset.rank1.fullskill"),
],
)

2
assets/common/entity/spot/pirate.ron
View File

@ -8,7 +8,7 @@ EntityConfig (
hands: Paired(Item("common.items.weapons.sword_1h.iron-2")),
meta: [
SkillSetAsset("common.skillset.dungeon.tier-3.sword"),
SkillSetAsset("common.skillset.preset.rank2.fullskill"),
LoadoutAsset("common.loadout.spots.pirate"),
],
)

2
assets/common/entity/spot/witch_dark.ron
View File

@ -8,7 +8,7 @@ EntityConfig (
hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")),
meta: [
SkillSetAsset("common.skillset.dungeon.tier-3.sceptre"),
LoadoutAsset("common.loadout.spots.witch"),
SkillSetAsset("common.skillset.preset.rank3.fullskill"),
],
)

2
assets/common/entity/template.ron
View File

@ -13,6 +13,6 @@ EntityConfig (
meta: [
LoadoutAsset("common.loadout.village.merchant"),
SkillSetAsset("common.skillset.village.merchant.merchant"),
SkillSetAsset("common.skillset.preset.rank3.fullskill"),
],
)

2
assets/common/entity/village/guard.ron
View File

@ -12,6 +12,6 @@ EntityConfig (
])),
meta: [
SkillSetAsset("common.skillset.village.guard"),
SkillSetAsset("common.skillset.preset.rank3.fullskill"),
],
)

2
assets/common/entity/village/merchant.ron
View File

@ -14,6 +14,6 @@ EntityConfig (
])),
meta: [
SkillSetAsset("common.skillset.village.merchant.merchant"),
SkillSetAsset("common.skillset.preset.rank3.fullskill"),
],
)

5
assets/common/skillset/dungeon/tier-0/enemy.ron
View File

@ -1,5 +0,0 @@
([
//You can always add more :P
Tree("common.skillset.dungeon.tier-0.bow"),
Tree("common.skillset.dungeon.tier-0.staff"),
])

9
assets/common/skillset/dungeon/tier-0/staff.ron
View File

@ -1,9 +0,0 @@
([
Group(Weapon(Staff)),
// Fireball
Skill((Staff(BDamage), Some(1))),
Skill((Staff(BRegen), Some(1))),
Skill((Staff(BRadius), Some(1))),
])

10
assets/common/skillset/dungeon/tier-1/bow.ron
View File

@ -1,10 +0,0 @@
([
Group(Weapon(Bow)),
// Charged
Skill((Bow(CDamage), Some(2))),
Skill((Bow(CKnockback), Some(2))),
Skill((Bow(CSpeed), Some(1))),
Skill((Bow(CMove), Some(1))),
])

5
assets/common/skillset/dungeon/tier-1/enemy.ron
View File

@ -1,5 +0,0 @@
([
//You can always add more :P
Tree("common.skillset.dungeon.tier-1.bow"),
Tree("common.skillset.dungeon.tier-1.staff"),
])

11
assets/common/skillset/dungeon/tier-2/bow.ron
View File

@ -1,11 +0,0 @@
([
Group(Weapon(Bow)),
// Charged
Skill((Bow(CDamage), Some(2))),
Skill((Bow(CKnockback), Some(2))),
Skill((Bow(CSpeed), Some(2))),
Skill((Bow(CMove), Some(1))),
])

5
assets/common/skillset/dungeon/tier-2/enemy.ron
View File

@ -1,5 +0,0 @@
([
//You can always add more :P
Tree("common.skillset.dungeon.tier-2.bow"),
Tree("common.skillset.dungeon.tier-2.staff"),
])

13
assets/common/skillset/dungeon/tier-2/staff.ron
View File

@ -1,13 +0,0 @@
([
Group(Weapon(Staff)),
// Fireball
Skill((Staff(BDamage), Some(2))),
Skill((Staff(BRegen), Some(2))),
Skill((Staff(BRadius), Some(1))),
// Flamethrower
Skill((Staff(FRange), Some(2))),
Skill((Staff(FDamage), Some(2))),
])

11
assets/common/skillset/dungeon/tier-3/bow.ron
View File

@ -1,11 +0,0 @@
([
Group(Weapon(Bow)),
// Charged
Skill((Bow(CDamage), Some(2))),
Skill((Bow(CRegen), Some(2))),
Skill((Bow(CKnockback), Some(2))),
Skill((Bow(CSpeed), Some(2))),
Skill((Bow(CMove), Some(2))),
])

5
assets/common/skillset/dungeon/tier-3/enemy.ron
View File

@ -1,5 +0,0 @@
([
//You can always add more :P
Tree("common.skillset.dungeon.tier-3.bow"),
Tree("common.skillset.dungeon.tier-3.staff"),
])

5
assets/common/skillset/dungeon/tier-4/enemy.ron
View File

@ -1,5 +0,0 @@
([
//You can always add more :P
Tree("common.skillset.preset.max.bow"),
Tree("common.skillset.preset.max.staff"),
])

8
assets/common/skillset/dungeon/tier-5/enemy.ron
View File

@ -1,8 +0,0 @@
([
// Just gather everything
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"),
])

10
assets/common/skillset/preset/rank1/axe.ron Normal file
View File

@ -0,0 +1,10 @@
([
Group(Weapon(Axe)),
// DoubleStrike
Skill((Axe(DsDamage), Some(1))),
// Spin
Skill((Axe(SInfinite), None)),
Skill((Axe(SDamage), Some(1))),
])

8
assets/common/skillset/dungeon/tier-0/bow.ron → assets/common/skillset/preset/rank1/bow.ron
View File

@ -1,10 +1,14 @@
([
Group(Weapon(Bow)),
// Projectile Speed
Skill((Bow(ProjSpeed), Some(1))),
// 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))),
])

9
assets/common/skillset/preset/rank1/fullskill.ron Normal file
View File

@ -0,0 +1,9 @@
([
Tree("common.skillset.preset.rank1.axe"),
Tree("common.skillset.preset.rank1.bow"),
Tree("common.skillset.preset.rank1.general"),
Tree("common.skillset.preset.rank1.hammer"),
Tree("common.skillset.preset.rank1.sceptre"),
Tree("common.skillset.preset.rank1.staff"),
Tree("common.skillset.preset.rank1.sword"),
])

4
assets/common/skillset/preset/rank1/general.ron Normal file
View File

@ -0,0 +1,4 @@
([
Skill((General(HealthIncrease), Some(2))),
Skill((General(EnergyIncrease), Some(1))),
])

12
assets/common/skillset/preset/rank1/hammer.ron Normal file
View File

@ -0,0 +1,12 @@
([
Group(Weapon(Hammer)),
// Single Strike, as single as you are
Skill((Hammer(SsKnockback), Some(1))),
Skill((Hammer(SsDamage), Some(1))),
// Charged
Skill((Hammer(CDamage), Some(1))),
Skill((Hammer(CKnockback), Some(1))),
])

12
assets/common/skillset/preset/rank1/sceptre.ron Normal file
View File

@ -0,0 +1,12 @@
([
Group(Weapon(Sceptre)),
// Beam
Skill((Sceptre(LDamage), Some(1))),
Skill((Sceptre(LRange), Some(1))),
// Heal
Skill((Sceptre(HHeal), Some(1))),
Skill((Sceptre(HDuration), Some(1))),
])

0
assets/common/skillset/dungeon/tier-1/staff.ron → assets/common/skillset/preset/rank1/staff.ron
View File

14
assets/common/skillset/preset/rank1/sword.ron Normal file
View File

@ -0,0 +1,14 @@
([
Group(Weapon(Sword)),
Skill((Sword(InterruptingAttacks), None)),
// TripleStrike
Skill((Sword(TsCombo), None)),
Skill((Sword(TsDamage), Some(1))),
Skill((Sword(TsRegen), Some(1))),
// Dash
Skill((Sword(DCost), Some(1))),
])

14
assets/common/skillset/preset/rank2/axe.ron Normal file
View File

@ -0,0 +1,14 @@
([
Group(Weapon(Axe)),
// DoubleStrike
Skill((Axe(DsCombo), None)),
Skill((Axe(DsDamage), 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))),
])

17
assets/common/skillset/preset/rank2/bow.ron Normal file
View File

@ -0,0 +1,17 @@
([
Group(Weapon(Bow)),
// Projectile Speed
Skill((Bow(ProjSpeed), Some(1))),
// Charged
Skill((Bow(CDamage), Some(1))),
Skill((Bow(CKnockback), Some(1))),
Skill((Bow(CSpeed), Some(1))),
Skill((Bow(CRegen), Some(1))),
// Repeater
Skill((Bow(RDamage), Some(1))),
Skill((Bow(RCost), Some(1))),
])

9
assets/common/skillset/preset/rank2/fullskill.ron Normal file
View File

@ -0,0 +1,9 @@
([
Tree("common.skillset.preset.rank2.axe"),
Tree("common.skillset.preset.rank2.bow"),
Tree("common.skillset.preset.rank2.general"),
Tree("common.skillset.preset.rank2.hammer"),
Tree("common.skillset.preset.rank2.sceptre"),
Tree("common.skillset.preset.rank2.staff"),
Tree("common.skillset.preset.rank2.sword"),
])

4
assets/common/skillset/preset/rank2/general.ron Normal file
View File

@ -0,0 +1,4 @@
([
Skill((General(HealthIncrease), Some(4))),
Skill((General(EnergyIncrease), Some(2))),
])

16
assets/common/skillset/preset/rank2/hammer.ron Normal file
View File

@ -0,0 +1,16 @@
([
Group(Weapon(Hammer)),
// Single Strike, as single as you are
Skill((Hammer(SsKnockback), Some(1))),
Skill((Hammer(SsDamage), Some(2))),
Skill((Hammer(SsRegen), Some(1))),
Skill((Hammer(SsSpeed), Some(1))),
// Charged
Skill((Hammer(CDamage), Some(1))),
Skill((Hammer(CKnockback), Some(1))),
Skill((Hammer(CDrain), Some(1))),
Skill((Hammer(CSpeed), Some(1))),
])

16
assets/common/skillset/preset/rank2/sceptre.ron Normal file
View File

@ -0,0 +1,16 @@
([
Group(Weapon(Sceptre)),
// Beam
Skill((Sceptre(LDamage), Some(1))),
Skill((Sceptre(LRange), Some(1))),
Skill((Sceptre(LLifesteal), Some(1))),
Skill((Sceptre(LRegen), Some(1))),
// Heal
Skill((Sceptre(HHeal), Some(1))),
Skill((Sceptre(HDuration), Some(1))),
Skill((Sceptre(HRange), Some(1))),
Skill((Sceptre(HCost), Some(1))),
])

15
assets/common/skillset/preset/rank2/staff.ron Normal file
View File

@ -0,0 +1,15 @@
([
Group(Weapon(Staff)),
// Fireball
Skill((Staff(BDamage), Some(1))),
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))),
])

17
assets/common/skillset/preset/rank2/sword.ron Normal file
View File

@ -0,0 +1,17 @@
([
Group(Weapon(Sword)),
Skill((Sword(InterruptingAttacks), None)),
// TripleStrike
Skill((Sword(TsCombo), None)),
Skill((Sword(TsDamage), Some(1))),
Skill((Sword(TsRegen), Some(1))),
Skill((Sword(TsSpeed), Some(1))),
// Dash
Skill((Sword(DCost), Some(1))),
Skill((Sword(DDrain), Some(1))),
Skill((Sword(DDamage), Some(1))),
])

20
assets/common/skillset/preset/rank3/axe.ron Normal file
View File

@ -0,0 +1,20 @@
([
Group(Weapon(Axe)),
// DoubleStrike
Skill((Axe(DsCombo), None)),
Skill((Axe(DsDamage), Some(1))),
Skill((Axe(DsRegen), Some(1))),
Skill((Axe(DsSpeed), Some(1))),
// Spin
Skill((Axe(SInfinite), None)),
Skill((Axe(SHelicopter), None)),
Skill((Axe(SDamage), Some(1))),
Skill((Axe(SSpeed), Some(1))),
Skill((Axe(SCost), Some(1))),
// Leap
Skill((Axe(UnlockLeap), None)),
Skill((Axe(LDamage), Some(1))),
])

23
assets/common/skillset/preset/rank3/bow.ron Normal file
View File

@ -0,0 +1,23 @@
([
Group(Weapon(Bow)),
// Projectile Speed
Skill((Bow(ProjSpeed), Some(2))),
// Charged
Skill((Bow(CDamage), Some(1))),
Skill((Bow(CKnockback), Some(1))),
Skill((Bow(CSpeed), Some(1))),
Skill((Bow(CRegen), Some(1))),
Skill((Bow(CMove), Some(1))),
// Repeater
Skill((Bow(RDamage), Some(1))),
Skill((Bow(RCost), Some(1))),
Skill((Bow(RSpeed), Some(1))),
// Shotgun
Skill((Bow(UnlockShotgun), None)),
Skill((Bow(SDamage), Some(1))),
Skill((Bow(SCost), Some(1))),
])

9
assets/common/skillset/preset/rank3/fullskill.ron Normal file
View File

@ -0,0 +1,9 @@
([
Tree("common.skillset.preset.rank3.axe"),
Tree("common.skillset.preset.rank3.bow"),
Tree("common.skillset.preset.rank3.general"),
Tree("common.skillset.preset.rank3.hammer"),
Tree("common.skillset.preset.rank3.sceptre"),
Tree("common.skillset.preset.rank3.staff"),
Tree("common.skillset.preset.rank3.sword"),
])

4
assets/common/skillset/preset/rank3/general.ron Normal file
View File

@ -0,0 +1,4 @@
([
Skill((General(HealthIncrease), Some(6))),
Skill((General(EnergyIncrease), Some(3))),
])

21
assets/common/skillset/preset/rank3/hammer.ron Normal file
View File

@ -0,0 +1,21 @@
([
Group(Weapon(Hammer)),
// Single Strike, as single as you are
Skill((Hammer(SsKnockback), Some(2))),
Skill((Hammer(SsDamage), Some(2))),
Skill((Hammer(SsRegen), Some(1))),
Skill((Hammer(SsSpeed), Some(1))),
// Charged
Skill((Hammer(CDamage), Some(2))),
Skill((Hammer(CKnockback), Some(1))),
Skill((Hammer(CDrain), Some(1))),
Skill((Hammer(CSpeed), Some(1))),
// Leap
Skill((Hammer(UnlockLeap), None)),
Skill((Hammer(LDamage), Some(1))),
Skill((Hammer(LCost), Some(1))),
Skill((Hammer(LDistance), Some(1))),
])

32
assets/common/skillset/preset/rank3/sceptre.ron Normal file
View File

@ -0,0 +1,32 @@
([
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))),
Skill((Sceptre(LRegen), Some(1))),
// Heal
Skill((Sceptre(HHeal), Some(2))),
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))),
Skill((Sceptre(ADuration), Some(1))),
])

0
assets/common/skillset/dungeon/tier-3/staff.ron → assets/common/skillset/preset/rank3/staff.ron
View File

13
assets/common/skillset/village/merchant/sword.ron → assets/common/skillset/preset/rank3/sword.ron
View File

@ -6,16 +6,19 @@
// TripleStrike
Skill((Sword(TsCombo), None)),
Skill((Sword(TsDamage), Some(2))),
Skill((Sword(TsRegen), Some(2))),
Skill((Sword(TsSpeed), Some(1))),
Skill((Sword(TsRegen), Some(1))),
Skill((Sword(TsSpeed), Some(2))),
// Dash
Skill((Sword(DCost), Some(2))),
Skill((Sword(DCost), Some(1))),
Skill((Sword(DDrain), Some(2))),
Skill((Sword(DDamage), Some(1))),
Skill((Sword(DScaling), Some(1))),
Skill((Sword(DScaling), Some(2))),
Skill((Sword(DSpeed), None)),
Skill((Sword(DInfinite), None)),
// Spin of death
Skill((Sword(UnlockSpin), None)),
])
Skill((Sword(SDamage), Some(1))),
Skill((Sword(SSpeed), Some(1))),
])

23
assets/common/skillset/preset/rank4/axe.ron Normal file
View File

@ -0,0 +1,23 @@
([
Group(Weapon(Axe)),
// DoubleStrike
Skill((Axe(DsCombo), None)),
Skill((Axe(DsDamage), Some(2))),
Skill((Axe(DsRegen), Some(1))),
Skill((Axe(DsSpeed), Some(2))),
// Spin
Skill((Axe(SInfinite), None)),
Skill((Axe(SHelicopter), None)),
Skill((Axe(SDamage), Some(2))),
Skill((Axe(SSpeed), Some(1))),
Skill((Axe(SCost), Some(1))),
// Leap
Skill((Axe(UnlockLeap), None)),
Skill((Axe(LDamage), Some(1))),
Skill((Axe(LKnockback), Some(1))),
Skill((Axe(LCost), Some(1))),
Skill((Axe(LDistance), Some(1))),
])

25
assets/common/skillset/preset/rank4/bow.ron Normal file
View File

@ -0,0 +1,25 @@
([
Group(Weapon(Bow)),
// Projectile Speed
Skill((Bow(ProjSpeed), Some(2))),
// Charged
Skill((Bow(CDamage), Some(2))),
Skill((Bow(CKnockback), Some(1))),
Skill((Bow(CSpeed), Some(1))),
Skill((Bow(CRegen), Some(2))),
Skill((Bow(CMove), Some(1))),
// Repeater
Skill((Bow(RDamage), Some(2))),
Skill((Bow(RCost), Some(1))),
Skill((Bow(RSpeed), Some(1))),
// Shotgun
Skill((Bow(UnlockShotgun), None)),
Skill((Bow(SDamage), Some(1))),
Skill((Bow(SCost), Some(1))),
Skill((Bow(SArrows), Some(1))),
Skill((Bow(SSpread), Some(1))),
])

9
assets/common/skillset/preset/rank4/fullskill.ron Normal file
View File

@ -0,0 +1,9 @@
([
Tree("common.skillset.preset.rank4.axe"),
Tree("common.skillset.preset.rank4.bow"),
Tree("common.skillset.preset.rank4.general"),
Tree("common.skillset.preset.rank4.hammer"),
Tree("common.skillset.preset.rank4.sceptre"),
Tree("common.skillset.preset.rank4.staff"),
Tree("common.skillset.preset.rank4.sword"),
])

4
assets/common/skillset/preset/rank4/general.ron Normal file
View File

@ -0,0 +1,4 @@
([
Skill((General(HealthIncrease), Some(8))),
Skill((General(EnergyIncrease), Some(4))),
])

23
assets/common/skillset/preset/rank4/hammer.ron Normal file
View File

@ -0,0 +1,23 @@
([
Group(Weapon(Hammer)),
// Single Strike, as single as you are
Skill((Hammer(SsKnockback), Some(2))),
Skill((Hammer(SsDamage), Some(2))),
Skill((Hammer(SsRegen), Some(2))),
Skill((Hammer(SsSpeed), Some(2))),
// Charged
Skill((Hammer(CDamage), Some(2))),
Skill((Hammer(CKnockback), Some(2))),
Skill((Hammer(CDrain), Some(2))),
Skill((Hammer(CSpeed), Some(2))),
// Leap
Skill((Hammer(UnlockLeap), None)),
Skill((Hammer(LDamage), Some(1))),
Skill((Hammer(LCost), Some(1))),
Skill((Hammer(LDistance), Some(1))),
Skill((Hammer(LKnockback), Some(1))),
Skill((Hammer(LRange), Some(1))),
])

2
assets/common/skillset/dungeon/tier-3/sceptre.ron → assets/common/skillset/preset/rank4/sceptre.ron
View File

@ -2,7 +2,7 @@
Group(Weapon(Sceptre)),
// Beam
Skill((Sceptre(LDamage), Some(3))),
Skill((Sceptre(LDamage), Some(2))),
Skill((Sceptre(LRange), Some(2))),
Skill((Sceptre(LLifesteal), Some(2))),
Skill((Sceptre(LRegen), Some(2))),

12
assets/common/skillset/village/merchant/staff.ron → assets/common/skillset/preset/rank4/staff.ron
View File

@ -2,16 +2,20 @@
Group(Weapon(Staff)),
// Fireball
Skill((Staff(BDamage), Some(3))),
Skill((Staff(BDamage), Some(1))),
Skill((Staff(BRegen), Some(2))),
Skill((Staff(BRadius), Some(2))),
// Flamethrower
Skill((Staff(FRange), Some(2))),
Skill((Staff(FDamage), Some(2))),
Skill((Staff(FDamage), Some(1))),
Skill((Staff(FDrain), Some(1))),
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))),
])

12
assets/common/skillset/dungeon/tier-3/sword.ron → assets/common/skillset/preset/rank4/sword.ron
View File

@ -1,18 +1,26 @@
([
Group(Weapon(Sword)),
Skill((Sword(InterruptingAttacks), None)),
// TripleStrike
Skill((Sword(TsCombo), None)),
Skill((Sword(TsDamage), Some(3))),
Skill((Sword(TsDamage), Some(2))),
Skill((Sword(TsRegen), Some(2))),
Skill((Sword(TsSpeed), Some(3))),
// Dash
Skill((Sword(DDamage), Some(2))),
Skill((Sword(DCost), Some(2))),
Skill((Sword(DDrain), Some(2))),
Skill((Sword(DDamage), Some(2))),
Skill((Sword(DScaling), Some(2))),
Skill((Sword(DSpeed), None)),
Skill((Sword(DInfinite), None)),
// Spin of death
Skill((Sword(UnlockSpin), None)),
Skill((Sword(SDamage), Some(1))),
Skill((Sword(SSpeed), Some(1))),
Skill((Sword(SSpins), Some(1))),
Skill((Sword(SCost), Some(1))),
])

0
assets/common/skillset/preset/max/axe.ron → assets/common/skillset/preset/rank5/axe.ron
View File

0
assets/common/skillset/preset/max/bow.ron → assets/common/skillset/preset/rank5/bow.ron
View File

9
assets/common/skillset/preset/rank5/fullskill.ron Normal file
View File

@ -0,0 +1,9 @@
([
Tree("common.skillset.preset.rank5.axe"),
Tree("common.skillset.preset.rank5.bow"),
Tree("common.skillset.preset.rank5.general"),
Tree("common.skillset.preset.rank5.hammer"),
Tree("common.skillset.preset.rank5.sceptre"),
Tree("common.skillset.preset.rank5.staff"),
Tree("common.skillset.preset.rank5.sword"),
])

0
assets/common/skillset/preset/max/general.ron → assets/common/skillset/preset/rank5/general.ron
View File

0
assets/common/skillset/preset/max/hammer.ron → assets/common/skillset/preset/rank5/hammer.ron
View File

0
assets/common/skillset/preset/max/sceptre.ron → assets/common/skillset/preset/rank5/sceptre.ron
View File

0
assets/common/skillset/preset/max/staff.ron → assets/common/skillset/preset/rank5/staff.ron
View File

0
assets/common/skillset/preset/max/sword.ron → assets/common/skillset/preset/rank5/sword.ron
View File

4
assets/common/skillset/spots/witch.ron
View File

@ -1,4 +0,0 @@
([
Tree("common.skillset.preset.max.general"),
Tree("common.skillset.preset.max.sceptre"),
])

5
assets/common/skillset/village/guard.ron
View File

@ -1,5 +0,0 @@
([
Tree("common.skillset.preset.max.sword"),
Tree("common.skillset.preset.max.bow"),
Tree("common.skillset.preset.max.axe"),
])

18
assets/common/skillset/village/merchant/bow.ron
View File

@ -1,18 +0,0 @@
([
Group(Weapon(Bow)),
// Charged
Skill((Bow(CDamage), Some(2))),
Skill((Bow(CKnockback), Some(2))),
Skill((Bow(CSpeed), Some(2))),
Skill((Bow(CRegen), Some(1))),
Skill((Bow(CMove), Some(1))),
// Repeater
Skill((Bow(RDamage), Some(2))),
Skill((Bow(RCost), Some(1))),
Skill((Bow(RSpeed), Some(1))),
// Shotgun
Skill((Bow(UnlockShotgun), None)),
])

5
assets/common/skillset/village/merchant/merchant.ron
View File

@ -1,5 +0,0 @@
([
Tree("common.skillset.village.merchant.sword"),
Tree("common.skillset.village.merchant.bow"),
Tree("common.skillset.village.merchant.staff"),
])