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

Add capture point locations for all maps

Browse Source
This commit is contained in:
NG (Graham)
2025-09-08 21:36:02 -04:00
parent a15939ba05
commit 31585513dd
3 changed files with 255 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,6 +517,7 @@ impl EqualizerTracker {
}
async fn damage_equalizer(&self, damage: i32, generic: &crate::matches::GenericGamemodeEngine<BattleArenaLogic>, ba_config: &oj_rc_core::data::battle_arena_config::BattleArenaData, bases: &std::collections::HashMap<u8, BaseInfo>, crystals: &[oj_rc_core::cubes::CubeLocationInfo]) {
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 {
@@ -526,8 +527,8 @@ impl EqualizerTracker {
}
async fn destroy_equalizer(&self, generic: &crate::matches::GenericGamemodeEngine<BattleArenaLogic>, ba_config: &oj_rc_core::data::battle_arena_config::BattleArenaData, bases: &std::collections::HashMap<u8, BaseInfo>, crystals: &[oj_rc_core::cubes::CubeLocationInfo]) {
if !self.activated.swap(false, std::sync::atomic::Ordering::Relaxed) { return; }
self.cancelled.store(true, std::sync::atomic::Ordering::Relaxed);
self.activated.store(false, std::sync::atomic::Ordering::Relaxed);
let eq_start = self.start.load(std::sync::atomic::Ordering::Relaxed);
let now = chrono::Utc::now().timestamp();
self.send_notification(rlnl::types::EqualizerState::Destroyed, ba_config, eq_start, now, generic).await;