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

Allow client AIs to run on non-teammates when there are no teammates available, fix/answer #42

Browse Source
This commit is contained in:
NG (Graham)
2025-10-29 21:29:34 -04:00
parent 2007abd3df
commit 127de674b4
4 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rc_core/src/persist/combat.rs
View File

@@ -28,7 +28,7 @@ impl super::config::SelfValidator for BattleConfig {
// TODO votes
// TODO games
is_ok &= self.singleplayer.validate_in(info, ctx, "singleplayer");
is_ok &= self.rotation.validate_in(info, ctx, "rotation");
is_ok &= self.rotation.validate_in(info, self, "rotation");
// TODO multiplayer
// TODO maps
// TODO energy
@@ -134,7 +134,7 @@ pub struct GameEventSequence {
}
impl super::config::SelfValidator for GameEventSequence {
type Context = crate::ConfigImpl;
type Context = BattleConfig;
fn validate(&self, info: &mut super::config::ValidationInfo, ctx: &Self::Context) -> bool {
// TODO
let mut is_ok = true;
@@ -168,11 +168,11 @@ pub struct GameEvents {
}
impl super::config::SelfValidator for GameEvents {
type Context = crate::ConfigImpl;
fn validate(&self, info: &mut super::config::ValidationInfo, _ctx: &Self::Context) -> bool {
type Context = BattleConfig;
fn validate(&self, info: &mut super::config::ValidationInfo, ctx: &Self::Context) -> bool {
// TODO
let mut is_ok = true;
if !matches!(self.singleplayer.mode, GameType::SuddenDeath) {
if !matches!(self.singleplayer.mode, GameType::SuddenDeath | GameType::SinglePlayer) {
info.warn(crate::persist::config::ValidationMessage {
path: vec!["singleplayer".to_owned(), "mode".to_owned()],
message: format!("Singleplayer game mode {:?} will be overidden by the client", self.singleplayer.mode),
@@ -185,6 +185,23 @@ impl super::config::SelfValidator for GameEvents {
});
is_ok = false;
}
if matches!(self.multiplayer.mode, GameType::Pit) {
if ctx.multiplayer.fakes.iter().any(|f| (f.team as usize) < ctx.multiplayer.players_per_game)
|| ctx.multiplayer.fakes.iter().enumerate()
.any(|(i, f)| ctx.multiplayer.fakes.iter().enumerate()
.any(|(i2, f2)| i != i2 && f.team == f2.team)) {
info.warn(crate::persist::config::ValidationMessage {
path: vec!["multiplayer".to_owned(), "mode".to_owned()],
message: format!("Multiplayer game mode {:?} does not work well with more than one player per team", self.multiplayer.mode),
});
}
if ctx.multiplayer.fakes.iter().any(|f| matches!(f.implementation, super::multiplayer::ClientEmulation::ClientAI)) {
info.warn(crate::persist::config::ValidationMessage {
path: vec!["multiplayer".to_owned(), "mode".to_owned()],
message: format!("Multiplayer game mode {:?} does not work well with client-side AI", self.multiplayer.mode),
});
}
}
is_ok
}
}
@@ -428,7 +445,7 @@ fn default_rotation() -> GameEventSequence {
multiplayer: GameEvent {
map: GameMap::Earth1,
visibility: GameVisibility::Good,
mode: GameType::TeamDeathmatch,
mode: GameType::Pit,
auto_heal: true,
},
duration_s: 5*60, // 5 minutes

4
rc_core/src/persist/multiplayer.rs
View File

@@ -120,7 +120,7 @@ pub(super) fn default_fake_users() -> Vec<FakePlayerConf> {
implementation: ClientEmulation::Experimental,
},
FakePlayerConf {
team: 0,
team: 1,
vehicle: super::garage::PrefabVehicle {
name: Some("fake1".to_owned()),
username: "Server1".to_owned(),
@@ -132,7 +132,7 @@ pub(super) fn default_fake_users() -> Vec<FakePlayerConf> {
implementation: ClientEmulation::ClientAI,
},
FakePlayerConf {
team: 1,
team: 2,
vehicle: super::garage::PrefabVehicle {
name: Some("fake2".to_owned()),
username: "Server2".to_owned(),