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

combat tweaks

Browse Source
This commit is contained in:
jshipsey 2021-04-15 02:49:12 -04:00
parent 9c59033976
commit 896d2a5b63
59 changed files with 103 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ ComboMelee(
( (
stage: 1, stage: 1,
base_damage: 90, base_damage: 90,
base_poise_damage: 15, base_poise_damage: 12,
damage_increase: 10, damage_increase: 10,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 8.0, knockback: 8.0,
@ -17,7 +17,7 @@ ComboMelee(
( (
stage: 2, stage: 2,
base_damage: 130, base_damage: 130,
base_poise_damage: 35, base_poise_damage: 20,
damage_increase: 15, damage_increase: 15,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 12.0, knockback: 12.0,

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

@ -3,7 +3,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 150, base_damage: 150,
damage_increase: 10, damage_increase: 10,
base_poise_damage: 40, base_poise_damage: 25,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 10.0, knockback: 10.0,
range: 4.5, range: 4.5,

4
assets/common/abilities/hammersimple/doublestrike.ron
View File

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 90, base_damage: 90,
damage_increase: 10, damage_increase: 10,
base_poise_damage: 45, base_poise_damage: 30,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 4.0, knockback: 4.0,
range: 3.5, range: 3.5,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 130, base_damage: 130,
damage_increase: 15, damage_increase: 15,
base_poise_damage: 45, base_poise_damage: 30,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 16.0, knockback: 16.0,
range: 1.5, range: 1.5,

2
assets/common/abilities/spear/dash.ron
View File

@ -2,7 +2,7 @@ DashMelee(
energy_cost: 100, energy_cost: 100,
base_damage: 80, base_damage: 80,
scaled_damage: 160, scaled_damage: 160,
base_poise_damage: 60, base_poise_damage: 45,
scaled_poise_damage: 0, scaled_poise_damage: 0,
base_knockback: 8.0, base_knockback: 8.0,
scaled_knockback: 7.0, scaled_knockback: 7.0,

4
assets/common/abilities/spear/doublestrike.ron
View File

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 90, base_damage: 90,
damage_increase: 10, damage_increase: 10,
base_poise_damage: 30, base_poise_damage: 18,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 4.0, knockback: 4.0,
range: 2.5, range: 2.5,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 130, base_damage: 130,
damage_increase: 20, damage_increase: 20,
base_poise_damage: 30, base_poise_damage: 18,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 7.0, knockback: 7.0,
range: 2.5, range: 2.5,

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

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

2
assets/common/abilities/unique/husk/singlestrike.ron
View File

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 90, base_damage: 90,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 12,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,

6
assets/common/abilities/unique/husk/triplestrike.ron
View File

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 35, base_poise_damage: 8,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 35, base_poise_damage: 10,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,
@ -32,7 +32,7 @@ ComboMelee(
stage: 3, stage: 3,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 35, base_poise_damage: 12,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 100, base_damage: 100,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 40, base_poise_damage: 28,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 3.0, knockback: 3.0,
range: 3.5, range: 3.5,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 15,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 7.0, knockback: 7.0,
range: 3.5, range: 3.5,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 80, base_damage: 80,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 18,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 7.0, knockback: 7.0,
range: 3.5, range: 3.5,
@ -32,7 +32,7 @@ ComboMelee(
stage: 3, stage: 3,
base_damage: 130, base_damage: 130,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 20,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 7.0, knockback: 7.0,
range: 3.5, range: 3.5,

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

@ -2,7 +2,7 @@ DashMelee(
energy_cost: 0, energy_cost: 0,
base_damage: 150, base_damage: 150,
scaled_damage: 110, scaled_damage: 110,
base_poise_damage: 40, base_poise_damage: 25,
scaled_poise_damage: 0, scaled_poise_damage: 0,
base_knockback: 4.0, base_knockback: 4.0,
scaled_knockback: 17.0, scaled_knockback: 17.0,

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

@ -2,7 +2,7 @@ DashMelee(
energy_cost: 0, energy_cost: 0,
base_damage: 30, base_damage: 30,
scaled_damage: 10, scaled_damage: 10,
base_poise_damage: 40, base_poise_damage: 30,
scaled_poise_damage: 0, scaled_poise_damage: 0,
base_knockback: 2.0, base_knockback: 2.0,
scaled_knockback: 7.0, scaled_knockback: 7.0,

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

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

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 60, base_damage: 60,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 40, base_poise_damage: 28,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 3.0, knockback: 3.0,
range: 3.5, range: 3.5,

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

@ -5,7 +5,7 @@ ComboMelee(
base_damage: 100, base_damage: 100,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 0, base_poise_damage: 0,
poise_damage_increase: 30, poise_damage_increase: 22,
knockback: 10.0, knockback: 10.0,
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 22,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 10.0, knockback: 10.0,
range: 3.5, range: 3.5,
@ -32,7 +32,7 @@ ComboMelee(
stage: 3, stage: 3,
base_damage: 130, base_damage: 130,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 22,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 10.0, knockback: 10.0,
range: 3.5, range: 3.5,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 28,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 35, base_poise_damage: 15,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 35, base_poise_damage: 18,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,
@ -32,7 +32,7 @@ ComboMelee(
stage: 3, stage: 3,
base_damage: 120, base_damage: 120,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 35, base_poise_damage: 20,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,

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

@ -2,7 +2,7 @@ DashMelee(
energy_cost: 0, energy_cost: 0,
base_damage: 150, base_damage: 150,
scaled_damage: 40, scaled_damage: 40,
base_poise_damage: 40, base_poise_damage: 28,
scaled_poise_damage: 40, scaled_poise_damage: 40,
base_knockback: 8.0, base_knockback: 8.0,
scaled_knockback: 17.0, scaled_knockback: 17.0,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 100, base_damage: 100,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 40, base_poise_damage: 22,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 10.0, knockback: 10.0,
range: 3.5, range: 3.5,
@ -19,7 +19,7 @@ ComboMelee(
base_damage: 80, base_damage: 80,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 0, base_poise_damage: 0,
poise_damage_increase: 40, poise_damage_increase: 22,
knockback: 10.0, knockback: 10.0,
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,

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

@ -4,7 +4,7 @@ BasicMelee(
swing_duration: 0.5, swing_duration: 0.5,
recover_duration: 0.35, recover_duration: 0.35,
base_damage: 130, base_damage: 130,
base_poise_damage: 30, base_poise_damage: 28,
knockback: 25.0, knockback: 25.0,
range: 3.0, range: 3.0,
max_angle: 120.0, max_angle: 120.0,

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

@ -2,8 +2,8 @@ DashMelee(
energy_cost: 0, energy_cost: 0,
base_damage: 130, base_damage: 130,
scaled_damage: 20, scaled_damage: 20,
base_poise_damage: 40, base_poise_damage: 28,
scaled_poise_damage: 60, scaled_poise_damage: 28,
base_knockback: 3.0, base_knockback: 3.0,
scaled_knockback: 7.0, scaled_knockback: 7.0,
range: 2.0, range: 2.0,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 150, base_damage: 150,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 15,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,
@ -18,7 +18,7 @@ ComboMelee(
stage: 2, stage: 2,
base_damage: 150, base_damage: 150,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 17,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,
@ -32,7 +32,7 @@ ComboMelee(
stage: 3, stage: 3,
base_damage: 150, base_damage: 150,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 30, base_poise_damage: 20,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.0, knockback: 5.0,
range: 3.5, range: 3.5,

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

@ -4,7 +4,7 @@ ComboMelee(
stage: 1, stage: 1,
base_damage: 150, base_damage: 150,
damage_increase: 0, damage_increase: 0,
base_poise_damage: 40, base_poise_damage: 28,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 2.0, knockback: 2.0,
range: 5.5, range: 5.5,

2
assets/common/items/weapons/axe/bloodsteel_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.8, power: 1.8,
poise_strength: 1.4, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1421875, crit_chance: 0.1421875,
crit_mult: 1.4395604, crit_mult: 1.4395604,

2
assets/common/items/weapons/axe/bloodsteel_axe-1.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.8, power: 1.8,
poise_strength: 1.8, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1421875, crit_chance: 0.1421875,
crit_mult: 1.4395604, crit_mult: 1.4395604,

2
assets/common/items/weapons/axe/bloodsteel_axe-2.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.8, power: 1.8,
poise_strength: 1.8, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1421875, crit_chance: 0.1421875,
crit_mult: 1.4395604, crit_mult: 1.4395604,

2
assets/common/items/weapons/axe/bronze_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.0, power: 1.0,
poise_strength: 0.9, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.15, crit_chance: 0.15,
crit_mult: 1.5714285, crit_mult: 1.5714285,

2
assets/common/items/weapons/axe/bronze_axe-1.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.0, power: 1.0,
poise_strength: 1.5, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.15, crit_chance: 0.15,
crit_mult: 1.5714285, crit_mult: 1.5714285,

2
assets/common/items/weapons/axe/bronze_axe-2.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.0, power: 1.0,
poise_strength: 1.4, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.15, crit_chance: 0.15,
crit_mult: 1.5714285, crit_mult: 1.5714285,

2
assets/common/items/weapons/axe/iron_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.7, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-1.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.4, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-2.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.1, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-3.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.6, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-4.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.4, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-5.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.8, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-6.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.3, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-7.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 1.6, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-8.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 0.6, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/iron_axe-9.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.2, power: 1.2,
poise_strength: 0.3, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.1375, crit_chance: 0.1375,
crit_mult: 1.5194805, crit_mult: 1.5194805,

2
assets/common/items/weapons/axe/malachite_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 2.0, power: 2.0,
poise_strength: 1.1, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.140625, crit_chance: 0.140625,
crit_mult: 1.4063492, crit_mult: 1.4063492,

2
assets/common/items/weapons/axe/orc_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.6, power: 0.6,
poise_strength: 1.5, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.083333336, crit_chance: 0.083333336,
crit_mult: 2.142857, crit_mult: 2.142857,

2
assets/common/items/weapons/axe/parashu.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 2.5, power: 2.5,
poise_strength: 1.8, poise_strength: 1.0,
speed: 0.8, speed: 0.8,
crit_chance: 0.11666667, crit_chance: 0.11666667,
crit_mult: 1.3918368, crit_mult: 1.3918368,

2
assets/common/items/weapons/axe/starter_axe.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.5, power: 0.5,
poise_strength: 2.0, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.09375, crit_chance: 0.09375,
crit_mult: 2.2190475, crit_mult: 2.2190475,

2
assets/common/items/weapons/axe/steel_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.4, power: 1.4,
poise_strength: 1.2, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.12857144, crit_chance: 0.12857144,
crit_mult: 1.4761904, crit_mult: 1.4761904,

2
assets/common/items/weapons/axe/steel_axe-1.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.4, power: 1.4,
poise_strength: 1.2, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.12857144, crit_chance: 0.12857144,
crit_mult: 1.4761904, crit_mult: 1.4761904,

2
assets/common/items/weapons/axe/steel_axe-2.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.4, power: 1.4,
poise_strength: 1.2, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.12857144, crit_chance: 0.12857144,
crit_mult: 1.4761904, crit_mult: 1.4761904,

2
assets/common/items/weapons/axe/steel_axe-3.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.4, power: 1.4,
poise_strength: 1.1, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.12857144, crit_chance: 0.12857144,
crit_mult: 1.4761904, crit_mult: 1.4761904,

2
assets/common/items/weapons/axe/steel_axe-4.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.4, power: 1.4,
poise_strength: 1.2, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.12857144, crit_chance: 0.12857144,
crit_mult: 1.4761904, crit_mult: 1.4761904,

2
assets/common/items/weapons/axe/steel_axe-5.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 1.4, power: 1.4,
poise_strength: 1.5, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.12857144, crit_chance: 0.12857144,
crit_mult: 1.4761904, crit_mult: 1.4761904,

2
assets/common/items/weapons/axe/worn_iron_axe-0.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.8, power: 0.8,
poise_strength: 0.4, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.0703125, crit_chance: 0.0703125,
crit_mult: 2.015873, crit_mult: 2.015873,

2
assets/common/items/weapons/axe/worn_iron_axe-1.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.8, power: 0.8,
poise_strength: 0.4, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.0703125, crit_chance: 0.0703125,
crit_mult: 2.015873, crit_mult: 2.015873,

2
assets/common/items/weapons/axe/worn_iron_axe-2.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.8, power: 0.8,
poise_strength: 0.7, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.0703125, crit_chance: 0.0703125,
crit_mult: 2.015873, crit_mult: 2.015873,

2
assets/common/items/weapons/axe/worn_iron_axe-3.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.8, power: 0.8,
poise_strength: 1.1, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.0703125, crit_chance: 0.0703125,
crit_mult: 2.015873, crit_mult: 2.015873,

2
assets/common/items/weapons/axe/worn_iron_axe-4.ron
View File

@ -7,7 +7,7 @@ ItemDef(
stats: Direct(( stats: Direct((
equip_time_secs: 0.4, equip_time_secs: 0.4,
power: 0.8, power: 0.8,
poise_strength: 0.5, poise_strength: 1.0,
speed: 1.0, speed: 1.0,
crit_chance: 0.0703125, crit_chance: 0.0703125,
crit_mult: 2.015873, crit_mult: 2.015873,

20
common/sys/src/character_behavior.rs
View File

@ -173,9 +173,9 @@ impl<'a> System<'a> for Sys {
*char_state.get_mut_unchecked() = *char_state.get_mut_unchecked() =
CharacterState::Stunned(common::states::stunned::Data { CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData { static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(150), buildup_duration: Duration::from_millis(125),
recover_duration: Duration::from_millis(150), recover_duration: Duration::from_millis(125),
movement_speed: 0.4, movement_speed: 0.80,
poise_state, poise_state,
}, },
timer: Duration::default(), timer: Duration::default(),
@ -188,9 +188,9 @@ impl<'a> System<'a> for Sys {
*char_state.get_mut_unchecked() = *char_state.get_mut_unchecked() =
CharacterState::Stunned(common::states::stunned::Data { CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData { static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(500), buildup_duration: Duration::from_millis(300),
recover_duration: Duration::from_millis(300), recover_duration: Duration::from_millis(300),
movement_speed: 0.1, movement_speed: 0.65,
poise_state, poise_state,
}, },
timer: Duration::default(), timer: Duration::default(),
@ -207,9 +207,9 @@ impl<'a> System<'a> for Sys {
*char_state.get_mut_unchecked() = *char_state.get_mut_unchecked() =
CharacterState::Stunned(common::states::stunned::Data { CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData { static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(800), buildup_duration: Duration::from_millis(600),
recover_duration: Duration::from_millis(250), recover_duration: Duration::from_millis(250),
movement_speed: 0.0, movement_speed: 0.45,
poise_state, poise_state,
}, },
timer: Duration::default(), timer: Duration::default(),
@ -226,9 +226,9 @@ impl<'a> System<'a> for Sys {
*char_state.get_mut_unchecked() = *char_state.get_mut_unchecked() =
CharacterState::Stunned(common::states::stunned::Data { CharacterState::Stunned(common::states::stunned::Data {
static_data: common::states::stunned::StaticData { static_data: common::states::stunned::StaticData {
buildup_duration: Duration::from_millis(1000), buildup_duration: Duration::from_millis(750),
recover_duration: Duration::from_millis(750), recover_duration: Duration::from_millis(500),
movement_speed: 0.0, movement_speed: 0.4,
poise_state, poise_state,
}, },
timer: Duration::default(), timer: Duration::default(),

6
voxygen/anim/src/biped_small/stunned.rs
View File

@ -68,10 +68,10 @@ impl Animation for StunnedAnimation {
let movement1abs = movement1base * pullback; let movement1abs = movement1base * pullback;
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation = next.head.orientation =
Quaternion::rotation_x(movement1 * 0.2) * Quaternion::rotation_z(movement1 * 0.5); Quaternion::rotation_x(movement1 * 0.2) * Quaternion::rotation_z(movement1 * -0.3);
next.chest.position = next.chest.position =
Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs - 2.0) * s_a.scaler / 11.0; Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs - 3.0) * s_a.scaler / 11.0;
next.chest.orientation = Quaternion::rotation_z(movement1 * 0.5); next.chest.orientation = Quaternion::rotation_z(movement1 * 1.2);
next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1);

9
voxygen/anim/src/character/staggered.rs
View File

@ -58,10 +58,11 @@ impl Animation for StaggeredAnimation {
let mirror = (check - 0.5).signum(); let mirror = (check - 0.5).signum();
let movement1 = movement1base * pullback * mirror; let movement1 = movement1base * pullback * mirror;
let movement1abs = movement1base * pullback; let movement1abs = movement1base * pullback;
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_z(0.0);
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation = next.head.orientation =
Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * 0.3); Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * -0.3);
next.shorts.orientation = next.shorts.orientation =
Quaternion::rotation_x(movement1abs * 0.2) * Quaternion::rotation_z(movement1 * -0.3); Quaternion::rotation_x(movement1abs * 0.2) * Quaternion::rotation_z(movement1 * -0.3);
next.belt.orientation = next.belt.orientation =
@ -69,10 +70,12 @@ impl Animation for StaggeredAnimation {
next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + movement1abs * 1.0, s_a.shorts.1); next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + movement1abs * 1.0, s_a.shorts.1);
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs * -4.0); next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + movement1abs * -4.0);
next.chest.orientation = next.chest.orientation =
Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * 1.0); Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * 1.3);
if wield_status { if wield_status {
next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0); next.main.orientation = Quaternion::rotation_x(0.0);
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_z(0.0);
match (hands, active_tool_kind, second_tool_kind) { match (hands, active_tool_kind, second_tool_kind) {
((Some(Hands::Two), _), tool, _) | ((None, Some(Hands::Two)), _, tool) => { ((Some(Hands::Two), _), tool, _) | ((None, Some(Hands::Two)), _, tool) => {
match tool { match tool {

7
voxygen/anim/src/character/stunned.rs
View File

@ -60,18 +60,19 @@ impl Animation for StunnedAnimation {
let movement1abs = movement1base * pullback; let movement1abs = movement1base * pullback;
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_z(movement1 * 0.3); next.head.orientation = Quaternion::rotation_z(movement1 * -0.3);
next.shorts.orientation = next.shorts.orientation =
Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * -0.3); Quaternion::rotation_x(movement1abs * -0.2) * Quaternion::rotation_z(movement1 * -0.3);
next.belt.orientation = next.belt.orientation =
Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * -0.2); Quaternion::rotation_x(movement1abs * -0.1) * Quaternion::rotation_z(movement1 * -0.2);
next.chest.orientation = next.chest.orientation =
Quaternion::rotation_x(movement1abs * 0.3) * Quaternion::rotation_z(movement1 * 0.5); Quaternion::rotation_x(movement1abs * 0.3) * Quaternion::rotation_z(movement1 * 1.0);
if wield_status { if wield_status {
next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0); next.main.orientation = Quaternion::rotation_x(0.0);
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_z(0.0);
match hands { match hands {
(Some(Hands::Two), _) | (None, Some(Hands::Two)) => match active_tool_kind { (Some(Hands::Two), _) | (None, Some(Hands::Two)) => match active_tool_kind {
Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => { Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {

5
world/src/site/dungeon/mod.rs
View File

@ -754,10 +754,11 @@ impl Floor {
) )
.with_loot_drop(chosen.read().choose().to_item()) .with_loot_drop(chosen.read().choose().to_item())
.with_main_tool(comp::Item::new_from_asset_expect( .with_main_tool(comp::Item::new_from_asset_expect(
match dynamic_rng.gen_range(0..5) { match dynamic_rng.gen_range(0..6) {
0 => "common.items.weapons.axe.malachite_axe-0", 0 => "common.items.weapons.axe_1h.orichalcum-0",
1..=2 => "common.items.weapons.sword.cultist", 1..=2 => "common.items.weapons.sword.cultist",
3 => "common.items.weapons.hammer.cultist_purp_2h-0", 3 => "common.items.weapons.hammer.cultist_purp_2h-0",
4 => "common.items.weapons.hammer_1h.orichalcum-0",
_ => "common.items.weapons.bow.bone-1", _ => "common.items.weapons.bow.bone-1",
}, },
)), )),