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

Various tweaks

Browse Source
This commit is contained in:
Sam 2022-07-26 19:44:49 -04:00
parent 34ae5b9df7
commit 28a4ce9be1
23 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 11.0,
base_damage: 12.0,
damage_increase: 1.0,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -24,7 +24,7 @@ ComboMelee(
),
(
stage: 2,
base_damage: 13.0,
base_damage: 15.0,
damage_increase: 1.5,
base_poise_damage: 0,
poise_damage_increase: 0,
@ -46,8 +46,8 @@ ComboMelee(
),
],
initial_energy_gain: 2.5,
max_energy_gain: 17.5,
energy_increase: 3.0,
max_energy_gain: 12.5,
energy_increase: 2.5,
speed_increase: 0.1,
max_speed_increase: 0.6,
scales_from_combo: 2,

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

@ -1,12 +1,12 @@
LeapMelee(
energy_cost: 45.0,
buildup_duration: 0.2,
movement_duration: 0.2,
energy_cost: 30.0,
buildup_duration: 0.3,
movement_duration: 0.25,
swing_duration: 0.2,
recover_duration: 0.2,
melee_constructor: (
kind: Slash(
damage: 30.0,
damage: 25.0,
poise: 0.0,
knockback: 12.0,
energy_regen: 0.0,

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

@ -1,6 +1,6 @@
SpinMelee(
buildup_duration: 0.2,
swing_duration: 0.6,
swing_duration: 0.4,
recover_duration: 0.2,
melee_constructor: (
kind: Slash(

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

@ -1,18 +1,18 @@
ChargedRanged(
energy_cost: 0,
energy_drain: 0,
initial_regen: 0.5,
scaled_regen: 12.0,
initial_damage: 0.5,
scaled_damage: 12.0,
initial_knockback: 0.0,
scaled_knockback: 10.0,
buildup_duration: 0.2,
charge_duration: 1.0,
recover_duration: 0.3,
initial_regen: 4,
scaled_regen: 16,
initial_damage: 3,
scaled_damage: 15,
initial_knockback: 0,
scaled_knockback: 15,
buildup_duration: 0.3,
charge_duration: 0.9,
recover_duration: 0.4,
projectile_body: Object(Arrow),
projectile_light: None,
initial_projectile_speed: 100.0,
scaled_projectile_speed: 150.0,
initial_projectile_speed: 50.0,
scaled_projectile_speed: 200.0,
move_speed: 0.6,
)

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

@ -1,13 +1,13 @@
RepeaterRanged(
energy_cost: 5.0,
buildup_duration: 0.2,
shoot_duration: 0.5,
recover_duration: 0.8,
max_speed: 2.0,
half_speed_at: 1,
shoot_duration: 0.3,
recover_duration: 0.5,
max_speed: 4.0,
half_speed_at: 3,
projectile: Arrow(
damage: 3.0,
knockback: 2.0,
damage: 5.0,
knockback: 0,
energy_regen: 0,
),
projectile_body: Object(Arrow),

12
assets/common/abilities/bow/shotgun.ron
View File

@ -1,15 +1,15 @@
BasicRanged(
energy_cost: 30.0,
buildup_duration: 0.4,
energy_cost: 25.0,
buildup_duration: 0.3,
recover_duration: 0.3,
projectile_spread: 0.05,
projectile: Arrow(
damage: 4.0,
knockback: 5.0,
damage: 6,
knockback: 5,
energy_regen: 0,
),
projectile_body: Object(Arrow),
projectile_light: None,
projectile_speed: 60.0,
num_projectiles: 4,
projectile_speed: 80.0,
num_projectiles: 5,
)

2
assets/common/abilities/custom/stonegolemfist/spin.ron
View File

@ -14,7 +14,7 @@ SpinMelee(
),
energy_cost: 0,
is_infinite: false,
movement_behavior: GolemHover,
movement_behavior: Stationary,
is_interruptible: false,
forward_speed: 0.0,
num_spins: 1,

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

@ -17,7 +17,7 @@ ChargedMelee(
range: 3.5,
angle: 30.0,
),
charge_duration: 1.2,
charge_duration: 1.0,
swing_duration: 0.12,
hit_timing: 0.2,
recover_duration: 0.3,

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

@ -1,7 +1,7 @@
LeapMelee(
energy_cost: 50.0,
energy_cost: 35.0,
buildup_duration: 0.1,
movement_duration: 0.8,
movement_duration: 0.6,
swing_duration: 0.15,
recover_duration: 0.2,
melee_constructor: (

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

@ -16,8 +16,8 @@ ComboMelee(
damage_kind: Crushing,
)],
initial_energy_gain: 5.0,
max_energy_gain: 15.0,
energy_increase: 5.0,
max_energy_gain: 12.5,
energy_increase: 2.5,
speed_increase: 0.1,
max_speed_increase: 0.4,
scales_from_combo: 2,

10
assets/common/abilities/sceptre/healingaura.ron
View File

@ -1,13 +1,13 @@
BasicAura(
buildup_duration: 0.25,
cast_duration: 0.5,
recover_duration: 0.25,
buildup_duration: 0.2,
cast_duration: 0.4,
recover_duration: 0.2,
targets: InGroup,
auras: [
(
kind: Regeneration,
strength: 0.2,
duration: Some(10.0),
strength: 1,
duration: Some(5),
category: Magical,
),
],

10
assets/common/abilities/sceptre/lifestealbeam.ron
View File

@ -2,13 +2,13 @@ BasicBeam(
buildup_duration: 0.20,
recover_duration: 0.20,
beam_duration: 1.0,
damage: 3.0,
tick_rate: 2.0,
damage: 4,
tick_rate: 4,
range: 25.0,
max_angle: 1.0,
damage_effect: Some(Lifesteal(0.125)),
energy_regen: 5.0,
damage_effect: Some(Lifesteal(0.05)),
energy_regen: 7.5,
energy_drain: 0,
ori_rate: 0.3,
ori_rate: 0.4,
specifier: LifestealBeam
)

12
assets/common/abilities/sceptre/wardingaura.ron
View File

@ -1,19 +1,19 @@
BasicAura(
buildup_duration: 0.25,
cast_duration: 0.5,
recover_duration: 0.25,
buildup_duration: 0.4,
cast_duration: 0.6,
recover_duration: 0.2,
targets: InGroup,
auras: [
(
kind: ProtectingWard,
strength: 0.15,
duration: Some(10.0),
strength: 0.25,
duration: Some(8),
category: Magical,
),
],
aura_duration: 1.0,
range: 25.0,
energy_cost: 40.0,
energy_cost: 35.0,
scales_with_combo: false,
specifier: Some(WardingAura),
)

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

@ -1,11 +1,11 @@
BasicRanged(
energy_cost: 0,
buildup_duration: 0.5,
buildup_duration: 0.35,
recover_duration: 0.4,
projectile: Fireball(
damage: 9.0,
radius: 4.0,
energy_regen: 10.0,
damage: 12.0,
radius: 3.0,
energy_regen: 12.0,
min_falloff: 0.5,
),
projectile_body: Object(BoltFire),

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

@ -1,14 +1,14 @@
Shockwave(
energy_cost: 50.0,
buildup_duration: 0.5,
energy_cost: 40.0,
buildup_duration: 0.4,
swing_duration: 0.1,
recover_duration: 0.2,
damage: 15.0,
recover_duration: 0.4,
damage: 18,
poise_damage: 0,
knockback: ( strength: 25.0, direction: Away),
knockback: ( strength: 30, direction: Away),
shockwave_angle: 360.0,
shockwave_vertical_angle: 90.0,
shockwave_speed: 20.0,
shockwave_speed: 30.0,
shockwave_duration: 0.5,
requires_ground: false,
move_efficiency: 0.1,

8
assets/common/abilities/staff/flamethrower.ron
View File

@ -2,18 +2,18 @@ BasicBeam(
buildup_duration: 0.25,
recover_duration: 0.25,
beam_duration: 1.0,
damage: 3.5,
damage: 4,
tick_rate: 3.0,
range: 20.0,
range: 15,
max_angle: 15.0,
damage_effect: Some(Buff((
kind: Burning,
dur_secs: 10.0,
strength: DamageFraction(0.5),
strength: DamageFraction(1),
chance: 0.25,
))),
energy_regen: 0,
energy_drain: 35.0,
energy_drain: 40,
ori_rate: 0.3,
specifier: Flamethrower,
)

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

@ -2,7 +2,7 @@ DashMelee(
energy_cost: 10.0,
melee_constructor: (
kind: Stab(
damage: 8.0,
damage: 4.0,
poise: 0.0,
knockback: 8.0,
energy_regen: 0.0,
@ -17,8 +17,8 @@ DashMelee(
angle: 60.0,
),
energy_drain: 30.0,
forward_speed: 3.0,
buildup_duration: 0.25,
forward_speed: 2.5,
buildup_duration: 0.2,
charge_duration: 1.2,
swing_duration: 0.1,
recover_duration: 0.5,

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

@ -68,7 +68,7 @@ ComboMelee(
),
],
initial_energy_gain: 0,
max_energy_gain: 20.0,
max_energy_gain: 12.5,
energy_increase: 2.5,
speed_increase: 0.1,
max_speed_increase: 0.8,

2
common/src/combat.rs
View File

@ -774,7 +774,7 @@ pub enum DamageKind {
Energy,
}
const PIERCING_PENETRATION_FRACTION: f32 = 1.0;
const PIERCING_PENETRATION_FRACTION: f32 = 1.5;
const SLASHING_ENERGY_FRACTION: f32 = 0.5;
const CRUSHING_POISE_FRACTION: f32 = 1.0;

2
common/src/comp/ability.rs
View File

@ -1302,7 +1302,7 @@ impl CharacterAbility {
*movement_behavior = if skillset.has_skill(Axe(SHelicopter)) {
spin_melee::MovementBehavior::AxeHover
} else {
spin_melee::MovementBehavior::ForwardGround
spin_melee::MovementBehavior::Walking
};
if let MeleeConstructorKind::Slash { ref mut damage, .. } = melee_constructor.kind {
if let Ok(level) = skillset.skill_level(Axe(SDamage)) {

4
common/src/states/basic_aura.rs
View File

@ -89,8 +89,8 @@ impl CharacterBehavior for Data {
category: _,
source: _,
} => {
data.strength *= 1.0
+ (self.static_data.combo_at_cast.max(1) as f32).log(2.0);
data.strength *=
(self.static_data.combo_at_cast.max(1) as f32).sqrt();
},
}
output_events.emit_server(ServerEvent::ComboChange {

6
common/src/states/spin_melee.rs
View File

@ -65,8 +65,8 @@ impl CharacterBehavior for Data {
let new_vel_z = update.vel.0.z + GRAVITY * data.dt.0 * 0.5;
update.vel.0 = Vec3::new(0.0, 0.0, new_vel_z) + data.inputs.move_dir * 5.0;
},
MovementBehavior::GolemHover => {
update.vel.0 = Vec3::new(0.0, 0.0, 20.0) + *data.inputs.look_dir * 25.0;
MovementBehavior::Walking => {
handle_move(data, &mut update, 0.2);
},
}
@ -180,7 +180,7 @@ pub enum MovementBehavior {
Stationary,
ForwardGround,
AxeHover,
GolemHover,
Walking,
}
#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)]

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

@ -409,7 +409,7 @@ pub fn handle_forced_movement(
}) {
update.vel.0 += Vec2::broadcast(data.dt.0)
* accel
* (data.inputs.move_dir + Vec2::from(update.ori))
* (data.inputs.move_dir * 0.5 + Vec2::from(update.ori) * 1.5)
* strength;
}
},