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

Further tweaks from testing

Browse Source
This commit is contained in:
uniior 2024-02-16 22:27:33 -03:00 committed by UncomfySilence
parent 60c58200a9
commit 7e7bfa00e4
7 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/custom/quadlowbasic/triplestrike.ron
View File

@ -44,7 +44,7 @@ ComboMelee2(
melee_constructor: (
kind: Bash(
damage: 28,
poise: 28,
poise: 36,
knockback: 3,
energy_regen: 0,
),

2
assets/common/abilities/custom/quadmedquick/dash.ron
View File

@ -2,7 +2,7 @@ DashMelee(
energy_cost: 0,
melee_constructor: (
kind: Bash(
damage: 11.0,
damage: 10.0,
poise: 20.0,
knockback: 3.0,
energy_regen: 0.0,

4
assets/common/abilities/custom/quadmedquick/triplestrike.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Bash(
damage: 14,
damage: 12,
poise: 12,
knockback: 5,
energy_regen: 0,
@ -23,7 +23,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Bash(
damage: 14,
damage: 12,
poise: 12,
knockback: 5,
energy_regen: 0,

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

@ -11,10 +11,10 @@ ComboMelee2(
range: 5.5,
angle: 60.0,
),
buildup_duration: 0.7,
buildup_duration: 0.6,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 0.5,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.25)),
),

10
assets/common/abilities/custom/theropodbasic/triplestrike.ron
View File

@ -11,10 +11,10 @@ ComboMelee2(
range: 5.0,
angle: 45.0,
),
buildup_duration: 0.8,
buildup_duration: 0.9,
swing_duration: 0.15,
hit_timing: 0.5,
recover_duration: 0.1,
recover_duration: 0.3,
movement: (
swing: Some(Forward(0.2)),
),
@ -31,10 +31,10 @@ ComboMelee2(
range: 5.0,
angle: 45.0,
),
buildup_duration: 0.25,
buildup_duration: 0.6,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 0.3,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.3)),
),
@ -51,7 +51,7 @@ ComboMelee2(
range: 5.5,
angle: 30.0,
),
buildup_duration: 0.65,
buildup_duration: 0.7,
swing_duration: 0.25,
hit_timing: 0.5,
recover_duration: 1.1,

6
assets/common/abilities/custom/treant_sapling/shockwave.ron
View File

@ -1,6 +1,6 @@
Shockwave(
energy_cost: 0.0,
buildup_duration: 2.3,
buildup_duration: 1.6,
swing_duration: 0.1,
recover_duration: 2.3,
damage: 8.0,
@ -8,8 +8,8 @@ Shockwave(
knockback: ( strength: 5.0, direction: Away),
shockwave_angle: 360.0,
shockwave_vertical_angle: 90.0,
shockwave_speed: 32.5,
shockwave_duration: 0.4,
shockwave_speed: 10,
shockwave_duration: 1.3,
dodgeable: Jump,
move_efficiency: 0.1,
damage_kind: Crushing,

10
common/src/comp/body.rs
View File

@ -1208,8 +1208,14 @@ impl Body {
quadruped_small::Species::Axolotl | quadruped_small::Species::Gecko => 0.6,
_ => 1.0,
},
Body::FishMedium(_) => 0.6,
Body::FishSmall(_) => 0.6,
Body::FishMedium(b) => match b.species {
fish_medium::Species::Marlin | fish_medium::Species::Icepike => 0.6,
_ => 1.0,
},
Body::FishSmall(b) => match b.species {
fish_small::Species::Clownfish | fish_small::Species::Piranha => 0.6,
_ => 1.0,
},
#[allow(unreachable_patterns)] // TODO: Remove when more crustacean species are added
Body::Crustacean(b) => match b.species {
crustacean::Species::Crab => 0.6,