[Freeciv-Dev] (PR#11477) META-TICKET: gen imprs
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
Subject: |
[Freeciv-Dev] (PR#11477) META-TICKET: gen imprs |
|
From: |
"Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx> |
|
Date: |
Mon, 20 Dec 2004 19:33:41 -0800 |
|
Reply-to: |
bugs@xxxxxxxxxxx |
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=11477 >
Here is a patch to remove the now unused equiv_* values. To apply ASAP.
? data/civ1/.buildings.ruleset.swp
Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.454
diff -u -r1.454 packhand.c
--- client/packhand.c 19 Dec 2004 16:47:08 -0000 1.454
+++ client/packhand.c 21 Dec 2004 03:30:52 -0000
@@ -2254,8 +2254,6 @@
T(terr_gate, terr_gate_count, T_NONE);
T(spec_gate, spec_gate_count, S_NO_SPECIAL);
- T(equiv_dupl, equiv_dupl_count, B_LAST);
- T(equiv_repl, equiv_repl_count, B_LAST);
#undef T
#ifdef DEBUG
@@ -2284,16 +2282,6 @@
freelog(LOG_DEBUG, " %2d/%s",
b->spec_gate[inx], get_special_name(b->spec_gate[inx]));
}
- freelog(LOG_DEBUG, " equiv_dupl...");
- for (inx = 0; b->equiv_dupl[inx] != B_LAST; inx++) {
- freelog(LOG_DEBUG, " %2d/%s",
- b->equiv_dupl[inx], improvement_types[b->equiv_dupl[inx]].name);
- }
- freelog(LOG_DEBUG, " equiv_repl...");
- for (inx = 0; b->equiv_repl[inx] != B_LAST; inx++) {
- freelog(LOG_DEBUG, " %2d/%s",
- b->equiv_repl[inx], improvement_types[b->equiv_repl[inx]].name);
- }
if (tech_exists(b->obsolete_by)) {
freelog(LOG_DEBUG, " obsolete_by %2d/%s",
b->obsolete_by,
Index: common/improvement.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/improvement.c,v
retrieving revision 1.49
diff -u -r1.49 improvement.c
--- common/improvement.c 19 Dec 2004 16:47:09 -0000 1.49
+++ common/improvement.c 21 Dec 2004 03:30:52 -0000
@@ -113,12 +113,6 @@
free(p->spec_gate);
p->spec_gate = NULL;
- free(p->equiv_dupl);
- p->equiv_dupl = NULL;
-
- free(p->equiv_repl);
- p->equiv_repl = NULL;
-
free(p->helptext);
p->helptext = NULL;
}
Index: common/improvement.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/improvement.h,v
retrieving revision 1.36
diff -u -r1.36 improvement.h
--- common/improvement.h 19 Dec 2004 16:47:09 -0000 1.36
+++ common/improvement.h 21 Dec 2004 03:30:52 -0000
@@ -74,8 +74,6 @@
Impr_Type_id bldg_req; /* B_LAST = none required */
Terrain_type_id *terr_gate; /* list; T_NONE terminated */
enum tile_special_type *spec_gate; /* list; S_NO_SPECIAL terminated */
- Impr_Type_id *equiv_dupl; /* list; B_LAST terminated */
- Impr_Type_id *equiv_repl; /* list; B_LAST terminated */
Tech_Type_id obsolete_by; /* A_LAST = never obsolete */
Impr_Type_id replaced_by; /* B_LAST = never replaced */
int build_cost; /* Use wrappers to access this. */
Index: common/packets.def
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.def,v
retrieving revision 1.84
diff -u -r1.84 packets.def
--- common/packets.def 19 Dec 2004 19:38:07 -0000 1.84
+++ common/packets.def 21 Dec 2004 03:30:53 -0000
@@ -1126,10 +1126,6 @@
TERRAIN terr_gate[255:terr_gate_count];
UINT8 spec_gate_count;
SPECIAL spec_gate[255:spec_gate_count];
- UINT8 equiv_dupl_count;
- IMPROVEMENT equiv_dupl[255:equiv_dupl_count];
- UINT8 equiv_repl_count;
- IMPROVEMENT equiv_repl[255:equiv_repl_count];
end
PACKET_RULESET_TERRAIN=105;sc,lsend
Index: data/civ1/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/buildings.ruleset,v
retrieving revision 1.42
diff -u -r1.42 buildings.ruleset
--- data/civ1/buildings.ruleset 21 Dec 2004 02:13:58 -0000 1.42
+++ data/civ1/buildings.ruleset 21 Dec 2004 03:30:56 -0000
@@ -33,8 +33,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -112,8 +110,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 2
@@ -137,8 +133,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -165,8 +159,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Barracks II", "Barracks III"
obsolete_by = "Gunpowder"
build_cost = 40
upkeep = 1
@@ -196,8 +188,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Barracks III"
obsolete_by = "Combustion"
build_cost = 40
upkeep = 2
@@ -227,8 +217,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 40
upkeep = 3
@@ -258,8 +246,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Michelangelo's Chapel"
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -284,8 +270,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-equiv_dupl = "Great Wall"
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 2
@@ -315,8 +299,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 4
@@ -340,8 +322,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -369,8 +349,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 4
@@ -395,8 +373,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Pyramids"
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -425,8 +401,6 @@
graphic_alt = "-"
terr_gate = "Mountains"
spec_gate = "River"
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Nuclear Plant"
obsolete_by = "None"
build_cost = 240
upkeep = 4
@@ -460,8 +434,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -486,8 +458,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -513,8 +483,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -540,8 +508,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 6
@@ -567,8 +533,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant"
obsolete_by = "None"
build_cost = 240
upkeep = 2
@@ -604,8 +568,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 0
@@ -642,8 +604,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Nuclear Plant", "Hydro Plant"
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -675,8 +635,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 2
@@ -702,8 +660,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 4
@@ -731,8 +687,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 2
@@ -754,8 +708,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-equiv_dupl = "Power Plant", "Hydro Plant", "Nuclear Plant"
-equiv_repl = "Hoover Dam"
obsolete_by = "None"
build_cost = 320
upkeep = 4
@@ -786,8 +738,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 0
@@ -816,8 +766,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 0
@@ -855,8 +803,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 0
@@ -885,8 +831,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -913,8 +857,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -940,8 +882,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -966,8 +906,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Electricity"
build_cost = 200
upkeep = 0
@@ -992,8 +930,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Automobile"
build_cost = 300
upkeep = 0
@@ -1020,8 +956,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1046,8 +980,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1073,8 +1005,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1098,8 +1028,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Electronics"
build_cost = 300
upkeep = 0
@@ -1124,8 +1052,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Gunpowder"
build_cost = 300
upkeep = 0
@@ -1152,8 +1078,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Invention"
build_cost = 300
upkeep = 0
@@ -1181,8 +1105,6 @@
graphic_alt = "-"
terr_gate = "Mountains"
spec_gate = "River"
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1210,8 +1132,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Nuclear Fission"
build_cost = 400
upkeep = 0
@@ -1241,8 +1161,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1267,8 +1185,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Magnetism"
build_cost = 200
upkeep = 0
@@ -1296,8 +1212,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1321,8 +1235,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1345,8 +1257,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Communism"
build_cost = 300
upkeep = 0
@@ -1370,8 +1280,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Religion"
build_cost = 300
upkeep = 0
@@ -1397,8 +1305,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Communism"
build_cost = 300
upkeep = 0
@@ -1425,8 +1331,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1451,8 +1355,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Electronics"
build_cost = 400
upkeep = 0
@@ -1476,8 +1378,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1509,8 +1409,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1536,8 +1434,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 999
upkeep = 0
Index: data/civ2/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/buildings.ruleset,v
retrieving revision 1.45
diff -u -r1.45 buildings.ruleset
--- data/civ2/buildings.ruleset 21 Dec 2004 02:13:58 -0000 1.45
+++ data/civ2/buildings.ruleset 21 Dec 2004 03:30:57 -0000
@@ -94,8 +94,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -128,8 +126,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 2
@@ -154,8 +150,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -182,8 +176,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy", "Barracks II", "Barracks III"
obsolete_by = "Gunpowder"
build_cost = 40
upkeep = 1
@@ -212,8 +204,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy","Barracks III"
obsolete_by = "Mobile Warfare"
build_cost = 40
upkeep = 1
@@ -242,8 +232,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy"
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -272,8 +260,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Michelangelo's Chapel"
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -304,8 +290,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-equiv_dupl = "Great Wall"
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 0
@@ -334,8 +318,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -360,8 +342,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 4
@@ -387,8 +367,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -418,8 +396,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 4
@@ -444,8 +420,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Pyramids"
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -474,8 +448,6 @@
graphic = "b.harbour"
graphic_alt = "-"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -500,8 +472,6 @@
graphic_alt = "-"
terr_gate = "Mountains"
spec_gate = "River"
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Nuclear Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 240
upkeep = 4
@@ -538,8 +508,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -564,8 +532,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -591,8 +557,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -618,8 +582,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 6
@@ -645,8 +607,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 160
upkeep = 2
@@ -685,8 +645,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -711,8 +669,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 0
@@ -749,8 +705,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Women's Suffrage"
obsolete_by = "None"
build_cost = 60
upkeep = 2
@@ -777,8 +731,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 3
@@ -805,8 +757,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Nuclear Plant", "Hydro Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -839,8 +789,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 2
@@ -866,8 +814,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "SETI Program"
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -894,8 +840,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 2
@@ -920,8 +864,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 4
@@ -950,8 +892,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 2
@@ -976,8 +916,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant", "Nuclear Plant"
obsolete_by = "None"
build_cost = 320
upkeep = 4
@@ -1008,8 +946,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 0
@@ -1038,8 +974,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 0
@@ -1077,8 +1011,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 0
@@ -1107,8 +1039,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -1135,8 +1065,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -1162,8 +1090,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -1190,8 +1116,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -1218,8 +1142,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -1245,8 +1167,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1273,8 +1193,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1299,8 +1217,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Flight"
build_cost = 200
upkeep = 0
@@ -1325,8 +1241,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1351,8 +1265,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1377,8 +1289,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1404,8 +1314,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1429,8 +1337,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Electricity"
build_cost = 300
upkeep = 0
@@ -1455,8 +1361,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Metallurgy"
build_cost = 300
upkeep = 0
@@ -1483,8 +1387,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Railroad"
build_cost = 200
upkeep = 0
@@ -1513,8 +1415,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1541,8 +1441,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1567,8 +1465,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1592,8 +1488,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Industrialization"
build_cost = 300
upkeep = 0
@@ -1618,8 +1512,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Automobile"
build_cost = 400
upkeep = 0
@@ -1643,8 +1535,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Magnetism"
build_cost = 200
upkeep = 0
@@ -1672,8 +1562,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1697,8 +1585,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1721,8 +1607,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Communism"
build_cost = 200
upkeep = 0
@@ -1746,8 +1630,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1778,8 +1660,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Theology"
build_cost = 300
upkeep = 0
@@ -1805,8 +1685,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 0
@@ -1830,8 +1708,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1856,8 +1732,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1881,8 +1755,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1909,8 +1781,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Mobile Warfare"
build_cost = 300
upkeep = 0
@@ -1937,8 +1807,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1970,8 +1838,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1999,8 +1865,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 999
upkeep = 0
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.63
diff -u -r1.63 buildings.ruleset
--- data/default/buildings.ruleset 21 Dec 2004 02:13:58 -0000 1.63
+++ data/default/buildings.ruleset 21 Dec 2004 03:30:57 -0000
@@ -45,12 +45,6 @@
; list means always allowed to build if nothing in terr_gate
; is given (that means only if both terr_gate and spec_gate
; are empty the building can be built everywhere)
-; equiv_dupl = list of buildings that duplicate this building if
-; this city is within that building's range (may
-; still build this, but will have no effect)
-; equiv_repl = list of buildings that replace this building if
-; this city is within that building's range (not
-; allowed to build this)
; obsolete_by = advance which makes building obsolete; special
; value "None" means does not become obsolete
; build_cost = production shields required to build
@@ -143,8 +137,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -177,8 +169,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 2
@@ -203,8 +193,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 2
@@ -231,8 +219,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy","Barracks II", "Barracks III"
obsolete_by = "Gunpowder"
replaced_by = "Barracks II"
build_cost = 30
@@ -262,8 +248,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy", "Barracks III"
obsolete_by = "Mobile Warfare"
replaced_by = "Barracks III"
build_cost = 30
@@ -293,8 +277,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy"
obsolete_by = "None"
build_cost = 30
upkeep = 1
@@ -323,8 +305,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Michelangelo's Chapel"
obsolete_by = "None"
build_cost = 80
upkeep = 3
@@ -355,8 +335,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-equiv_dupl = "Great Wall"
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 0
@@ -385,8 +363,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -411,8 +387,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 70
upkeep = 4
@@ -440,8 +414,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -471,8 +443,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 140
upkeep = 4
@@ -497,8 +467,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Pyramids"
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -527,8 +495,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -553,8 +519,6 @@
graphic_alt = "-"
terr_gate = "Mountains"
spec_gate = "River"
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Nuclear Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 180
upkeep = 4
@@ -595,8 +559,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -621,8 +583,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 0
@@ -648,8 +608,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 4
@@ -675,8 +633,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 220
upkeep = 6
@@ -702,8 +658,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 120
upkeep = 2
@@ -745,8 +699,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -771,8 +723,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 70
upkeep = 0
@@ -809,8 +759,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Women's Suffrage"
obsolete_by = "None"
build_cost = 50
upkeep = 2
@@ -840,8 +788,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 3
@@ -868,8 +814,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Nuclear Plant", "Hydro Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 130
upkeep = 4
@@ -905,8 +849,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 140
upkeep = 2
@@ -932,8 +874,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -961,8 +901,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 70
upkeep = 2
@@ -987,8 +925,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 140
upkeep = 4
@@ -1017,8 +953,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 2
@@ -1043,8 +977,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant", "Nuclear Plant"
obsolete_by = "None"
build_cost = 220
upkeep = 4
@@ -1078,8 +1010,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 0
@@ -1108,8 +1038,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 0
@@ -1147,8 +1075,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 0
@@ -1177,8 +1103,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -1205,8 +1129,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -1234,8 +1156,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 3
@@ -1262,8 +1182,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 30
upkeep = 1
@@ -1290,8 +1208,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -1317,8 +1233,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1345,8 +1259,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1371,8 +1283,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Flight"
build_cost = 100
upkeep = 0
@@ -1397,8 +1307,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 0
@@ -1423,8 +1331,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1451,8 +1357,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1478,8 +1382,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 0
@@ -1507,8 +1409,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Electricity"
build_cost = 300
upkeep = 0
@@ -1533,8 +1433,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Metallurgy"
build_cost = 300
upkeep = 0
@@ -1562,8 +1460,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Railroad"
build_cost = 200
upkeep = 0
@@ -1592,8 +1488,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1621,8 +1515,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1648,8 +1540,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1673,8 +1563,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Robotics"
build_cost = 150
upkeep = 0
@@ -1699,8 +1587,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Automobile"
build_cost = 400
upkeep = 0
@@ -1724,8 +1610,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Magnetism"
build_cost = 200
upkeep = 0
@@ -1753,8 +1637,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1778,8 +1660,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1802,8 +1682,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Communism"
build_cost = 200
upkeep = 0
@@ -1827,8 +1705,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1859,8 +1735,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Theology"
build_cost = 100
upkeep = 0
@@ -1885,8 +1759,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 0
@@ -1910,8 +1782,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1935,8 +1805,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 0
@@ -1960,8 +1828,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1988,8 +1854,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Mobile Warfare"
build_cost = 300
upkeep = 0
@@ -2016,8 +1880,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -2049,8 +1911,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -2086,8 +1946,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 999
upkeep = 0
Index: data/history/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/buildings.ruleset,v
retrieving revision 1.17
diff -u -r1.17 buildings.ruleset
--- data/history/buildings.ruleset 21 Dec 2004 02:13:58 -0000 1.17
+++ data/history/buildings.ruleset 21 Dec 2004 03:30:58 -0000
@@ -94,8 +94,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -128,8 +126,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 2
@@ -154,8 +150,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -182,8 +176,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy","Barracks II", "Barracks III"
obsolete_by = "Gunpowder"
replaced_by = "Barracks II"
build_cost = 40
@@ -213,8 +205,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy", "Barracks III"
obsolete_by = "Mobile Warfare"
replaced_by = "Barracks III"
build_cost = 40
@@ -244,8 +234,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Sun Tzu's War Academy"
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -274,8 +262,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Michelangelo's Chapel"
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -306,8 +292,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-equiv_dupl = "Great Wall"
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 0
@@ -336,8 +320,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -362,8 +344,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 4
@@ -391,8 +371,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -422,8 +400,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 4
@@ -448,8 +424,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Pyramids"
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -478,8 +452,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 60
upkeep = 1
@@ -504,8 +476,6 @@
graphic_alt = "-"
terr_gate = "Mountains"
spec_gate = "River"
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Nuclear Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 240
upkeep = 4
@@ -545,8 +515,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -571,8 +539,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 1
@@ -598,8 +564,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -625,8 +589,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 6
@@ -652,8 +614,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 160
upkeep = 2
@@ -694,8 +654,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -720,8 +678,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 0
@@ -758,8 +714,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Women's Suffrage"
obsolete_by = "None"
build_cost = 60
upkeep = 2
@@ -789,8 +743,6 @@
graphic_alt = "-"
terr_gate = "Ocean"
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 3
@@ -817,8 +769,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Nuclear Plant", "Hydro Plant", "Solar Plant"
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -854,8 +804,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 2
@@ -881,8 +829,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "SETI Program"
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -909,8 +855,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 100
upkeep = 2
@@ -935,8 +879,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 4
@@ -965,8 +907,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 2
@@ -991,8 +931,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-equiv_repl = "Hoover Dam", "Power Plant", "Hydro Plant", "Nuclear Plant"
obsolete_by = "None"
build_cost = 320
upkeep = 4
@@ -1026,8 +964,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 0
@@ -1056,8 +992,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 320
upkeep = 0
@@ -1095,8 +1029,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 80
upkeep = 0
@@ -1125,8 +1057,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 4
@@ -1153,8 +1083,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -1182,8 +1110,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 120
upkeep = 3
@@ -1210,8 +1136,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 40
upkeep = 1
@@ -1238,8 +1162,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 160
upkeep = 3
@@ -1265,8 +1187,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1293,8 +1213,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1319,8 +1237,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Flight"
build_cost = 200
upkeep = 0
@@ -1345,8 +1261,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1371,8 +1285,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1399,8 +1311,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1426,8 +1336,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1451,8 +1359,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Electricity"
build_cost = 300
upkeep = 0
@@ -1477,8 +1383,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Metallurgy"
build_cost = 300
upkeep = 0
@@ -1506,8 +1410,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Railroad"
build_cost = 200
upkeep = 0
@@ -1536,8 +1438,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1564,8 +1464,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1590,8 +1488,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1615,8 +1511,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Industrialization"
build_cost = 300
upkeep = 0
@@ -1641,8 +1535,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Automobile"
build_cost = 400
upkeep = 0
@@ -1666,8 +1558,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Magnetism"
build_cost = 200
upkeep = 0
@@ -1695,8 +1585,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1720,8 +1608,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1744,8 +1630,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Communism"
build_cost = 200
upkeep = 0
@@ -1769,8 +1653,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1801,8 +1683,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Theology"
build_cost = 300
upkeep = 0
@@ -1827,8 +1707,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 200
upkeep = 0
@@ -1852,8 +1730,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1878,8 +1754,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 300
upkeep = 0
@@ -1903,8 +1777,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 400
upkeep = 0
@@ -1931,8 +1803,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "Mobile Warfare"
build_cost = 300
upkeep = 0
@@ -1959,8 +1829,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -1992,8 +1860,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 600
upkeep = 0
@@ -2029,8 +1895,6 @@
graphic_alt = "-"
;terr_gate =
;spec_gate =
-;equiv_dupl =
-;equiv_repl =
obsolete_by = "None"
build_cost = 999
upkeep = 0
Index: server/ruleset.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/ruleset.c,v
retrieving revision 1.223
diff -u -r1.223 ruleset.c
--- server/ruleset.c 19 Dec 2004 19:38:08 -0000 1.223
+++ server/ruleset.c 21 Dec 2004 03:30:59 -0000
@@ -1270,38 +1270,6 @@
b->spec_gate[k] = S_NO_SPECIAL;
free(list);
- list = secfile_lookup_str_vec(file, &count, "%s.equiv_dupl", sec[i]);
- b->equiv_dupl = fc_malloc((count + 1) * sizeof(b->equiv_dupl[0]));
- k = 0;
- for (j = 0; j < count; j++) {
- b->equiv_dupl[k] = find_improvement_by_name(list[j]);
- if (b->equiv_dupl[k] == B_LAST) {
- freelog(LOG_ERROR,
- "for %s equiv_dupl[%d] couldn't match improvement \"%s\" (%s)",
- b->name, j, list[j], filename);
- } else {
- k++;
- }
- }
- b->equiv_dupl[k] = B_LAST;
- free(list);
-
- list = secfile_lookup_str_vec(file, &count, "%s.equiv_repl", sec[i]);
- b->equiv_repl = fc_malloc((count + 1) * sizeof(b->equiv_repl[0]));
- k = 0;
- for (j = 0; j < count; j++) {
- b->equiv_repl[k] = find_improvement_by_name(list[j]);
- if (b->equiv_repl[k] == B_LAST) {
- freelog(LOG_ERROR,
- "for %s equiv_repl[%d] couldn't match improvement \"%s\" (%s)",
- b->name, j, list[j], filename);
- } else {
- k++;
- }
- }
- b->equiv_repl[k] = B_LAST;
- free(list);
-
b->obsolete_by = lookup_tech(file, sec[i], "obsolete_by",
FALSE, filename, b->name);
if (b->obsolete_by == A_NONE || !tech_exists(b->obsolete_by)) {
@@ -2890,8 +2858,6 @@
T(terr_gate, terr_gate_count, T_NONE);
T(spec_gate, spec_gate_count, S_NO_SPECIAL);
- T(equiv_dupl, equiv_dupl_count, B_LAST);
- T(equiv_repl, equiv_repl_count, B_LAST);
#undef T
lsend_packet_ruleset_building(dest, &packet);
- [Freeciv-Dev] Re: (PR#11477) gen imprs, (continued)
- [Freeciv-Dev] Re: (PR#11477) gen imprs, Marko Lindqvist, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] Re: (PR#11477) gen imprs, Marko Lindqvist, 2004/12/19
- [Freeciv-Dev] Re: (PR#11477) gen imprs, Marko Lindqvist, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Jason Short, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/20
- [Freeciv-Dev] (PR#11477) META-TICKET: gen imprs,
Vasco Alexandre da Silva Costa <=
- [Freeciv-Dev] (PR#11477) META-TICKET: gen imprs, Vasco Alexandre da Silva Costa, 2004/12/20
|
|
