mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Removed air slash stance and abilities
This commit is contained in:
parent
67fa03dc23
commit
da21e1cb02
@ -35,10 +35,6 @@
|
||||
(Some(Sword(ReachingCharge)), "common.abilities.sword.reaching_charge"),
|
||||
(Some(Sword(ReachingFlurry)), "common.abilities.sword.reaching_flurry"),
|
||||
(Some(Sword(ReachingSkewer)), "common.abilities.sword.reaching_skewer"),
|
||||
(Some(Sword(AirSlashCombo)), "common.abilities.sword.airslash_combo"),
|
||||
(Some(Sword(AirSlashVertical)), "common.abilities.sword.airslash_vertical"),
|
||||
(Some(Sword(AirSlashHorizontal)), "common.abilities.sword.airslash_horizontal"),
|
||||
(Some(Sword(AirSlashWhirlwind)), "common.abilities.sword.airslash_whirlwind"),
|
||||
],
|
||||
),
|
||||
Tool(Axe): (
|
||||
|
@ -1,45 +0,0 @@
|
||||
ComboMelee2(
|
||||
strikes: [
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
),
|
||||
range: 8.0,
|
||||
angle: 45.0,
|
||||
multi_target: true,
|
||||
),
|
||||
buildup_duration: 0.3,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.5,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 7,
|
||||
poise: 0,
|
||||
knockback: 0,
|
||||
energy_regen: 10,
|
||||
),
|
||||
range: 8.0,
|
||||
angle: 45.0,
|
||||
multi_target: true,
|
||||
),
|
||||
buildup_duration: 0.3,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.3,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
is_stance: true,
|
||||
energy_cost_per_strike: 10,
|
||||
meta: (
|
||||
kind: Some(Sword(AirSlash)),
|
||||
),
|
||||
)
|
@ -1,20 +0,0 @@
|
||||
Shockwave(
|
||||
energy_cost: 30,
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.4,
|
||||
damage: 10,
|
||||
poise_damage: 0,
|
||||
knockback: (strength: 0, direction: Away),
|
||||
shockwave_angle: 120.0,
|
||||
shockwave_vertical_angle: 5.0,
|
||||
shockwave_speed: 8.0,
|
||||
shockwave_duration: 2.5,
|
||||
requires_ground: false,
|
||||
move_efficiency: 0.3,
|
||||
damage_kind: Slashing,
|
||||
specifier: AirSlash,
|
||||
meta: (
|
||||
kind: Some(Sword(AirSlash)),
|
||||
),
|
||||
)
|
@ -1,20 +0,0 @@
|
||||
Shockwave(
|
||||
energy_cost: 30,
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.4,
|
||||
damage: 16,
|
||||
poise_damage: 0,
|
||||
knockback: (strength: 0, direction: Away),
|
||||
shockwave_angle: 10.0,
|
||||
shockwave_vertical_angle: 90.0,
|
||||
shockwave_speed: 10.0,
|
||||
shockwave_duration: 2.5,
|
||||
requires_ground: false,
|
||||
move_efficiency: 0.3,
|
||||
damage_kind: Slashing,
|
||||
specifier: AirSlash,
|
||||
meta: (
|
||||
kind: Some(Sword(AirSlash)),
|
||||
),
|
||||
)
|
@ -1,21 +0,0 @@
|
||||
RapidMelee(
|
||||
buildup_duration: 0.4,
|
||||
swing_duration: 0.5,
|
||||
recover_duration: 0.6,
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 6,
|
||||
poise: 0,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
),
|
||||
range: 7.5,
|
||||
angle: 360.0,
|
||||
multi_target: true,
|
||||
),
|
||||
energy_cost: 10,
|
||||
max_strikes: 6,
|
||||
meta: (
|
||||
kind: Some(Sword(AirSlash)),
|
||||
),
|
||||
)
|
@ -29,8 +29,4 @@
|
||||
Sword(ReachingCharge): 5,
|
||||
Sword(ReachingFlurry): 5,
|
||||
Sword(ReachingSkewer): 5,
|
||||
Sword(AirSlashCombo): 4,
|
||||
Sword(AirSlashVertical): 5,
|
||||
Sword(AirSlashHorizontal): 5,
|
||||
Sword(AirSlashWhirlwind): 5,
|
||||
})
|
@ -25,10 +25,6 @@
|
||||
Sword(ReachingCharge): {Sword(ReachingCombo): 1},
|
||||
Sword(ReachingFlurry): {Sword(ReachingCombo): 1},
|
||||
Sword(ReachingSkewer): {Sword(ReachingCombo): 1},
|
||||
Sword(AirSlashCombo): {Sword(MobilityCombo): 1},
|
||||
Sword(AirSlashVertical): {Sword(AirSlashCombo): 1},
|
||||
Sword(AirSlashHorizontal): {Sword(AirSlashCombo): 1},
|
||||
Sword(AirSlashWhirlwind): {Sword(AirSlashCombo): 1},
|
||||
Axe(LDamage): {Axe(UnlockLeap): 1},
|
||||
Axe(LKnockback): {Axe(UnlockLeap): 1},
|
||||
Axe(LCost): {Axe(UnlockLeap): 1},
|
||||
|
@ -46,10 +46,6 @@
|
||||
Sword(ReachingCharge),
|
||||
Sword(ReachingFlurry),
|
||||
Sword(ReachingSkewer),
|
||||
Sword(AirSlashCombo),
|
||||
Sword(AirSlashVertical),
|
||||
Sword(AirSlashHorizontal),
|
||||
Sword(AirSlashWhirlwind),
|
||||
],
|
||||
Weapon(Axe): [
|
||||
Axe(DsCombo),
|
||||
|
@ -44,11 +44,6 @@
|
||||
(Sword(ReachingCharge), 1),
|
||||
(Sword(ReachingFlurry), 1),
|
||||
(Sword(ReachingSkewer), 1),
|
||||
(Sword(AirSlashCombo), 1),
|
||||
(Sword(AirSlashVertical), 1),
|
||||
(Sword(AirSlashHorizontal), 1),
|
||||
(Sword(AirSlashWhirlwind), 1),
|
||||
|
||||
// Axe
|
||||
(UnlockGroup(Weapon(Axe)), 1),
|
||||
|
||||
|
@ -2588,7 +2588,6 @@ pub enum SwordStance {
|
||||
Heavy,
|
||||
Mobility,
|
||||
Reaching,
|
||||
AirSlash,
|
||||
}
|
||||
|
||||
bitflags::bitflags! {
|
||||
|
@ -51,5 +51,4 @@ pub enum FrontendSpecifier {
|
||||
Water,
|
||||
IceSpikes,
|
||||
Steam,
|
||||
AirSlash,
|
||||
}
|
||||
|
@ -57,10 +57,6 @@ pub enum SwordSkill {
|
||||
ReachingCharge,
|
||||
ReachingFlurry,
|
||||
ReachingSkewer,
|
||||
AirSlashCombo,
|
||||
AirSlashVertical,
|
||||
AirSlashHorizontal,
|
||||
AirSlashWhirlwind,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)]
|
||||
|
@ -1,448 +0,0 @@
|
||||
// Maps a tool kind to a set of abilities
|
||||
// A set of abilities is a primary, a secondary, and a vec of all extra abilities
|
||||
({
|
||||
Tool(Sword): (
|
||||
primary: "common.abilities.sword.balanced_combo",
|
||||
secondary: "common.abilities.sword.balanced_thrust",
|
||||
abilities: [
|
||||
(Some(Sword(BalancedFinisher)), "common.abilities.sword.balanced_finisher"),
|
||||
(Some(Sword(OffensiveCombo)), "common.abilities.sword.offensive_combo"),
|
||||
(Some(Sword(OffensiveFinisher)), "common.abilities.sword.offensive_finisher"),
|
||||
(Some(Sword(OffensiveAdvance)), "common.abilities.sword.offensive_advance"),
|
||||
(Some(Sword(CripplingCombo)), "common.abilities.sword.crippling_combo"),
|
||||
(Some(Sword(CripplingFinisher)), "common.abilities.sword.crippling_finisher"),
|
||||
(Some(Sword(CripplingStrike)), "common.abilities.sword.crippling_strike"),
|
||||
(Some(Sword(CripplingGouge)), "common.abilities.sword.crippling_gouge"),
|
||||
(Some(Sword(CleavingCombo)), "common.abilities.sword.cleaving_combo"),
|
||||
(Some(Sword(CleavingFinisher)), "common.abilities.sword.cleaving_finisher"),
|
||||
(Some(Sword(CleavingSpin)), "common.abilities.sword.cleaving_spin"),
|
||||
(Some(Sword(CleavingDive)), "common.abilities.sword.cleaving_dive"),
|
||||
(Some(Sword(DefensiveCombo)), "common.abilities.sword.defensive_combo"),
|
||||
(Some(Sword(DefensiveBulwark)), "common.abilities.sword.defensive_bulwark"),
|
||||
(Some(Sword(DefensiveRetreat)), "common.abilities.sword.defensive_retreat"),
|
||||
(Some(Sword(ParryingCombo)), "common.abilities.sword.parrying_combo"),
|
||||
(Some(Sword(ParryingParry)), "common.abilities.sword.parrying_parry"),
|
||||
(Some(Sword(ParryingRiposte)), "common.abilities.sword.parrying_riposte"),
|
||||
(Some(Sword(ParryingCounter)), "common.abilities.sword.parrying_counter"),
|
||||
(Some(Sword(HeavyCombo)), "common.abilities.sword.heavy_combo"),
|
||||
(Some(Sword(HeavyFinisher)), "common.abilities.sword.heavy_finisher"),
|
||||
(Some(Sword(HeavyPommelStrike)), "common.abilities.sword.heavy_pommelstrike"),
|
||||
(Some(Sword(HeavyFortitude)), "common.abilities.sword.heavy_fortitude"),
|
||||
(Some(Sword(MobilityCombo)), "common.abilities.sword.mobility_combo"),
|
||||
(Some(Sword(MobilityFeint)), "common.abilities.sword.mobility_feint"),
|
||||
(Some(Sword(MobilityAgility)), "common.abilities.sword.mobility_agility"),
|
||||
(Some(Sword(ReachingCombo)), "common.abilities.sword.reaching_combo"),
|
||||
(Some(Sword(ReachingCharge)), "common.abilities.sword.reaching_charge"),
|
||||
(Some(Sword(ReachingFlurry)), "common.abilities.sword.reaching_flurry"),
|
||||
(Some(Sword(ReachingSkewer)), "common.abilities.sword.reaching_skewer"),
|
||||
(Some(Sword(AirSlashCombo)), "common.abilities.sword.airslash_combo"),
|
||||
(Some(Sword(AirSlashVertical)), "common.abilities.sword.airslash_vertical"),
|
||||
(Some(Sword(AirSlashHorizontal)), "common.abilities.sword.airslash_horizontal"),
|
||||
(Some(Sword(AirSlashWhirlwind)), "common.abilities.sword.airslash_whirlwind"),
|
||||
],
|
||||
),
|
||||
Tool(Axe): (
|
||||
primary: "common.abilities.axe.doublestrike",
|
||||
secondary: "common.abilities.axe.spin",
|
||||
abilities: [
|
||||
(Some(Axe(UnlockLeap)), "common.abilities.axe.leap"),
|
||||
],
|
||||
),
|
||||
Tool(Hammer): (
|
||||
primary: "common.abilities.hammer.singlestrike",
|
||||
secondary: "common.abilities.hammer.charged",
|
||||
abilities: [
|
||||
(Some(Hammer(UnlockLeap)), "common.abilities.hammer.leap"),
|
||||
],
|
||||
),
|
||||
Tool(Bow): (
|
||||
primary: "common.abilities.bow.charged",
|
||||
secondary: "common.abilities.bow.repeater",
|
||||
abilities: [
|
||||
(Some(Bow(UnlockShotgun)), "common.abilities.bow.shotgun"),
|
||||
],
|
||||
),
|
||||
Tool(Staff): (
|
||||
primary: "common.abilities.staff.firebomb",
|
||||
secondary: "common.abilities.staff.flamethrower",
|
||||
abilities: [
|
||||
(Some(Staff(UnlockShockwave)), "common.abilities.staff.fireshockwave"),
|
||||
],
|
||||
),
|
||||
Tool(Sceptre): (
|
||||
primary: "common.abilities.sceptre.lifestealbeam",
|
||||
secondary: "common.abilities.sceptre.healingaura",
|
||||
abilities: [
|
||||
(Some(Sceptre(UnlockAura)), "common.abilities.sceptre.wardingaura"),
|
||||
],
|
||||
),
|
||||
Custom("Husk"): (
|
||||
primary: "common.abilities.custom.husk.singlestrike",
|
||||
secondary: "common.abilities.custom.husk.triplestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Husk Brute"): (
|
||||
primary: "common.abilities.custom.husk_brute.singlestrike",
|
||||
secondary: "common.abilities.custom.husk_brute.chargedmelee",
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Spear): (
|
||||
primary: "common.abilities.spear.doublestrike",
|
||||
secondary: "common.abilities.spear.dash",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Hammer Simple"): (
|
||||
primary: "common.abilities.hammersimple.doublestrike",
|
||||
secondary: "common.abilities.hammersimple.doublestrike",
|
||||
abilities: [],
|
||||
),
|
||||
// TODO: Later investigate if we want to make this back to a simple axe when more things need a simpler axe ability set
|
||||
Custom("Gnarling Axe"): (
|
||||
primary: "common.abilities.gnarling.axe.chop",
|
||||
secondary: "common.abilities.gnarling.axe.chop",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Gnarling Dagger"): (
|
||||
primary: "common.abilities.gnarling.dagger.stab",
|
||||
secondary: "common.abilities.gnarling.dagger.stab",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Gnarling Blowgun"): (
|
||||
primary: "common.abilities.gnarling.blowgun.dart",
|
||||
secondary: "common.abilities.gnarling.blowgun.dart",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Gnarling Chieftain"): (
|
||||
primary: "common.abilities.gnarling.chieftain.flamestrike",
|
||||
secondary: "common.abilities.gnarling.chieftain.firebarrage",
|
||||
abilities: [
|
||||
(None, "common.abilities.gnarling.chieftain.fireshockwave"),
|
||||
(None, "common.abilities.gnarling.chieftain.redtotem"),
|
||||
(None, "common.abilities.gnarling.chieftain.greentotem"),
|
||||
(None, "common.abilities.gnarling.chieftain.whitetotem"),
|
||||
],
|
||||
),
|
||||
Custom("Gnarling Totem Red"): (
|
||||
primary: "common.abilities.gnarling.totem.red",
|
||||
secondary: "common.abilities.gnarling.totem.red",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Gnarling Totem Green"): (
|
||||
primary: "common.abilities.gnarling.totem.green",
|
||||
secondary: "common.abilities.gnarling.totem.green",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Gnarling Totem White"): (
|
||||
primary: "common.abilities.gnarling.totem.white",
|
||||
secondary: "common.abilities.gnarling.totem.white",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Deadwood"): (
|
||||
primary: "common.abilities.custom.deadwood.lifestealbeam",
|
||||
secondary: "common.abilities.custom.deadwood.dash",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Mandragora"): (
|
||||
primary: "common.abilities.custom.mandragora.basic",
|
||||
secondary: "common.abilities.custom.mandragora.scream",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Wood Golem"): (
|
||||
primary: "common.abilities.custom.woodgolem.strike",
|
||||
secondary: "common.abilities.custom.woodgolem.spin",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.woodgolem.shockwave")
|
||||
],
|
||||
),
|
||||
Custom("Sword Simple"): (
|
||||
primary: "common.abilities.swordsimple.doublestrike",
|
||||
secondary: "common.abilities.swordsimple.dash",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Staff Simple"): (
|
||||
primary: "common.abilities.staffsimple.firebomb",
|
||||
secondary: "common.abilities.staffsimple.flamethrower",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Bow Simple"): (
|
||||
primary: "common.abilities.bowsimple.basic",
|
||||
secondary: "common.abilities.bowsimple.basic",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Axe Simple"): (
|
||||
primary: "common.abilities.axesimple.doublestrike",
|
||||
secondary: "common.abilities.axesimple.doublestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Dagger Simple"): (
|
||||
primary: "common.abilities.daggersimple.singlestrike",
|
||||
secondary: "common.abilities.daggersimple.singlestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Dagger): (
|
||||
primary: "common.abilities.dagger.tempbasic",
|
||||
secondary: "common.abilities.dagger.tempbasic",
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Shield): (
|
||||
primary: "common.abilities.shield.tempbasic",
|
||||
secondary: "common.abilities.shield.block",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Stone Golem"): (
|
||||
primary: "common.abilities.custom.stonegolemfist.singlestrike",
|
||||
secondary: "common.abilities.custom.stonegolemfist.shockwave",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.stonegolemfist.spin"),
|
||||
],
|
||||
),
|
||||
Custom("Beast Claws"): (
|
||||
primary: "common.abilities.custom.beastclaws.basic",
|
||||
secondary: "common.abilities.custom.beastclaws.basic",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Wendigo Magic"): (
|
||||
primary: "common.abilities.custom.wendigomagic.frostbomb",
|
||||
secondary: "common.abilities.custom.wendigomagic.singlestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Tidal Warrior"): (
|
||||
primary: "common.abilities.custom.tidalwarrior.pincer",
|
||||
secondary: "common.abilities.custom.tidalwarrior.scuttle",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.tidalwarrior.bubbles"),
|
||||
(None, "common.abilities.custom.tidalwarrior.totem"),
|
||||
],
|
||||
),
|
||||
Custom("Tidal Totem"): (
|
||||
primary: "common.abilities.custom.tidalwarrior.totem_wave",
|
||||
secondary: "common.abilities.custom.tidalwarrior.totem_wave",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Med Quick"): (
|
||||
primary: "common.abilities.custom.quadmedquick.triplestrike",
|
||||
secondary: "common.abilities.custom.quadmedquick.dash",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Med Jump"): (
|
||||
primary: "common.abilities.custom.quadmedjump.leap",
|
||||
secondary: "common.abilities.custom.quadmedjump.doublestrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.quadmedjump.quickleap"),
|
||||
],
|
||||
),
|
||||
Custom("Quad Med Charge"): (
|
||||
primary: "common.abilities.custom.quadmedcharge.doublestrike",
|
||||
secondary: "common.abilities.custom.quadmedcharge.dash",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Med Hoof"): (
|
||||
primary: "common.abilities.custom.quadmedhoof.basic",
|
||||
secondary: "common.abilities.custom.quadmedhoof.basic",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Med Basic"): (
|
||||
primary: "common.abilities.custom.quadmedbasic.singlestrike",
|
||||
secondary: "common.abilities.custom.quadmedbasic.triplestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Basilisk"): (
|
||||
primary: "common.abilities.custom.basilisk.petrify",
|
||||
secondary: "common.abilities.custom.basilisk.triplestrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.basilisk.dash"),
|
||||
],
|
||||
),
|
||||
Custom("Asp"): (
|
||||
primary: "common.abilities.custom.asp.singlestrike",
|
||||
secondary: "common.abilities.custom.asp.firebomb",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Maneater"): (
|
||||
primary: "common.abilities.custom.maneater.singlestrike",
|
||||
secondary: "common.abilities.custom.maneater.poisonball",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Low Breathe"): (
|
||||
primary: "common.abilities.custom.quadlowbreathe.flamethrower",
|
||||
secondary: "common.abilities.custom.quadlowbreathe.triplestrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.quadlowbreathe.dash"),
|
||||
],
|
||||
),
|
||||
Custom("Quad Low Tail"): (
|
||||
primary: "common.abilities.custom.quadlowtail.charged",
|
||||
secondary: "common.abilities.custom.quadlowtail.triplestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Low Quick"): (
|
||||
primary: "common.abilities.custom.quadlowquick.dash",
|
||||
secondary: "common.abilities.custom.quadlowquick.quadstrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Low Basic"): (
|
||||
primary: "common.abilities.custom.quadlowbasic.triplestrike",
|
||||
secondary: "common.abilities.custom.quadlowbasic.singlestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Quad Low Beam"): (
|
||||
primary: "common.abilities.custom.quadlowbeam.lifestealbeam",
|
||||
secondary: "common.abilities.custom.quadlowbreathe.triplestrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.quadlowbreathe.dash"),
|
||||
],
|
||||
),
|
||||
Custom("Quad Small Basic"): (
|
||||
primary: "common.abilities.custom.quadsmallbasic.singlestrike",
|
||||
secondary: "common.abilities.custom.quadsmallbasic.singlestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Theropod Basic"): (
|
||||
primary: "common.abilities.custom.theropodbasic.triplestrike",
|
||||
secondary: "common.abilities.custom.theropodbasic.triplestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Theropod Bird"): (
|
||||
primary: "common.abilities.custom.theropodbird.triplestrike",
|
||||
secondary: "common.abilities.custom.theropodbird.triplestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Theropod Charge"): (
|
||||
primary: "common.abilities.custom.theropodbasic.triplestrike",
|
||||
secondary: "common.abilities.custom.theropodbasic.dash",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Arthropod Basic"): (
|
||||
primary: "common.abilities.custom.arthropodbasic.singlestrike",
|
||||
secondary: "common.abilities.custom.arthropodbasic.ensnaringweb",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Arthropod Leap"): (
|
||||
primary: "common.abilities.custom.arthropodbasic.singlestrike",
|
||||
secondary: "common.abilities.custom.arthropodbasic.ensnaringweb",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.arthropodbasic.leap"),
|
||||
],
|
||||
),
|
||||
Custom("Arthropod Ranged"): (
|
||||
primary: "common.abilities.custom.arthropodranged.singlestrike",
|
||||
secondary: "common.abilities.custom.arthropodranged.ensnaringweb",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.arthropodranged.poisonball"),
|
||||
],
|
||||
),
|
||||
Custom("Arthropod Charge"): (
|
||||
primary: "common.abilities.custom.arthropodcharge.singlestrike",
|
||||
secondary: "common.abilities.custom.arthropodcharge.charge",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Turret"): (
|
||||
primary: "common.abilities.custom.turret.arrows",
|
||||
secondary: "common.abilities.custom.turret.arrows",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Haniwa Sentry"): (
|
||||
primary: "common.abilities.custom.turret.flamethrower",
|
||||
secondary: "common.abilities.custom.turret.flamethrower",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Mindflayer"): (
|
||||
primary: "common.abilities.custom.mindflayer.cursedflames",
|
||||
secondary: "common.abilities.custom.mindflayer.necroticvortex",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.mindflayer.dimensionaldoor"),
|
||||
(None, "common.abilities.custom.mindflayer.necroticsphere"),
|
||||
(None, "common.abilities.custom.mindflayer.summonminions"),
|
||||
],
|
||||
),
|
||||
Custom("Minotaur"): (
|
||||
primary: "common.abilities.custom.minotaur.cleave",
|
||||
secondary: "common.abilities.custom.minotaur.cripplingstrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.minotaur.charge"),
|
||||
(None, "common.abilities.custom.minotaur.frenzy"),
|
||||
],
|
||||
),
|
||||
Custom("Clay Golem"): (
|
||||
primary: "common.abilities.custom.claygolem.strike",
|
||||
secondary: "common.abilities.custom.claygolem.laser",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.claygolem.shockwave"),
|
||||
(None, "common.abilities.custom.claygolem.rocket"),
|
||||
],
|
||||
),
|
||||
Custom("Yeti"): (
|
||||
primary: "common.abilities.custom.yeti.strike",
|
||||
secondary: "common.abilities.custom.yeti.icespikes",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.yeti.frostbreath"),
|
||||
(None, "common.abilities.custom.yeti.snowball"),
|
||||
],
|
||||
),
|
||||
Custom("Harvester"): (
|
||||
primary: "common.abilities.custom.harvester.scythe",
|
||||
secondary: "common.abilities.custom.harvester.firebreath",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.harvester.ensnaringvines"),
|
||||
(None, "common.abilities.custom.harvester.explodingpumpkin"),
|
||||
],
|
||||
),
|
||||
Custom("Oni"): (
|
||||
primary: "common.abilities.custom.oni.dash",
|
||||
secondary: "common.abilities.custom.oni.doublestrike",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Bird Large Breathe"): (
|
||||
primary: "common.abilities.custom.birdlargebreathe.firebomb",
|
||||
secondary: "common.abilities.custom.birdlargebreathe.triplestrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.birdlargebreathe.flamethrower"),
|
||||
],
|
||||
),
|
||||
Custom("Bird Large Fire"): (
|
||||
primary: "common.abilities.custom.birdlargefire.firebomb",
|
||||
secondary: "common.abilities.custom.birdlargefire.triplestrike",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.birdlargefire.fireshockwave"),
|
||||
],
|
||||
),
|
||||
Custom("Bird Large Basic"): (
|
||||
primary: "common.abilities.custom.birdlargebasic.triplestrike",
|
||||
secondary: "common.abilities.custom.birdlargebasic.summontornadoes",
|
||||
abilities: [
|
||||
(None, "common.abilities.custom.birdlargebasic.dash"),
|
||||
],
|
||||
),
|
||||
Custom("Tornado"): (
|
||||
primary: "common.abilities.custom.tornado.spin",
|
||||
secondary: "common.abilities.empty.basic",
|
||||
abilities: [],
|
||||
),
|
||||
Custom("Golf Club"): (
|
||||
primary: "common.abilities.hammer.singlestrike",
|
||||
secondary: "common.abilities.tool.golf_club.charged",
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Debug): (
|
||||
primary: "common.abilities.debug.forwardboost",
|
||||
secondary: "common.abilities.debug.upboost",
|
||||
abilities: [
|
||||
(None, "common.abilities.debug.possess"),
|
||||
],
|
||||
),
|
||||
Tool(Farming): (
|
||||
primary: "common.abilities.farming.basic",
|
||||
secondary: "common.abilities.farming.basic",
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Pick): (
|
||||
primary: "common.abilities.pick.swing",
|
||||
secondary: "common.abilities.pick.swing",
|
||||
abilities: [],
|
||||
),
|
||||
Tool(Empty): (
|
||||
primary: "common.abilities.empty.basic",
|
||||
secondary: "common.abilities.empty.basic",
|
||||
abilities: [],
|
||||
),
|
||||
})
|
@ -366,10 +366,6 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
|
||||
"common.abilities.sword.reaching_charge" => imgs.not_found,
|
||||
"common.abilities.sword.reaching_flurry" => imgs.not_found,
|
||||
"common.abilities.sword.reaching_skewer" => imgs.not_found,
|
||||
"common.abilities.sword.airslash_combo" => imgs.not_found,
|
||||
"common.abilities.sword.airslash_vertical" => imgs.not_found,
|
||||
"common.abilities.sword.airslash_horizontal" => imgs.not_found,
|
||||
"common.abilities.sword.airslash_whirlwind" => imgs.not_found,
|
||||
// Axe
|
||||
"common.abilities.axe.doublestrike" => imgs.twohaxe_m1,
|
||||
"common.abilities.axe.spin" => imgs.axespin,
|
||||
|
@ -1678,8 +1678,6 @@ impl ParticleMgr {
|
||||
}
|
||||
}
|
||||
},
|
||||
// TODO: Maybe look into weapon trails?
|
||||
FrontendSpecifier::AirSlash => {},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user