From c596577d326a84a80da68c106cbabf0f1931fe6e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 19 Feb 2006 09:47:26 +0000 Subject: [PATCH] (mchrstr, plchrstr, lchrstr, nchrstr): New member m_type, pl_type, l_type, n_type. (mchr_ca, plchr_ca, lchr_ca, nchr_ca): New selector type. Update builtin config files. --- include/land.h | 1 + include/nuke.h | 1 + include/plane.h | 1 + include/ship.h | 1 + src/lib/global/land.config | 46 +++++++++++----------- src/lib/global/nsc.c | 8 ++-- src/lib/global/nuke.config | 28 +++++++------- src/lib/global/plane.config | 72 +++++++++++++++++------------------ src/lib/global/ship.config | 76 ++++++++++++++++++------------------- 9 files changed, 119 insertions(+), 115 deletions(-) diff --git a/include/land.h b/include/land.h index a6e435df..5294eab1 100644 --- a/include/land.h +++ b/include/land.h @@ -124,6 +124,7 @@ struct lchrstr { u_char l_fuelu; /* fuel used per 10 mob */ u_char l_nxlight; /* maximum number of xlight planes */ u_char l_nland; /* maximum number of units */ + signed char l_type; /* index in lchr[] */ long l_flags; /* what special things can this unit do */ }; diff --git a/include/nuke.h b/include/nuke.h index 0a5cbb94..6115e9f2 100644 --- a/include/nuke.h +++ b/include/nuke.h @@ -64,6 +64,7 @@ struct nchrstr { int n_tech; /* tech needed to build */ int n_weight; int n_flags; /* description of capability */ + signed char n_type; /* index in nchr[] */ }; #define N_NEUT bit(0) /* Neutron bomb (low damage, high fallout) */ diff --git a/include/plane.h b/include/plane.h index bcfbb078..0d40d6eb 100644 --- a/include/plane.h +++ b/include/plane.h @@ -99,6 +99,7 @@ struct plchrstr { int pl_fuel; /* fuel consumption */ int pl_stealth; /* how stealthy is it? */ int pl_flags; /* description of capability */ + signed char pl_type; /* index in plchr[] */ }; #define P_B bit(0) /* bombing factor only for bombing */ diff --git a/include/ship.h b/include/ship.h index ef786076..9886fe4e 100644 --- a/include/ship.h +++ b/include/ship.h @@ -149,6 +149,7 @@ struct mchrstr { long m_flags; /* what special things can this ship do */ u_char m_nplanes; /* maximum number of planes this ship holds */ u_char m_nland; /* maximum number of units this ship holds */ + signed char m_type; /* index in mchr[] */ }; #define M_FOOD bit(0) /* catch that fish! */ diff --git a/src/lib/global/land.config b/src/lib/global/land.config index 09463b5a..6ab20dfe 100644 --- a/src/lib/global/land.config +++ b/src/lib/global/land.config @@ -40,27 +40,27 @@ # document them all. config land-chr -name civ mil she gun pet iro dus bar foo oil lcm hcm uw rad l_b h_b g_b s_b tech cost att def vul spd vis spy rm frg acc dam amm aaf fuelc fuelu nx nl flags -"cav cavalry" 0 20 0 0 0 0 0 0 12 0 0 0 0 0 10 5 0 0 30 500 1.2 0.5 80 32 18 4 3 0 0 0 0 0 0 0 0 0 (light recon) -"linf light infantry" 0 25 1 0 0 0 0 0 15 0 0 0 0 0 8 4 0 0 40 300 1.0 1.5 60 28 15 2 1 0 0 0 1 1 0 0 0 0 (light assault) -"inf infantry" 0 100 0 0 0 0 0 0 24 0 0 0 0 0 10 5 0 0 50 500 1.0 1.5 60 25 15 2 1 0 0 0 0 0 0 0 0 0 (light assault) -"mtif motor inf" 0 100 8 0 0 0 0 0 60 0 0 0 0 0 15 10 0 0 190 400 1.2 2.2 60 33 17 1 3 0 0 0 2 3 13 1 0 0 (light) -"mif mech inf" 0 100 8 0 0 0 0 0 60 0 0 0 0 0 15 10 0 0 190 800 1.5 2.5 50 33 17 1 3 0 0 0 2 3 13 1 0 0 (light) -"mar marines" 0 100 4 0 0 0 0 0 60 0 0 0 0 0 10 5 0 0 140 1000 1.4 2.4 60 25 14 2 1 0 0 0 1 2 0 0 0 0 (light marine assault) -"sup supply" 0 25 200 10 300 100 100 10 300 0 200 100 0 0 10 5 0 0 50 500 0.1 0.2 80 25 20 1 0 0 0 0 0 0 0 0 0 0 (supply light) -"tra train" 0 990 990 200 990 500 500 100 990 990 990 990 0 150 100 50 0 0 40 3500 0.0 0.0 120 10 25 3 0 0 0 0 0 0 0 0 5 12 (supply train heavy) -"spy infiltrator" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 5 0 0 40 750 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0 0 0 (recon light assault spy) -"com commando" 0 0 3 0 0 0 0 0 0 0 0 0 0 0 10 5 0 0 55 1500 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0 0 0 (light recon assault spy) -"aau aa unit" 0 20 5 0 0 0 0 0 12 0 0 0 0 0 20 10 0 0 70 500 0.5 1.0 60 18 20 1 1 0 0 0 1 2 0 0 0 0 (light flak) -"art artillery" 0 25 40 10 0 0 0 0 24 0 0 0 0 0 20 10 0 0 35 800 0.1 0.4 70 18 20 1 0 8 50 5 2 1 0 0 0 0 (light) -"lat lt artillery" 0 25 20 6 0 0 0 0 12 0 0 0 0 0 20 10 0 0 70 500 0.2 0.6 60 30 18 1 1 5 10 3 1 1 0 0 0 0 (light) -"hat hvy artillery" 0 25 80 12 0 0 0 0 24 0 0 0 0 0 40 20 0 0 100 800 0.0 0.2 60 12 20 1 0 11 99 8 4 1 0 0 0 0 () -"mat mech artillery" 0 25 40 10 0 0 0 0 15 0 0 0 0 0 20 10 0 0 200 1000 0.2 0.6 50 35 17 1 1 8 35 6 3 3 13 1 0 0 (light) -"eng engineer" 0 20 3 0 0 0 0 0 12 0 0 0 0 0 10 5 0 0 130 3000 1.2 2.4 50 25 14 2 1 0 0 0 1 1 0 0 0 0 (engineer light assault) -"meng mech engineer" 0 20 4 0 0 0 0 0 15 0 0 0 0 0 10 5 0 0 260 4500 1.8 3.5 45 33 15 3 3 0 0 0 1 5 25 2 0 0 (engineer light assault) -"lar lt armor" 0 50 4 0 0 0 0 0 30 0 0 0 0 0 10 5 0 0 150 600 2.0 1.0 50 42 15 4 4 0 0 0 1 2 25 1 0 0 (light recon) -"har hvy armor" 0 100 3 0 0 0 0 0 48 0 0 0 0 0 20 10 0 0 120 500 2.0 0.8 50 18 17 1 1 0 0 0 2 1 10 2 0 0 () -"arm armor" 0 50 4 0 0 0 0 0 30 0 0 0 0 0 20 10 0 0 170 1000 3.0 1.5 40 33 16 2 2 0 0 0 1 2 13 1 0 0 (light) -"sec security" 0 50 4 0 0 0 0 0 30 0 0 0 0 0 10 5 0 0 170 600 1.0 2.0 60 25 15 2 1 0 0 0 1 1 0 0 0 0 (security light) -"rad radar unit" 0 10 0 0 0 0 0 0 7 0 0 0 0 0 10 5 0 0 270 1000 0.0 0.0 50 33 15 3 0 0 0 0 0 2 25 2 1 0 (light radar) +type name civ mil she gun pet iro dus bar foo oil lcm hcm uw rad l_b h_b g_b s_b tech cost att def vul spd vis spy rm frg acc dam amm aaf fuelc fuelu nx nl flags + 0 "cav cavalry" 0 20 0 0 0 0 0 0 12 0 0 0 0 0 10 5 0 0 30 500 1.2 0.5 80 32 18 4 3 0 0 0 0 0 0 0 0 0 (light recon) + 1 "linf light infantry" 0 25 1 0 0 0 0 0 15 0 0 0 0 0 8 4 0 0 40 300 1.0 1.5 60 28 15 2 1 0 0 0 1 1 0 0 0 0 (light assault) + 2 "inf infantry" 0 100 0 0 0 0 0 0 24 0 0 0 0 0 10 5 0 0 50 500 1.0 1.5 60 25 15 2 1 0 0 0 0 0 0 0 0 0 (light assault) + 3 "mtif motor inf" 0 100 8 0 0 0 0 0 60 0 0 0 0 0 15 10 0 0 190 400 1.2 2.2 60 33 17 1 3 0 0 0 2 3 13 1 0 0 (light) + 4 "mif mech inf" 0 100 8 0 0 0 0 0 60 0 0 0 0 0 15 10 0 0 190 800 1.5 2.5 50 33 17 1 3 0 0 0 2 3 13 1 0 0 (light) + 5 "mar marines" 0 100 4 0 0 0 0 0 60 0 0 0 0 0 10 5 0 0 140 1000 1.4 2.4 60 25 14 2 1 0 0 0 1 2 0 0 0 0 (light marine assault) + 6 "sup supply" 0 25 200 10 300 100 100 10 300 0 200 100 0 0 10 5 0 0 50 500 0.1 0.2 80 25 20 1 0 0 0 0 0 0 0 0 0 0 (supply light) + 7 "tra train" 0 990 990 200 990 500 500 100 990 990 990 990 0 150 100 50 0 0 40 3500 0.0 0.0 120 10 25 3 0 0 0 0 0 0 0 0 5 12 (supply train heavy) + 8 "spy infiltrator" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 5 0 0 40 750 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0 0 0 (recon light assault spy) + 9 "com commando" 0 0 3 0 0 0 0 0 0 0 0 0 0 0 10 5 0 0 55 1500 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0 0 0 (light recon assault spy) +10 "aau aa unit" 0 20 5 0 0 0 0 0 12 0 0 0 0 0 20 10 0 0 70 500 0.5 1.0 60 18 20 1 1 0 0 0 1 2 0 0 0 0 (light flak) +11 "art artillery" 0 25 40 10 0 0 0 0 24 0 0 0 0 0 20 10 0 0 35 800 0.1 0.4 70 18 20 1 0 8 50 5 2 1 0 0 0 0 (light) +12 "lat lt artillery" 0 25 20 6 0 0 0 0 12 0 0 0 0 0 20 10 0 0 70 500 0.2 0.6 60 30 18 1 1 5 10 3 1 1 0 0 0 0 (light) +13 "hat hvy artillery" 0 25 80 12 0 0 0 0 24 0 0 0 0 0 40 20 0 0 100 800 0.0 0.2 60 12 20 1 0 11 99 8 4 1 0 0 0 0 () +14 "mat mech artillery" 0 25 40 10 0 0 0 0 15 0 0 0 0 0 20 10 0 0 200 1000 0.2 0.6 50 35 17 1 1 8 35 6 3 3 13 1 0 0 (light) +15 "eng engineer" 0 20 3 0 0 0 0 0 12 0 0 0 0 0 10 5 0 0 130 3000 1.2 2.4 50 25 14 2 1 0 0 0 1 1 0 0 0 0 (engineer light assault) +16 "meng mech engineer" 0 20 4 0 0 0 0 0 15 0 0 0 0 0 10 5 0 0 260 4500 1.8 3.5 45 33 15 3 3 0 0 0 1 5 25 2 0 0 (engineer light assault) +17 "lar lt armor" 0 50 4 0 0 0 0 0 30 0 0 0 0 0 10 5 0 0 150 600 2.0 1.0 50 42 15 4 4 0 0 0 1 2 25 1 0 0 (light recon) +18 "har hvy armor" 0 100 3 0 0 0 0 0 48 0 0 0 0 0 20 10 0 0 120 500 2.0 0.8 50 18 17 1 1 0 0 0 2 1 10 2 0 0 () +19 "arm armor" 0 50 4 0 0 0 0 0 30 0 0 0 0 0 20 10 0 0 170 1000 3.0 1.5 40 33 16 2 2 0 0 0 1 2 13 1 0 0 (light) +20 "sec security" 0 50 4 0 0 0 0 0 30 0 0 0 0 0 10 5 0 0 170 600 1.0 2.0 60 25 15 2 1 0 0 0 1 1 0 0 0 0 (security light) +21 "rad radar unit" 0 10 0 0 0 0 0 0 7 0 0 0 0 0 10 5 0 0 270 1000 0.0 0.0 50 33 15 3 0 0 0 0 0 2 25 2 1 0 (light radar) /config diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index 8c1a4912..9442c9c9 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -246,7 +246,7 @@ struct castr ship_ca[] = { }; struct castr mchr_ca[] = { - /* FIXME uid */ + {NSC_CHAR, 0, 0, offsetof(struct mchrstr, m_type), "type", EF_SHIP_CHR}, {NSC_STRING, 0, 0, offsetof(struct mchrstr, m_name), "name", EF_BAD}, NSC_IVEC(offsetof(struct mchrstr, m_item), ""), {NSC_INT, 0, 0, offsetof(struct mchrstr, m_lcm), "l_build", EF_BAD}, @@ -291,7 +291,7 @@ struct castr plane_ca[] = { }; struct castr plchr_ca[] = { - /* FIXME uid */ + {NSC_CHAR, 0, 0, offsetof(struct plchrstr, pl_type), "type", EF_PLANE_CHR}, {NSC_STRING, 0, 0, offsetof(struct plchrstr, pl_name), "name", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_lcm), "l_build", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_hcm), "h_build", EF_BAD}, @@ -351,7 +351,7 @@ struct castr land_ca[] = { }; struct castr lchr_ca[] = { - /* FIXME uid */ + {NSC_CHAR, 0, 0, offsetof(struct lchrstr, l_type), "type", EF_LAND_CHR}, {NSC_STRING, 0, 0, offsetof(struct lchrstr, l_name), "name", EF_BAD}, NSC_IVEC(offsetof(struct lchrstr, l_item), ""), {NSC_INT, 0, 0, offsetof(struct lchrstr, l_lcm), "l_build", EF_BAD}, @@ -394,7 +394,7 @@ struct castr nuke_ca[] = { }; struct castr nchr_ca[] = { - /* FIXME uid */ + {NSC_CHAR, 0, 0, offsetof(struct nchrstr, n_type), "type", EF_NUKE_CHR}, {NSC_STRING, 0, 0, offsetof(struct nchrstr, n_name), "name", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct nchrstr, n_lcm), "l_build", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct nchrstr, n_hcm), "h_build", EF_BAD}, diff --git a/src/lib/global/nuke.config b/src/lib/global/nuke.config index ae6ccd1d..8a31ba44 100644 --- a/src/lib/global/nuke.config +++ b/src/lib/global/nuke.config @@ -37,18 +37,18 @@ # document them all. config nuke-chr -name l_b h_b o_b r_b bla dam cost tech wei flags -"10kt fission" 50 50 25 70 3 70 10000 280 4 () -"15kt fission" 50 50 25 80 3 90 15000 290 5 () -"50kt fission" 60 60 30 90 3 100 25000 300 6 () -"100kt fission" 75 75 40 120 4 125 30000 310 8 () -"5kt fusion" 15 15 15 30 2 80 12500 315 1 () -"75kt fusion" 40 40 35 50 3 90 20000 320 3 () -"250kt fusion" 50 50 45 60 4 110 25000 330 4 () -"500kt fusion" 60 60 50 80 5 120 35000 340 5 () -"1mt fusion" 75 75 50 110 6 150 40000 350 5 () -"60kt neutron" 60 60 30 100 3 30 30000 355 2 (neutron) -"3mt fusion" 100 100 75 130 7 170 45000 360 6 () -"5mt fusion" 120 120 100 150 8 190 50000 370 8 () -"120kt neutron" 75 75 40 120 5 50 36000 375 3 (neutron) +type name l_b h_b o_b r_b bla dam cost tech wei flags + 0 "10kt fission" 50 50 25 70 3 70 10000 280 4 () + 1 "15kt fission" 50 50 25 80 3 90 15000 290 5 () + 2 "50kt fission" 60 60 30 90 3 100 25000 300 6 () + 3 "100kt fission" 75 75 40 120 4 125 30000 310 8 () + 4 "5kt fusion" 15 15 15 30 2 80 12500 315 1 () + 5 "75kt fusion" 40 40 35 50 3 90 20000 320 3 () + 6 "250kt fusion" 50 50 45 60 4 110 25000 330 4 () + 7 "500kt fusion" 60 60 50 80 5 120 35000 340 5 () + 8 "1mt fusion" 75 75 50 110 6 150 40000 350 5 () + 9 "60kt neutron" 60 60 30 100 3 30 30000 355 2 (neutron) +10 "3mt fusion" 100 100 75 130 7 170 45000 360 6 () +11 "5mt fusion" 120 120 100 150 8 190 50000 370 8 () +12 "120kt neutron" 75 75 40 120 5 50 36000 375 3 (neutron) /config diff --git a/src/lib/global/plane.config b/src/lib/global/plane.config index e5fb8b82..87e4094b 100644 --- a/src/lib/global/plane.config +++ b/src/lib/global/plane.config @@ -45,40 +45,40 @@ # set by init_plchr(). config plane-chr -name l_b h_b cost tech acc loa att def ran cr fu ste flags -"f1 Sopwith Camel" 8 2 400 50 90 1 1 1 4 1 1 0 (tactical intercept VTOL) -"f2 P-51 Mustang" 8 2 400 80 80 1 4 4 8 1 1 0 (tactical intercept light) -"jf1 F-4 Phantom" 12 4 1000 125 45 1 14 14 11 2 3 0 (tactical intercept light) -"jf2 AV-8B Harrier" 12 4 1400 195 30 1 17 17 14 2 3 0 (tactical intercept VTOL light) -"sf F-117A Nighthawk" 15 5 3000 325 45 3 19 19 20 2 4 80 (tactical intercept light) -"es P-38 Lightning" 9 3 700 90 60 1 5 5 15 1 2 0 (tactical escort) -"jes F-14E jet escort" 14 8 1400 160 60 1 10 10 25 2 3 0 (tactical escort) -"lb TBD-1 Devastator" 10 3 550 60 50 2 0 3 7 1 1 0 (bomber tactical VTOL light) -"jl A-6 Intruder" 14 4 1000 130 25 3 0 9 11 2 3 0 (bomber tactical light) -"mb medium bomber" 14 5 1000 80 45 4 0 5 14 3 3 0 (bomber tactical) -"jfb FB-111 Aardvark f/b" 20 10 1800 140 30 7 8 8 20 5 5 0 (bomber tactical) -"hb B-26B Marauder" 20 6 1100 90 90 5 0 4 15 2 2 0 (bomber) -"jhb B-52 Strato-Fortress" 26 13 3200 150 80 12 0 11 35 5 6 0 (bomber) -"sb B-2 stealth bomber" 15 5 4000 325 25 8 0 15 28 2 5 80 (bomber tactical) -"as anti-sub plane" 10 3 550 100 85 2 0 3 15 2 2 0 (tactical ASW mine sweep) -"np naval plane" 20 10 1800 135 70 3 0 4 28 4 2 0 (tactical cargo light ASW mine sweep) -"nc AH-1 Cobra" 8 2 800 160 55 2 0 3 11 2 2 0 (tactical VTOL helo ASW sweep) -"ac AH-64 Apache" 8 2 800 200 15 1 0 9 11 2 2 40 (tactical VTOL helo) -"tc transport chopper" 8 2 800 135 0 5 0 3 7 2 2 40 (cargo VTOL light helo para) -"tr C-56 Lodestar" 14 5 1000 85 0 7 0 2 15 3 3 0 (cargo para) -"jt C-141 Starlifter" 18 5 1500 160 0 16 0 9 35 3 4 0 (cargo para) -"zep Zeppelin" 6 2 1000 70 60 2 0 -3 15 3 2 0 (tactical cargo VTOL spy) -"re recon" 12 4 800 130 0 0 0 4 15 2 2 20 (spy) -"sp E2-C Hawkeye" 15 5 2000 190 0 0 0 11 32 2 5 50 (spy) -"lst landsat" 20 20 2000 245 0 0 0 3 41 0 9 0 (satellite) -"ss KH-7 spysat" 20 20 4000 305 0 0 0 3 61 0 9 0 (spy image satellite) -"mi Harpoon" 8 2 300 160 50 6 0 5 6 0 0 0 (tactical VTOL missile light marine) -"sam Sea Sparrow" 3 1 200 180 0 0 0 18 2 0 0 0 (intercept VTOL missile light x-light) -"ssm V2" 15 15 800 145 60 3 0 3 4 0 0 0 (tactical VTOL missile) -"srbm Atlas" 20 20 1000 200 60 6 0 5 9 0 0 0 (tactical VTOL missile) -"irbm Titan" 20 20 1500 260 60 8 0 10 15 0 0 0 (tactical VTOL missile) -"icbm Minuteman" 20 20 3000 310 60 10 0 15 41 0 0 0 (tactical VTOL missile) -"slbm Trident" 20 20 2000 280 60 8 0 6 23 0 0 0 (tactical VTOL missile light) -"asat anti-sat" 20 20 2000 305 50 6 0 7 13 0 4 0 (VTOL missile satellite) -"abm Patriot" 16 8 1500 270 50 0 0 31 12 0 0 0 (VTOL missile SDI) +type name l_b h_b cost tech acc loa att def ran cr fu ste flags + 0 "f1 Sopwith Camel" 8 2 400 50 90 1 1 1 4 1 1 0 (tactical intercept VTOL) + 1 "f2 P-51 Mustang" 8 2 400 80 80 1 4 4 8 1 1 0 (tactical intercept light) + 2 "jf1 F-4 Phantom" 12 4 1000 125 45 1 14 14 11 2 3 0 (tactical intercept light) + 3 "jf2 AV-8B Harrier" 12 4 1400 195 30 1 17 17 14 2 3 0 (tactical intercept VTOL light) + 4 "sf F-117A Nighthawk" 15 5 3000 325 45 3 19 19 20 2 4 80 (tactical intercept light) + 5 "es P-38 Lightning" 9 3 700 90 60 1 5 5 15 1 2 0 (tactical escort) + 6 "jes F-14E jet escort" 14 8 1400 160 60 1 10 10 25 2 3 0 (tactical escort) + 7 "lb TBD-1 Devastator" 10 3 550 60 50 2 0 3 7 1 1 0 (bomber tactical VTOL light) + 8 "jl A-6 Intruder" 14 4 1000 130 25 3 0 9 11 2 3 0 (bomber tactical light) + 9 "mb medium bomber" 14 5 1000 80 45 4 0 5 14 3 3 0 (bomber tactical) +10 "jfb FB-111 Aardvark f/b" 20 10 1800 140 30 7 8 8 20 5 5 0 (bomber tactical) +11 "hb B-26B Marauder" 20 6 1100 90 90 5 0 4 15 2 2 0 (bomber) +12 "jhb B-52 Strato-Fortress" 26 13 3200 150 80 12 0 11 35 5 6 0 (bomber) +13 "sb B-2 stealth bomber" 15 5 4000 325 25 8 0 15 28 2 5 80 (bomber tactical) +14 "as anti-sub plane" 10 3 550 100 85 2 0 3 15 2 2 0 (tactical ASW mine sweep) +15 "np naval plane" 20 10 1800 135 70 3 0 4 28 4 2 0 (tactical cargo light ASW mine sweep) +16 "nc AH-1 Cobra" 8 2 800 160 55 2 0 3 11 2 2 0 (tactical VTOL helo ASW sweep) +17 "ac AH-64 Apache" 8 2 800 200 15 1 0 9 11 2 2 40 (tactical VTOL helo) +18 "tc transport chopper" 8 2 800 135 0 5 0 3 7 2 2 40 (cargo VTOL light helo para) +19 "tr C-56 Lodestar" 14 5 1000 85 0 7 0 2 15 3 3 0 (cargo para) +20 "jt C-141 Starlifter" 18 5 1500 160 0 16 0 9 35 3 4 0 (cargo para) +21 "zep Zeppelin" 6 2 1000 70 60 2 0 -3 15 3 2 0 (tactical cargo VTOL spy) +22 "re recon" 12 4 800 130 0 0 0 4 15 2 2 20 (spy) +23 "sp E2-C Hawkeye" 15 5 2000 190 0 0 0 11 32 2 5 50 (spy) +24 "lst landsat" 20 20 2000 245 0 0 0 3 41 0 9 0 (satellite) +25 "ss KH-7 spysat" 20 20 4000 305 0 0 0 3 61 0 9 0 (spy image satellite) +26 "mi Harpoon" 8 2 300 160 50 6 0 5 6 0 0 0 (tactical VTOL missile light marine) +27 "sam Sea Sparrow" 3 1 200 180 0 0 0 18 2 0 0 0 (intercept VTOL missile light x-light) +28 "ssm V2" 15 15 800 145 60 3 0 3 4 0 0 0 (tactical VTOL missile) +29 "srbm Atlas" 20 20 1000 200 60 6 0 5 9 0 0 0 (tactical VTOL missile) +30 "irbm Titan" 20 20 1500 260 60 8 0 10 15 0 0 0 (tactical VTOL missile) +31 "icbm Minuteman" 20 20 3000 310 60 10 0 15 41 0 0 0 (tactical VTOL missile) +32 "slbm Trident" 20 20 2000 280 60 8 0 6 23 0 0 0 (tactical VTOL missile light) +33 "asat anti-sat" 20 20 2000 305 50 6 0 7 13 0 4 0 (VTOL missile satellite) +34 "abm Patriot" 16 8 1500 270 50 0 0 31 12 0 0 0 (VTOL missile SDI) /config diff --git a/src/lib/global/ship.config b/src/lib/global/ship.config index 81bc7b86..642f9476 100644 --- a/src/lib/global/ship.config +++ b/src/lib/global/ship.config @@ -47,42 +47,42 @@ # flag plane is not set, then flag miss will automatically be set. config ship-chr -name l_b h_b tec cost ar spe vi vr fr gl nx nc fuelc fuelu np nl civ mil she gun pet iro dus bar foo oil lcm hcm uw rad flags -"fb fishing boat" 25 15 0 180 10 10 15 2 0 0 0 0 0 0 0 0 300 10 0 0 0 0 0 0 900 0 0 0 15 0 (fish canal) -"ft fishing trawler" 25 15 35 300 10 25 15 2 0 0 0 0 20 1 0 0 300 10 0 0 0 0 0 0 900 0 0 0 15 0 (fish canal) -"cs cargo ship" 60 40 20 500 20 25 35 3 0 0 1 0 0 0 0 2 600 50 300 50 0 0 0 0 900 0 1400 900 250 0 (supply) -"os ore ship" 60 40 20 500 20 25 35 3 0 0 1 0 30 1 0 0 30 5 0 0 0 990 990 0 200 0 0 0 45 990 () -"ss slave ship" 60 40 0 300 20 10 35 3 0 0 1 0 0 0 0 0 20 80 0 0 0 0 0 0 200 0 0 0 1200 0 () -"ts trade ship" 200 100 30 1750 20 25 35 3 0 0 1 0 30 1 0 0 50 50 0 0 0 0 0 0 100 0 0 0 0 0 (trade) -"frg frigate" 30 30 0 600 50 25 25 3 1 1 1 0 0 0 0 2 0 60 10 2 0 0 0 0 60 0 0 0 0 0 (semi-land) -"oe oil exploration boat" 25 15 40 800 10 25 15 2 0 0 0 0 20 1 0 0 10 5 0 0 0 0 0 0 100 1 0 0 0 0 (oil canal) -"od oil derrick" 60 60 50 1500 30 15 65 3 0 0 2 0 0 0 0 0 990 80 0 0 0 0 0 0 990 990 0 0 990 0 (oil) -"pt patrol boat" 20 10 40 300 10 38 10 2 1 1 0 0 4 1 0 0 0 2 12 2 0 0 0 0 5 0 0 0 0 0 (torp canal) -"lc light cruiser" 30 40 45 800 50 30 30 5 6 3 1 0 40 1 0 2 0 100 40 5 0 0 0 0 100 0 0 0 0 0 (mine) -"hc heavy cruiser" 40 50 50 1200 70 30 30 5 8 4 1 0 30 1 0 4 0 120 100 8 0 0 0 0 200 0 0 0 0 0 () -"tt troop transport" 50 50 10 800 60 20 35 3 1 2 1 0 0 0 0 2 0 120 20 4 0 0 0 0 120 0 0 0 0 0 (semi-land) -"bb battleship" 50 70 45 1800 95 25 35 6 10 7 1 0 50 2 0 2 0 200 200 10 0 0 0 0 900 0 0 0 0 0 () -"bbc battlecruiser" 50 60 75 1500 55 30 35 6 10 6 1 0 60 2 0 2 0 180 100 10 0 0 0 0 400 0 0 0 0 0 () -"tk tanker" 60 40 35 600 75 25 45 3 0 0 1 0 30 1 0 0 30 5 0 0 990 0 0 0 200 990 0 0 25 0 (oiler supply) -"ms minesweeper" 25 15 40 400 10 25 15 2 0 0 0 0 20 1 0 0 0 10 100 1 0 0 0 0 90 0 0 0 0 0 (mine sweep canal) -"dd destroyer" 30 30 70 600 45 35 20 4 6 3 1 0 30 1 0 1 0 60 40 4 0 0 0 0 80 0 0 0 0 0 (dchrg sonar mine) -"sb submarine" 30 30 60 650 25 20 5 4 3 3 0 0 30 1 0 0 0 25 36 5 0 0 0 0 80 0 0 0 0 0 (torp sonar mine sub) -"sbc cargo submarine" 40 40 150 1200 50 30 2 3 0 0 0 0 50 2 0 0 5 10 104 20 100 0 0 0 900 0 500 300 0 0 (sonar sub oiler supply) -"cal light carrier" 50 60 80 2700 60 30 40 5 2 2 4 20 50 2 20 0 0 175 250 4 300 0 0 0 180 0 0 0 0 0 (plane) -"car aircraft carrier" 60 70 160 4500 80 35 40 7 2 2 10 40 120 3 40 0 0 350 500 4 500 0 0 0 900 0 0 0 0 0 (plane) -"can nuc carrier" 70 80 305 8000 100 45 40 9 2 2 20 4 0 0 60 0 0 350 999 4 999 0 0 0 900 0 0 0 0 0 (plane oiler supply) -"ls landing ship" 60 40 145 1000 40 30 30 2 0 0 2 0 30 1 0 6 0 400 10 1 0 0 0 0 300 0 0 0 0 0 (land) -"af asw frigate" 40 30 220 800 50 35 30 5 2 2 4 0 40 1 0 0 0 60 60 4 0 0 0 0 120 0 0 0 0 0 (torp dchrg sonar sub-torp) -"na nuc attack sub" 30 40 260 1200 45 40 3 6 5 3 0 0 0 0 0 0 0 25 60 6 0 0 0 0 500 0 0 0 0 0 (torp sonar min sub sub-torp) -"ad asw destroyer" 40 40 240 1500 60 40 35 6 8 3 10 2 80 2 0 0 0 100 80 6 40 0 0 0 500 0 0 0 0 0 (torp dchrg sonar sub-torp) -"nm nuc miss sub" 30 40 270 1500 55 35 2 6 0 0 0 0 0 0 20 0 0 25 200 1 0 0 0 0 500 0 0 0 0 0 (sonar sub) -"msb missile sub" 30 30 230 1200 35 30 3 3 0 0 0 0 30 1 10 0 0 25 100 1 0 0 0 0 500 0 0 0 0 0 (sonar sub) -"mb missile boat" 20 20 180 500 15 40 15 3 2 2 0 0 7 1 10 0 0 5 100 3 0 0 0 0 500 0 0 0 0 0 () -"mf missile frigate" 40 30 280 1000 50 35 30 5 2 2 2 0 30 1 20 0 0 60 220 4 0 0 0 0 120 0 0 0 0 0 () -"mc missile cruiser" 50 50 290 1500 70 35 35 8 8 6 8 8 35 1 40 0 0 120 500 6 160 0 0 0 200 0 0 0 0 0 (anti-missile) -"aac aa cruiser" 50 60 130 1500 80 35 30 6 1 8 1 0 60 2 0 4 0 100 100 15 0 0 0 0 200 0 0 0 0 0 (anti-missile) -"agc aegis cruiser" 50 60 265 4000 80 35 30 6 1 16 30 2 0 0 32 0 0 200 400 25 40 0 0 0 900 0 0 0 0 0 (anti-missile) -"ncr nuc cruiser" 50 50 325 1800 100 45 35 6 14 7 10 2 0 0 20 0 0 200 400 8 40 0 0 0 900 0 0 0 0 0 (anti-missile) -"nas nuc asw cruiser" 50 50 330 1800 80 45 35 9 10 4 25 8 0 0 0 0 0 200 120 6 160 0 0 0 500 0 0 0 0 0 (torp dchrg sonar sub-torp) -"nsp nuc supply ship" 60 40 360 1500 40 45 35 6 0 0 10 2 0 0 0 2 50 50 600 50 999 0 0 0 999 0 1500 900 0 0 (supply) +type name l_b h_b tec cost ar spe vi vr fr gl nx nc fuelc fuelu np nl civ mil she gun pet iro dus bar foo oil lcm hcm uw rad flags + 0 "fb fishing boat" 25 15 0 180 10 10 15 2 0 0 0 0 0 0 0 0 300 10 0 0 0 0 0 0 900 0 0 0 15 0 (fish canal) + 1 "ft fishing trawler" 25 15 35 300 10 25 15 2 0 0 0 0 20 1 0 0 300 10 0 0 0 0 0 0 900 0 0 0 15 0 (fish canal) + 2 "cs cargo ship" 60 40 20 500 20 25 35 3 0 0 1 0 0 0 0 2 600 50 300 50 0 0 0 0 900 0 1400 900 250 0 (supply) + 3 "os ore ship" 60 40 20 500 20 25 35 3 0 0 1 0 30 1 0 0 30 5 0 0 0 990 990 0 200 0 0 0 45 990 () + 4 "ss slave ship" 60 40 0 300 20 10 35 3 0 0 1 0 0 0 0 0 20 80 0 0 0 0 0 0 200 0 0 0 1200 0 () + 5 "ts trade ship" 200 100 30 1750 20 25 35 3 0 0 1 0 30 1 0 0 50 50 0 0 0 0 0 0 100 0 0 0 0 0 (trade) + 6 "frg frigate" 30 30 0 600 50 25 25 3 1 1 1 0 0 0 0 2 0 60 10 2 0 0 0 0 60 0 0 0 0 0 (semi-land) + 7 "oe oil exploration boat" 25 15 40 800 10 25 15 2 0 0 0 0 20 1 0 0 10 5 0 0 0 0 0 0 100 1 0 0 0 0 (oil canal) + 8 "od oil derrick" 60 60 50 1500 30 15 65 3 0 0 2 0 0 0 0 0 990 80 0 0 0 0 0 0 990 990 0 0 990 0 (oil) + 9 "pt patrol boat" 20 10 40 300 10 38 10 2 1 1 0 0 4 1 0 0 0 2 12 2 0 0 0 0 5 0 0 0 0 0 (torp canal) +10 "lc light cruiser" 30 40 45 800 50 30 30 5 6 3 1 0 40 1 0 2 0 100 40 5 0 0 0 0 100 0 0 0 0 0 (mine) +11 "hc heavy cruiser" 40 50 50 1200 70 30 30 5 8 4 1 0 30 1 0 4 0 120 100 8 0 0 0 0 200 0 0 0 0 0 () +12 "tt troop transport" 50 50 10 800 60 20 35 3 1 2 1 0 0 0 0 2 0 120 20 4 0 0 0 0 120 0 0 0 0 0 (semi-land) +13 "bb battleship" 50 70 45 1800 95 25 35 6 10 7 1 0 50 2 0 2 0 200 200 10 0 0 0 0 900 0 0 0 0 0 () +14 "bbc battlecruiser" 50 60 75 1500 55 30 35 6 10 6 1 0 60 2 0 2 0 180 100 10 0 0 0 0 400 0 0 0 0 0 () +15 "tk tanker" 60 40 35 600 75 25 45 3 0 0 1 0 30 1 0 0 30 5 0 0 990 0 0 0 200 990 0 0 25 0 (oiler supply) +16 "ms minesweeper" 25 15 40 400 10 25 15 2 0 0 0 0 20 1 0 0 0 10 100 1 0 0 0 0 90 0 0 0 0 0 (mine sweep canal) +17 "dd destroyer" 30 30 70 600 45 35 20 4 6 3 1 0 30 1 0 1 0 60 40 4 0 0 0 0 80 0 0 0 0 0 (dchrg sonar mine) +18 "sb submarine" 30 30 60 650 25 20 5 4 3 3 0 0 30 1 0 0 0 25 36 5 0 0 0 0 80 0 0 0 0 0 (torp sonar mine sub) +19 "sbc cargo submarine" 40 40 150 1200 50 30 2 3 0 0 0 0 50 2 0 0 5 10 104 20 100 0 0 0 900 0 500 300 0 0 (sonar sub oiler supply) +20 "cal light carrier" 50 60 80 2700 60 30 40 5 2 2 4 20 50 2 20 0 0 175 250 4 300 0 0 0 180 0 0 0 0 0 (plane) +21 "car aircraft carrier" 60 70 160 4500 80 35 40 7 2 2 10 40 120 3 40 0 0 350 500 4 500 0 0 0 900 0 0 0 0 0 (plane) +22 "can nuc carrier" 70 80 305 8000 100 45 40 9 2 2 20 4 0 0 60 0 0 350 999 4 999 0 0 0 900 0 0 0 0 0 (plane oiler supply) +23 "ls landing ship" 60 40 145 1000 40 30 30 2 0 0 2 0 30 1 0 6 0 400 10 1 0 0 0 0 300 0 0 0 0 0 (land) +24 "af asw frigate" 40 30 220 800 50 35 30 5 2 2 4 0 40 1 0 0 0 60 60 4 0 0 0 0 120 0 0 0 0 0 (torp dchrg sonar sub-torp) +25 "na nuc attack sub" 30 40 260 1200 45 40 3 6 5 3 0 0 0 0 0 0 0 25 60 6 0 0 0 0 500 0 0 0 0 0 (torp sonar min sub sub-torp) +26 "ad asw destroyer" 40 40 240 1500 60 40 35 6 8 3 10 2 80 2 0 0 0 100 80 6 40 0 0 0 500 0 0 0 0 0 (torp dchrg sonar sub-torp) +27 "nm nuc miss sub" 30 40 270 1500 55 35 2 6 0 0 0 0 0 0 20 0 0 25 200 1 0 0 0 0 500 0 0 0 0 0 (sonar sub) +28 "msb missile sub" 30 30 230 1200 35 30 3 3 0 0 0 0 30 1 10 0 0 25 100 1 0 0 0 0 500 0 0 0 0 0 (sonar sub) +29 "mb missile boat" 20 20 180 500 15 40 15 3 2 2 0 0 7 1 10 0 0 5 100 3 0 0 0 0 500 0 0 0 0 0 () +30 "mf missile frigate" 40 30 280 1000 50 35 30 5 2 2 2 0 30 1 20 0 0 60 220 4 0 0 0 0 120 0 0 0 0 0 () +31 "mc missile cruiser" 50 50 290 1500 70 35 35 8 8 6 8 8 35 1 40 0 0 120 500 6 160 0 0 0 200 0 0 0 0 0 (anti-missile) +32 "aac aa cruiser" 50 60 130 1500 80 35 30 6 1 8 1 0 60 2 0 4 0 100 100 15 0 0 0 0 200 0 0 0 0 0 (anti-missile) +33 "agc aegis cruiser" 50 60 265 4000 80 35 30 6 1 16 30 2 0 0 32 0 0 200 400 25 40 0 0 0 900 0 0 0 0 0 (anti-missile) +34 "ncr nuc cruiser" 50 50 325 1800 100 45 35 6 14 7 10 2 0 0 20 0 0 200 400 8 40 0 0 0 900 0 0 0 0 0 (anti-missile) +35 "nas nuc asw cruiser" 50 50 330 1800 80 45 35 9 10 4 25 8 0 0 0 0 0 200 120 6 160 0 0 0 500 0 0 0 0 0 (torp dchrg sonar sub-torp) +36 "nsp nuc supply ship" 60 40 360 1500 40 45 35 6 0 0 10 2 0 0 0 2 50 50 600 50 999 0 0 0 999 0 1500 900 0 0 (supply) /config