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

animal adjustments

Browse Source
This commit is contained in:
jshipsey 2021-05-01 12:29:01 -04:00
parent 769e21104e
commit 63fdc4f590
21 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.5,
range: 2.0,
angle: 60.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 7.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.07,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 7.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,
@ -35,7 +35,7 @@ ComboMelee(
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 7.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,

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

@ -6,7 +6,7 @@ DashMelee(
scaled_poise_damage: 0,
base_knockback: 4.0,
scaled_knockback: 17.0,
range: 5.0,
range: 2.5,
angle: 45.0,
energy_drain: 0,
forward_speed: 4.0,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 4.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.1,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.1,
@ -35,7 +35,7 @@ ComboMelee(
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.1,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.1,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.15,
base_swing_duration: 0.07,
@ -35,7 +35,7 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.07,
@ -49,7 +49,7 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.07,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 0,
poise_damage_increase: 22,
knockback: 10.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.1,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 22,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.1,
@ -35,7 +35,7 @@ ComboMelee(
base_poise_damage: 22,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.1,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
range: 2.7,
angle: 60.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.1,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.45,
base_swing_duration: 0.07,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,
@ -35,7 +35,7 @@ ComboMelee(
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,

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

@ -6,7 +6,7 @@ DashMelee(
scaled_poise_damage: 40,
base_knockback: 8.0,
scaled_knockback: 17.0,
range: 4.0,
range: 2.5,
angle: 45.0,
energy_drain: 0,
forward_speed: 2.0,

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 22,
poise_damage_increase: 0,
knockback: 10.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.1,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 0,
poise_damage_increase: 22,
knockback: 10.0,
range: 3.5,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.1,

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

@ -6,6 +6,6 @@ BasicMelee(
base_damage: 100,
base_poise_damage: 28,
knockback: 25.0,
range: 3.0,
max_angle: 120.0,
range: 1.2,
max_angle: 50.0,
)

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

@ -7,7 +7,7 @@ ComboMelee(
base_poise_damage: 30,
poise_damage_increase: 0,
knockback: 4.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.1,
@ -21,7 +21,7 @@ ComboMelee(
base_poise_damage: 30,
poise_damage_increase: 0,
knockback: 4.0,
range: 3.5,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.1,

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

@ -7,8 +7,8 @@ ComboMelee(
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,
range: 2.2,
angle: 40.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.15,
base_recover_duration: 0.4,
@ -21,8 +21,8 @@ ComboMelee(
base_poise_damage: 17,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,
range: 2.2,
angle: 40.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.15,
base_recover_duration: 0.3,
@ -35,8 +35,8 @@ ComboMelee(
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,
range: 2.2,
angle: 40.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.15,
base_recover_duration: 0.3,

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

@ -7,8 +7,8 @@ ComboMelee(
base_poise_damage: 10,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.5,
angle: 60.0,
range: 1.5,
angle: 50.0,
base_buildup_duration: 0.3,
base_swing_duration: 0.15,
base_recover_duration: 0.3,

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

@ -7,8 +7,8 @@ ComboMelee(
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 2.0,
range: 5.5,
angle: 5.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.15,
base_recover_duration: 0.4,
@ -22,5 +22,5 @@ ComboMelee(
max_speed_increase: 0.0,
scales_from_combo: 0,
is_interruptible: false,
ori_modifier: 0.8,
ori_modifier: 0.7,
)

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

@ -7,8 +7,8 @@ ComboMelee(
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 4.5,
angle: 5.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.15,
base_recover_duration: 0.3,
@ -21,8 +21,8 @@ ComboMelee(
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 4.0,
angle: 10.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.15,
base_recover_duration: 0.15,
@ -35,8 +35,8 @@ ComboMelee(
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 4.0,
angle: 10.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.35,
base_swing_duration: 0.125,
base_recover_duration: 0.9,
@ -50,5 +50,5 @@ ComboMelee(
max_speed_increase: 0.0,
scales_from_combo: 0,
is_interruptible: false,
ori_modifier: 0.75,
ori_modifier: 0.6,
)

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

@ -385,50 +385,50 @@ impl Body {
match self {
Body::Humanoid(_) => 500,
Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
quadruped_small::Species::Boar => 600,
quadruped_small::Species::Boar => 700,
quadruped_small::Species::Batfox => 400,
quadruped_small::Species::Dodarock => 900,
quadruped_small::Species::Holladon => 700,
quadruped_small::Species::Dodarock => 1000,
quadruped_small::Species::Holladon => 800,
quadruped_small::Species::Hyena => 450,
quadruped_small::Species::Truffler => 450,
_ => 350,
_ => 400,
},
Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
quadruped_medium::Species::Grolgar => 800,
quadruped_medium::Species::Saber => 500,
quadruped_medium::Species::Tiger => 500,
quadruped_medium::Species::Lion => 800,
quadruped_medium::Species::Tarasque => 1200,
quadruped_medium::Species::Wolf => 500,
quadruped_medium::Species::Grolgar => 900,
quadruped_medium::Species::Saber => 600,
quadruped_medium::Species::Tiger => 700,
quadruped_medium::Species::Lion => 900,
quadruped_medium::Species::Tarasque => 1500,
quadruped_medium::Species::Wolf => 550,
quadruped_medium::Species::Frostfang => 400,
quadruped_medium::Species::Mouflon => 500,
quadruped_medium::Species::Catoblepas => 1000,
quadruped_medium::Species::Bonerattler => 400,
quadruped_medium::Species::Deer => 450,
quadruped_medium::Species::Hirdrasil => 500,
quadruped_medium::Species::Roshwalr => 600,
quadruped_medium::Species::Donkey => 500,
quadruped_medium::Species::Zebra => 500,
quadruped_medium::Species::Antelope => 300,
quadruped_medium::Species::Bonerattler => 500,
quadruped_medium::Species::Deer => 500,
quadruped_medium::Species::Hirdrasil => 700,
quadruped_medium::Species::Roshwalr => 800,
quadruped_medium::Species::Donkey => 550,
quadruped_medium::Species::Zebra => 550,
quadruped_medium::Species::Antelope => 450,
quadruped_medium::Species::Kelpie => 600,
quadruped_medium::Species::Horse => 600,
quadruped_medium::Species::Barghest => 1700,
quadruped_medium::Species::Cattle => 1000,
quadruped_medium::Species::Highland => 1200,
quadruped_medium::Species::Yak => 1000,
quadruped_medium::Species::Panda => 800,
quadruped_medium::Species::Bear => 800,
quadruped_medium::Species::Moose => 600,
quadruped_medium::Species::Yak => 1100,
quadruped_medium::Species::Panda => 900,
quadruped_medium::Species::Bear => 900,
quadruped_medium::Species::Moose => 800,
quadruped_medium::Species::Dreadhorn => 1100,
_ => 600,
_ => 700,
},
Body::BirdMedium(bird_medium) => match bird_medium.species {
bird_medium::Species::Chicken => 200,
bird_medium::Species::Duck => 200,
bird_medium::Species::Goose => 200,
bird_medium::Species::Parrot => 200,
bird_medium::Species::Peacock => 250,
bird_medium::Species::Eagle => 400,
bird_medium::Species::Chicken => 300,
bird_medium::Species::Duck => 300,
bird_medium::Species::Goose => 300,
bird_medium::Species::Parrot => 250,
bird_medium::Species::Peacock => 350,
bird_medium::Species::Eagle => 450,
_ => 250,
},
Body::FishMedium(_) => 250,
@ -436,18 +436,18 @@ impl Body {
Body::BirdLarge(_) => 3000,
Body::FishSmall(_) => 20,
Body::BipedLarge(biped_large) => match biped_large.species {
biped_large::Species::Ogre => 3000,
biped_large::Species::Cyclops => 3000,
biped_large::Species::Ogre => 3200,
biped_large::Species::Cyclops => 3200,
biped_large::Species::Wendigo => 2800,
biped_large::Species::Troll => 2200,
biped_large::Species::Troll => 2400,
biped_large::Species::Dullahan => 3000,
biped_large::Species::Mindflayer => 8000,
biped_large::Species::Tidalwarrior => 2500,
biped_large::Species::Yeti => 4000,
biped_large::Species::Minotaur => 5000,
biped_large::Species::Harvester => 3000,
biped_large::Species::Blueoni => 2300,
biped_large::Species::Redoni => 2300,
biped_large::Species::Blueoni => 2400,
biped_large::Species::Redoni => 2400,
_ => 1200,
},
Body::BipedSmall(biped_small) => match biped_small.species {

1
common/src/states/basic_block.rs
View File

@ -36,6 +36,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(&data, &mut update, 0.4);
match self.stage_section {

10
common/src/states/combo_melee.rs
View File

@ -97,7 +97,7 @@ pub struct StaticData {
pub scales_from_combo: u32,
/// Whether the state can be interrupted by other abilities
pub is_interruptible: bool,
/// xxx
/// Adjusts turning rate during the attack
pub ori_modifier: f32,
/// What key is used to press ability
pub ability_info: AbilityInfo,
@ -121,7 +121,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_move(data, &mut update, 0.6);
handle_move(data, &mut update, 0.4);
let stage_index = (self.stage - 1) as usize;
@ -136,7 +136,7 @@ impl CharacterBehavior for Data {
match self.stage_section {
StageSection::Buildup => {
if self.timer < self.static_data.stage_data[stage_index].base_buildup_duration {
handle_orientation(data, &mut update, 0.4*self.static_data.ori_modifier);
handle_orientation(data, &mut update, 0.4 * self.static_data.ori_modifier);
// Build up
update.character = CharacterState::ComboMelee(Data {
@ -231,7 +231,7 @@ impl CharacterBehavior for Data {
},
StageSection::Swing => {
if self.timer < self.static_data.stage_data[stage_index].base_swing_duration {
handle_orientation(data, &mut update, 0.4*self.static_data.ori_modifier);
handle_orientation(data, &mut update, 0.4 * self.static_data.ori_modifier);
// Forward movement
handle_forced_movement(
@ -264,7 +264,7 @@ impl CharacterBehavior for Data {
},
StageSection::Recover => {
if self.timer < self.static_data.stage_data[stage_index].base_recover_duration {
handle_orientation(data, &mut update, 0.8*self.static_data.ori_modifier);
handle_orientation(data, &mut update, 0.8 * self.static_data.ori_modifier);
// Recovers
update.character = CharacterState::ComboMelee(Data {
static_data: self.static_data.clone(),

1
common/src/states/leap_melee.rs
View File

@ -56,6 +56,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 0.3);
handle_jump(data, &mut update, 1.0);

30
common/src/states/utils.rs
View File

@ -129,32 +129,30 @@ impl Body {
/// The turn rate in 180°/s (or (rotations per second)/2)
pub fn base_ori_rate(&self) -> f32 {
match self {
Body::Humanoid(_) => 800.0,
Body::Humanoid(_) => 3.5,
Body::QuadrupedSmall(_) => 3.0,
Body::QuadrupedMedium(_) => 1.6,
Body::QuadrupedMedium(_) => 2.8,
Body::BirdMedium(_) => 6.0,
Body::FishMedium(_) => 6.0,
Body::Dragon(_) => 1.0,
Body::BirdLarge(_) => 7.0,
Body::FishSmall(_) => 7.0,
Body::BipedLarge(_) => 1.6,
Body::BipedSmall(_) => 3.0,
Body::BipedLarge(_) => 2.7,
Body::BipedSmall(_) => 3.5,
Body::Object(_) => 2.0,
Body::Golem(_) => 0.8,
Body::Golem(_) => 2.0,
Body::Theropod(theropod) => match theropod.species {
theropod::Species::Archaeos => 1.0,
theropod::Species::Odonto => 1.0,
theropod::Species::Ntouka => 1.0,
_ => 2.0,
theropod::Species::Archaeos => 2.3,
theropod::Species::Odonto => 2.3,
theropod::Species::Ntouka => 2.3,
_ => 2.5,
},
Body::QuadrupedLow(quadruped_low) => match quadruped_low.species {
quadruped_low::Species::Monitor => 1.8,
quadruped_low::Species::Asp => 1.6,
quadruped_low::Species::Tortoise => 0.6,
quadruped_low::Species::Rocksnapper => 0.8,
quadruped_low::Species::Maneater => 1.0,
quadruped_low::Species::Lavadrake => 0.8,
_ => 1.2,
quadruped_low::Species::Asp => 2.2,
quadruped_low::Species::Tortoise => 1.5,
quadruped_low::Species::Rocksnapper => 1.8,
quadruped_low::Species::Lavadrake => 1.7,
_ => 2.0,
},
Body::Ship(_) => 0.035,
}