empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove option FUEL

Browse source 
The abstract idea of tying ships and land units to a logistical tether
is sound, the concrete implementation as option FUEL is flawed.  It
adds too much busy-work to the game to be enjoyable.  It hasn't been
enabled in a public game for years.  The code implementing it is ugly,
repetitive, and a burden to maintain.

Remove selector fuel from ship_ca[] and land_ca[], and selectors
fuelc, fuelu from mchr_ca[] and lchr_ca[].  Remove fields fuelc, fuelu
from ship.config and land.config.

Remove command fuel from player_coms[].

Deprecate edit key 'B' in doship(), dounit(), and don't show it in
pr_ship(), pr_land().

Drop opt_FUEL code from build_ship(), shi(), sdump(), ship_damage(),
show_ship_stats(), do_mob_ship(), nav_ship(), build_land(), land(),
ldump(), land_damage(), show_land_stats(), do_mob_land(),
resupply_all(), resupply_commod(), get_minimum(), has_supply(),
unit_list(), vers().

Remove opt_FUEL, fuel_mult, struct shpstr member shp_fuel, struct
mchrstr members m_fuelc and m_fuelu, M_OILER, struct lndstr member
lnd_fuel, struct lchrstr members l_fuelc and l_fuelu, fuel(), and
auto_fuel_ship().
This commit is contained in:
Markus Armbruster 2008-05-12 09:25:20 +02:00
parent 3cc80e83c3
commit 3b4de2feb1
42 changed files with 124 additions and 984 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/global/constants.c
View file

@ -102,9 +102,6 @@ double people_damage = 1.00; /* Civs/mil/uw take this fraction of damage */
double collateral_dam = 0.10; /* Side effect damage to sector */
double assault_penalty = 0.50; /* attack factor for para & assault troops */
/* opt_FUEL */
int fuel_mult = 10; /* 1 fuel = 10 mob */
float land_grow_scale = 2.0; /* how fast eff grows for land units (xETUS) */
float ship_grow_scale = 3.0; /* how fast eff grows for ships (xETUS) */
float plane_grow_scale = 2.0; /* how fast eff grows for planes (xETUS) */

46
src/lib/global/land.config
View file

