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 pit win conditions #34

Browse Source
This commit is contained in:
NG (Graham)
2025-09-10 19:40:51 -04:00
parent f2de67b338
commit 82cc2dcf1b
11 changed files with 219 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ impl PlayerTracker {
async fn players_on_team(&self, team: u8) -> Vec<u8> {
if let Some(members) = self.connected.lock().await.get(&team) {
members.iter().map(|x| *x).collect()
members.iter().copied().collect()
} else {
Vec::default()
}
@@ -434,12 +434,12 @@ impl EqualizerTracker {
|| ba_config.equalizer_model.is_empty()
//|| ba_config.equalizer_trigger_time_seconds.is_empty()
|| ba_config.equalizer_duration_seconds.is_empty()
|| ba_config.equalizer_duration_seconds.iter().any(|&x| x == 0);
|| ba_config.equalizer_duration_seconds.contains(&0);
if is_disabled {
log::info!("Battle Arena equalizer is disabled by config (model ok? {}, health ok? {}, duration ok? {})",
!ba_config.equalizer_model.is_empty(),
ba_config.equalizer_health > 0,
!ba_config.equalizer_duration_seconds.is_empty() && !ba_config.equalizer_duration_seconds.iter().any(|&x| x == 0)
!ba_config.equalizer_duration_seconds.is_empty() && !ba_config.equalizer_duration_seconds.contains(&0)
);
}
Self {
@@ -704,6 +704,7 @@ impl BaseTracker {
// undo cube_index update
tracked_base.cube_index.fetch_sub(increment, std::sync::atomic::Ordering::SeqCst);
log::debug!("Skipping increment in favour of healing damaged/destroyed cube");
#[allow(clippy::unnecessary_unwrap)] // have you seen the mess this would be with another if statement?
let first_damaged = first_damaged.unwrap();
let healing = crystal_health - tracked_base.calculate_crystal_health(first_damaged, crystal_health);
tracked_base.crystals_healths[first_damaged].store(u8::MAX, std::sync::atomic::Ordering::Relaxed);