From f8ccf1d9186c294ceff6807701455696574c762b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 4 Jan 2021 10:42:42 +0100 Subject: [PATCH] config: Change asat not to consume shells The asat's impact on the target does not depend on its shell load (it sometimes did until commit cf960a573 "Make anti-sat launch consistent with interception", v4.3.23). The shell use is logistical busy-work, and economically irrelevant. Remove it. Signed-off-by: Markus Armbruster --- src/lib/global/plane.config | 4 ++-- tests/version/journal.log | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/global/plane.config b/src/lib/global/plane.config index a257d0ba0..5cc5e8f0b 100644 --- a/src/lib/global/plane.config +++ b/src/lib/global/plane.config @@ -27,7 +27,7 @@ # plane.config: Plane characteristics # # Known contributors to this file: -# Markus Armbruster, 2006-2016 +# Markus Armbruster, 2006-2021 # # Derived from plane.c; known contributors: # Dave Pare, 1986 @@ -118,7 +118,7 @@ type name acc loa att def ran fue ste ... 30 "irbm Titan" 60 8 0 10 15 0 0 31 "icbm Minuteman" 60 10 0 15 41 0 0 32 "slbm Trident" 60 8 0 6 23 0 0 -33 "asat anti-sat" 50 6 0 7 13 4 0 +33 "asat anti-sat" 50 0 0 7 13 0 0 34 "abm Patriot" 50 0 0 31 12 0 0 /config diff --git a/tests/version/journal.log b/tests/version/journal.log index 84849f7ee..74ae1d834 100644 --- a/tests/version/journal.log +++ b/tests/version/journal.log @@ -428,7 +428,7 @@ Play#0 output Play#0 1 abm Patriot 22 0 0 41 21 0 0% Play#0 output Play#0 1 slbm Trident 27 13 0 16 32 0 0% Play#0 output Play#0 1 ss KH-7 spysat 0 0 0 13 70 9 0% - Play#0 output Play#0 1 asat anti-sat 23 10 0 17 22 4 0% + Play#0 output Play#0 1 asat anti-sat 23 0 0 17 22 0 0% Play#0 output Play#0 1 icbm Minuteman 28 16 0 25 50 0 0% Play#0 output Play#0 1 sf F-117A Nighthawk 21 4 29 29 29 4 80% Play#0 output Play#0 1 sb B-2 stealth bomber 12 13 0 25 37 5 80% @@ -1705,7 +1705,7 @@ Play#0 output Play#0 1 30 "irbm\\040Titan" 0 0 0 0 0 0 0 0 0 0 20 20 0 0 80 260 1500 60 8 0 10 15 0 0 50 Play#0 output Play#0 1 31 "icbm\\040Minuteman" 0 0 0 0 0 0 0 0 0 0 20 20 0 0 80 310 3000 60 10 0 15 41 0 0 50 Play#0 output Play#0 1 32 "slbm\\040Trident" 0 0 0 0 0 0 0 0 0 0 20 20 0 0 80 280 2000 60 8 0 6 23 0 0 114 - Play#0 output Play#0 1 33 "asat\\040anti-sat" 0 0 0 0 0 0 0 0 0 0 20 20 0 0 80 305 2000 50 6 0 7 13 4 0 560 + Play#0 output Play#0 1 33 "asat\\040anti-sat" 0 0 0 0 0 0 0 0 0 0 20 20 0 0 80 305 2000 50 0 0 7 13 0 0 560 Play#0 output Play#0 1 34 "abm\\040\\040Patriot" 0 0 0 0 0 0 0 0 0 0 16 8 0 0 52 270 1500 50 0 0 31 12 0 0 2096 Play#0 output Play#0 1 /35 Play#0 output Play#0 6 0 640 -- 2.43.0