mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'juliancoffee/patch_animal_dash_double_hit' into 'master'
Set charge_through to false for non-humanoid dash See merge request veloren/veloren!2616
This commit is contained in:
commit
5063264e04
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 3.0,
|
||||
swing_duration: 0.35,
|
||||
recover_duration: 1.2,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: true,
|
||||
damage_kind: Slashing,
|
||||
damage_effect: Some(Buff((
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.0,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.0,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 0.8,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.0,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.1,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.0,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 1.1,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 2.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.5,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: false,
|
||||
damage_kind: Crushing,
|
||||
)
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.0,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.8,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: true,
|
||||
damage_kind: Piercing,
|
||||
damage_effect: Some(Buff((
|
||||
|
@ -14,7 +14,7 @@ DashMelee(
|
||||
charge_duration: 1.2,
|
||||
swing_duration: 0.1,
|
||||
recover_duration: 0.9,
|
||||
charge_through: true,
|
||||
charge_through: false,
|
||||
is_interruptible: true,
|
||||
damage_kind: Piercing,
|
||||
damage_effect: Some(Buff((
|
||||
|
Loading…
Reference in New Issue
Block a user