@ -70,29 +70,29 @@ type name l_b h_b tech cost ...
/config
config land-chr
type name att def vul spd vis spy rma frg acc dam amm aaf fuelc fuelu nxl nla ...
0 "cav cavalry" 1.2 0.5 80 32 18 4 3 0 0 0 0 0 0 0 0 0
1 "linf light infantry" 1.0 1.5 60 28 15 2 1 0 0 0 1 1 0 0 0 0
2 "inf infantry" 1.0 1.5 60 25 15 2 1 0 0 0 0 0 0 0 0 0
3 "mtif motor inf" 1.2 2.2 60 33 17 1 3 0 0 0 2 3 13 1 0 0
4 "mif mech inf" 1.5 2.5 50 33 17 1 3 0 0 0 2 3 13 1 0 0
5 "mar marines" 1.4 2.4 60 25 14 2 1 0 0 0 1 2 0 0 0 0
6 "sup supply" 0.1 0.2 80 25 20 1 0 0 0 0 0 0 0 0 0 0
7 "tra train" 0.0 0.0 120 10 25 3 0 0 0 0 0 0 0 0 5 12
8 "spy infiltrator" 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0 0 0
9 "com commando" 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0 0 0
10 "aau aa unit" 0.5 1.0 60 18 20 1 1 0 0 0 1 2 0 0 0 0
11 "art artillery" 0.1 0.4 70 18 20 1 0 8 50 5 2 1 0 0 0 0
12 "lat lt artillery" 0.2 0.6 60 30 18 1 1 5 10 3 1 1 0 0 0 0
13 "hat hvy artillery" 0.0 0.2 60 12 20 1 0 11 99 8 4 1 0 0 0 0
14 "mat mech artillery" 0.2 0.6 50 35 17 1 1 8 35 6 3 3 13 1 0 0
15 "eng engineer" 1.2 2.4 50 25 14 2 1 0 0 0 1 1 0 0 0 0
16 "meng mech engineer" 1.8 3.5 45 33 15 3 3 0 0 0 1 5 25 2 0 0
17 "lar lt armor" 2.0 1.0 50 42 15 4 4 0 0 0 1 2 25 1 0 0
18 "har hvy armor" 2.0 0.8 50 18 17 1 1 0 0 0 2 1 10 2 0 0
19 "arm armor" 3.0 1.5 40 33 16 2 2 0 0 0 1 2 13 1 0 0
20 "sec security" 1.0 2.0 60 25 15 2 1 0 0 0 1 1 0 0 0 0
21 "rad radar unit" 0.0 0.0 50 33 15 3 0 0 0 0 0 2 25 2 1 0
type name att def vul spd vis spy rma frg acc dam amm aaf nxl nla ...
0 "cav cavalry" 1.2 0.5 80 32 18 4 3 0 0 0 0 0 0 0
1 "linf light infantry" 1.0 1.5 60 28 15 2 1 0 0 0 1 1 0 0
2 "inf infantry" 1.0 1.5 60 25 15 2 1 0 0 0 0 0 0 0
3 "mtif motor inf" 1.2 2.2 60 33 17 1 3 0 0 0 2 3 0 0
4 "mif mech inf" 1.5 2.5 50 33 17 1 3 0 0 0 2 3 0 0
5 "mar marines" 1.4 2.4 60 25 14 2 1 0 0 0 1 2 0 0
6 "sup supply" 0.1 0.2 80 25 20 1 0 0 0 0 0 0 0 0
7 "tra train" 0.0 0.0 120 10 25 3 0 0 0 0 0 0 5 12
8 "spy infiltrator" 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0
9 "com commando" 0.0 0.0 80 32 18 4 3 0 0 0 0 0 0 0
10 "aau aa unit" 0.5 1.0 60 18 20 1 1 0 0 0 1 2 0 0
11 "art artillery" 0.1 0.4 70 18 20 1 0 8 50 5 2 1 0 0
12 "lat lt artillery" 0.2 0.6 60 30 18 1 1 5 10 3 1 1 0 0
13 "hat hvy artillery" 0.0 0.2 60 12 20 1 0 11 99 8 4 1 0 0
14 "mat mech artillery" 0.2 0.6 50 35 17 1 1 8 35 6 3 3 0 0
15 "eng engineer" 1.2 2.4 50 25 14 2 1 0 0 0 1 1 0 0
16 "meng mech engineer" 1.8 3.5 45 33 15 3 3 0 0 0 1 5 0 0
17 "lar lt armor" 2.0 1.0 50 42 15 4 4 0 0 0 1 2 0 0
18 "har hvy armor" 2.0 0.8 50 18 17 1 1 0 0 0 2 1 0 0
19 "arm armor" 3.0 1.5 40 33 16 2 2 0 0 0 1 2 0 0
20 "sec security" 1.0 2.0 60 25 15 2 1 0 0 0 1 1 0 0
21 "rad radar unit" 0.0 0.0 50 33 15 3 0 0 0 0 0 2 1 0
/config
config land-chr

8
src/lib/global/nsc.c
View file

