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

Self buffs clear on tab swaps

Browse Source
This commit is contained in:
Sam
2023-07-10 21:17:36 -04:00
parent d6fcd893bf
commit 9f86cafc5c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -904,7 +904,7 @@ pub fn handle_wallrun(data: &JoinData<'_>, update: &mut StateUpdate) -> bool {
pub fn attempt_swap_equipped_weapons( pub fn attempt_swap_equipped_weapons(
data: &JoinData<'_>, data: &JoinData<'_>,
update: &mut StateUpdate, update: &mut StateUpdate,
_output_events: &mut OutputEvents, output_events: &mut OutputEvents,
) { ) {
if data if data
.inventory .inventory
@ -916,6 +916,7 @@ pub fn attempt_swap_equipped_weapons(
.is_some() .is_some()
{ {
update.swap_equipped_weapons = true; update.swap_equipped_weapons = true;
loadout_change_hook(data, output_events, false);
} }
} }
@ -1000,7 +1001,7 @@ pub fn handle_manipulate_loadout(
update: &mut StateUpdate, update: &mut StateUpdate,
inv_action: InventoryAction, inv_action: InventoryAction,
) { ) {
loadout_change_hook(data, output_events); loadout_change_hook(data, output_events, true);
match inv_action { match inv_action {
InventoryAction::Use(slot @ Slot::Inventory(inv_slot)) => { InventoryAction::Use(slot @ Slot::Inventory(inv_slot)) => {
// If inventory action is using a slot, and slot is in the inventory // If inventory action is using a slot, and slot is in the inventory
@ -1632,12 +1633,14 @@ impl Default for ComboConsumption {
fn default() -> Self { Self::All } fn default() -> Self { Self::All }
} }
fn loadout_change_hook(data: &JoinData<'_>, output_events: &mut OutputEvents) { fn loadout_change_hook(data: &JoinData<'_>, output_events: &mut OutputEvents, clear_combo: bool) {
if clear_combo {
// Reset combo to 0 // Reset combo to 0
output_events.emit_server(ServerEvent::ComboChange { output_events.emit_server(ServerEvent::ComboChange {
entity: data.entity, entity: data.entity,
change: -data.combo.map_or(0, |c| c.counter() as i32), change: -data.combo.map_or(0, |c| c.counter() as i32),
}); });
}
// Clear any buffs from equipped weapons // Clear any buffs from equipped weapons
output_events.emit_server(ServerEvent::Buff { output_events.emit_server(ServerEvent::Buff {
entity: data.entity, entity: data.entity,