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

Fix base stealing not ending game; fix #100

Browse Source
This commit is contained in:
NG (Graham)
2026-03-21 21:06:38 -04:00
parent 27da413ed1
commit 57b825a6f8
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,7 +721,7 @@ struct BaseTickInfo {
} }
impl BaseTracker { impl BaseTracker {
const DOMINATING_MULT: f32 = 4.0; const DOMINATING_MULT: f32 = 8.0;
fn new<'a>(bases_iter: impl std::iter::Iterator<Item=&'a u8>, crystals: &[oj_rc_core::cubes::CubeLocationInfo], ba_config: &oj_rc_core::data::battle_arena_config::BattleArenaData, base_graph: &oj_rc_core::cubes::CubeGraph) -> Self { fn new<'a>(bases_iter: impl std::iter::Iterator<Item=&'a u8>, crystals: &[oj_rc_core::cubes::CubeLocationInfo], ba_config: &oj_rc_core::data::battle_arena_config::BattleArenaData, base_graph: &oj_rc_core::cubes::CubeGraph) -> Self {
let mut bases = std::collections::HashMap::new(); let mut bases = std::collections::HashMap::new();
@@ -765,6 +765,7 @@ impl BaseTracker {
let one_tick = (crystals.len() as f32) let one_tick = (crystals.len() as f32)
* ((PointTracker::TICK_MS as f32) / (generic.game_duration.as_millis() as f32)) * ((PointTracker::TICK_MS as f32) / (generic.game_duration.as_millis() as f32))
* ((self.bases.len() as f32) / (capture_points_count as f32)); * ((self.bases.len() as f32) / (capture_points_count as f32));
let one_tick = 0.1;
let increment = tick_info.delta as f32 * (*owned_points as f32) * one_tick * multiplier; let increment = tick_info.delta as f32 * (*owned_points as f32) * one_tick * multiplier;
let old_float_index = tracked_base.cube_index.fetch_add(increment, std::sync::atomic::Ordering::SeqCst); let old_float_index = tracked_base.cube_index.fetch_add(increment, std::sync::atomic::Ordering::SeqCst);
let new_float_index = old_float_index + increment; let new_float_index = old_float_index + increment;
@@ -820,6 +821,7 @@ impl BaseTracker {
if new_index == crystals.len() { if new_index == crystals.len() {
// team base is charged to 100% // team base is charged to 100%
log::debug!("Base {} is fully charged due to tick", base_id);
return BaseTickInfo { return BaseTickInfo {
win: Some((*base_id, WinMode::BaseFull)), win: Some((*base_id, WinMode::BaseFull)),
}; };
@@ -1049,6 +1051,7 @@ pub struct BattleArenaLogic {
//cube_parser: std::sync::Arc<oj_rc_core::cubes::CubeLocationsParser>, //cube_parser: std::sync::Arc<oj_rc_core::cubes::CubeLocationsParser>,
crystals: std::sync::Arc<Vec<oj_rc_core::cubes::CubeLocationInfo>>, crystals: std::sync::Arc<Vec<oj_rc_core::cubes::CubeLocationInfo>>,
config: oj_rc_core::data::battle_arena_config::BattleArenaData, config: oj_rc_core::data::battle_arena_config::BattleArenaData,
can_drop_shields: bool,
} }
impl BattleArenaLogic { impl BattleArenaLogic {
@@ -1073,6 +1076,7 @@ impl BattleArenaLogic {
//ba_equalizer: equalizer, //ba_equalizer: equalizer,
crystals, crystals,
config: ba_config, config: ba_config,
can_drop_shields: true,
} }
} }
@@ -1236,6 +1240,7 @@ impl BattleArenaLogic {
async fn do_team_base_stealing(&self, cube_damage: &rlnl::events::ingame::DestroyCubeNoEffect, generic: &crate::matches::GenericGamemodeEngine<Self>, actual_damage_data: impl FnOnce(Vec<rlnl::types::CubeState>) -> crate::matches::RlnlPacket) { async fn do_team_base_stealing(&self, cube_damage: &rlnl::events::ingame::DestroyCubeNoEffect, generic: &crate::matches::GenericGamemodeEngine<Self>, actual_damage_data: impl FnOnce(Vec<rlnl::types::CubeState>) -> crate::matches::RlnlPacket) {
let base_id = cube_damage.hit_machine_id as u8; let base_id = cube_damage.hit_machine_id as u8;
let mut total_destroyed = 0; let mut total_destroyed = 0;
#[cfg(debug_assertions)]
let mut total_damaged = 0; let mut total_damaged = 0;
let mut actual_cube_damage = Vec::with_capacity(cube_damage.hit_cubes.len()); let mut actual_cube_damage = Vec::with_capacity(cube_damage.hit_cubes.len());
let mut destroyed_cubes_positions = Vec::with_capacity(cube_damage.hit_cubes.len()); let mut destroyed_cubes_positions = Vec::with_capacity(cube_damage.hit_cubes.len());
@@ -1244,7 +1249,8 @@ impl BattleArenaLogic {
if let Some(damage) = hit_cube.status.damage { if let Some(damage) = hit_cube.status.damage {
if base.damage_crystal_at_pos(hit_cube.loc, damage, &self.crystals).is_some() { if base.damage_crystal_at_pos(hit_cube.loc, damage, &self.crystals).is_some() {
actual_cube_damage.push(hit_cube.to_owned()); actual_cube_damage.push(hit_cube.to_owned());
total_damaged += 1; #[cfg(debug_assertions)]
{ total_damaged += 1; }
} else { } else {
log::warn!("Could not damage cube with damage status"); log::warn!("Could not damage cube with damage status");
} }
@@ -1259,6 +1265,7 @@ impl BattleArenaLogic {
} }
} }
base.destroy_crystals_update_graph(destroyed_cubes_positions, &self.crystals); base.destroy_crystals_update_graph(destroyed_cubes_positions, &self.crystals);
#[cfg(debug_assertions)]
log::debug!("Destroyed {} ({} damaged) base cubes; {}/{} valid, game {}", total_destroyed, total_damaged, actual_cube_damage.len(), cube_damage.hit_cubes.len(), generic.game_guid()); log::debug!("Destroyed {} ({} damaged) base cubes; {}/{} valid, game {}", total_destroyed, total_damaged, actual_cube_damage.len(), cube_damage.hit_cubes.len(), generic.game_guid());
let actual_damage_data = actual_damage_data(actual_cube_damage); let actual_damage_data = actual_damage_data(actual_cube_damage);
generic.broadcast( generic.broadcast(
@@ -1291,6 +1298,12 @@ impl BattleArenaLogic {
&payload, &payload,
true, true,
).await; ).await;
if new_index == self.crystals.len() {
// team base is charged to 100%
log::debug!("Base {} is fully charged due to stealing", team_id);
self.do_win(team_id, WinMode::BaseFull, generic).await;
}
} }
} else { } else {
log::warn!("Machine {} has no team", cube_damage.shooting_machine_id); log::warn!("Machine {} has no team", cube_damage.shooting_machine_id);
@@ -1312,8 +1325,8 @@ impl BattleArenaLogic {
#[async_trait::async_trait] #[async_trait::async_trait]
impl CustomGameLogic for BattleArenaLogic { impl CustomGameLogic for BattleArenaLogic {
async fn on_player_join(&self, _generic: &crate::matches::GenericGamemodeEngine<Self>, _conn: &crate::matches::generic::UserConnection, player: &crate::matches::generic::UserDescriptor) -> bool { async fn on_player_join(&self, generic: &crate::matches::GenericGamemodeEngine<Self>, _conn: &crate::matches::generic::UserConnection, player: &crate::matches::generic::UserDescriptor) -> bool {
log::info!("Player {} joined", player.descriptor.player_id); log::info!("Player {} joined BA game {}", player.descriptor.player_id, generic.game_guid());
self.player_tracking.track_player(&player.descriptor).await; self.player_tracking.track_player(&player.descriptor).await;
true true
} }
@@ -1677,16 +1690,18 @@ impl CustomGameLogic for BattleArenaLogic {
true, true,
).await; ).await;
} }
for team in tick_info.lost_lasts.iter() { if self.can_drop_shields {
generic.broadcast( for team in tick_info.lost_lasts.iter() {
rlnl::event_code::NetworkEvent::SetShieldState, generic.broadcast(
literustlib::packet::Property::ReliableOrdered, rlnl::event_code::NetworkEvent::SetShieldState,
&rlnl::events::sync::FusionShieldState { literustlib::packet::Property::ReliableOrdered,
team_id: *team as i8, &rlnl::events::sync::FusionShieldState {
full_power: 0, team_id: *team as i8,
}, full_power: 0,
true, },
).await; true,
).await;
}
} }
// do base charge tick // do base charge tick