Return loaded RM48U to depot by truck
Co-authored-by: Codex <codex@openai.com>
This commit is contained in:
@@ -10,6 +10,7 @@ const DEPOT_REACH: f64 = 60.0;
|
||||
const HANDOVER: f64 = 10.0;
|
||||
/// What a truck carries.
|
||||
const TRUCK_LOAD: u32 = 2;
|
||||
const STOCK_LIMIT: u32 = 1_000_000;
|
||||
|
||||
impl Sim {
|
||||
/// Whether ammunition is counted: a depot was set up (without one, magazines refill as
|
||||
@@ -26,6 +27,7 @@ impl Sim {
|
||||
if !s.alive() || s.moving() || s.preparing.is_some() || s.reloading > 0 || s.part(Part::Launcher) <= 0.0 {
|
||||
return Err("Комплекс должен быть исправен и развёрнут".into());
|
||||
}
|
||||
if s.ground_return { return Err("Сначала отмените заявку на вывоз RM48U".into()); }
|
||||
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)))
|
||||
@@ -56,10 +58,18 @@ impl Sim {
|
||||
if s.kind != SamKind::S400 || !s.alive() || s.moving() || s.preparing.is_some() || s.reloading > 0 || s.part(Part::Launcher) <= 0.0 || s.ground_rounds == 0 {
|
||||
return Err("Нужен исправный развёрнутый С-400 с загруженной RM48U".into());
|
||||
}
|
||||
if s.ground_request { return Err("Сначала отмените заявку на доставку RM48U".into()); }
|
||||
if s.ground_return { return Err("Заявка на вывоз RM48U уже ожидает ТЗМ".into()); }
|
||||
let depot = self.sams.iter().enumerate().filter(|(_, d)| d.kind == SamKind::Depot && d.alive() && 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("Нет живого склада рядом (60 блоков)")?;
|
||||
let stock = self.sams[depot].ground_stock.checked_add(1).ok_or("Запас склада переполнен")?;
|
||||
.map(|(j, _)| j);
|
||||
let Some(depot) = depot else {
|
||||
if !self.sams.iter().any(|d| d.kind == SamKind::Depot && d.alive() && d.ground_stock < STOCK_LIMIT) { return Err("Нет доступного склада для возврата RM48U".into()); }
|
||||
if !self.sams.iter().any(|t| t.kind == SamKind::Tzm && t.alive() && t.drive_speed() > 0.0 && t.ground_stock.saturating_add(t.air_48n6_stock) < TRUCK_LOAD) { return Err("Нет исправной ТЗМ со свободным местом для RM48U".into()); }
|
||||
self.sams[i].ground_return = true;
|
||||
return Ok(format!("С-400 №{}: RM48U зарезервирована, ожидается вывоз ТЗМ", i + 1));
|
||||
};
|
||||
let stock = self.sams[depot].ground_stock.checked_add(1).filter(|n| *n <= STOCK_LIMIT).ok_or("Запас склада переполнен")?;
|
||||
self.sams[i].ground_rounds -= 1;
|
||||
self.sams[depot].ground_stock = stock;
|
||||
if self.sams[depot].air_48n6_stock > 0 {
|
||||
@@ -69,6 +79,14 @@ impl Sim {
|
||||
Ok(format!("С-400 №{}: выгружена RM48U; ударных {}, ПВО {}", i + 1, self.sams[i].ground_rounds, self.sams[i].missiles))
|
||||
}
|
||||
|
||||
pub fn cancel_ground_request(&mut self, i: usize) -> Result<String, String> {
|
||||
let s = self.sams.get_mut(i).ok_or("Нет такого комплекса")?;
|
||||
if s.kind != SamKind::S400 || (!s.ground_request && !s.ground_return) { return Err("Нет ожидающей заявки RM48U".into()); }
|
||||
s.ground_request = false;
|
||||
s.ground_return = false;
|
||||
Ok(format!("С-400 №{}: заявка RM48U отменена", i + 1))
|
||||
}
|
||||
|
||||
/// Reloads from depots near the systems, and the trucks' rounds.
|
||||
pub(super) fn step_supply(&mut self, out: &mut Out) {
|
||||
if !self.logistics() {
|
||||
@@ -105,6 +123,42 @@ impl Sim {
|
||||
}
|
||||
let at = truck.pos;
|
||||
let truck_id = truck.id;
|
||||
// A return is picked up physically; its cargo remains marked until a depot accepts it.
|
||||
let can_pick = truck.ground_stock == 0 && truck.air_48n6_stock < TRUCK_LOAD;
|
||||
let return_work = truck.return_cargo || (can_pick && self.sams.iter().any(|s| s.kind == SamKind::S400 && s.alive() && s.ground_return));
|
||||
if return_work {
|
||||
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 target = if truck.return_cargo {
|
||||
self.sams.iter().filter(|s| s.kind == SamKind::Depot && s.alive() && s.ground_stock < STOCK_LIMIT && !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::S400 && s.alive() && s.ground_return && s.ground_rounds > 0 && !s.moving() && s.preparing.is_none() && s.reloading == 0 && s.part(Part::Launcher) > 0.0 && !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)))
|
||||
}.map(|s| (s.id, s.pos));
|
||||
self.sams[t].job = target.map(|x| x.0);
|
||||
if let Some((id, to)) = target {
|
||||
if at.distance(to) > HANDOVER {
|
||||
let side = horizontal(at - to).normalize_or(DVec3::X) * (HANDOVER * 0.6);
|
||||
self.order_move_near(t, to + side, 3.5);
|
||||
} else if let Some(j) = self.sams.iter().position(|s| s.id == id) {
|
||||
if self.sams[t].return_cargo {
|
||||
self.sams[j].ground_stock += 1;
|
||||
self.sams[t].ground_stock -= 1;
|
||||
self.sams[t].return_cargo = false;
|
||||
} else {
|
||||
self.sams[j].ground_rounds -= 1;
|
||||
self.sams[j].ground_return = false;
|
||||
self.sams[t].ground_stock += 1;
|
||||
self.sams[t].return_cargo = true;
|
||||
if self.sams[t].air_48n6_stock > 0 && self.sams[j].missiles + self.sams[j].ground_rounds < self.sams[j].cells() {
|
||||
self.sams[t].air_48n6_stock -= 1;
|
||||
self.sams[j].missiles += 1;
|
||||
}
|
||||
}
|
||||
self.sams[t].job = None;
|
||||
out.sound("minecraft:block.piston.extend", at, 1.5, 0.8);
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// 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 ||
|
||||
@@ -123,6 +177,11 @@ impl Sim {
|
||||
self.sams[j].air_48n6_stock = n;
|
||||
self.sams[t].air_48n6_stock = 0;
|
||||
}
|
||||
if self.sams[t].ground_stock > 0 && !self.sams.iter().any(|s| s.kind == SamKind::S400 && s.alive() && s.ground_request) && self.sams[j].ground_stock < STOCK_LIMIT {
|
||||
let take = self.sams[t].ground_stock.min(STOCK_LIMIT - self.sams[j].ground_stock);
|
||||
self.sams[j].ground_stock += take;
|
||||
self.sams[t].ground_stock -= take;
|
||||
}
|
||||
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;
|
||||
@@ -147,10 +206,10 @@ impl Sim {
|
||||
} 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 {
|
||||
let next = if self.sams[t].ground_stock > 0 && self.sams.iter().any(|s| s.kind == SamKind::S400 && s.alive() && s.ground_request) {
|
||||
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)))
|
||||
self.sams.iter().filter(|s| s.kind == SamKind::Depot && s.alive() && (self.sams[t].air_48n6_stock > 0 || (self.sams[t].ground_stock > 0 && s.ground_stock < STOCK_LIMIT) || (self.sams[t].ground_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);
|
||||
@@ -229,6 +288,36 @@ impl Sim {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn return_waits_for_capacity_and_ready_carrier_and_can_be_cancelled() {
|
||||
let mut sim = Sim::new(3);
|
||||
for (kind, x) in [(SamKind::Depot, 0.0), (SamKind::S400, 160.0), (SamKind::Tzm, 160.0)] {
|
||||
let id = sim.id(); sim.sams.push(Sam::new(id, kind, DVec3::new(x, 70.0, 0.0), 0.0));
|
||||
}
|
||||
sim.sams[1].ground_rounds = 1;
|
||||
sim.sams[1].missiles = 3;
|
||||
sim.sams[2].air_48n6_stock = 2;
|
||||
assert!(sim.unload_ground_round(1).is_err());
|
||||
sim.sams[2].air_48n6_stock = 1;
|
||||
sim.unload_ground_round(1).unwrap();
|
||||
sim.cancel_ground_request(1).unwrap();
|
||||
assert!(!sim.sams[1].ground_return);
|
||||
sim.unload_ground_round(1).unwrap();
|
||||
sim.tick = 2;
|
||||
sim.sams[1].reloading = 1;
|
||||
sim.step_supply(&mut Out::default());
|
||||
assert_eq!(sim.sams[1].ground_rounds, 1);
|
||||
sim.sams[1].reloading = 0;
|
||||
sim.step_supply(&mut Out::default());
|
||||
assert_eq!((sim.sams[1].ground_rounds, sim.sams[1].missiles), (0, 4));
|
||||
assert_eq!((sim.sams[2].ground_stock, sim.sams[2].air_48n6_stock), (1, 0));
|
||||
assert!(sim.sams[2].return_cargo);
|
||||
sim.direct_hit(sim.sams[2].pos + DVec3::Y, DVec3::ZERO, 1, &mut Out::default());
|
||||
sim.repair();
|
||||
assert_eq!((sim.sams[0].ground_stock, sim.sams[1].ground_rounds, sim.sams[2].ground_stock), (0, 0, 0));
|
||||
assert!(!sim.sams[2].return_cargo);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_delivery_uses_stock_and_shared_cells_and_survives_interruption() {
|
||||
let mut sim = Sim::new(1);
|
||||
|
||||
Reference in New Issue
Block a user