Merge branch 'sam/health-float' into 'master'

Turned Health into a Float

See merge request veloren/veloren!2824
This commit is contained in:
Samuel Keiffer 2021-09-13 15:23:18 +00:00
commit 73d3d3e4bb
175 changed files with 745 additions and 794 deletions

View File

@ -2,9 +2,9 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 110,
base_damage: 11.0,
base_poise_damage: 12,
damage_increase: 10,
damage_increase: 1.0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
@ -24,9 +24,9 @@ ComboMelee(
),
(
stage: 2,
base_damage: 130,
base_damage: 13.0,
base_poise_damage: 20,
damage_increase: 15,
damage_increase: 1.5,
poise_damage_increase: 0,
knockback: 6.0,
range: 3.5,

View File

@ -4,7 +4,7 @@ LeapMelee(
movement_duration: 0.2,
swing_duration: 0.2,
recover_duration: 0.2,
base_damage: 150,
base_damage: 15.0,
base_poise_damage: 70,
knockback: 12.0,
range: 4.5,

View File

@ -2,7 +2,7 @@ SpinMelee(
buildup_duration: 0.2,
swing_duration: 0.6,
recover_duration: 0.2,
base_damage: 70,
base_damage: 7.0,
base_poise_damage: 25,
knockback: ( strength: 0.0, direction: Away),
range: 3.5,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 80,
scaled_damage: 160,
base_damage: 8.0,
scaled_damage: 16.0,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,

View File

@ -2,8 +2,8 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 90,
damage_increase: 10,
base_damage: 9.0,
damage_increase: 1.0,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 4.0,
@ -24,8 +24,8 @@ ComboMelee(
),
(
stage: 2,
base_damage: 130,
damage_increase: 15,
base_damage: 13.0,
damage_increase: 1.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 16.0,

View File

@ -3,8 +3,8 @@ ChargedRanged(
energy_drain: 0,
initial_regen: 5,
scaled_regen: 120,
initial_damage: 5,
scaled_damage: 140,
initial_damage: 0.5,
scaled_damage: 14.0,
initial_knockback: 0.0,
scaled_knockback: 10.0,
buildup_duration: 0.2,

View File

@ -6,7 +6,7 @@ RepeaterRanged(
max_speed: 2.0,
half_speed_at: 1,
projectile: Arrow(
damage: 30.0,
damage: 3.0,
knockback: 2.0,
energy_regen: 0,
),

View File

@ -4,7 +4,7 @@ BasicRanged(
recover_duration: 0.3,
projectile_spread: 0.05,
projectile: Arrow(
damage: 40.0,
damage: 4.0,
knockback: 5.0,
energy_regen: 0,
),

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.3,
projectile: Arrow(
damage: 35.0,
damage: 3.5,
knockback: 5.0,
energy_regen: 40,
),

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.8,
recover_duration: 0.35,
projectile: Fireball(
damage: 130.0,
damage: 13.0,
radius: 5.0,
energy_regen: 0,
),

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 140,
base_damage: 14.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 120,
scaled_damage: 180,
base_damage: 12.0,
scaled_damage: 18.0,
base_poise_damage: 25,
scaled_poise_damage: 0,
base_knockback: 4.0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.9,
recover_duration: 1.0,
beam_duration: 1.0,
damage: 420,
damage: 42.0,
tick_rate: 0.5,
range: 22.0,
max_angle: 5.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 180,
base_damage: 18.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 180,
base_damage: 18.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 180,
base_damage: 18.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,

View File

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 0.1,
recover_duration: 0.25,
knockback: ( strength: 25.0, direction: Away),
base_damage: 200,
base_damage: 20.0,
base_poise_damage: 40,
range: 5.0,
max_angle: 120.0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 80,
scaled_damage: 150,
base_damage: 8.0,
scaled_damage: 15.0,
base_poise_damage: 50,
scaled_poise_damage: 100,
base_knockback: 6.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 110,
base_damage: 11.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 90,
base_damage: 9.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 140,
base_damage: 14.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.35,
projectile: Fireball(
damage: 100.0,
damage: 10.0,
radius: 5.0,
energy_regen: 50,
),

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.4,
recover_duration: 0.25,
beam_duration: 0.5,
damage: 50,
damage: 5.0,
tick_rate: 3.0,
range: 15.0,
max_angle: 22.5,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 100,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -24,7 +24,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -46,7 +46,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 130,
base_damage: 13.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.35,
projectile: Fireball(
damage: 100.0,
damage: 10.0,
radius: 5.0,
energy_regen: 50,
),

View File

@ -3,7 +3,7 @@ Shockwave(
buildup_duration: 0.7,
swing_duration: 0.1,
recover_duration: 0.2,
damage: 200,
damage: 20.0,
poise_damage: 0,
knockback: ( strength: 25.0, direction: Away),
shockwave_angle: 360.0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.4,
recover_duration: 0.25,
beam_duration: 0.5,
damage: 50,
damage: 5.0,
tick_rate: 3.0,
range: 15.0,
max_angle: 22.5,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 100,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -24,7 +24,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -46,7 +46,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 130,
base_damage: 13.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.5,
recover_duration: 0.4,
beam_duration: 0.25,
damage: 70,
damage: 7.0,
tick_rate: 2.0,
range: 40.0,
max_angle: 1.0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.8,
recover_duration: 0.5,
projectile: ClayRocket(
damage: 500.0,
damage: 50.0,
knockback: 18.0,
radius: 5.0,
),

View File

@ -3,7 +3,7 @@ Shockwave(
buildup_duration: 1.5,
swing_duration: 0.12,
recover_duration: 1.2,
damage: 500,
damage: 50.0,
poise_damage: 50,
knockback: (strength: 30.0, direction: TowardsUp),
shockwave_angle: 180.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.8,
swing_duration: 0.1,
recover_duration: 0.5,
base_damage: 200,
base_damage: 20.0,
base_poise_damage: 50,
knockback: ( strength: 10.0, direction: Away),
range: 4.0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.8,
projectile: ExplodingPumpkin(
damage: 200.0,
damage: 20.0,
knockback: 25.0,
radius: 5.0,
),

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.5,
recover_duration: 0.5,
beam_duration: 1.0,
damage: 40,
damage: 4.0,
tick_rate: 1.5,
range: 20.0,
max_angle: 15.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.7,
swing_duration: 0.1,
recover_duration: 0.6,
base_damage: 70,
base_damage: 7.0,
base_poise_damage: 10,
knockback: ( strength: 10.0, direction: Away),
range: 4.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 160,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 12,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 160,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 6,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 160,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 8,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 160,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 0,

View File

@ -1,8 +1,8 @@
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
initial_damage: 50,
scaled_damage: 450,
initial_damage: 5.0,
scaled_damage: 45.0,
initial_poise_damage: 50,
scaled_poise_damage: 150,
initial_knockback: 0.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 200,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 12,
poise_damage_increase: 0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.8,
recover_duration: 0.35,
projectile: NecroticSphere(
damage: 260.0,
damage: 26.0,
radius: 5.0,
energy_regen: 0,
),

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 200,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.40,
recover_duration: 0.50,
beam_duration: 1.0,
damage: 150,
damage: 15.0,
tick_rate: 5.0,
range: 22.0,
max_angle: 15.0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.75,
recover_duration: 0.4,
projectile: NecroticSphere(
damage: 450.0,
damage: 45.0,
radius: 5.0,
),
projectile_body: Object(FireworkPurple),

View File

@ -2,7 +2,7 @@ SpinMelee(
buildup_duration: 0.8,
swing_duration: 0.5,
recover_duration: 0.6,
base_damage: 200.0,
base_damage: 20.0,
base_poise_damage: 1.0,
knockback: ( strength: 7.0, direction: Towards),
range: 16.0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 150,
scaled_damage: 600,
base_damage: 15.0,
scaled_damage: 60.0,
base_poise_damage: 25,
scaled_poise_damage: 100,
base_knockback: 10.0,

View File

@ -1,8 +1,8 @@
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
initial_damage: 50,
scaled_damage: 450,
initial_damage: 5.0,
scaled_damage: 45.0,
initial_poise_damage: 50,
scaled_poise_damage: 150,
initial_knockback: 0.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.3,
swing_duration: 0.1,
recover_duration: 0.6,
base_damage: 150.0,
base_damage: 15.0,
base_poise_damage: 60.0,
knockback: ( strength: 15.0, direction: Away),
range: 5.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 200,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 140,
base_damage: 14.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 140,
base_damage: 14.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 140,
base_damage: 14.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.25,
recover_duration: 0.25,
beam_duration: 1.0,
damage: 30,
damage: 3.0,
tick_rate: 2.0,
range: 25.0,
max_angle: 1.0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 80,
scaled_damage: 150,
base_damage: 8.0,
scaled_damage: 15.0,
base_poise_damage: 25,
scaled_poise_damage: 0,
base_knockback: 4.0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.4,
recover_duration: 0.25,
beam_duration: 0.5,
damage: 70,
damage: 7.0,
tick_rate: 3.0,
range: 15.0,
max_angle: 22.5,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 220,
base_damage: 22.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 220,
base_damage: 22.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 220,
base_damage: 22.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 40,
scaled_damage: 80,
base_damage: 4.0,
scaled_damage: 8.0,
base_poise_damage: 30,
scaled_poise_damage: 0,
base_knockback: 2.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 60,
base_damage: 6.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 60,
base_damage: 6.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 60,
base_damage: 6.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -50,7 +50,7 @@ ComboMelee(
),
(
stage: 4,
base_damage: 60,
base_damage: 6.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.8,
recover_duration: 0.35,
projectile: NecroticSphere(
damage: 130.0,
damage: 13.0,
radius: 5.0,
energy_regen: 0,
),

View File

@ -1,8 +1,8 @@
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
initial_damage: 40,
scaled_damage: 200,
initial_damage: 4.0,
scaled_damage: 20.0,
initial_poise_damage: 30,
scaled_poise_damage: 80,
initial_knockback: 10.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 22,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 22,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 22,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 100,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 50,
base_damage: 5.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 50,
base_damage: 5.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 50,
base_damage: 5.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 70,
scaled_damage: 280,
base_damage: 7.0,
scaled_damage: 28.0,
base_poise_damage: 28,
scaled_poise_damage: 40,
base_knockback: 8.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 250,
base_damage: 25.0,
damage_increase: 0,
base_poise_damage: 22,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 370,
base_damage: 37.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 22,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.65,
swing_duration: 0.3,
recover_duration: 0.35,
base_damage: 100,
base_damage: 10.0,
base_poise_damage: 28,
knockback: ( strength: 25.0, direction: Away),
range: 0.8,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 30,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 30,
poise_damage_increase: 0,

View File

@ -4,7 +4,7 @@ LeapMelee(
movement_duration: 0.4,
swing_duration: 0.075,
recover_duration: 0.2,
base_damage: 120,
base_damage: 12.0,
base_poise_damage: 60,
knockback: 4.0,
range: 4.5,

View File

@ -4,7 +4,7 @@ LeapMelee(
movement_duration: 0.3,
swing_duration: 0.075,
recover_duration: 0.125,
base_damage: 80,
base_damage: 8.0,
base_poise_damage: 30,
knockback: 2.0,
range: 4.5,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 75,
scaled_damage: 20,
base_damage: 7.5,
scaled_damage: 2.0,
base_poise_damage: 28,
scaled_poise_damage: 28,
base_knockback: 3.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 100,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 100,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 17,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 100,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 30,
base_damage: 3.0,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 0,

View File

@ -3,7 +3,7 @@ Shockwave(
buildup_duration: 0.6,
swing_duration: 0.12,
recover_duration: 1.2,
damage: 500,
damage: 50.0,
poise_damage: 50,
knockback: (strength: 40.0, direction: TowardsUp),
shockwave_angle: 100.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 300,
base_damage: 30.0,
damage_increase: 0,
base_poise_damage: 40,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ SpinMelee(
buildup_duration: 0.1,
swing_duration: 0.3,
recover_duration: 0.1,
base_damage: 500,
base_damage: 50.0,
base_poise_damage: 30,
knockback: ( strength: 0.0, direction: Away),
range: 7.5,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 120,
scaled_damage: 160,
base_damage: 12.0,
scaled_damage: 16.0,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 270,
base_damage: 27.0,
damage_increase: 0,
base_poise_damage: 40,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 300,
base_damage: 30.0,
damage_increase: 0,
base_poise_damage: 35,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 340,
base_damage: 34.0,
damage_increase: 0,
base_poise_damage: 35,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 400,
base_damage: 40.0,
damage_increase: 0,
base_poise_damage: 35,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 110,
base_damage: 11.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 110,
base_damage: 11.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
@ -18,7 +18,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 150,
base_damage: 15.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
@ -34,7 +34,7 @@ ComboMelee(
),
(
stage: 3,
base_damage: 180,
base_damage: 18.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,

View File

@ -1,14 +0,0 @@
BasicBeam(
buildup_duration: 0.4,
recover_duration: 0.25,
beam_duration: 0.5,
base_hps: 0,
base_dps: 150,
tick_rate: 3.0,
range: 15.0,
max_angle: 22.5,
damage_effect: None,
energy_regen: 0,
energy_cost: 0,
energy_drain: 0,
)

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.5,
recover_duration: 0.5,
beam_duration: 2.5,
damage: 50,
damage: 5.0,
tick_rate: 2.0,
range: 25.0,
max_angle: 15.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.3,
swing_duration: 0.1,
recover_duration: 0.6,
base_damage: 50.0,
base_damage: 5.0,
base_poise_damage: 0.0,
knockback: ( strength: 50.0, direction: Towards),
range: 5.0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 0,
base_damage: 50,
scaled_damage: 250,
base_damage: 5.0,
scaled_damage: 25.0,
base_poise_damage: 10,
scaled_poise_damage: 40,
base_knockback: 10.0,

View File

@ -3,7 +3,7 @@ Shockwave(
buildup_duration: 0.4,
swing_duration: 0.1,
recover_duration: 3.5,
damage: 10,
damage: 1.0,
poise_damage: 0,
knockback: ( strength: 18.0, direction: Away),
shockwave_angle: 360.0,

View File

@ -2,7 +2,7 @@ SpinMelee(
buildup_duration: 0.0,
swing_duration: 0.5,
recover_duration: 0.0,
base_damage: 400,
base_damage: 40.0,
base_poise_damage: 0,
knockback: ( strength: 50.0, direction: Away),
range: 3.5,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 1.0,
recover_duration: 0.3,
projectile: Arrow(
damage: 200.0,
damage: 20.0,
knockback: 5.0,
energy_regen: 100,
),

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.25,
recover_duration: 0.25,
beam_duration: 1.0,
damage: 35,
damage: 3.5,
tick_rate: 3.0,
range: 20.0,
max_angle: 15.0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.35,
projectile: Frostball(
damage: 120.0,
damage: 12.0,
radius: 5.0,
),
projectile_body: Object(BoltFire), // TODO: Get ice projectile model

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 180,
base_damage: 18.0,
damage_increase: 0,
base_poise_damage: 40,
poise_damage_increase: 0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.8,
recover_duration: 0.25,
beam_duration: 0.25,
damage: 10,
damage: 1.0,
tick_rate: 5.0,
range: 15.0,
max_angle: 30.0,

View File

@ -3,7 +3,7 @@ Shockwave(
buildup_duration: 0.6,
swing_duration: 0.15,
recover_duration: 1.0,
damage: 100,
damage: 10.0,
poise_damage: 10,
knockback: (strength: 18.0, direction: Up),
shockwave_angle: 90.0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.9,
projectile: Snowball(
damage: 200.0,
damage: 20.0,
radius: 5.0,
),
projectile_body: Object(Snowball),

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.8,
swing_duration: 0.1,
recover_duration: 1.0,
base_damage: 100,
base_damage: 10.0,
base_poise_damage: 50,
knockback: ( strength: 50.0, direction: Away),
range: 4.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.1,
swing_duration: 0.1,
recover_duration: 0.3,
base_damage: 50,
base_damage: 5.0,
base_poise_damage: 0,
knockback: ( strength: 0.0, direction: Away),
range: 3.5,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.0,
swing_duration: 0.1,
recover_duration: 0.9,
base_damage: 20,
base_damage: 2.0,
base_poise_damage: 0,
knockback: ( strength: 0.0, direction: Away),
range: 3.5,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.6,
swing_duration: 0.1,
recover_duration: 0.15,
base_damage: 50,
base_damage: 5.0,
base_poise_damage: 0,
knockback: ( strength: 0.0, direction: Away),
range: 3.5,

View File

@ -1,8 +1,8 @@
ChargedMelee(
energy_cost: 1,
energy_drain: 300,
initial_damage: 10,
scaled_damage: 160,
initial_damage: 1.0,
scaled_damage: 16.0,
initial_poise_damage: 5,
scaled_poise_damage: 75,
initial_knockback: 5.0,

View File

@ -4,7 +4,7 @@ LeapMelee(
movement_duration: 0.8,
swing_duration: 0.15,
recover_duration: 0.2,
base_damage: 160,
base_damage: 16.0,
base_poise_damage: 80,
knockback: 25.0,
range: 4.5,

View File

@ -1,8 +1,8 @@
ComboMelee(
stage_data: [(
stage: 1,
base_damage: 150,
damage_increase: 10,
base_damage: 15.0,
damage_increase: 1.0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.5,

View File

@ -2,8 +2,8 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 240,
damage_increase: 10,
base_damage: 24.0,
damage_increase: 1.0,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 4.0,
@ -18,8 +18,8 @@ ComboMelee(
),
(
stage: 2,
base_damage: 320,
damage_increase: 15,
base_damage: 32.0,
damage_increase: 1.5,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 16.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.25,
swing_duration: 0.05,
recover_duration: 0.075,
base_damage: 50,
base_damage: 5.0,
base_poise_damage: 0,
knockback: ( strength: 0.0, direction: Away),
range: 4.5,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.20,
recover_duration: 0.20,
beam_duration: 1.0,
damage: 30,
damage: 3.0,
tick_rate: 2.0,
range: 25.0,
max_angle: 1.0,

View File

@ -3,7 +3,7 @@ BasicMelee(
buildup_duration: 0.1,
swing_duration: 0.1,
recover_duration: 0.3,
base_damage: 40,
base_damage: 4.0,
base_poise_damage: 0,
knockback: ( strength: 0.0, direction: Away),
range: 3.0,

View File

@ -1,7 +1,7 @@
DashMelee(
energy_cost: 100,
base_damage: 10,
scaled_damage: 80,
base_damage: 1.0,
scaled_damage: 8.0,
base_poise_damage: 0,
scaled_poise_damage: 25,
base_knockback: 8.0,

View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 65,
base_damage: 6.5,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
@ -24,7 +24,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 80,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.5,
recover_duration: 0.4,
projectile: Fireball(
damage: 90.0,
damage: 9.0,
radius: 4.0,
energy_regen: 60,
),

Some files were not shown because too many files have changed in this diff Show More