Deliver typed strike rounds by transport loader
Co-authored-by: Codex <codex@openai.com>
This commit is contained in:
@@ -24,6 +24,7 @@ pub struct SamRec {
|
||||
/// The parts, from the sensor on; older saves have fewer or none.
|
||||
pub comps: Vec<f64>,
|
||||
pub ground_rounds: u32,
|
||||
pub ground_request: bool,
|
||||
pub ground_stock: u32,
|
||||
pub air_48n6_stock: u32,
|
||||
pub mode: sim::battery::SamMode,
|
||||
@@ -138,19 +139,21 @@ impl Layout {
|
||||
None => 0,
|
||||
Some(v) => v.parse::<u8>().map_err(|_| l.bad("пустые контейнеры", "нужно целое число 0..255"))?,
|
||||
};
|
||||
let ground_request = l.num(28, "заявка RM48U", 0.0, 1.0)?.unwrap_or(0.0) == 1.0;
|
||||
if ground_request && kind != SamKind::S400 { return Err(l.bad("заявка RM48U", "нужен С-400")); }
|
||||
if radar_role != sim::battery::RadarRole::Multifunction && kind != SamKind::Radar {
|
||||
return Err(l.bad("роль РЛС", "роль поддерживается только отдельной РЛС"));
|
||||
}
|
||||
if mode == sim::battery::SamMode::LauncherOnly && !matches!(kind, SamKind::S400 | SamKind::S500) {
|
||||
return Err(l.bad("режим", "пусковая поддерживается только С-400 и С-500"));
|
||||
}
|
||||
if (kind != SamKind::S400 && ground_rounds != 0) || (kind != SamKind::Depot && (ground_stock != 0 || air_48n6_stock != 0)) {
|
||||
if (kind != SamKind::S400 && ground_rounds != 0) || (!matches!(kind, SamKind::Depot | SamKind::Tzm) && (ground_stock != 0 || air_48n6_stock != 0)) {
|
||||
return Err(l.bad("боезапас", "несовместимый тип техники"));
|
||||
}
|
||||
if let Some((m, _, _, _)) = ammo && m + ground_rounds > 4 && kind == SamKind::S400 {
|
||||
return Err(l.bad("боезапас", "больше четырёх ячеек"));
|
||||
}
|
||||
out.sams.push(SamRec { kind, pos, heading, roles, health, cargo, ammo, dest, comps, ground_rounds, ground_stock, air_48n6_stock, mode, radar_role, spent_cells });
|
||||
out.sams.push(SamRec { kind, pos, heading, roles, health, cargo, ammo, dest, comps, ground_rounds, ground_stock, air_48n6_stock, mode, radar_role, spent_cells, ground_request });
|
||||
}
|
||||
"target" => {
|
||||
if out.targets.len() >= MAX_UNITS {
|
||||
@@ -278,6 +281,15 @@ mod tests {
|
||||
assert!(Layout::parse(&text.replace("0 2 0 0 0 -", "0 4 0 0 0 -")).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_truck_cargo_and_delivery_request_load_from_save() {
|
||||
let text = "sam s400 200 70 0 0 30 1 0 4 0 0 0 - - - 1 1 1 1 1 1 0 0 0 integrated multi 0 1\nsam tzm 0 70 0 0 0 1 0 0 0 0 0 - - - 1 1 1 1 1 1 0 1 0 integrated multi 0 0\n";
|
||||
let l = Layout::parse(text).unwrap();
|
||||
assert!(l.sams[0].ground_request);
|
||||
assert_eq!(l.sams[1].ground_stock, 1);
|
||||
assert!(Layout::parse(&text.replace("sam s400", "sam patriot")).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_save_line_is_what_the_layout_reads() {
|
||||
let mut d = crate::sim::doctrine::Doctrine { salvo: crate::sim::doctrine::Salvo::Economy, reserve: 3, ..Default::default() };
|
||||
|
||||
@@ -897,7 +897,7 @@ impl AirDef {
|
||||
let comps = if fresh { new.comps } else { s.comps };
|
||||
let parts = comps.0.iter().map(|v| format!("{v:.3}")).collect::<Vec<_>>().join(" ");
|
||||
text += &format!(
|
||||
"sam {} {} {} {} {} {} {} {} {} {} {} {} {dest} {parts} {} {} {} {} {} {}\n",
|
||||
"sam {} {} {} {} {} {} {} {} {} {} {} {} {dest} {parts} {} {} {} {} {} {} {}\n",
|
||||
s.kind.key(),
|
||||
s.pos.x,
|
||||
s.pos.y,
|
||||
@@ -910,7 +910,7 @@ impl AirDef {
|
||||
bursts,
|
||||
u8::from(empty),
|
||||
reloading,
|
||||
s.ground_rounds, s.ground_stock, s.air_48n6_stock, s.mode.key(), s.radar_role.key(), if fresh { 0 } else { s.spent_cells },
|
||||
s.ground_rounds, s.ground_stock, s.air_48n6_stock, s.mode.key(), s.radar_role.key(), if fresh { 0 } else { s.spent_cells }, u8::from(!fresh && s.ground_request),
|
||||
);
|
||||
}
|
||||
for (i, t) in self.sim.targets.iter().enumerate() {
|
||||
@@ -1019,6 +1019,7 @@ impl AirDef {
|
||||
*v = *c;
|
||||
}
|
||||
sam.ground_rounds = r.ground_rounds;
|
||||
sam.ground_request = r.ground_request;
|
||||
sam.ground_stock = r.ground_stock;
|
||||
sam.air_48n6_stock = r.air_48n6_stock;
|
||||
sam.fit_cells();
|
||||
@@ -1117,7 +1118,7 @@ fn durable_mark(sim: &Sim) -> u64 {
|
||||
let at = s.dest.unwrap_or(s.pos);
|
||||
let place = (at.x * 10.0) as i64 as u64 ^ ((at.z * 10.0) as i64 as u64).rotate_left(21) ^ (if s.dest.is_some() { 0 } else { (s.heading * 100.0) as i64 as u64 }).rotate_left(42);
|
||||
let ammo = u64::from(s.missiles) | u64::from(s.bursts) << 16 | u64::from(s.cargo) << 32 | u64::from(s.empty) << 48 | u64::from(s.reloading > 0) << 49;
|
||||
let typed = u64::from(s.ground_rounds) ^ u64::from(s.ground_stock).rotate_left(17) ^ u64::from(s.air_48n6_stock).rotate_left(39);
|
||||
let typed = u64::from(s.ground_rounds) ^ u64::from(s.ground_stock).rotate_left(17) ^ u64::from(s.air_48n6_stock).rotate_left(39) ^ u64::from(s.ground_request).rotate_left(55);
|
||||
let parts = s.comps.0.iter().fold(0u64, |a, v| a.wrapping_mul(131).wrapping_add((v * 100.0) as u64));
|
||||
((s.health * 1000.0) as u64).wrapping_mul(1_000_003) ^ place ^ ammo.rotate_left(7) ^ parts.rotate_left(13) ^ typed.rotate_left(29) ^ (s.mode as u64).rotate_left(3) ^ (s.radar_role as u64).rotate_left(11) ^ u64::from(s.spent_cells).rotate_left(19)
|
||||
})
|
||||
|
||||
@@ -345,7 +345,12 @@ impl Sim {
|
||||
// A depot's stock (or a truck's load) goes up with it.
|
||||
let stock = if matches!(self.sams[i].kind, SamKind::Depot | SamKind::Tzm) { self.sams[i].cargo } else { 0 };
|
||||
self.sams[i].cargo = 0;
|
||||
let missiles = missiles + stock * 2;
|
||||
let typed = self.sams[i].ground_stock + self.sams[i].air_48n6_stock;
|
||||
self.sams[i].ground_stock = 0;
|
||||
self.sams[i].air_48n6_stock = 0;
|
||||
self.sams[i].ground_rounds = 0;
|
||||
self.sams[i].ground_request = false;
|
||||
let missiles = missiles + stock * 2 + typed;
|
||||
let charge = spec.missile.as_ref().map_or(0.0, |m| m.kind.charge() * missiles as f64) + bursts as f64 / 60.0
|
||||
+ stock as f64 * 1.5;
|
||||
// The vehicle's own fuel and the first of its load at once, then the rest cooking off.
|
||||
|
||||
@@ -29,11 +29,21 @@ impl Sim {
|
||||
if s.ground_rounds >= s.cells() { return Err("Нет свободной ячейки для RM48U".into()); }
|
||||
let depot = self.sams.iter().enumerate().filter(|(_, d)| d.kind == SamKind::Depot && d.alive() && d.ground_stock > 0 && d.pos.distance(s.pos) < DEPOT_REACH)
|
||||
.min_by(|(_, a), (_, b)| a.pos.distance(s.pos).total_cmp(&b.pos.distance(s.pos)).then(a.id.cmp(&b.id)))
|
||||
.map(|(j, _)| j).ok_or("Нет живого склада с RM48U рядом (60 блоков)")?;
|
||||
.map(|(j, _)| j);
|
||||
let Some(depot) = depot else {
|
||||
if s.ground_request { return Err("Заявка RM48U уже ожидает ТЗМ".into()); }
|
||||
if !self.sams.iter().any(|d| d.alive() && ((d.kind == SamKind::Depot && d.ground_stock > 0) || (d.kind == SamKind::Tzm && d.ground_stock > 0))) {
|
||||
return Err("Нет живого склада с RM48U рядом (60 блоков)".into());
|
||||
}
|
||||
if !self.sams.iter().any(|t| t.kind == SamKind::Tzm && t.alive()) { return Err("Для доставки RM48U нужна исправная ТЗМ".into()); }
|
||||
self.sams[i].ground_request = true;
|
||||
return Ok(format!("С-400 №{}: заявка RM48U ожидает доставки ТЗМ", i + 1));
|
||||
};
|
||||
let displaced = u32::from(self.sams[i].missiles + self.sams[i].ground_rounds >= self.sams[i].cells());
|
||||
let air_48n6_stock = self.sams[depot].air_48n6_stock.checked_add(displaced).ok_or("Запас склада переполнен")?;
|
||||
self.sams[i].missiles -= displaced;
|
||||
self.sams[i].ground_rounds += 1;
|
||||
self.sams[i].ground_request = false;
|
||||
if self.sams[i].ground_rounds >= self.sams[i].cells() && self.sams[i].kind.spec().gun.is_none() { self.sams[i].empty = false; }
|
||||
self.sams[depot].ground_stock -= 1;
|
||||
self.sams[depot].air_48n6_stock = air_48n6_stock;
|
||||
@@ -95,6 +105,60 @@ impl Sim {
|
||||
}
|
||||
let at = truck.pos;
|
||||
let truck_id = truck.id;
|
||||
// Typed strike cargo takes precedence over generic reloads. Jobs are reconstructed
|
||||
// after loading a save; the request and physical cargo survive independently.
|
||||
let typed_work = truck.ground_stock > 0 || truck.air_48n6_stock > 0 ||
|
||||
(self.sams.iter().any(|s| s.kind == SamKind::S400 && s.alive() && s.ground_request)
|
||||
&& self.sams.iter().any(|s| s.kind == SamKind::Depot && s.alive() && s.ground_stock > 0));
|
||||
if typed_work {
|
||||
if let Some(id) = self.sams[t].job {
|
||||
let valid = self.sams.iter().find(|s| s.id == id).is_some_and(|s| s.alive() && !self.routes.out_of_reach(truck_id, s.id, now) && (s.kind == SamKind::Depot || (self.sams[t].ground_stock > 0 && s.kind == SamKind::S400 && s.ground_request)));
|
||||
if !valid { self.sams[t].job = None; }
|
||||
}
|
||||
if let Some(id) = self.sams[t].job {
|
||||
if let Some(j) = self.sams.iter().position(|s| s.id == id && s.alive()) {
|
||||
if self.sams[j].pos.distance(at) <= HANDOVER {
|
||||
if self.sams[j].kind == SamKind::Depot {
|
||||
if let Some(n) = self.sams[j].air_48n6_stock.checked_add(self.sams[t].air_48n6_stock) {
|
||||
self.sams[j].air_48n6_stock = n;
|
||||
self.sams[t].air_48n6_stock = 0;
|
||||
}
|
||||
if self.sams[t].ground_stock == 0 && self.sams[j].ground_stock > 0 && self.sams[t].air_48n6_stock == 0 && self.sams.iter().any(|s| s.kind == SamKind::S400 && s.alive() && s.ground_request) {
|
||||
self.sams[j].ground_stock -= 1;
|
||||
self.sams[t].ground_stock += 1;
|
||||
}
|
||||
} else if self.sams[j].kind == SamKind::S400 && self.sams[j].ground_request && !self.sams[j].moving() && self.sams[j].preparing.is_none() && self.sams[j].reloading == 0 && self.sams[j].part(Part::Launcher) > 0.0 && self.sams[j].ground_rounds < self.sams[j].cells() && self.sams[t].ground_stock > 0 {
|
||||
let displaced = u32::from(self.sams[j].missiles + self.sams[j].ground_rounds >= self.sams[j].cells());
|
||||
self.sams[j].missiles -= displaced;
|
||||
self.sams[j].ground_rounds += 1;
|
||||
if self.sams[j].ground_rounds >= self.sams[j].cells() && self.sams[j].kind.spec().gun.is_none() { self.sams[j].empty = false; }
|
||||
self.sams[j].ground_request = false;
|
||||
self.sams[t].ground_stock -= 1;
|
||||
self.sams[t].air_48n6_stock += displaced;
|
||||
out.sound("minecraft:block.piston.extend", at, 1.5, 0.8);
|
||||
}
|
||||
self.sams[t].job = None;
|
||||
} else {
|
||||
let to = self.sams[j].pos;
|
||||
let side = horizontal(at - to).normalize_or(DVec3::X) * (HANDOVER * 0.6);
|
||||
self.order_move_near(t, to + side, 3.5);
|
||||
continue;
|
||||
}
|
||||
} else { self.sams[t].job = None; }
|
||||
}
|
||||
let taken: Vec<u32> = self.sams.iter().filter(|s| s.kind == SamKind::Tzm && s.alive() && s.id != truck_id).filter_map(|s| s.job).collect();
|
||||
let next = if self.sams[t].ground_stock > 0 {
|
||||
self.sams.iter().filter(|s| s.kind == SamKind::S400 && s.alive() && s.ground_request && !s.moving() && s.preparing.is_none() && s.reloading == 0 && s.part(Part::Launcher) > 0.0 && s.ground_rounds < s.cells() && !taken.contains(&s.id) && !self.routes.out_of_reach(truck_id, s.id, now)).min_by(|a,b| a.pos.distance(at).total_cmp(&b.pos.distance(at)))
|
||||
} else {
|
||||
self.sams.iter().filter(|s| s.kind == SamKind::Depot && s.alive() && (self.sams[t].air_48n6_stock > 0 || s.ground_stock > 0) && !self.routes.out_of_reach(truck_id, s.id, now)).min_by(|a,b| a.pos.distance(at).total_cmp(&b.pos.distance(at)))
|
||||
}.map(|s| (s.id, s.pos));
|
||||
if let Some((id, to)) = next {
|
||||
self.sams[t].job = Some(id);
|
||||
let side = horizontal(at - to).normalize_or(DVec3::X) * (HANDOVER * 0.6);
|
||||
if to.distance(at) > HANDOVER { self.order_move_near(t, to + side, 3.5); }
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// Where it was going: hand over, or load up.
|
||||
if let Some(job) = truck.job
|
||||
&& let Some(j) = self.sams.iter().position(|s| s.id == job)
|
||||
@@ -161,3 +225,40 @@ impl Sim {
|
||||
out.sound("minecraft:block.piston.extend", sam.pos, 2.0, 0.6);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn typed_delivery_uses_stock_and_shared_cells_and_survives_interruption() {
|
||||
let mut sim = Sim::new(1);
|
||||
for (kind, x) in [(SamKind::Depot, 0.0), (SamKind::S400, 200.0), (SamKind::Tzm, 0.0)] {
|
||||
let id = sim.id(); sim.sams.push(Sam::new(id, kind, DVec3::new(x, 70.0, 0.0), 0.0));
|
||||
}
|
||||
assert!(sim.load_ground_round(1).is_err());
|
||||
sim.sams[0].ground_stock = 1;
|
||||
assert!(sim.load_ground_round(0).is_err());
|
||||
sim.load_ground_round(1).unwrap();
|
||||
sim.tick = 2;
|
||||
sim.step_supply(&mut Out::default()); // assign depot
|
||||
sim.step_supply(&mut Out::default()); // physically take one
|
||||
assert_eq!((sim.sams[0].ground_stock, sim.sams[2].ground_stock), (0, 1));
|
||||
assert_eq!(sim.sams[1].ground_rounds, 0);
|
||||
// Interrupted truck retains cargo and request; a restored job is not required.
|
||||
sim.sams[2].job = None;
|
||||
sim.sams[2].state = SamState::Search;
|
||||
sim.sams[2].pos = sim.sams[1].pos;
|
||||
sim.step_supply(&mut Out::default());
|
||||
sim.step_supply(&mut Out::default());
|
||||
assert_eq!((sim.sams[1].missiles, sim.sams[1].ground_rounds), (3, 1));
|
||||
assert_eq!((sim.sams[2].ground_stock, sim.sams[2].air_48n6_stock), (0, 1));
|
||||
assert!(!sim.sams[1].ground_request);
|
||||
sim.sams[2].job = None;
|
||||
sim.sams[2].state = SamState::Search;
|
||||
sim.sams[2].pos = sim.sams[0].pos;
|
||||
sim.step_supply(&mut Out::default());
|
||||
sim.step_supply(&mut Out::default());
|
||||
assert_eq!((sim.sams[0].air_48n6_stock, sim.sams[2].air_48n6_stock), (1, 0));
|
||||
assert!(sim.load_ground_round(1).is_err());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1380,6 +1380,8 @@ pub struct Sam {
|
||||
pub missiles: u32,
|
||||
/// Explicit RM48U game rounds loaded in shared launcher cells.
|
||||
pub ground_rounds: u32,
|
||||
/// Pending player request for one delivered ground round.
|
||||
pub ground_request: bool,
|
||||
/// Separate typed rounds and returned S-400 air rounds held by a depot.
|
||||
pub ground_stock: u32,
|
||||
pub air_48n6_stock: u32,
|
||||
@@ -1468,6 +1470,7 @@ impl Sam {
|
||||
pitch_vel: 0.0,
|
||||
missiles: spec.missile.as_ref().map_or(0, |m| m.magazine),
|
||||
ground_rounds: 0,
|
||||
ground_request: false,
|
||||
ground_stock: 0,
|
||||
air_48n6_stock: 0,
|
||||
bursts: spec.gun.as_ref().map_or(0, |g| g.bursts),
|
||||
@@ -1551,7 +1554,7 @@ impl Sam {
|
||||
}
|
||||
match self.kind {
|
||||
SamKind::Depot => return format!("{text}: {} перезарядок, RM48U {}, снятых ПВО {}", self.cargo, self.ground_stock, self.air_48n6_stock),
|
||||
SamKind::Tzm => return format!("{text}: на борту {}/2{}", self.cargo, if self.job.is_some() { ", в пути" } else { "" }),
|
||||
SamKind::Tzm => return format!("{text}: на борту {}/2, RM48U {}, снятых ПВО {}{}", self.cargo, self.ground_stock, self.air_48n6_stock, if self.job.is_some() { ", в пути" } else { "" }),
|
||||
SamKind::Ew => {
|
||||
let state = if self.ew_on { "ГЛУШИТ" } else if self.ew_lock { "остывает" } else { "готова" };
|
||||
return format!("{text}: {state}, нагрев {:.0}%", self.heat * 100.0);
|
||||
|
||||
Reference in New Issue
Block a user