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

Final tweaks

Browse Source
This commit is contained in:
Sam 2023-03-28 20:46:44 -04:00
parent 4309767898
commit c9af470cc7
13 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/ability_set_manifest.ron
View File

@ -20,7 +20,7 @@
None: (None, "common.abilities.sword.basic_thrust"),
Stance(Sword(Heavy)): (None, "common.abilities.sword.heavy_slam"),
Stance(Sword(Agile)): (None, "common.abilities.sword.agile_perforate"),
Stance(Sword(Defensive)): (None, "common.abilities.sword.defensive_jab"),
Stance(Sword(Defensive)): (None, "common.abilities.sword.defensive_vital_jab"),
Stance(Sword(Crippling)): (None, "common.abilities.sword.crippling_deep_rend"),
Stance(Sword(Cleaving)): (None, "common.abilities.sword.cleaving_spiral_slash"),
},

4
assets/common/abilities/sword/agile_hundred_cuts.ron
View File

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 3,
damage: 4,
poise: 0,
knockback: 0,
energy_regen: 0,
@ -16,5 +16,5 @@ RapidMelee(
max_strikes: Some(20),
move_modifier: 0.6,
ori_modifier: 0.4,
minimum_combo: 20,
minimum_combo: 10,
)

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 18,
damage: 24,
poise: 5,
knockback: 0,
energy_regen: 5,
@ -12,10 +12,10 @@ ComboMelee2(
angle: 45.0,
damage_effect: Some(BuffsVulnerable(1.0, Bleeding)),
),
buildup_duration: 0.15,
buildup_duration: 0.2,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.15,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],

4
assets/common/abilities/sword/crippling_eviscerate.ron
View File

@ -10,7 +10,7 @@ ComboMelee2(
),
range: 3.0,
angle: 45.0,
damage_effect: Some(BuffsVulnerable(2.0, Crippled)),
damage_effect: Some(BuffsVulnerable(1.0, Crippled)),
),
buildup_duration: 0.2,
swing_duration: 0.15,
@ -19,7 +19,7 @@ ComboMelee2(
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 10,
energy_cost_per_strike: 15,
meta: (
requirements: (stance: Some(Sword(Crippling))),
),

0
assets/common/abilities/sword/defensive_jab.ron → assets/common/abilities/sword/defensive_vital_jab.ron
View File

10
assets/common/items/weapons/sword/caladbolg.ron
View File

@ -5,14 +5,14 @@ ItemDef(
kind: Sword,
hands: Two,
stats: (
equip_time_secs: 3.0,
equip_time_secs: 0.5,
power: 3.0,
effect_power: 1.5,
speed: 0.6,
crit_chance: 0.05,
effect_power: 1.2,
speed: 0.7,
crit_chance: 0.2,
range: 1.0,
energy_efficiency: 0.8,
buff_strength: 1.5,
buff_strength: 1.2,
),
)),
quality: Legendary,

BIN
assets/voxygen/element/skills/sword/defensive_jab.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/defensive_vital_jab.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

2
assets/voxygen/i18n/en/hud/ability.ftl
View File

@ -44,7 +44,7 @@ common-abilities-sword-heavy_slam = Heavy Slam
.desc = A strong overhead slash that can be charged to be more staggering
common-abilities-sword-agile_perforate = Perforate
.desc = A rapid flurry of light attacks
common-abilities-sword-defensive_jab = Defensive Jab
common-abilities-sword-defensive_vital_jab = Defensive Vital Jab
.desc = A quickly charged jab that does more damage against parried foes
common-abilities-sword-crippling_deep_rend = Deep Rend
.desc = A strike aimed at an already open wound, deals more damage to bleeding enemies

16
common/src/states/rapid_melee.rs
View File

@ -67,14 +67,6 @@ impl CharacterBehavior for Data {
c.timer = Duration::default();
c.stage_section = StageSection::Action;
}
// Consume combo if any was required
if self.static_data.minimum_combo > 0 {
output_events.emit_server(ServerEvent::ComboChange {
entity: data.entity,
change: -data.combo.map_or(0, |c| c.counter() as i32),
});
}
}
},
StageSection::Action => {
@ -118,6 +110,14 @@ impl CharacterBehavior for Data {
c.stage_section = StageSection::Recover;
}
}
// Consume combo if any was required
if self.static_data.minimum_combo > 0 {
output_events.emit_server(ServerEvent::ComboChange {
entity: data.entity,
change: -data.combo.map_or(0, |c| c.counter() as i32),
});
}
},
StageSection::Recover => {
if self.timer < self.static_data.recover_duration {

3
voxygen/anim/src/character/chargeswing.rs
View File

@ -44,7 +44,8 @@ impl Animation for ChargeswingAnimation {
match ability_id {
Some(
"common.abilities.sword.basic_thrust" | "common.abilities.sword.defensive_jab",
"common.abilities.sword.basic_thrust"
| "common.abilities.sword.defensive_vital_jab",
) => {
let (move1, move2, move3, tension) = match stage_section {
Some(StageSection::Charge) => (

2
voxygen/src/hud/img_ids.rs
View File

@ -225,7 +225,7 @@ image_ids! {
sword_basic_thrust: "voxygen.element.skills.sword.basic_thrust",
sword_heavy_slam: "voxygen.element.skills.sword.heavy_slam",
sword_agile_perforate: "voxygen.element.skills.sword.agile_perforate",
sword_defensive_jab: "voxygen.element.skills.sword.defensive_jab",
sword_defensive_vital_jab: "voxygen.element.skills.sword.defensive_vital_jab",
sword_crippling_deep_rend: "voxygen.element.skills.sword.crippling_deep_rend",
sword_cleaving_spiral_slash: "voxygen.element.skills.sword.cleaving_spiral_slash",
sword_crescent_slash: "voxygen.element.skills.sword.crescent_slash",

2
voxygen/src/hud/util.rs
View File

@ -360,7 +360,7 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
"common.abilities.sword.basic_thrust" => imgs.sword_basic_thrust,
"common.abilities.sword.heavy_slam" => imgs.sword_heavy_slam,
"common.abilities.sword.agile_perforate" => imgs.sword_agile_perforate,
"common.abilities.sword.defensive_jab" => imgs.sword_defensive_jab,
"common.abilities.sword.defensive_vital_jab" => imgs.sword_defensive_vital_jab,
"common.abilities.sword.crippling_deep_rend" => imgs.sword_crippling_deep_rend,
"common.abilities.sword.cleaving_spiral_slash" => imgs.sword_cleaving_spiral_slash,
"veloren.core.pseudo_abilities.sword.crescent_slash" => imgs.sword_crescent_slash,