Merge branch 'sam/combat-skill-trees' into 'master'

Sam/combat skill trees

See merge request veloren/veloren!1680

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added an additional Ring loadout slot
 - The inventory can now be expanded to fill the whole window
 - Added /dropall admin command (drops all inventory items on the ground)
+- Skill trees
 
 ### Changed
 
@@ -38,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - SSAAx4 option
 - The Stats button and associated screen were removed
+- Levels
 
 ### Fixed
 

assets/common/abilities/axe/doublestrike.ron

@@ -28,8 +28,8 @@ ComboMelee(
     initial_energy_gain: 25,
     max_energy_gain: 175,
     energy_increase: 30,
-    speed_increase: 0.075,
-    max_speed_increase: 1.6,
+    speed_increase: 0.1,
+    max_speed_increase: 0.6,
     scales_from_combo: 2,
     is_interruptible: false,
 )

assets/common/abilities/axe/spin.ron

@@ -1,7 +1,7 @@
 SpinMelee(
-    buildup_duration: 100,
-    swing_duration: 300,
-    recover_duration: 100,
+    buildup_duration: 200,
+    swing_duration: 400,
+    recover_duration: 200,
     base_damage: 60,
     knockback: 0.0,
     range: 3.5,

assets/common/abilities/bow/basic.ron

@@ -5,7 +5,7 @@ BasicRanged(
     projectile: Arrow(
         damage: 80.0,
         knockback: 5.0,
-        energy_regen: 100,
+        energy_regen: 50,
     ),
     projectile_body: Object(Arrow),
     projectile_light: None,

assets/common/abilities/bow/charged.ron

@@ -14,4 +14,5 @@ ChargedRanged(
     projectile_gravity: Some(Gravity(0.2)),
     initial_projectile_speed: 100.0,
     scaled_projectile_speed: 400.0,
+    move_speed: 0.3,
 )

assets/common/abilities/bow/repeater.ron

@@ -14,5 +14,5 @@ RepeaterRanged(
     projectile_light: None,
     projectile_gravity: Some(Gravity(0.2)),
     projectile_speed: 100.0,
-    reps_remaining: 5,
+    reps_remaining: 3,
 )

assets/common/abilities/hammer/singlestrike.ron

@@ -3,7 +3,7 @@ ComboMelee(
         stage: 1,
         base_damage: 130,
         damage_increase: 10,
-        knockback: 0.0,
+        knockback: 10.0,
         range: 4.5,
         angle: 50.0,
         base_buildup_duration: 600,
@@ -14,8 +14,8 @@ ComboMelee(
     initial_energy_gain: 50,
     max_energy_gain: 150,
     energy_increase: 50,
-    speed_increase: 0.05,
-    max_speed_increase: 1.4,
+    speed_increase: 0.1,
+    max_speed_increase: 0.4,
     scales_from_combo: 2,
     is_interruptible: false,
 )

assets/common/abilities/sword/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 200,
     energy_increase: 25,
     speed_increase: 0.1,
-    max_speed_increase: 1.8,
+    max_speed_increase: 0.8,
     scales_from_combo: 2,
     is_interruptible: true,
 )

assets/common/abilities/unique/quadlowbasic/singlestrike.ron

@@ -17,7 +17,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadlowbasic/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadlowbreathe/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadlowquick/quadstrike.ron

@@ -53,7 +53,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadlowranged/singlestrike.ron

@@ -17,7 +17,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadlowtail/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadmedbasic/singlestrike.ron

@@ -17,7 +17,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadmedbasic/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadmedcharge/doublestrike.ron

@@ -29,7 +29,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadmedjump/doublestrike.ron

@@ -29,7 +29,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadmedquick/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/quadsmallbasic/singlestrike.ron

@@ -17,7 +17,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/theropodbasic/singlestrike.ron

@@ -17,7 +17,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/theropodbasic/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/theropodbird/singlestrike.ron

@@ -17,7 +17,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/abilities/unique/theropodbird/triplestrike.ron

@@ -41,7 +41,7 @@ ComboMelee(
     max_energy_gain: 0,
     energy_increase: 0,
     speed_increase: 0.0,
-    max_speed_increase: 1.0,
+    max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
 )

assets/common/items/boss_drops/exp_flask.ron

@@ -1,11 +1,8 @@
 ItemDef(
     name: "Flask of Velorite Dust",
-    description: "Increases Exp by 250\n\nTake with plenty of water",
-    kind: Consumable(
-        kind: "PotionExp",
-        effect: [
-            Xp(250),
-        ]
+    description: "Take with plenty of water",
+    kind: Ingredient(
+        kind: "PotionExp",        
     ),
     quality: High,
 )

assets/common/items/boss_drops/xp_potion.ron

@@ -1,11 +1,8 @@
 ItemDef(
     name: "Potion of Skill",
-    description: "Provides 250 XP to the drinker",
-    kind: Consumable(
-        kind: "Potion",
-        effect: [
-            Xp(250),
-        ]
+    description: "It doesn't seem to be doing anything...",
+    kind: Ingredient(
+        kind: "Potion",        
     ),
     quality: High,
 )

assets/common/items/consumable/potion_big.ron

@@ -7,7 +7,7 @@ ItemDef(
             Buff((
                 kind: Potion,
                 data: (
-                    strength: 2000.0,
+                    strength: 1000.0,
                     duration: Some((
                             secs: 1,
                             nanos: 0,

assets/common/items/consumable/potion_med.ron

@@ -7,7 +7,7 @@ ItemDef(
             Buff((
                 kind: Potion,
                 data: (
-                    strength: 1000.0,
+                    strength: 750.0,
                     duration: Some((
                             secs: 1,
                             nanos: 0,

assets/common/items/ore/velorite.ron

@@ -1,11 +1,8 @@
 ItemDef(
     name: "Velorite",
-    description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times",
-    kind: Consumable(
-        kind: "Velorite",
-        effect: [
-            Xp(20),
-        ]
+    description: "Just a slight touch makes you feel\n\the knowledge of ancient times",
+    kind: Ingredient(
+        kind: "Velorite",      
     ),
     quality: High,
 )

assets/common/items/ore/veloritefrag.ron

@@ -1,11 +1,8 @@
 ItemDef(
     name: "Velorite Fragment",
-    description: "Increases Exp by 10\n\nSmall runes sparkle on its surface",
-    kind: Consumable(
-        kind: "VeloriteFrag",
-        effect: [
-            Xp(10),
-        ]
+    description: "Small runes sparkle on its surface",
+    kind: Ingredient(
+        kind: "VeloriteFrag",        
     ),
     quality: Moderate,
 )

assets/common/loot_tables/loot_table_cultists.ron

@@ -211,7 +211,4 @@
     (0.01, "common.items.armor.pants.cultist_legs_purple"),
     (0.01, "common.items.armor.shoulder.cultist_shoulder_purple"),
     (0.005, "common.items.armor.back.dungeon_purple-0"),
-    (0.1, "common.items.boss_drops.exp_flask"),
-    (0.2, "common.items.boss_drops.potions"),
-
 ]

assets/common/npc_names.ron

@@ -106,6 +106,99 @@
                 "Zenner"
             ]
         ),
+        /*keyword: "humanoid_f",
+            names: [
+                "Acele",
+                "Autumn",
+                "Acholate",
+                "Ada",
+                "Adorra",
+                "Ahanna",
+                "Brana",
+                "Bathelie",
+                "Calene",
+                "Calina",
+                "Celestine",
+                "Caela",
+                "Cassia",
+                "Celoa",
+                "Dalavesta",
+                "Dylena",
+                "Desini",
+                "Diva",
+                "Ebatryne",
+                "Efari",
+                "Enona",
+                "Enaldie",
+                "Ember",
+                "Esdel",
+                "Eune",
+                "Fayne",
+                "Frida",
+                "Ferra",
+                "Flora",
+                "Fintis",
+                "Gatlen",
+                "Gatline",
+                "Gronalyn",
+                "Helenia",
+                "Halete",
+                "Hyza",
+                "Helena",
+                "Halin",
+                "Hera",
+                "Hilda",
+                "Hydra",
+                "Ismeria",
+                "Iris",
+                "Joss",
+                "Kadra",
+                "Kagra",
+                "Kyra",
+                "Konta",
+                "Krinn",
+                "Lydia",
+                "Laelia",
+                "Leda",
+                "Leta",
+                "Lisbeth",
+                "Lyra",
+                "Luna",
+                "Medora",
+                "Mazarine",
+                "Merlyn",
+                "Marina",
+                "Nephele",
+                "Odessa",
+                "Orla",
+                "Perl",
+                "Rhodeia",
+                "Rosella",
+                "Raven",
+                "Rachel",
+                "Ryven",
+                "Solenne",
+                "Seren",
+                "Summer",
+                "Solstice",
+                "Stella",
+                "Sarah",
+                "Syrin",
+                "Tessa",
+                "Thea",
+                "Tez",
+                "Vivien",
+                "Varda",
+                "Veridia",
+                "Victoria",
+                "Vale",
+                "Vega",
+                "Yorja",
+                "Xaviera",
+                "Zorina",
+                "Zephyra"
+            ]
+        ),*/
         species: (
             danari: (
                 keyword: "danari",

assets/common/skill_trees/skill_max_levels.ron

@@ -0,0 +1,75 @@
+({
+    General(HealthIncrease): Some(10),
+    General(EnergyIncrease): Some(5),
+    Sword(TsDamage): Some(3),
+    Sword(TsRegen): Some(2),
+    Sword(TsSpeed): Some(3),
+    Sword(DCost): Some(2),
+    Sword(DDrain): Some(2),
+    Sword(DDamage): Some(2),
+    Sword(DScaling): Some(3),
+    Sword(SDamage): Some(2),
+    Sword(SSpeed): Some(2),
+    Sword(SCost): Some(2),
+    Sword(SSpins): Some(2),
+    Axe(DsDamage): Some(3),
+    Axe(DsRegen): Some(2),
+    Axe(DsSpeed): Some(3),
+    Axe(SDamage): Some(3),
+    Axe(SSpeed): Some(2),
+    Axe(SCost): Some(2),
+    Axe(LDamage): Some(2),
+    Axe(LKnockback): Some(2),
+    Axe(LCost): Some(2),
+    Axe(LDistance): Some(2),
+    Hammer(SsKnockback): Some(2),
+    Hammer(SsDamage): Some(3),
+    Hammer(SsRegen): Some(2),
+    Hammer(SsSpeed): Some(3),
+    Hammer(CDamage): Some(3),
+    Hammer(CKnockback): Some(3),
+    Hammer(CDrain): Some(2),
+    Hammer(CSpeed): Some(2),
+    Hammer(LDamage): Some(2),
+    Hammer(LCost): Some(2),
+    Hammer(LDistance): Some(2),
+    Hammer(LKnockback): Some(2),
+    Hammer(LRange): Some(2),
+    Bow(ProjSpeed): Some(2),
+    Bow(BDamage): Some(3),
+    Bow(BRegen): Some(2),
+    Bow(CDamage): Some(3),
+    Bow(CKnockback): Some(2),
+    Bow(CProjSpeed): Some(2),
+    Bow(CDrain): Some(2),
+    Bow(CSpeed): Some(2),
+    Bow(CMove): Some(2),
+    Bow(RDamage): Some(2),
+    Bow(RArrows): Some(2),
+    Bow(RCost): Some(2),
+    Staff(BDamage): Some(3),
+    Staff(BRegen): Some(2),
+    Staff(BRadius): Some(2),
+    Staff(FRange): Some(2),
+    Staff(FDamage): Some(3),
+    Staff(FDrain): Some(2),
+    Staff(FVelocity): Some(2),
+    Staff(SDamage): Some(2),
+    Staff(SKnockback): Some(2),
+    Staff(SRange): Some(2),
+    Staff(SCost): Some(2),
+    Sceptre(BHeal): Some(3),
+    Sceptre(BDamage): Some(2),
+    Sceptre(BRange): Some(2),
+    Sceptre(BLifesteal): Some(2),
+    Sceptre(BRegen): Some(2),
+    Sceptre(BCost): Some(2),
+    Sceptre(PHeal): Some(3),
+    Sceptre(PDamage): Some(2),
+    Sceptre(PRadius): Some(2),
+    Sceptre(PCost): Some(2),
+    Sceptre(PProjSpeed): Some(2),
+    Roll(Cost): Some(2),
+    Roll(Strength): Some(2),
+    Roll(Duration): Some(2),
+})

assets/common/skill_trees/skill_prerequisites.ron

@@ -0,0 +1,68 @@
+({
+    Roll(Cost): {Roll(ImmuneMelee): None},
+    Roll(Strength): {Roll(ImmuneMelee): None},
+    Roll(Duration): {Roll(ImmuneMelee): None},
+    Sword(TsDamage): {Sword(TsCombo): None},
+    Sword(TsRegen): {Sword(TsCombo): None},
+    Sword(TsSpeed): {Sword(TsCombo): None},
+    Sword(DDrain): {Sword(DDamage): Some(1)},
+    Sword(DCost): {Sword(DDamage): Some(1)},
+    Sword(DSpeed): {Sword(DDamage): Some(1)},
+    Sword(DInfinite): {Sword(DDamage): Some(1)},
+    Sword(DScaling): {Sword(DDamage): Some(1)},
+    Sword(SDamage): {Sword(UnlockSpin): None},
+    Sword(SSpeed): {Sword(UnlockSpin): None},
+    Sword(SCost): {Sword(UnlockSpin): None},
+    Sword(SSpins): {Sword(UnlockSpin): None},
+    Axe(DsDamage): {Axe(DsCombo): None},
+    Axe(DsSpeed): {Axe(DsCombo): None},
+    Axe(DsRegen): {Axe(DsCombo): None},
+    Axe(SHelicopter): {Axe(SInfinite): None},
+    Axe(SDamage): {Axe(SInfinite): None},
+    Axe(SSpeed): {Axe(SInfinite): None},
+    Axe(SCost): {Axe(SInfinite): None},
+    Axe(LDamage): {Axe(UnlockLeap): None},
+    Axe(LKnockback): {Axe(UnlockLeap): None},
+    Axe(LCost): {Axe(UnlockLeap): None},
+    Axe(LDistance): {Axe(UnlockLeap): None},
+    Hammer(SsDamage): {Hammer(SsKnockback): Some(1)},
+    Hammer(SsRegen): {Hammer(SsKnockback): Some(1)},
+    Hammer(SsSpeed): {Hammer(SsKnockback): Some(1)},
+    Hammer(CDamage): {Hammer(CKnockback): Some(1)},
+    Hammer(CDrain): {Hammer(CKnockback): Some(1)},
+    Hammer(CSpeed): {Hammer(CKnockback): Some(1)},
+    Hammer(LDamage): {Hammer(UnlockLeap): None},
+    Hammer(LCost): {Hammer(UnlockLeap): None},
+    Hammer(LDistance): {Hammer(UnlockLeap): None},
+    Hammer(LKnockback): {Hammer(UnlockLeap): None},
+    Hammer(LRange): {Hammer(UnlockLeap): None},
+    Bow(BRegen): {Bow(BDamage): Some(1)},
+    Bow(CKnockback): {Bow(CDamage): Some(1)},
+    Bow(CProjSpeed): {Bow(CDamage): Some(1)},
+    Bow(CDrain): {Bow(CDamage): Some(1)},
+    Bow(CSpeed): {Bow(CDamage): Some(1)},
+    Bow(CMove): {Bow(CDamage): Some(1)},
+    Bow(RDamage): {Bow(UnlockRepeater): None},
+    Bow(RGlide): {Bow(UnlockRepeater): None},
+    Bow(RArrows): {Bow(UnlockRepeater): None},
+    Bow(RCost): {Bow(UnlockRepeater): None},
+    Staff(BDamage): {Staff(BExplosion): None},
+    Staff(BRegen): {Staff(BExplosion): None},
+    Staff(BRadius): {Staff(BExplosion): None},
+    Staff(FRange): {Staff(FDamage): Some(1)},
+    Staff(FDrain): {Staff(FDamage): Some(1)},
+    Staff(FVelocity): {Staff(FDamage): Some(1)},
+    Staff(SDamage): {Staff(UnlockShockwave): None},
+    Staff(SKnockback): {Staff(UnlockShockwave): None},
+    Staff(SRange): {Staff(UnlockShockwave): None},
+    Staff(SCost): {Staff(UnlockShockwave): None},
+    Sceptre(BDamage): {Sceptre(BHeal): Some(1)},
+    Sceptre(BRange): {Sceptre(BHeal): Some(1)},
+    Sceptre(BLifesteal): {Sceptre(BHeal): Some(1)},
+    Sceptre(BRegen): {Sceptre(BHeal): Some(1)},
+    Sceptre(BCost): {Sceptre(BHeal): Some(1)},
+    Sceptre(PDamage): {Sceptre(PHeal): Some(1)},
+    Sceptre(PRadius): {Sceptre(PHeal): Some(1)},
+    Sceptre(PCost): {Sceptre(PHeal): Some(1)},
+    Sceptre(PProjSpeed): {Sceptre(PHeal): Some(1)},
+})

assets/common/skill_trees/skills_skill-groups_manifest.ron

@@ -0,0 +1,110 @@
+({
+    General: [
+        General(HealthIncrease),
+        General(EnergyIncrease),
+        UnlockGroup(Weapon(Sword)),
+        UnlockGroup(Weapon(Axe)),
+        UnlockGroup(Weapon(Hammer)),
+        UnlockGroup(Weapon(Bow)),
+        UnlockGroup(Weapon(Staff)),
+        UnlockGroup(Weapon(Sceptre)),
+        Roll(ImmuneMelee),
+        Roll(Cost),
+        Roll(Strength),
+        Roll(Duration),
+    ],
+    Weapon(Sword): [
+        Sword(InterruptingAttacks),
+        Sword(TsCombo),
+        Sword(TsDamage),
+        Sword(TsRegen),
+        Sword(TsSpeed),
+        Sword(DCost),
+        Sword(DDrain),
+        Sword(DDamage),
+        Sword(DScaling),
+        Sword(DSpeed),
+        Sword(DInfinite),
+        Sword(UnlockSpin),
+        Sword(SDamage),
+        Sword(SSpeed),
+        Sword(SCost),
+        Sword(SSpins),
+    ],
+    Weapon(Axe): [
+        Axe(DsCombo),
+        Axe(DsDamage),
+        Axe(DsSpeed),
+        Axe(DsRegen),
+        Axe(SInfinite),
+        Axe(SHelicopter),
+        Axe(SDamage),
+        Axe(SSpeed),
+        Axe(SCost),
+        Axe(UnlockLeap),
+        Axe(LDamage),
+        Axe(LKnockback),
+        Axe(LCost),
+        Axe(LDistance),
+    ],
+    Weapon(Hammer): [
+        Hammer(SsKnockback),
+        Hammer(SsDamage),
+        Hammer(SsSpeed),
+        Hammer(SsRegen),
+        Hammer(CDamage),
+        Hammer(CKnockback),
+        Hammer(CDrain),
+        Hammer(CSpeed),
+        Hammer(UnlockLeap),
+        Hammer(LDamage),
+        Hammer(LCost),
+        Hammer(LDistance),
+        Hammer(LKnockback),
+        Hammer(LRange),
+    ],
+    Weapon(Bow): [
+        Bow(ProjSpeed),
+        Bow(BDamage),
+        Bow(BRegen),
+        Bow(CDamage),
+        Bow(CKnockback),
+        Bow(CProjSpeed),
+        Bow(CDrain),
+        Bow(CSpeed),
+        Bow(CMove),
+        Bow(UnlockRepeater),
+        Bow(RDamage),
+        Bow(RGlide),
+        Bow(RArrows),
+        Bow(RCost),
+    ],
+    Weapon(Staff): [
+        Staff(BExplosion),
+        Staff(BDamage),
+        Staff(BRegen),
+        Staff(BRadius),
+        Staff(FDamage),
+        Staff(FRange),
+        Staff(FDrain),
+        Staff(FVelocity),
+        Staff(UnlockShockwave),
+        Staff(SDamage),
+        Staff(SKnockback),
+        Staff(SRange),
+        Staff(SCost),
+    ],
+    Weapon(Sceptre): [
+        Sceptre(BHeal),
+        Sceptre(BDamage),
+        Sceptre(BRange),
+        Sceptre(BLifesteal),
+        Sceptre(BRegen),
+        Sceptre(BCost),
+        Sceptre(PHeal),
+        Sceptre(PDamage),
+        Sceptre(PRadius),
+        Sceptre(PCost),
+        Sceptre(PProjSpeed),
+    ],
+})