Stances can now be left by interacting with the buff bar.

client/src/lib.rs

@@ -1315,6 +1315,10 @@ impl Client {
         )));
     }
 
+    pub fn leave_stance(&mut self) {
+        self.send_msg(ClientGeneral::ControlEvent(ControlEvent::LeaveStance));
+    }
+
     pub fn unlock_skill(&mut self, skill: Skill) {
         self.send_msg(ClientGeneral::UnlockSkill(skill));
     }

common/src/comp/ability.rs

@@ -2894,7 +2894,7 @@ pub struct AbilityRequirements {
     pub stance: Option<Stance>,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash, PartialOrd, Ord)]
 pub enum SwordStance {
     Crippling,
     Cleaving,
@@ -2922,12 +2922,31 @@ bitflags::bitflags! {
     }
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash, PartialOrd, Ord)]
 pub enum Stance {
     None,
     Sword(SwordStance),
 }
 
+impl Stance {
+    pub fn pseudo_ability_id(&self) -> &str {
+        match self {
+            Stance::Sword(SwordStance::Heavy) => "veloren.core.pseudo_abilities.sword.heavy_stance",
+            Stance::Sword(SwordStance::Agile) => "veloren.core.pseudo_abilities.sword.agile_stance",
+            Stance::Sword(SwordStance::Defensive) => {
+                "veloren.core.pseudo_abilities.sword.defensive_stance"
+            },
+            Stance::Sword(SwordStance::Crippling) => {
+                "veloren.core.pseudo_abilities.sword.crippling_stance"
+            },
+            Stance::Sword(SwordStance::Cleaving) => {
+                "veloren.core.pseudo_abilities.sword.cleaving_stance"
+            },
+            Stance::None => "veloren.core.pseudo_abilities.no_stance",
+        }
+    }
+}
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AbilityInitEvent {
     EnterStance(Stance),

common/src/comp/controller.rs

@@ -143,6 +143,7 @@ pub enum ControlEvent {
     InventoryEvent(InventoryEvent),
     GroupManip(GroupManip),
     RemoveBuff(BuffKind),
+    LeaveStance,
     Respawn,
     Utterance(UtteranceKind),
     ChangeAbility {

common/systems/src/controller.rs

@@ -1,5 +1,6 @@
 use common::{
     comp::{
+        ability::Stance,
         agent::{Sound, SoundKind},
         Body, BuffChange, ControlEvent, Controller, Pos,
     },
@@ -115,6 +116,12 @@ impl<'a> System<'a> for Sys {
                             new_ability,
                         });
                     },
+                    ControlEvent::LeaveStance => {
+                        server_emitter.emit(ServerEvent::ChangeStance {
+                            entity,
+                            stance: Stance::None,
+                        });
+                    },
                 }
             }
         }

voxygen/src/hud/buffs.rs

@@ -94,6 +94,7 @@ pub struct State {
 
 pub enum Event {
     RemoveBuff(BuffKind),
+    LeaveStance,
 }
 
 const MULTIPLICITY_COLOR: Color = TEXT_COLOR;
@@ -283,7 +284,7 @@ impl<'a> Widget for BuffsBar<'a> {
                     {
                         match buff.kind {
                             BuffIconKind::Buff { kind, .. } => event.push(Event::RemoveBuff(kind)),
-                            BuffIconKind::Ability { .. } => {},
+                            BuffIconKind::Stance(_) => event.push(Event::LeaveStance),
                         }
                     };
                 });
