bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Don't trigger equalizer when bases are too low

Browse Source
This commit is contained in:
NG (Graham)
2025-12-20 21:53:47 -05:00
parent 4297622aa9
commit f4539c9c32
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rc_multiplayer/src/matches/modes/battle_arena.rs
View File

@@ -569,11 +569,16 @@ impl EqualizerTracker {
// do activation
if let Some(winning_base) = Self::winning_base(bases) {
if let Some(losing_base) = Self::losing_base(bases) {
self.activated.store(true, std::sync::atomic::Ordering::Relaxed);
self.winning_team.store(winning_base.0, std::sync::atomic::Ordering::Relaxed);
self.losing_team.store(losing_base.0, std::sync::atomic::Ordering::Relaxed);
self.health.store(ba_config.equalizer_health as u64, std::sync::atomic::Ordering::Relaxed);
self.send_notification(rlnl::types::EqualizerState::Start, ba_config, eq_start, now, generic).await;
if losing_base.0 != winning_base.0 && winning_base.1 > 0.0 {
self.activated.store(true, std::sync::atomic::Ordering::Relaxed);
self.winning_team.store(winning_base.0, std::sync::atomic::Ordering::Relaxed);
self.losing_team.store(losing_base.0, std::sync::atomic::Ordering::Relaxed);
self.health.store(ba_config.equalizer_health as u64, std::sync::atomic::Ordering::Relaxed);
self.send_notification(rlnl::types::EqualizerState::Start, ba_config, eq_start, now, generic).await;
} else {
log::info!("Skipping equalizer for game {} (no base charge or teams are tied)", generic.game_guid());
self.cancelled.store(true, std::sync::atomic::Ordering::Relaxed);
}
} else {
log::warn!("No losing team found for game {}", generic.game_guid());
}
@@ -588,7 +593,7 @@ impl EqualizerTracker {
if !self.activated.load(std::sync::atomic::Ordering::Relaxed) { return; }
let damage_u64 = damage as u64;
let old_health = self.health.fetch_sub(damage as u64, std::sync::atomic::Ordering::Relaxed);
if old_health < damage_u64 {
if old_health <= damage_u64 {
// equalizer is now destroyed
self.destroy_equalizer(generic, ba_config, bases, crystals).await;
}