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

last tweaks

Browse Source
This commit is contained in:
jshipsey 2021-12-16 01:16:51 -05:00
parent 2f2c171a4a
commit 88b4035729
8 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

8
assets/common/skillset/preset/rank2/staff.ron
View File

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

13
assets/common/skillset/preset/rank3/sceptre.ron
View File

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

9
assets/common/skillset/preset/rank3/sword.ron
View File

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

6
assets/common/skillset/preset/rank4/bow.ron
View File

@ -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