mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'sam/energy-float' into 'master'
Changed energy to a float See merge request veloren/veloren!2838
This commit is contained in:
commit
0af6969d19
@ -45,9 +45,9 @@ ComboMelee(
|
||||
))),
|
||||
),
|
||||
],
|
||||
initial_energy_gain: 25,
|
||||
max_energy_gain: 175,
|
||||
energy_increase: 30,
|
||||
initial_energy_gain: 2.5,
|
||||
max_energy_gain: 17.5,
|
||||
energy_increase: 3.0,
|
||||
speed_increase: 0.1,
|
||||
max_speed_increase: 0.6,
|
||||
scales_from_combo: 2,
|
||||
|
@ -1,5 +1,5 @@
|
||||
LeapMelee(
|
||||
energy_cost: 450,
|
||||
energy_cost: 45.0,
|
||||
buildup_duration: 0.2,
|
||||
movement_duration: 0.2,
|
||||
swing_duration: 0.2,
|
||||
|
@ -12,7 +12,7 @@ SpinMelee(
|
||||
strength: DamageFraction(0.1),
|
||||
chance: 0.1,
|
||||
))),
|
||||
energy_cost: 100,
|
||||
energy_cost: 10.0,
|
||||
is_infinite: true,
|
||||
movement_behavior: AxeHover,
|
||||
is_interruptible: false,
|
||||
|
@ -1,8 +1,8 @@
|
||||
ChargedRanged(
|
||||
energy_cost: 0,
|
||||
energy_drain: 0,
|
||||
initial_regen: 5,
|
||||
scaled_regen: 120,
|
||||
initial_regen: 0.5,
|
||||
scaled_regen: 12.0,
|
||||
initial_damage: 0.5,
|
||||
scaled_damage: 14.0,
|
||||
initial_knockback: 0.0,
|
||||
|
@ -1,5 +1,5 @@
|
||||
RepeaterRanged(
|
||||
energy_cost: 50,
|
||||
energy_cost: 5.0,
|
||||
buildup_duration: 0.2,
|
||||
shoot_duration: 0.5,
|
||||
recover_duration: 0.8,
|
||||
|
@ -1,5 +1,5 @@
|
||||
BasicRanged(
|
||||
energy_cost: 300,
|
||||
energy_cost: 30.0,
|
||||
buildup_duration: 0.4,
|
||||
recover_duration: 0.3,
|
||||
projectile_spread: 0.05,
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: Arrow(
|
||||
damage: 3.5,
|
||||
knockback: 5.0,
|
||||
energy_regen: 40,
|
||||
energy_regen: 4.0,
|
||||
),
|
||||
projectile_body: Object(Arrow),
|
||||
projectile_light: None,
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: Fireball(
|
||||
damage: 10.0,
|
||||
radius: 5.0,
|
||||
energy_regen: 50,
|
||||
energy_regen: 5.0,
|
||||
),
|
||||
projectile_body: Object(BoltFire),
|
||||
/*projectile_light: Some(LightEmitter {
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: Fireball(
|
||||
damage: 10.0,
|
||||
radius: 5.0,
|
||||
energy_regen: 50,
|
||||
energy_regen: 5.0,
|
||||
),
|
||||
projectile_body: Object(BoltFire),
|
||||
/*projectile_light: Some(LightEmitter {
|
||||
|
@ -1,5 +1,5 @@
|
||||
Shockwave(
|
||||
energy_cost: 600,
|
||||
energy_cost: 60.0,
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.2,
|
||||
|
@ -12,7 +12,7 @@ BasicBeam(
|
||||
strength: DamageFraction(0.75),
|
||||
chance: 0.75,
|
||||
))),
|
||||
energy_regen: 50,
|
||||
energy_regen: 0,
|
||||
energy_drain: 0,
|
||||
ori_rate: 0.07,
|
||||
specifier: ClayGolem,
|
||||
|
@ -7,7 +7,7 @@ BasicBeam(
|
||||
range: 25.0,
|
||||
max_angle: 1.0,
|
||||
damage_effect: Some(Lifesteal(0.15)),
|
||||
energy_regen: 25,
|
||||
energy_regen: 2.5,
|
||||
energy_drain: 0,
|
||||
ori_rate: 0.3,
|
||||
specifier: LifestealBeam,
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: Arrow(
|
||||
damage: 20.0,
|
||||
knockback: 5.0,
|
||||
energy_regen: 100,
|
||||
energy_regen: 10.0,
|
||||
),
|
||||
projectile_body: Object(ArrowTurret),
|
||||
projectile_light: None,
|
||||
|
@ -1,6 +1,6 @@
|
||||
ChargedMelee(
|
||||
energy_cost: 1,
|
||||
energy_drain: 300,
|
||||
energy_drain: 30.0,
|
||||
initial_damage: 1.0,
|
||||
scaled_damage: 16.0,
|
||||
initial_poise_damage: 5,
|
||||
|
@ -1,5 +1,5 @@
|
||||
LeapMelee(
|
||||
energy_cost: 500,
|
||||
energy_cost: 50.0,
|
||||
buildup_duration: 0.1,
|
||||
movement_duration: 0.8,
|
||||
swing_duration: 0.15,
|
||||
|
@ -15,9 +15,9 @@ ComboMelee(
|
||||
forward_movement: 0.0,
|
||||
damage_kind: Crushing,
|
||||
)],
|
||||
initial_energy_gain: 50,
|
||||
max_energy_gain: 150,
|
||||
energy_increase: 50,
|
||||
initial_energy_gain: 5.0,
|
||||
max_energy_gain: 15.0,
|
||||
energy_increase: 5.0,
|
||||
speed_increase: 0.1,
|
||||
max_speed_increase: 0.4,
|
||||
scales_from_combo: 2,
|
||||
|
@ -11,7 +11,7 @@ BasicAura(
|
||||
),
|
||||
aura_duration: 1.0,
|
||||
range: 25.0,
|
||||
energy_cost: 200,
|
||||
energy_cost: 20.0,
|
||||
scales_with_combo: true,
|
||||
specifier: HealingAura,
|
||||
)
|
||||
|
@ -7,7 +7,7 @@ BasicBeam(
|
||||
range: 25.0,
|
||||
max_angle: 1.0,
|
||||
damage_effect: Some(Lifesteal(0.125)),
|
||||
energy_regen: 50,
|
||||
energy_regen: 5.0,
|
||||
energy_drain: 0,
|
||||
ori_rate: 0.3,
|
||||
specifier: LifestealBeam
|
||||
|
@ -11,7 +11,7 @@ BasicAura(
|
||||
),
|
||||
aura_duration: 1.0,
|
||||
range: 25.0,
|
||||
energy_cost: 400,
|
||||
energy_cost: 40.0,
|
||||
scales_with_combo: false,
|
||||
specifier: WardingAura,
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
DashMelee(
|
||||
energy_cost: 100,
|
||||
energy_cost: 10.0,
|
||||
base_damage: 1.0,
|
||||
scaled_damage: 8.0,
|
||||
base_poise_damage: 0,
|
||||
|
@ -47,7 +47,7 @@ ComboMelee(
|
||||
],
|
||||
initial_energy_gain: 0,
|
||||
max_energy_gain: 0,
|
||||
energy_increase: 30,
|
||||
energy_increase: 3.0,
|
||||
speed_increase: 0.0,
|
||||
max_speed_increase: 0.0,
|
||||
scales_from_combo: 2,
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: Fireball(
|
||||
damage: 9.0,
|
||||
radius: 4.0,
|
||||
energy_regen: 60,
|
||||
energy_regen: 6.0,
|
||||
),
|
||||
projectile_body: Object(BoltFire),
|
||||
projectile_speed: 60.0,
|
||||
|
@ -1,5 +1,5 @@
|
||||
Shockwave(
|
||||
energy_cost: 600,
|
||||
energy_cost: 60.0,
|
||||
buildup_duration: 0.7,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.2,
|
||||
|
@ -13,7 +13,7 @@ BasicBeam(
|
||||
chance: 0.25,
|
||||
))),
|
||||
energy_regen: 0,
|
||||
energy_drain: 350,
|
||||
energy_drain: 35.0,
|
||||
ori_rate: 0.3,
|
||||
specifier: Flamethrower,
|
||||
)
|
||||
|
@ -5,7 +5,7 @@ BasicRanged(
|
||||
projectile: Fireball(
|
||||
damage: 6.0,
|
||||
radius: 5.0,
|
||||
energy_regen: 50,
|
||||
energy_regen: 5.0,
|
||||
),
|
||||
projectile_body: Object(BoltFire),
|
||||
/*projectile_light: Some(LightEmitter {
|
||||
|
@ -13,7 +13,7 @@ BasicBeam(
|
||||
chance: 0.25,
|
||||
))),
|
||||
energy_regen: 0,
|
||||
energy_drain: 350,
|
||||
energy_drain: 35.0,
|
||||
ori_rate: 0.3,
|
||||
specifier: Flamethrower,
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
DashMelee(
|
||||
energy_cost: 100,
|
||||
energy_cost: 10.0,
|
||||
base_damage: 8.0,
|
||||
scaled_damage: 16.0,
|
||||
base_poise_damage: 0,
|
||||
@ -8,7 +8,7 @@ DashMelee(
|
||||
scaled_knockback: 7.0,
|
||||
range: 4.0,
|
||||
angle: 60.0,
|
||||
energy_drain: 300,
|
||||
energy_drain: 30.0,
|
||||
forward_speed: 3.0,
|
||||
buildup_duration: 0.25,
|
||||
charge_duration: 1.2,
|
||||
|
@ -12,7 +12,7 @@ SpinMelee(
|
||||
strength: DamageFraction(0.1),
|
||||
chance: 0.1,
|
||||
))),
|
||||
energy_cost: 150,
|
||||
energy_cost: 15.0,
|
||||
is_infinite: false,
|
||||
movement_behavior: ForwardGround,
|
||||
is_interruptible: true,
|
||||
|
@ -68,8 +68,8 @@ ComboMelee(
|
||||
),
|
||||
],
|
||||
initial_energy_gain: 0,
|
||||
max_energy_gain: 200,
|
||||
energy_increase: 25,
|
||||
max_energy_gain: 20.0,
|
||||
energy_increase: 2.5,
|
||||
speed_increase: 0.1,
|
||||
max_speed_increase: 0.8,
|
||||
scales_from_combo: 2,
|
||||
|
@ -1,5 +1,5 @@
|
||||
DashMelee(
|
||||
energy_cost: 100,
|
||||
energy_cost: 10.0,
|
||||
base_damage: 9.0,
|
||||
scaled_damage: 16.0,
|
||||
base_poise_damage: 40,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(3.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 33,
|
||||
energy_max: 3.3,
|
||||
energy_reward: 0.034,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(3.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 33,
|
||||
energy_max: 3.3,
|
||||
energy_reward: 0.034,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(18.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 198,
|
||||
energy_max: 19.8,
|
||||
energy_reward: 0.2,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(6.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 66,
|
||||
energy_max: 6.6,
|
||||
energy_reward: 0.067,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(6.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 66,
|
||||
energy_max: 6.6,
|
||||
energy_reward: 0.067,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(12.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 132,
|
||||
energy_max: 13.2,
|
||||
energy_reward: 0.134,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(12.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 132,
|
||||
energy_max: 13.2,
|
||||
energy_reward: 0.134,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(1.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 8,
|
||||
energy_max: 0.8,
|
||||
energy_reward: 0.009,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(1.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 8,
|
||||
energy_max: 0.8,
|
||||
energy_reward: 0.009,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(5.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 50,
|
||||
energy_max: 5.0,
|
||||
energy_reward: 0.051,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(2.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 17,
|
||||
energy_max: 1.7,
|
||||
energy_reward: 0.017,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(2.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 17,
|
||||
energy_max: 1.7,
|
||||
energy_reward: 0.017,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(3.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 33,
|
||||
energy_max: 3.3,
|
||||
energy_reward: 0.034,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(3.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 33,
|
||||
energy_max: 3.3,
|
||||
energy_reward: 0.034,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(4.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 41,
|
||||
energy_max: 4.1,
|
||||
energy_reward: 0.042,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(4.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 41,
|
||||
energy_max: 4.1,
|
||||
energy_reward: 0.042,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(23.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 248,
|
||||
energy_max: 24.8,
|
||||
energy_reward: 0.252,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(8.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 83,
|
||||
energy_max: 8.3,
|
||||
energy_reward: 0.084,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(8.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 83,
|
||||
energy_max: 8.3,
|
||||
energy_reward: 0.084,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(17.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 165,
|
||||
energy_max: 16.5,
|
||||
energy_reward: 0.168,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(17.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 165,
|
||||
energy_max: 16.5,
|
||||
energy_reward: 0.168,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(2.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 25,
|
||||
energy_max: 2.5,
|
||||
energy_reward: 0.025,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(2.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 25,
|
||||
energy_max: 2.5,
|
||||
energy_reward: 0.025,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(14.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 149,
|
||||
energy_max: 14.9,
|
||||
energy_reward: 0.15,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(5.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 50,
|
||||
energy_max: 5.0,
|
||||
energy_reward: 0.05,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(5.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 50,
|
||||
energy_max: 5.0,
|
||||
energy_reward: 0.05,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(9.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 99,
|
||||
energy_max: 9.9,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(9.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 99,
|
||||
energy_max: 9.9,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(5.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 50,
|
||||
energy_max: 5.0,
|
||||
energy_reward: 0.05,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(5.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 50,
|
||||
energy_max: 5.0,
|
||||
energy_reward: 0.05,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(27.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 300,
|
||||
energy_max: 30.0,
|
||||
energy_reward: 0.3,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(9.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 100,
|
||||
energy_max: 10.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(9.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 100,
|
||||
energy_max: 10.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(18.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 200,
|
||||
energy_max: 20.0,
|
||||
energy_reward: 0.2,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(18.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 200,
|
||||
energy_max: 20.0,
|
||||
energy_reward: 0.2,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(2.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 17,
|
||||
energy_max: 1.7,
|
||||
energy_reward: 0.017,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(2.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 17,
|
||||
energy_max: 1.7,
|
||||
energy_reward: 0.017,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(9.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 99,
|
||||
energy_max: 9.9,
|
||||
energy_reward: 0.099,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(3.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 33,
|
||||
energy_max: 3.3,
|
||||
energy_reward: 0.033,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(3.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 33,
|
||||
energy_max: 3.3,
|
||||
energy_reward: 0.033,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(6.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 66,
|
||||
energy_max: 6.6,
|
||||
energy_reward: 0.066,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(6.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 66,
|
||||
energy_max: 6.6,
|
||||
energy_reward: 0.066,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(8.0),
|
||||
poise_resilience: Normal(1.0),
|
||||
energy_max: 20,
|
||||
energy_max: 2.0,
|
||||
energy_reward: 0.025,
|
||||
crit_power: 0.02,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(48.0),
|
||||
poise_resilience: Normal(6.0),
|
||||
energy_max: 135,
|
||||
energy_max: 13.5,
|
||||
energy_reward: 0.135,
|
||||
crit_power: 0.125,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(16.0),
|
||||
poise_resilience: Normal(2.0),
|
||||
energy_max: 45,
|
||||
energy_max: 4.5,
|
||||
energy_reward: 0.045,
|
||||
crit_power: 0.04,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(16.0),
|
||||
poise_resilience: Normal(2.0),
|
||||
energy_max: 45,
|
||||
energy_max: 4.5,
|
||||
energy_reward: 0.045,
|
||||
crit_power: 0.04,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(4.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(5.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(8.0),
|
||||
poise_resilience: Normal(1.0),
|
||||
energy_max: 20,
|
||||
energy_max: 2.0,
|
||||
energy_reward: 0.025,
|
||||
crit_power: 0.02,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(0.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 100,
|
||||
energy_max: 10.0,
|
||||
energy_reward: 0.0,
|
||||
crit_power: -0.025,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(0.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: -100,
|
||||
energy_max: -10.0,
|
||||
energy_reward: 0.05,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(0.0),
|
||||
poise_resilience: Normal(0.0),
|
||||
energy_max: 50,
|
||||
energy_max: 5.0,
|
||||
energy_reward: 0.00,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(8.0),
|
||||
poise_resilience: Normal(1.0),
|
||||
energy_max: 20,
|
||||
energy_max: 2.0,
|
||||
energy_reward: 0.025,
|
||||
crit_power: 0.02,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(48.0),
|
||||
poise_resilience: Normal(6.0),
|
||||
energy_max: 135,
|
||||
energy_max: 13.5,
|
||||
energy_reward: 0.135,
|
||||
crit_power: 0.125,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(16.0),
|
||||
poise_resilience: Normal(2.0),
|
||||
energy_max: 45,
|
||||
energy_max: 4.5,
|
||||
energy_reward: 0.045,
|
||||
crit_power: 0.04,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(16.0),
|
||||
poise_resilience: Normal(2.0),
|
||||
energy_max: 45,
|
||||
energy_max: 4.5,
|
||||
energy_reward: 0.045,
|
||||
crit_power: 0.04,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(5.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(4.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(5.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(5.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(8.0),
|
||||
poise_resilience: Normal(1.0),
|
||||
energy_max: 20,
|
||||
energy_max: 2.0,
|
||||
energy_reward: 0.025,
|
||||
crit_power: 0.02,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(48.0),
|
||||
poise_resilience: Normal(6.0),
|
||||
energy_max: 135,
|
||||
energy_max: 13.5,
|
||||
energy_reward: 0.135,
|
||||
crit_power: 0.125,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(16.0),
|
||||
poise_resilience: Normal(2.0),
|
||||
energy_max: 45,
|
||||
energy_max: 4.5,
|
||||
energy_reward: 0.045,
|
||||
crit_power: 0.04,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(16.0),
|
||||
poise_resilience: Normal(2.0),
|
||||
energy_max: 45,
|
||||
energy_max: 4.5,
|
||||
energy_reward: 0.045,
|
||||
crit_power: 0.04,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(5.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(4.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(32.0),
|
||||
poise_resilience: Normal(5.0),
|
||||
energy_max: 90,
|
||||
energy_max: 9.0,
|
||||
energy_reward: 0.1,
|
||||
crit_power: 0.08,
|
||||
stealth: 0.0,
|
||||
|
@ -7,7 +7,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Invincible,
|
||||
poise_resilience: Invincible,
|
||||
energy_max: 9000,
|
||||
energy_max: 900.0,
|
||||
energy_reward: 9.0,
|
||||
crit_power: 0.0,
|
||||
stealth: 1000.0,
|
||||
|
@ -6,7 +6,7 @@ ItemDef(
|
||||
stats: (
|
||||
protection: Normal(250.0),
|
||||
poise_resilience: Normal(1.0),
|
||||
energy_max: 1000,
|
||||
energy_max: 100.0,
|
||||
energy_reward: 1.0,
|
||||
crit_power: 0.0,
|
||||
stealth: 0.0,
|
||||
|
@ -122,7 +122,7 @@ fn armor_stats() -> Result<(), Box<dyn Error>> {
|
||||
"Could not unwrap max energy value for {:?}",
|
||||
item.item_definition_id()
|
||||
);
|
||||
0
|
||||
0.0
|
||||
};
|
||||
|
||||
let energy_reward = if let Some(energy_reward_raw) =
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user