CHANGELOG.md

@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Potion quaffing no longer makes characters practically immortal.
 - Stat diff now displays correctly for armor
 - Lamps, embers and campfires use glowing indices
+- Non-potion drinks no longer heal as much as potions.
+- Added SFX to the new sword abilities
 
 ## [0.14.0] - 2023-01-07
 

assets/common/items/food/cactus_colada.ron

@@ -7,7 +7,7 @@ ItemDef(
             Buff((
                 kind: Saturation,
                 data: (
-                    strength: 5.0,
+                    strength: 2.0,
                     duration: Some((
                             secs: 5,
                             nanos: 0,

assets/common/items/food/pumpkin_spice_brew.ron

@@ -7,9 +7,9 @@ ItemDef(
             Buff((
                 kind: Saturation,
                 data: (
-                    strength: 10.0,
+                    strength: 2.0,
                     duration: Some((
-                            secs: 5,
+                            secs: 10,
                             nanos: 0,
                         )),
                     ),

assets/common/items/food/sunflower_icetea.ron

@@ -7,9 +7,9 @@ ItemDef(
             Buff((
                 kind: Saturation,
                 data: (
-                    strength: 10.0,
+                    strength: 2.0,
                     duration: Some((
-                            secs: 5,
+                            secs: 10,
                             nanos: 0,
                         )),
                     ),

assets/voxygen/audio/sfx.ron

@@ -306,21 +306,39 @@
             ],
             threshold: 0.5,
         ),
-        Attack(ComboMelee(Action, 1), Sword): (
+        Attack(ComboMelee2(Action), Sword): (
             files: [
                 "voxygen.audio.sfx.abilities.swing_sword",
             ],
             threshold: 0.7,
         ),
-        Attack(ComboMelee(Action, 2), Sword): (
+        Attack(FinisherMelee(Action), Sword): (
             files: [
-                "voxygen.audio.sfx.abilities.separated_second_swing",
+                "voxygen.audio.sfx.abilities.swing_sword",
             ],
             threshold: 0.7,
         ),
-        Attack(ComboMelee(Action, 3), Sword): (
+        Attack(DiveMelee(Action), Sword): (
             files: [
-                "voxygen.audio.sfx.abilities.separated_third_swing",
+                "voxygen.audio.sfx.abilities.swing_sword",
+            ],
+            threshold: 0.7,
+        ),
+        Attack(RiposteMelee(Action), Sword): (
+            files: [
+                "voxygen.audio.sfx.abilities.swing_sword",
+            ],
+            threshold: 0.7,
+        ),
+        Attack(RapidMelee(Action), Sword): (
+            files: [
+                "voxygen.audio.sfx.abilities.swing_sword",
+            ],
+            threshold: 0.7,
+        ),
+        Attack(ChargedMelee(Action), Sword): (
+            files: [
+                "voxygen.audio.sfx.abilities.swing_sword",
             ],
             threshold: 0.7,
         ),
@@ -336,6 +354,24 @@
             ],
             threshold: 0.7,
         ),
+        Attack(ComboMelee(Action, 1), Sword): (
+            files: [
+                "voxygen.audio.sfx.abilities.swing_sword",
+            ],
+            threshold: 0.7,
+        ),
+        Attack(ComboMelee(Action, 2), Sword): (
+            files: [
+                "voxygen.audio.sfx.abilities.separated_second_swing",
+            ],
+            threshold: 0.7,
+        ),
+        Attack(ComboMelee(Action, 3), Sword): (
+            files: [
+                "voxygen.audio.sfx.abilities.separated_third_swing",
+            ],
+            threshold: 0.7,
+        ),
         Inventory(CollectedTool(Sword)): (
             files: [
                 "voxygen.audio.sfx.inventory.pickup_sword",

common/src/comp/ability.rs

@@ -399,6 +399,11 @@ pub enum CharacterAbilityType {
     DashMelee(StageSection),
     BasicBlock,
     ComboMelee(StageSection, u32),
+    ComboMelee2(StageSection),
+    FinisherMelee(StageSection),
+    DiveMelee(StageSection),
+    RiposteMelee(StageSection),
+    RapidMelee(StageSection),
     LeapMelee(StageSection),
     SpinMelee(StageSection),
     Music(StageSection),
@@ -420,6 +425,13 @@ impl From<&CharacterState> for CharacterAbilityType {
             CharacterState::BasicBlock(_) => Self::BasicBlock,
             CharacterState::LeapMelee(data) => Self::LeapMelee(data.stage_section),
             CharacterState::ComboMelee(data) => Self::ComboMelee(data.stage_section, data.stage),
+            CharacterState::ComboMelee2(data) => {
+                data.stage_section.map_or(Self::Other, Self::ComboMelee2)
+            },
+            CharacterState::FinisherMelee(data) => Self::FinisherMelee(data.stage_section),
+            CharacterState::DiveMelee(data) => Self::DiveMelee(data.stage_section),
+            CharacterState::RiposteMelee(data) => Self::RiposteMelee(data.stage_section),
+            CharacterState::RapidMelee(data) => Self::RapidMelee(data.stage_section),
             CharacterState::SpinMelee(data) => Self::SpinMelee(data.stage_section),
             CharacterState::ChargedMelee(data) => Self::ChargedMelee(data.stage_section),
             CharacterState::ChargedRanged(_) => Self::ChargedRanged,
@@ -446,12 +458,7 @@ impl From<&CharacterState> for CharacterAbilityType {
             | CharacterState::UseItem(_)
             | CharacterState::SpriteInteract(_)
             | CharacterState::Skate(_)
-            | CharacterState::Wallrun(_)
-            | CharacterState::ComboMelee2(_)
-            | CharacterState::FinisherMelee(_)
-            | CharacterState::DiveMelee(_)
-            | CharacterState::RiposteMelee(_)
-            | CharacterState::RapidMelee(_) => Self::Other,
+            | CharacterState::Wallrun(_) => Self::Other,
         }
     }
 }

common/src/comp/energy.rs

@@ -22,7 +22,8 @@ pub struct Energy {
     /// Maximum is the amount of energy the entity has after temporary modifiers
     /// are considered
     maximum: u32,
-    pub regen_rate: f32,
+    /// Rate of regeneration per tick. Starts at zero and accelerates.
+    regen_rate: f32,
 }
 
 impl Energy {
@@ -94,6 +95,24 @@ impl Energy {
         }
     }
 
+    /// Returns `true` if the current value is less than the maximum
+    pub fn needs_regen(&self) -> bool { self.current < self.maximum }
+
+    /// Regenerates energy based on the provided acceleration
+    pub fn regen(&mut self, accel: f32, dt: f32) {
+        if self.current < self.maximum {
+            self.change_by(self.regen_rate * dt);
+            self.regen_rate = (self.regen_rate + accel * dt).min(10.0);
+        }
+    }
+
+    /// Checks whether the `regen_rate` is zero or not. Returns true if the
+    /// value is anything other than `0.0`.
+    pub fn needs_regen_rate_reset(&self) -> bool { self.regen_rate != 0.0 }
+
+    /// Resets the energy regeneration rate to zero
+    pub fn reset_regen_rate(&mut self) { self.regen_rate = 0.0 }
+
     pub fn change_by(&mut self, change: f32) {
         self.current = (((self.current() + change).clamp(0.0, f32::from(Self::MAX_ENERGY))
             * Self::SCALING_FACTOR_FLOAT) as u32)

common/src/comp/poise.rs

@@ -52,8 +52,8 @@ pub struct Poise {
     maximum: u32,
     /// Direction that the last poise change came from
     pub last_change: Dir,
-    /// Rate of poise regeneration per tick. Starts at zero and accelerates.
-    pub regen_rate: f32,
+    /// Rate of regeneration per tick. Starts at zero and accelerates.
+    regen_rate: f32,
     /// Time that entity was last in a poise state
     last_stun_time: Option<Time>,
     /// The previous poise state
@@ -217,6 +217,24 @@ impl Poise {
         }
     }
 
+    /// Returns `true` if the current value is less than the maximum
+    pub fn needs_regen(&self) -> bool { self.current < self.maximum }
+
+    /// Regenerates poise based on a provided acceleration
+    pub fn regen(&mut self, accel: f32, dt: f32, now: Time) {
+        if self.current < self.maximum {
+            let poise_change = PoiseChange {
+                amount: self.regen_rate * dt,
+                impulse: Vec3::zero(),
+                by: None,
+                cause: None,
+                time: now,
+            };
+            self.change(poise_change);
+            self.regen_rate = (self.regen_rate + accel * dt).min(10.0);
+        }
+    }
+
     pub fn reset(&mut self, time: Time, poise_state_time: f64) {
         self.current = self.maximum;
         self.last_stun_time = Some(Time(time.0 + poise_state_time));

common/systems/src/stats.rs

@@ -4,8 +4,8 @@ use common::{
         self,
         item::MaterialStatManifest,
         skills::{GeneralSkill, Skill},
-        Body, CharacterState, Combo, Energy, Health, Inventory, Poise, PoiseChange, Pos, SkillSet,
-        Stats, StatsModifier,
+        Body, CharacterState, Combo, Energy, Health, Inventory, Poise, Pos, SkillSet, Stats,
+        StatsModifier,
     },
     event::{EventBus, ServerEvent},
     resources::{DeltaTime, EntitiesDiedLastTick, Time},
@@ -16,9 +16,9 @@ use specs::{
     shred::ResourceId, Entities, Join, Read, ReadExpect, ReadStorage, SystemData, World, Write,
     WriteStorage,
 };
-use vek::Vec3;
 
 const ENERGY_REGEN_ACCEL: f32 = 1.0;
+const SIT_ENERGY_REGEN_ACCEL: f32 = 2.5;
 const POISE_REGEN_ACCEL: f32 = 2.0;
 
 #[derive(SystemData)]
@@ -145,10 +145,18 @@ impl<'a> System<'a> for Sys {
             (&read_data.char_states, &mut energies, &mut poises).join()
         {
             match character_state {
+                // Sitting accelerates recharging energy the most
+                CharacterState::Sit => {
+                    if energy.needs_regen() {
+                        energy.regen(SIT_ENERGY_REGEN_ACCEL, dt);
+                    }
+                    if poise.needs_regen() {
+                        poise.regen(POISE_REGEN_ACCEL, dt, *read_data.time);
+                    }
+                },
                 // Accelerate recharging energy.
                 CharacterState::Idle(_)
                 | CharacterState::Talk
-                | CharacterState::Sit
                 | CharacterState::Dance
                 | CharacterState::Glide(_)
                 | CharacterState::Skate(_)
@@ -160,34 +168,11 @@ impl<'a> System<'a> for Sys {
                     stage_section: None,
                     ..
                 }) => {
-                    let res = { energy.current() < energy.maximum() };
-
-                    if res {
-                        let energy = &mut *energy;
-                        energy.change_by(energy.regen_rate * dt);
-                        if matches!(character_state, CharacterState::Sit) {
-                            // Higher Energy-regeneration while sitting
-                            energy.regen_rate =
-                                (energy.regen_rate + ENERGY_REGEN_ACCEL * dt * 1.5).min(25.0);
-                        } else {
-                            energy.regen_rate =
-                                (energy.regen_rate + ENERGY_REGEN_ACCEL * dt).min(10.0);
-                        }
+                    if energy.needs_regen() {
+                        energy.regen(ENERGY_REGEN_ACCEL, dt);
                     }
-
-                    let res_poise = { poise.current() < poise.maximum() };
-
-                    if res_poise {
-                        let poise = &mut *poise;
-                        let poise_change = PoiseChange {
-                            amount: poise.regen_rate * dt,
-                            impulse: Vec3::zero(),
-                            by: None,
-                            cause: None,
-                            time: *read_data.time,
-                        };
-                        poise.change(poise_change);
-                        poise.regen_rate = (poise.regen_rate + POISE_REGEN_ACCEL * dt).min(10.0);
+                    if poise.needs_regen() {
+                        poise.regen(POISE_REGEN_ACCEL, dt, *read_data.time);
                     }
                 },
                 // Ability use does not regen and sets the rate back to zero.
@@ -206,6 +191,7 @@ impl<'a> System<'a> for Sys {
                 | CharacterState::BasicBeam(_)
                 | CharacterState::BasicAura(_)
                 | CharacterState::Blink(_)
+                | CharacterState::Climb(_)
                 | CharacterState::BasicSummon(_)
                 | CharacterState::SelfBuff(_)
                 | CharacterState::SpriteSummon(_)
@@ -213,14 +199,13 @@ impl<'a> System<'a> for Sys {
                 | CharacterState::DiveMelee(_)
                 | CharacterState::RiposteMelee(_)
                 | CharacterState::RapidMelee(_) => {
-                    if energy.regen_rate != 0.0 {
-                        energy.regen_rate = 0.0
+                    if energy.needs_regen_rate_reset() {
+                        energy.reset_regen_rate();
                     }
                 },
                 // Abilities that temporarily stall energy gain, but preserve regen_rate.
                 CharacterState::Roll(_)
                 | CharacterState::Wallrun(_)
-                | CharacterState::Climb(_)
                 | CharacterState::Stunned(_)
                 | CharacterState::BasicBlock(_)
                 | CharacterState::UseItem(_)

voxygen/src/hud/mod.rs

@@ -899,12 +899,12 @@ impl Show {
         if !self.esc_menu {
             self.bag = open;
             self.map = false;
-            self.want_grab = !self.any_window_requires_cursor();
             self.crafting_fields.salvage = false;
-
             if !open {
                 self.crafting = false;
             }
+
+            self.want_grab = !self.any_window_requires_cursor();
         }
     }