Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase and scrub poise from UI

Browse Source
This commit is contained in:
jiminycrick 2021-01-25 20:16:28 -08:00
parent d456271921
commit 152156d065
56 changed files with 149 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/common/abilities/axe/doublestrike.ron
View File

@ -4,9 +4,9 @@ ComboMelee(
stage: 1,
base_damage: 90,
max_damage: 110,
base_poise_damage: 20,
base_poise_damage: 0,
damage_increase: 10,
poise_damage_increase: 5,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 50.0,
@ -19,9 +19,9 @@ ComboMelee(
stage: 2,
base_damage: 130,
max_damage: 160,
base_poise_damage: 40,
base_poise_damage: 0,
damage_increase: 15,
poise_damage_increase: 15,
poise_damage_increase: 0,
knockback: 12.0,
range: 3.5,
angle: 30.0,

2
assets/common/abilities/axe/leap.ron
View File

@ -5,7 +5,7 @@ LeapMelee(
swing_duration: 200,
recover_duration: 200,
base_damage: 240,
base_poise_damage: 70,
base_poise_damage: 0,
knockback: 12.0,
range: 4.5,
max_angle: 30.0,

2
assets/common/abilities/axe/spin.ron
View File

@ -3,7 +3,7 @@ SpinMelee(
swing_duration: 400,
recover_duration: 200,
base_damage: 60,
base_poise_damage: 20,
base_poise_damage: 0,
knockback: 0.0,
range: 3.5,
energy_cost: 100,

2
assets/common/abilities/bow/basic.ron
View File

@ -4,7 +4,7 @@ BasicRanged(
recover_duration: 300,
projectile: Arrow(
damage: 70.0,
poise_damage: 2,
poise_damage: 0,
knockback: 5.0,
energy_regen: 40,
),

4
assets/common/abilities/bow/charged.ron
View File

@ -3,8 +3,8 @@ ChargedRanged(
energy_drain: 300,
initial_damage: 10,
scaled_damage: 190,
initial_poise_damage: 10,
scaled_poise_damage: 60,
initial_poise_damage: 0,
scaled_poise_damage: 0,
initial_knockback: 10.0,
scaled_knockback: 10.0,
speed: 1.0,

2
assets/common/abilities/bow/repeater.ron
View File

@ -7,7 +7,7 @@ RepeaterRanged(
leap: Some(5.0),
projectile: Arrow(
damage: 40.0,
poise_damage: 4,
poise_damage: 0,
knockback: 5.0,
energy_regen: 0,
),

2
assets/common/abilities/dagger/tempbasic.ron
View File

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 100,
recover_duration: 300,
base_damage: 50,
base_poise_damage: 10,
base_poise_damage: 0,
knockback: 0.0,
range: 3.5,
max_angle: 20.0,

2
assets/common/abilities/empty/basic.ron
View File

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 100,
recover_duration: 900,
base_damage: 20,
base_poise_damage: 5,
base_poise_damage: 0,
knockback: 0.0,
range: 3.5,
max_angle: 15.0,

2
assets/common/abilities/farming/basic.ron
View File

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 100,
recover_duration: 150,
base_damage: 50,
base_poise_damage: 5,
base_poise_damage: 0,
knockback: 0.0,
range: 3.5,
max_angle: 20.0,

4
assets/common/abilities/hammer/charged.ron
View File

@ -3,8 +3,8 @@ ChargedMelee(
energy_drain: 300,
initial_damage: 10,
scaled_damage: 160,
initial_poise_damage: 5,
scaled_poise_damage: 70,
initial_poise_damage: 0,
scaled_poise_damage: 0,
initial_knockback: 10.0,
scaled_knockback: 50.0,
range: 3.5,

2
assets/common/abilities/hammer/leap.ron
View File

@ -5,7 +5,7 @@ LeapMelee(
swing_duration: 150,
recover_duration: 200,
base_damage: 240,
base_poise_damage: 40,
base_poise_damage: 0,
knockback: 25.0,
range: 4.5,
max_angle: 360.0,

4
assets/common/abilities/hammer/singlestrike.ron
View File

@ -3,8 +3,8 @@ ComboMelee(
stage: 1,
base_damage: 130,
damage_increase: 10,
base_poise_damage: 10,
poise_damage_increase: 5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 0.0,
range: 4.5,
angle: 50.0,

2
assets/common/abilities/shield/tempbasic.ron
View File

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 100,
recover_duration: 300,
base_damage: 40,
base_poise_damage: 20,
base_poise_damage: 0,
knockback: 0.0,
range: 3.0,
max_angle: 120.0,

2
assets/common/abilities/staff/firebomb.ron
View File

@ -4,7 +4,7 @@ BasicRanged(
recover_duration: 350,
projectile: Fireball(
damage: 100.0,
poise_damage: 10,
poise_damage: 0,
radius: 5.0,
energy_regen: 50,
),

2
assets/common/abilities/staff/fireshockwave.ron
View File

@ -4,7 +4,7 @@ Shockwave(
swing_duration: 100,
recover_duration: 300,
damage: 200,
poise_damage: 10,
poise_damage: 0,
knockback: Away(25.0),
shockwave_angle: 360.0,
shockwave_vertical_angle: 90.0,

4
assets/common/abilities/sword/dash.ron
View File

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 100,
base_damage: 80,
scaled_damage: 160,
base_poise_damage: 20,
scaled_poise_damage: 20,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,
scaled_knockback: 7.0,
range: 5.0,

2
assets/common/abilities/sword/spin.ron
View File

@ -3,7 +3,7 @@ SpinMelee(
swing_duration: 400,
recover_duration: 500,
base_damage: 160,
base_poise_damage: 10,
base_poise_damage: 0,
knockback: 10.0,
range: 3.5,
energy_cost: 150,

12
assets/common/abilities/sword/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 10,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 4.0,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 80,
damage_increase: 15,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 12.0,
range: 3.5,
angle: 180.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 130,
damage_increase: 20,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 14.0,
range: 6.0,
angle: 10.0,

2
assets/common/abilities/unique/beastclaws/basic.ron
View File

@ -5,7 +5,7 @@ BasicMelee(
recover_duration: 250,
knockback: 25.0,
base_damage: 200,
base_poise_damage: 30,
base_poise_damage: 0,
range: 5.0,
max_angle: 120.0,
)

4
assets/common/abilities/unique/quadlowbasic/singlestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 0,
base_poise_damage: 30,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,

12
assets/common/abilities/unique/quadlowbasic/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 120,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 80,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 130,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,

4
assets/common/abilities/unique/quadlowbreathe/dash.ron
View File

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 0,
base_damage: 150,
scaled_damage: 110,
base_poise_damage: 60,
scaled_poise_damage: 20,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,
scaled_knockback: 17.0,
range: 5.0,

12
assets/common/abilities/unique/quadlowbreathe/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 4.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 80,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 130,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,

4
assets/common/abilities/unique/quadlowquick/dash.ron
View File

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 0,
base_damage: 30,
scaled_damage: 10,
base_poise_damage: 30,
scaled_poise_damage: 20,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,
scaled_knockback: 7.0,
range: 2.0,

16
assets/common/abilities/unique/quadlowquick/quadstrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 130,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.5,
angle: 30.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 130,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.5,
angle: 30.0,
@ -46,8 +46,8 @@ ComboMelee(
stage: 4,
base_damage: 130,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 30.0,

2
assets/common/abilities/unique/quadlowranged/firebomb.ron
View File

@ -4,7 +4,7 @@ BasicRanged(
recover_duration: 350,
projectile: Fireball(
damage: 100.0,
poise_damage: 10,
poise_damage: 0,
radius: 5.0,
energy_regen: 0,
),

4
assets/common/abilities/unique/quadlowranged/singlestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 60,
damage_increase: 0,
base_poise_damage: 30,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,

4
assets/common/abilities/unique/quadlowtail/charged.ron
View File

@ -3,8 +3,8 @@ ChargedMelee(
energy_drain: 0,
initial_damage: 160,
scaled_damage: 40,
initial_poise_damage: 50,
scaled_poise_damage: 20,
initial_poise_damage: 0,
scaled_poise_damage: 0,
initial_knockback: 10.0,
scaled_knockback: 20.0,
range: 6.0,

12
assets/common/abilities/unique/quadlowtail/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 120,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 130,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,

4
assets/common/abilities/unique/quadmedbasic/singlestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 120,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,

12
assets/common/abilities/unique/quadmedbasic/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 120,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 120,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 120,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,

4
assets/common/abilities/unique/quadmedcharge/dash.ron
View File

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 0,
base_damage: 150,
scaled_damage: 40,
base_poise_damage: 40,
scaled_poise_damage: 15,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,
scaled_knockback: 17.0,
range: 4.0,

8
assets/common/abilities/unique/quadmedcharge/doublestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 80,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
angle: 30.0,

2
assets/common/abilities/unique/quadmedhoof/basic.ron
View File

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 500,
recover_duration: 350,
base_damage: 130,
base_poise_damage: 70,
base_poise_damage: 0,
knockback: 25.0,
range: 3.0,
max_angle: 120.0,

8
assets/common/abilities/unique/quadmedjump/doublestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 100,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 80,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 30.0,

2
assets/common/abilities/unique/quadmedjump/leap.ron
View File

@ -5,7 +5,7 @@ LeapMelee(
swing_duration: 75,
recover_duration: 200,
base_damage: 240,
base_poise_damage: 15,
base_poise_damage: 0,
knockback: 12.0,
range: 4.5,
max_angle: 180.0,

2
assets/common/abilities/unique/quadmedjump/quickleap.ron
View File

@ -5,7 +5,7 @@ LeapMelee(
swing_duration: 75,
recover_duration: 125,
base_damage: 120,
base_poise_damage: 15,
base_poise_damage: 0,
knockback: 7.0,
range: 4.5,
max_angle: 180.0,

4
assets/common/abilities/unique/quadmedquick/dash.ron
View File

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 0,
base_damage: 130,
scaled_damage: 20,
base_poise_damage: 30,
scaled_poise_damage: 5,
base_poise_damage: 0,
scaled_poise_damage: 0,
base_knockback: 8.0,
scaled_knockback: 7.0,
range: 2.0,

12
assets/common/abilities/unique/quadmedquick/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 150,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 150,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 150,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 3,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,

4
assets/common/abilities/unique/quadsmallbasic/singlestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 30,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,

2
assets/common/abilities/unique/stonegolemfist/basic.ron
View File

@ -5,7 +5,7 @@ BasicMelee(
recover_duration: 250,
knockback: 25.0,
base_damage: 200,
base_poise_damage: 90,
base_poise_damage: 0,
range: 5.0,
max_angle: 120.0,
)

2
assets/common/abilities/unique/stonegolemfist/shockwave.ron
View File

@ -4,7 +4,7 @@ Shockwave(
swing_duration: 200,
recover_duration: 800,
damage: 500,
poise_damage: 50,
poise_damage: 0,
knockback: TowardsUp(40.0),
shockwave_angle: 90.0,
shockwave_vertical_angle: 90.0,

3
assets/common/abilities/unique/stonegolemfist/spin.ron
View File

@ -3,6 +3,7 @@ SpinMelee(
swing_duration: 300,
recover_duration: 100,
base_damage: 500,
base_poise_damage: 0,
knockback: 0.0,
range: 7.5,
energy_cost: 0,
@ -11,4 +12,4 @@ SpinMelee(
is_interruptible: false,
forward_speed: 0.0,
num_spins: 1,
)
)

4
assets/common/abilities/unique/theropodbasic/singlestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 150,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 7.5,
angle: 60.0,

12
assets/common/abilities/unique/theropodbasic/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 170,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 7.5,
angle: 30.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 190,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 5.5,
angle: 30.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 230,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 5.5,
angle: 30.0,

4
assets/common/abilities/unique/theropodbird/singlestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 150,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
range: 5.5,
angle: 5.0,

12
assets/common/abilities/unique/theropodbird/triplestrike.ron
View File

@ -4,8 +4,8 @@ ComboMelee(
stage: 1,
base_damage: 170,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 4.5,
angle: 5.0,
@ -18,8 +18,8 @@ ComboMelee(
stage: 2,
base_damage: 190,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 4.0,
angle: 10.0,
@ -32,8 +32,8 @@ ComboMelee(
stage: 3,
base_damage: 230,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 2,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 4.0,
angle: 10.0,

5
assets/common/items/debug/admin_black_hole.ron
View File

@ -4,7 +4,10 @@ ItemDef(
kind: Armor(
(
kind: Bag("BrownFace"),
stats: (protection: Normal(0.0)),
stats: (
protection: Normal(0.0),
poise_protection: Normal(0.0)
),
)
),
quality: Artifact,

1
assets/common/items/weapons/sceptre/fork0.ron
View File

@ -7,6 +7,7 @@ ItemDef(
stats: (
equip_time_millis: 400,
power: 2.0,
poise_power: 1.5,
speed: 0.8
),
)

1
assets/common/items/weapons/sceptre/loops0.ron
View File

@ -7,6 +7,7 @@ ItemDef(
stats: (
equip_time_millis: 400,
power: 1.2,
poise_power: 1.5,
speed: 1.5
),
)

1
assets/common/items/weapons/sceptre/moon0.ron
View File

@ -7,6 +7,7 @@ ItemDef(
stats: (
equip_time_millis: 400,
power: 1.6,
poise_power: 1.5,
speed: 0.5
),
)

1
assets/common/items/weapons/sceptre/root_evil.ron
View File

@ -7,6 +7,7 @@ ItemDef(
stats: (
equip_time_millis: 400,
power: 4.0,
poise_power: 1.5,
speed: 0.5
),
)

1
assets/common/items/weapons/sceptre/root_green0.ron
View File

@ -7,6 +7,7 @@ ItemDef(
stats: (
equip_time_millis: 400,
power: 3.5,
poise_power: 1.5,
speed: 0.4
),
)

1
assets/common/items/weapons/sceptre/totem_green.ron
View File

@ -8,6 +8,7 @@ ItemDef(
stats: (
equip_time_millis: 400,
power: 1.0,
poise_power: 1.5,
speed: 1.2
),
)

2
server/src/sys/terrain.rs
View File

@ -152,7 +152,7 @@ impl<'a> System<'a> for Sys {
LoadoutBuilder::build_loadout(body, main_tool, loadout_config).build();
let health = comp::Health::new(body, entity.level.unwrap_or(0));
let poise = comp::Poise::new(stats.body_type);
let poise = comp::Poise::new(body);
let can_speak = match body {
comp::Body::Humanoid(_) => alignment == comp::Alignment::Npc,

32
voxygen/src/hud/util.rs
View File

@ -73,14 +73,16 @@ fn armor_desc(armor: &Armor, desc: &str, slots: u16) -> String {
Protection::Normal(a) => a.to_string(),
Protection::Invincible => "Inf".to_string(),
};
let armor_poise_protection = match armor.get_poise_protection() {
Protection::Normal(a) => a.to_string(),
Protection::Invincible => "Inf".to_string(),
};
//let armor_poise_protection = match armor.get_poise_protection() {
// Protection::Normal(a) => a.to_string(),
// Protection::Invincible => "Inf".to_string(),
//};
let mut description = format!(
"{}\n\nArmor: {}\n\nPoise Protection: {}",
kind, armor_protection, armor_poise_protection
"{}\n\nArmor: {}",
//"{}\n\nArmor: {}\n\nPoise Protection: {}",
kind,
armor_protection, /* armor_poise_protection // Add back when we are ready for poise */
);
if !desc.is_empty() {
@ -113,28 +115,32 @@ fn tool_desc(tool: &Tool, desc: &str) -> String {
// Get tool stats
let power = tool.base_power();
let poise_power = tool.base_poise_power();
//let poise_power = tool.base_poise_power();
let speed = tool.base_speed();
if !desc.is_empty() {
format!(
"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \
{:0.1}\n\n{}\n\n<Right-Click to use>",
"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n<Right-Click to use>",
// add back when ready for poise
//"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \
// {:0.1}\n\n{}\n\n<Right-Click to use>",
kind,
speed * power * 10.0, // Damage per second
power * 10.0,
poise_power * 10.0,
//poise_power * 10.0,
speed,
desc
)
} else {
format!(
"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \
{:0.1}\n\n<Right-Click to use>",
"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n<Right-Click to use>",
// add back when ready for poise
//"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \
// {:0.1}\n\n<Right-Click to use>",
kind,
speed * power * 10.0, // Damage per second
power * 10.0,
poise_power * 10.0,
//poise_power * 10.0,
speed
)
}