@@ -471,7 +472,7 @@ impl<'a> Widget for BuffsBar<'a> {
                     {
                         match buff.kind {
                             BuffIconKind::Buff { kind, .. } => event.push(Event::RemoveBuff(kind)),
-                            BuffIconKind::Ability { .. } => {},
+                            BuffIconKind::Stance(_) => event.push(Event::LeaveStance),
                         }
                     }
                     Text::new(&remaining_time)

voxygen/src/hud/mod.rs

@@ -85,7 +85,7 @@ use common::{
     combat,
     comp::{
         self,
-        ability::AuxiliaryAbility,
+        ability::{AuxiliaryAbility, Stance},
         fluid_dynamics,
         inventory::{slot::InvSlotId, trade_pricing::TradePricing, CollectFailedReason},
         item::{
@@ -460,29 +460,27 @@ impl<W: Positionable> Position for W {
 }
 
 #[derive(Clone, Copy, Debug)]
-pub enum BuffIconKind<'a> {
+pub enum BuffIconKind {
     Buff {
         kind: BuffKind,
         data: BuffData,
         multiplicity: usize,
     },
-    Ability {
-        ability_id: &'a str,
-    },
+    Stance(Stance),
 }
 
-impl<'a> BuffIconKind<'a> {
+impl BuffIconKind {
     pub fn image(&self, imgs: &Imgs) -> conrod_core::image::Id {
         match self {
             Self::Buff { kind, .. } => get_buff_image(*kind, imgs),
-            Self::Ability { ability_id, .. } => util::ability_image(imgs, ability_id),
+            Self::Stance(stance) => util::ability_image(imgs, stance.pseudo_ability_id()),
         }
     }
 
     pub fn max_duration(&self) -> Option<Secs> {
         match self {
             Self::Buff { data, .. } => data.duration,
-            Self::Ability { .. } => None,
+            Self::Stance(_) => None,
         }
     }
 
@@ -499,14 +497,14 @@ impl<'a> BuffIconKind<'a> {
                 get_buff_title(*kind, localized_strings),
                 get_buff_desc(*kind, *data, localized_strings),
             ),
-            Self::Ability { ability_id } => {
-                util::ability_description(ability_id, localized_strings)
+            Self::Stance(stance) => {
+                util::ability_description(stance.pseudo_ability_id(), localized_strings)
             },
         }
     }
 }
 
-impl<'a> PartialOrd for BuffIconKind<'a> {
+impl PartialOrd for BuffIconKind {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         match (self, other) {
             (
@@ -515,19 +513,16 @@ impl<'a> PartialOrd for BuffIconKind<'a> {
                     kind: other_kind, ..
                 },
             ) => Some(kind.cmp(other_kind)),
-            (BuffIconKind::Buff { .. }, BuffIconKind::Ability { .. }) => Some(Ordering::Greater),
-            (BuffIconKind::Ability { .. }, BuffIconKind::Buff { .. }) => Some(Ordering::Less),
-            (
-                BuffIconKind::Ability { ability_id },
-                BuffIconKind::Ability {
-                    ability_id: other_id,
-                },
-            ) => Some(ability_id.cmp(other_id)),
+            (BuffIconKind::Buff { .. }, BuffIconKind::Stance(_)) => Some(Ordering::Greater),
+            (BuffIconKind::Stance(_), BuffIconKind::Buff { .. }) => Some(Ordering::Less),
+            (BuffIconKind::Stance(stance), BuffIconKind::Stance(stance_other)) => {
+                Some(stance.cmp(stance_other))
+            },
         }
     }
 }
 
-impl<'a> Ord for BuffIconKind<'a> {
+impl Ord for BuffIconKind {
     fn cmp(&self, other: &Self) -> Ordering {
         // We know this is safe since we can look at the partialord implementation and
         // see that every variant is wrapped in Some
@@ -535,7 +530,7 @@ impl<'a> Ord for BuffIconKind<'a> {
     }
 }
 
-impl<'a> PartialEq for BuffIconKind<'a> {
+impl PartialEq for BuffIconKind {
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
             (
@@ -544,31 +539,28 @@ impl<'a> PartialEq for BuffIconKind<'a> {
                     kind: other_kind, ..
                 },
             ) => kind == other_kind,
-            (
-                BuffIconKind::Ability { ability_id },
-                BuffIconKind::Ability {
-                    ability_id: other_id,
-                },
-            ) => ability_id == other_id,
+            (BuffIconKind::Stance(stance), BuffIconKind::Stance(stance_other)) => {
+                stance == stance_other
+            },
             _ => false,
         }
     }
 }
 
-impl<'a> Eq for BuffIconKind<'a> {}
+impl Eq for BuffIconKind {}
 
 #[derive(Clone, Copy, Debug)]
-pub struct BuffIcon<'a> {
-    kind: BuffIconKind<'a>,
+pub struct BuffIcon {
+    kind: BuffIconKind,
     is_buff: bool,
     end_time: Option<f64>,
 }
 
-impl<'a> BuffIcon<'a> {
+impl BuffIcon {
     pub fn multiplicity(&self) -> usize {
         match self.kind {
             BuffIconKind::Buff { multiplicity, .. } => multiplicity,
-            BuffIconKind::Ability { .. } => 1,
+            BuffIconKind::Stance(_) => 1,
         }
     }
 
@@ -589,25 +581,13 @@ impl<'a> BuffIcon<'a> {
     }
 
     fn from_stance(stance: &comp::Stance) -> Option<Self> {
-        use comp::ability::{Stance, SwordStance};
-        let id = match stance {
-            Stance::Sword(SwordStance::Heavy) => "veloren.core.pseudo_abilities.sword.heavy_stance",
-            Stance::Sword(SwordStance::Agile) => "veloren.core.pseudo_abilities.sword.agile_stance",
-            Stance::Sword(SwordStance::Defensive) => {
-                "veloren.core.pseudo_abilities.sword.defensive_stance"
-            },
-            Stance::Sword(SwordStance::Crippling) => {
-                "veloren.core.pseudo_abilities.sword.crippling_stance"
-            },
-            Stance::Sword(SwordStance::Cleaving) => {
-                "veloren.core.pseudo_abilities.sword.cleaving_stance"
-            },
-            Stance::None => {
-                return None;
-            },
+        let stance = if let Stance::None = stance {
+            return None;
+        } else {
+            stance
         };
         Some(BuffIcon {
-            kind: BuffIconKind::Ability { ability_id: id },
+            kind: BuffIconKind::Stance(*stance),
             is_buff: true,
             end_time: None,
         })
@@ -745,6 +725,7 @@ pub enum Event {
     LeaveGroup,
     AssignLeader(Uid),
     RemoveBuff(BuffKind),
+    LeaveStance,
     UnlockSkill(Skill),
     SelectExpBar(Option<SkillGroupKind>),
 
@@ -3170,6 +3151,7 @@ impl Hud {
             {
                 match event {
                     buffs::Event::RemoveBuff(buff_id) => events.push(Event::RemoveBuff(buff_id)),
+                    buffs::Event::LeaveStance => events.push(Event::LeaveStance),
                 }
             }
         }

voxygen/src/session/mod.rs

@@ -1446,6 +1446,7 @@ impl PlayState for SessionState {
                     HudEvent::RemoveBuff(buff_id) => {
                         self.client.borrow_mut().remove_buff(buff_id);
                     },
+                    HudEvent::LeaveStance => self.client.borrow_mut().leave_stance(),
                     HudEvent::UnlockSkill(skill) => {
                         self.client.borrow_mut().unlock_skill(skill);
                     },