@ -242,7 +242,6 @@ struct castr ship_ca[] = {
{"follow", fldoff(shp_follow), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"name", fldoff(shp_name), NSC_STRINGY, MAXSHPNAMLEN, NULL,
EF_BAD, 0},
{"fuel", fldoff(shp_fuel), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nchoppers", fldoff(shp_nchoppers), NSC_UCHAR, 0, NULL,
EF_BAD, NSC_EXTRA},
{"nxlight", fldoff(shp_nxlight), NSC_UCHAR, 0, NULL,
@ -276,8 +275,6 @@ struct castr mchr_ca[] = {
{"glim", fldoff(m_glim), NSC_INT, 0, NULL, EF_BAD, 0},
{"nxlight", fldoff(m_nxlight), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nchoppers", fldoff(m_nchoppers), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"fuelc", fldoff(m_fuelc), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"fuelu", fldoff(m_fuelu), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"tech", fldoff(m_tech), NSC_INT, 0, NULL, EF_BAD, 0},
{"cost", fldoff(m_cost), NSC_INT, 0, NULL, EF_BAD, 0},
{"flags", fldoff(m_flags), NSC_LONG, 0, NULL,
@ -336,7 +333,6 @@ struct castr land_ca[] = {
{"ship", fldoff(lnd_ship), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"harden", fldoff(lnd_harden), NSC_CHAR, 0, NULL, EF_BAD, 0},
{"retreat", fldoff(lnd_retreat), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"fuel", fldoff(lnd_fuel), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nxlight", fldoff(lnd_nxlight), NSC_UCHAR, 0, NULL,
EF_BAD, NSC_EXTRA},
{"rflags", fldoff(lnd_rflags), NSC_INT, 0, NULL,
@ -364,8 +360,6 @@ struct castr land_ca[] = {
{"spy", fldoff(l_spy), NSC_INT, 0, nsc_lchr, EF_BAD, NSC_EXTRA},
{"rmax", fldoff(l_rad), NSC_INT, 0, nsc_lchr, EF_BAD, NSC_EXTRA},
{"ammo", fldoff(l_ammo), NSC_INT, 0, nsc_lchr, EF_BAD, NSC_EXTRA},
{"fuelc", fldoff(l_fuelc), NSC_UCHAR, 0, nsc_lchr, EF_BAD, NSC_EXTRA},
{"fuelu", fldoff(l_fuelu), NSC_UCHAR, 0, nsc_lchr, EF_BAD, NSC_EXTRA},
{"maxlight", fldoff(l_nxlight), NSC_UCHAR, 0, nsc_lchr,
EF_BAD, NSC_EXTRA},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
@ -393,8 +387,6 @@ struct castr lchr_ca[] = {
{"dam", fldoff(l_dam), NSC_INT, 0, NULL, EF_BAD, 0},
{"ammo", fldoff(l_ammo), NSC_INT, 0, NULL, EF_BAD, 0},
{"aaf", fldoff(l_aaf), NSC_INT, 0, NULL, EF_BAD, 0},
{"fuelc", fldoff(l_fuelc), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"fuelu", fldoff(l_fuelu), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nxlight", fldoff(l_nxlight), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nland", fldoff(l_nland), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"flags", fldoff(l_flags), NSC_LONG, 0, NULL,

1
src/lib/global/options.c
View file

@ -42,7 +42,6 @@ int opt_BLITZ = 1;
int opt_BRIDGETOWERS = 1;
int opt_EASY_BRIDGES = 1;
int opt_FALLOUT = 1;
int opt_FUEL = 0;
int opt_GODNEWS = 1;
int opt_GO_RENEW = 0;
int opt_GUINEA_PIGS = 0;

82
src/lib/global/ship.config
View file

@ -90,44 +90,44 @@ type name l_b h_b tech cost ...
/config
config ship-chr
type name arm spe vis vrn frn gli nla npl nch nxl fuelc fuelu ...
0 "fb fishing boat" 10 10 15 2 0 0 0 0 0 0 0 0
1 "ft fishing trawler" 10 25 15 2 0 0 0 0 0 0 20 1
2 "cs cargo ship" 20 25 35 3 0 0 2 0 0 1 0 0
3 "os ore ship" 20 25 35 3 0 0 0 0 0 1 30 1
4 "ss slave ship" 20 10 35 3 0 0 0 0 0 1 0 0
5 "ts trade ship" 20 25 35 3 0 0 0 0 0 1 30 1
6 "frg frigate" 50 25 25 3 1 1 2 0 0 1 0 0
7 "oe oil exploration boat" 10 25 15 2 0 0 0 0 0 0 20 1
8 "od oil derrick" 30 15 65 3 0 0 0 0 0 2 0 0
9 "pt patrol boat" 10 38 10 2 1 1 0 0 0 0 4 1
10 "lc light cruiser" 50 30 30 5 6 3 2 0 0 1 40 1
11 "hc heavy cruiser" 70 30 30 5 8 4 4 0 0 1 30 1
12 "tt troop transport" 60 20 35 3 1 2 2 0 0 1 0 0
13 "bb battleship" 95 25 35 6 10 7 2 0 0 1 50 2
14 "bbc battlecruiser" 55 30 35 6 10 6 2 0 0 1 60 2
15 "tk tanker" 75 25 45 3 0 0 0 0 0 1 30 1
16 "ms minesweeper" 10 25 15 2 0 0 0 0 0 0 20 1
17 "dd destroyer" 45 35 20 4 6 3 1 0 0 1 30 1
18 "sb submarine" 25 20 5 4 3 3 0 0 0 0 30 1
19 "sbc cargo submarine" 50 30 2 3 0 0 0 0 0 0 50 2
20 "cal light carrier" 60 30 40 5 2 2 0 20 20 4 50 2
21 "car aircraft carrier" 80 35 40 7 2 2 0 40 40 10 120 3
22 "can nuc carrier" 100 45 40 9 2 2 0 60 4 20 0 0
23 "ls landing ship" 40 30 30 2 0 0 6 0 0 2 30 1
24 "af asw frigate" 50 35 30 5 2 2 0 0 0 4 40 1
25 "na nuc attack sub" 45 40 3 6 5 3 0 0 0 0 0 0
26 "ad asw destroyer" 60 40 35 6 8 3 0 0 2 10 80 2
27 "nm nuc miss sub" 55 35 2 6 0 0 0 20 0 0 0 0
28 "msb missile sub" 35 30 3 3 0 0 0 10 0 0 30 1
29 "mb missile boat" 15 40 15 3 2 2 0 10 0 0 7 1
30 "mf missile frigate" 50 35 30 5 2 2 0 20 0 2 30 1
31 "mc missile cruiser" 70 35 35 8 8 6 0 40 8 8 35 1
32 "aac aa cruiser" 80 35 30 6 1 8 4 0 0 1 60 2
33 "agc aegis cruiser" 80 35 30 6 1 16 0 32 2 30 0 0
34 "ncr nuc cruiser" 100 45 35 6 14 7 0 20 2 10 0 0
35 "nas nuc asw cruiser" 80 45 35 9 10 4 0 0 8 25 0 0
36 "nsp nuc supply ship" 40 45 35 6 0 0 2 0 2 10 0 0
type name arm spe vis vrn frn gli nla npl nch nxl ...
0 "fb fishing boat" 10 10 15 2 0 0 0 0 0 0
1 "ft fishing trawler" 10 25 15 2 0 0 0 0 0 0
2 "cs cargo ship" 20 25 35 3 0 0 2 0 0 1
3 "os ore ship" 20 25 35 3 0 0 0 0 0 1
4 "ss slave ship" 20 10 35 3 0 0 0 0 0 1
5 "ts trade ship" 20 25 35 3 0 0 0 0 0 1
6 "frg frigate" 50 25 25 3 1 1 2 0 0 1
7 "oe oil exploration boat" 10 25 15 2 0 0 0 0 0 0
8 "od oil derrick" 30 15 65 3 0 0 0 0 0 2
9 "pt patrol boat" 10 38 10 2 1 1 0 0 0 0
10 "lc light cruiser" 50 30 30 5 6 3 2 0 0 1
11 "hc heavy cruiser" 70 30 30 5 8 4 4 0 0 1
12 "tt troop transport" 60 20 35 3 1 2 2 0 0 1
13 "bb battleship" 95 25 35 6 10 7 2 0 0 1
14 "bbc battlecruiser" 55 30 35 6 10 6 2 0 0 1
15 "tk tanker" 75 25 45 3 0 0 0 0 0 1
16 "ms minesweeper" 10 25 15 2 0 0 0 0 0 0
17 "dd destroyer" 45 35 20 4 6 3 1 0 0 1
18 "sb submarine" 25 20 5 4 3 3 0 0 0 0
19 "sbc cargo submarine" 50 30 2 3 0 0 0 0 0 0
20 "cal light carrier" 60 30 40 5 2 2 0 20 20 4
21 "car aircraft carrier" 80 35 40 7 2 2 0 40 40 10
22 "can nuc carrier" 100 45 40 9 2 2 0 60 4 20
23 "ls landing ship" 40 30 30 2 0 0 6 0 0 2
24 "af asw frigate" 50 35 30 5 2 2 0 0 0 4
25 "na nuc attack sub" 45 40 3 6 5 3 0 0 0 0
26 "ad asw destroyer" 60 40 35 6 8 3 0 0 2 10
27 "nm nuc miss sub" 55 35 2 6 0 0 0 20 0 0
28 "msb missile sub" 35 30 3 3 0 0 0 10 0 0
29 "mb missile boat" 15 40 15 3 2 2 0 10 0 0
30 "mf missile frigate" 50 35 30 5 2 2 0 20 0 2
31 "mc missile cruiser" 70 35 35 8 8 6 0 40 8 8
32 "aac aa cruiser" 80 35 30 6 1 8 4 0 0 1
33 "agc aegis cruiser" 80 35 30 6 1 16 0 32 2 30
34 "ncr nuc cruiser" 100 45 35 6 14 7 0 20 2 10
35 "nas nuc asw cruiser" 80 45 35 9 10 4 0 0 8 25
36 "nsp nuc supply ship" 40 45 35 6 0 0 2 0 2 10
/config
config ship-chr
@ -147,14 +147,14 @@ type name civ mil she gun pet iro dus bar foo oil lcm hcm
12 "tt troop transport" 0 120 20 4 0 0 0 0 120 0 0 0 0 0 (semi-land)
13 "bb battleship" 0 200 200 10 0 0 0 0 900 0 0 0 0 0 ()
14 "bbc battlecruiser" 0 180 100 10 0 0 0 0 400 0 0 0 0 0 ()
15 "tk tanker" 30 5 0 0 990 0 0 0 200 990 0 0 25 0 (oiler supply)
15 "tk tanker" 30 5 0 0 990 0 0 0 200 990 0 0 25 0 (supply)
16 "ms minesweeper" 0 10 100 1 0 0 0 0 90 0 0 0 0 0 (mine sweep canal)
17 "dd destroyer" 0 60 40 4 0 0 0 0 80 0 0 0 0 0 (dchrg sonar mine)
18 "sb submarine" 0 25 36 5 0 0 0 0 80 0 0 0 0 0 (torp sonar mine sub)
19 "sbc cargo submarine" 5 10 104 20 100 0 0 0 900 0 500 300 0 0 (sonar sub oiler supply)
19 "sbc cargo submarine" 5 10 104 20 100 0 0 0 900 0 500 300 0 0 (sonar sub supply)
20 "cal light carrier" 0 175 250 4 300 0 0 0 180 0 0 0 0 0 (plane)
21 "car aircraft carrier" 0 350 500 4 500 0 0 0 900 0 0 0 0 0 (plane)
22 "can nuc carrier" 0 350 999 4 999 0 0 0 900 0 0 0 0 0 (plane oiler supply)
22 "can nuc carrier" 0 350 999 4 999 0 0 0 900 0 0 0 0 0 (plane supply)
23 "ls landing ship" 0 400 10 1 0 0 0 0 300 0 0 0 0 0 (land)
24 "af asw frigate" 0 60 60 4 0 0 0 0 120 0 0 0 0 0 (torp dchrg sonar sub-torp)
25 "na nuc attack sub" 0 25 60 6 0 0 0 0 500 0 0 0 0 0 (torp sonar min sub sub-torp)

1
src/lib/global/symbol.c
View file

@ -276,7 +276,6 @@ struct symbol ship_chr_flags[] = {
{M_SUBT, "sub-torp"},
{M_TRADE, "trade"},
{M_SEMILAND, "semi-land"},
{M_OILER, "oiler"},
{M_SUPPLY, "supply"},
{M_CANAL, "canal"},
{M_ANTIMISSILE, "anti-missile"},