[Freeciv-Dev] (PR#6214) Remove AI advisors
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
To: |
undisclosed-recipients: ; |
|
Subject: |
[Freeciv-Dev] (PR#6214) Remove AI advisors |
|
From: |
"Per I. Mathisen" <per@xxxxxxxxxxx> |
|
Date: |
Sat, 20 Sep 2003 11:53:02 -0700 |
|
Reply-to: |
rt@xxxxxxxxxxxxxx |
The AI advisors were never used, but added a lot of cruft that made the AI
code harder to read. This patch removes them and some other unused AI
hints in the nation rulesets. I left the tech, wonder and government hints
alone.
This patch removes 754 lines (including 12 files), and adds 6.
The files to be removed: advattitude.c, advattitude.h, advforeign.c,
advforeign.h, advisland.c, advisland.h, advleader.c, advleader.h,
advscience.c, advscience.h, advtrade.c and advtrade.h
- Per
Index: ai/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- ai/Makefile.am 8 Aug 2003 22:11:41 -0000 1.14
+++ ai/Makefile.am 20 Sep 2003 18:40:03 -0000
@@ -7,26 +7,14 @@
## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
libcivai_a_SOURCES = \
- advattitude.c \
- advattitude.h \
advdomestic.c \
advdomestic.h \
- advforeign.c \
- advforeign.h \
- advisland.c \
- advisland.h \
- advleader.c \
- advleader.h \
advmilitary.c \
advmilitary.h \
- advscience.c \
- advscience.h \
advdiplomacy.c \
advdiplomacy.h \
advspace.c \
advspace.h \
- advtrade.c \
- advtrade.h \
aiair.c \
aiair.h \
aicity.c \
Index: ai/aicity.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aicity.c,v
retrieving revision 1.142
diff -u -r1.142 aicity.c
--- ai/aicity.c 14 Jul 2003 22:40:05 -0000 1.142
+++ ai/aicity.c 20 Sep 2003 18:40:04 -0000
@@ -44,8 +44,6 @@
#include "unittools.h"
#include "advdomestic.h"
-#include "advisland.h"
-#include "advleader.h"
#include "advmilitary.h"
#include "aidata.h"
#include "aihand.h"
Index: ai/aitech.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aitech.c,v
retrieving revision 1.40
diff -u -r1.40 aitech.c
--- ai/aitech.c 21 Jul 2003 01:43:51 -0000 1.40
+++ ai/aitech.c 20 Sep 2003 18:40:04 -0000
@@ -26,12 +26,7 @@
#include "plrhand.h"
-#include "advattitude.h"
-#include "advforeign.h"
-#include "advleader.h"
#include "advmilitary.h"
-#include "advscience.h"
-#include "advtrade.h"
#include "aitools.h"
#include "aitech.h"
@@ -97,17 +92,6 @@
}
}
-static void adjust_tech_choice(struct player *pplayer, struct ai_choice *cur,
- struct ai_choice *best, int advisor)
-{
- if (cur->want != 0) {
- leader_adjust_tech_choice(pplayer, cur, advisor);
- copy_if_better_choice(cur, best);
- }
-}
-
-/* Syela-code starts here ................................. */
-
/**************************************************************************
...
**************************************************************************/
@@ -211,28 +195,14 @@
init_choice(&bestchoice);
ai_select_tech_goal(pplayer, &curchoice);
- copy_if_better_choice(&curchoice, &bestchoice); /* not dealing with the rest
*/
+ copy_if_better_choice(&curchoice, &bestchoice);
- military_advisor_choose_tech(pplayer, &curchoice);
- adjust_tech_choice(pplayer, &curchoice, &bestchoice, ADV_MILITARY);
-
- trade_advisor_choose_tech(pplayer, &curchoice);
- adjust_tech_choice(pplayer, &curchoice, &bestchoice, ADV_TRADE);
-
- science_advisor_choose_tech(pplayer, &curchoice);
- adjust_tech_choice(pplayer, &curchoice, &bestchoice, ADV_SCIENCE);
-
- foreign_advisor_choose_tech(pplayer, &curchoice);
- adjust_tech_choice(pplayer, &curchoice, &bestchoice, ADV_FOREIGN);
-
- attitude_advisor_choose_tech(pplayer, &curchoice);
- adjust_tech_choice(pplayer, &curchoice , &bestchoice, ADV_ATTITUDE);
-
- if (bestchoice.want == 0) {/* remove when the ai is done */
+ if (bestchoice.want == 0) {
ai_next_tech_goal_default(pplayer, &bestchoice);
}
- if (bestchoice.want != 0)
+ if (bestchoice.want != 0) {
pplayer->ai.tech_goal = bestchoice.choice;
+ }
}
/**************************************************************************
Index: common/nation.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/nation.h,v
retrieving revision 1.25
diff -u -r1.25 nation.h
--- common/nation.h 15 Sep 2003 16:51:07 -0000 1.25
+++ common/nation.h 20 Sep 2003 18:40:04 -0000
@@ -36,9 +36,6 @@
struct Sprite; /* opaque; client-gui specific */
struct player;
-enum advisor_type {ADV_ISLAND, ADV_MILITARY, ADV_TRADE, ADV_SCIENCE,
ADV_FOREIGN,
- ADV_ATTITUDE, ADV_DOMESTIC, ADV_LAST};
-
/*
* The city_name structure holds information about a default choice for
* the city name. The "name" field is, of course, just the name for
@@ -92,16 +89,6 @@
* Advances given to this nation at game start.
*/
int init_techs[MAX_NUM_TECH_LIST];
-
- /* AI hints */
- int attack; /* c 0 = optimize for food, 2 = optimize for prod
*/
- /* c0 = large amount of buildings, 2 = units */
- /* attack has been un-implemented for the time being. -- Syela */
- int expand; /* c0 = transform first , 2 = build cities first
*/
- /* expand has been un-implemented, probably permanently. -- Syela */
- int civilized; /* c 0 = don't use nukes, 2 = use nukes, lots of
pollution */
- /* civilized was never implemented, but will be eventually. -- Syela */
- int advisors[ADV_LAST]; /* never implemented either. -- Syela */
/* Following basically disabled -- Syela */
/* Note the client doesn't use/have these. */
Index: data/default/nations.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/nations.ruleset,v
retrieving revision 1.62
diff -u -r1.62 nations.ruleset
--- data/default/nations.ruleset 29 Jan 2003 01:46:05 -0000 1.62
+++ data/default/nations.ruleset 20 Sep 2003 18:40:04 -0000
@@ -25,15 +25,7 @@
; preferred flag icon
; flag_alt = alternate flag icon string, or "-"
;
-; Next are some hints for AI, as defined in struct player_race
-; Ask the guy who designed this struct for more explanation :-)
-; AFAIK some of them are not implemented yet.
-;
-; attack = c 0 = optimize for food, 2 = optimize for prod
-; c0 = large amount of buildings, 2 = units
-; expand = c0 = transform first , 2 = build cities first
-; civilized = c 0 = do not use nukes, 2 = use nukes, lots of pollution
-; advisors = some kind of advisors, not implemented anyway
+; The following AI hints are currently not used, but may be in the future:
; tech_goals = technology goals, up to 10
; wonder = primary wonder
; government = wanted government
Index: data/nation/american.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/american.ruleset,v
retrieving revision 1.10
diff -u -r1.10 american.ruleset
--- data/nation/american.ruleset 15 Sep 2003 17:03:24 -0000 1.10
+++ data/nation/american.ruleset 20 Sep 2003 18:40:04 -0000
@@ -65,10 +65,6 @@
"Fundamentalism", _("Reverend"), _("Reverend")
}
-attack=0
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Trade", "Engineering", "Democracy",
"Railroad", "Explosives", "Automobile"
Index: data/nation/arab.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/arab.ruleset,v
retrieving revision 1.5
diff -u -r1.5 arab.ruleset
--- data/nation/arab.ruleset 15 Sep 2003 17:03:24 -0000 1.5
+++ data/nation/arab.ruleset 20 Sep 2003 18:40:04 -0000
@@ -15,10 +15,6 @@
"Monarchy", _("Caliph"), _("Caliph")
}
-attack=2
-expand=1
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy", "Philosophy", "Chivalry", "Trade", "Bridge Building",
"Railroad"
Index: data/nation/argentine.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/argentine.ruleset,v
retrieving revision 1.9
diff -u -r1.9 argentine.ruleset
--- data/nation/argentine.ruleset 15 Sep 2003 17:03:24 -0000 1.9
+++ data/nation/argentine.ruleset 20 Sep 2003 18:40:04 -0000
@@ -14,10 +14,6 @@
flag_alt = "-"
city_style = "European"
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy", "The Republic", "Iron Working", "Trade", "Navigation",
Index: data/nation/australian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/australian.ruleset,v
retrieving revision 1.7
diff -u -r1.7 australian.ruleset
--- data/nation/australian.ruleset 3 Feb 2003 00:30:33 -0000 1.7
+++ data/nation/australian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -15,10 +15,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Chivalry","Iron Working","Trade","Navigation",
Index: data/nation/aztec.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/aztec.ruleset,v
retrieving revision 1.6
diff -u -r1.6 aztec.ruleset
--- data/nation/aztec.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/aztec.ruleset 20 Sep 2003 18:40:04 -0000
@@ -13,10 +13,6 @@
flag_alt = "-"
city_style = "Tropical"
-attack=1
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Chivalry", "Iron Working", "Trade",
Index: data/nation/babylonian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/babylonian.ruleset,v
retrieving revision 1.7
diff -u -r1.7 babylonian.ruleset
--- data/nation/babylonian.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/babylonian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
flag_alt = "-"
city_style = "Classical"
-attack=0
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy","Philosophy","Mathematics","Chivalry",
Index: data/nation/barbarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/barbarian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 barbarian.ruleset
--- data/nation/barbarian.ruleset 30 Jan 2003 00:05:54 -0000 1.6
+++ data/nation/barbarian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -8,10 +8,6 @@
flag_alt = "-"
city_style = "European"
-attack=0
-expand=0
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Warrior Code"
Index: data/nation/bavarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/bavarian.ruleset,v
retrieving revision 1.7
diff -u -r1.7 bavarian.ruleset
--- data/nation/bavarian.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/bavarian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
flag_alt = "-"
city_style = "European"
-attack=1
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Feudalism", "Gunpowder", "Railroad",
"Explosives"
Index: data/nation/boer.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/boer.ruleset,v
retrieving revision 1.7
diff -u -r1.7 boer.ruleset
--- data/nation/boer.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/boer.ruleset 20 Sep 2003 18:40:04 -0000
@@ -15,10 +15,6 @@
flag_alt = "-"
city_style = "European"
-attack=1
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Trade", "Engineering", "Gunpowder",
"Railroad", "Explosives"
Index: data/nation/brazilian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/brazilian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 brazilian.ruleset
--- data/nation/brazilian.ruleset 15 Sep 2003 17:03:24 -0000 1.10
+++ data/nation/brazilian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -21,10 +21,6 @@
"Fundamentalism", _("Director-President"),
_("Director-President")
}
-attack=0
-expand=1
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Ceremonial Burial", "Code of Laws", "Bridge Building",
"Flight", "Banking", "Conscription", "The Corporation",
Index: data/nation/canadian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/canadian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 canadian.ruleset
--- data/nation/canadian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/canadian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=0
-expand=1
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Trade", "Engineering", "Democracy",
"Railroad", "Explosives", "Automobile"
Index: data/nation/carthaginian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/carthaginian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 carthaginian.ruleset
--- data/nation/carthaginian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/carthaginian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
flag_alt = "-"
city_style = "Classical"
-attack=2
-expand=1
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy", "Philosophy","Chivalry","Trade","Bridge Building",
Index: data/nation/catalan.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/catalan.ruleset,v
retrieving revision 1.9
diff -u -r1.9 catalan.ruleset
--- data/nation/catalan.ruleset 15 Sep 2003 17:03:24 -0000 1.9
+++ data/nation/catalan.ruleset 20 Sep 2003 18:40:04 -0000
@@ -20,10 +20,6 @@
"Fundamentalism", _("Arquebisbe"), _("Gran Bruixa")
}
-attack=1
-expand=1
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Navigation", "Chivalry", "Trade",
Index: data/nation/chilean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/chilean.ruleset,v
retrieving revision 1.11
diff -u -r1.11 chilean.ruleset
--- data/nation/chilean.ruleset 15 Sep 2003 17:03:24 -0000 1.11
+++ data/nation/chilean.ruleset 20 Sep 2003 18:40:04 -0000
@@ -21,10 +21,6 @@
"Democracy", _("President"), _("President")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Iron Working", "Trade", "Navigation", "The Republic",
Index: data/nation/chinese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/chinese.ruleset,v
retrieving revision 1.6
diff -u -r1.6 chinese.ruleset
--- data/nation/chinese.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/chinese.ruleset 20 Sep 2003 18:40:04 -0000
@@ -17,10 +17,6 @@
"Communism", _("Chairman"), _("Chairperson")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Trade", "Philosophy", "Bridge Building",
Index: data/nation/cornish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/cornish.ruleset,v
retrieving revision 1.6
diff -u -r1.6 cornish.ruleset
--- data/nation/cornish.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/cornish.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
flag_alt = "f.england"
city_style = "European"
-attack=1
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Iron Working", "Feudalism", "Invention"
wonder = "King Richard's Crusade"
Index: data/nation/croatian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/croatian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 croatian.ruleset
--- data/nation/croatian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/croatian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -25,10 +25,6 @@
"Democracy", _("President"), _("President")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="The Republic", "Trade", "Engineering", "Democracy",
Index: data/nation/danish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/danish.ruleset,v
retrieving revision 1.10
diff -u -r1.10 danish.ruleset
--- data/nation/danish.ruleset 15 Sep 2003 17:03:24 -0000 1.10
+++ data/nation/danish.ruleset 20 Sep 2003 18:40:04 -0000
@@ -26,10 +26,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Chivalry", "Trade", "Theology", "University",
Index: data/nation/dunedain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/dunedain.ruleset,v
retrieving revision 1.8
diff -u -r1.8 dunedain.ruleset
--- data/nation/dunedain.ruleset 15 Sep 2003 17:03:24 -0000 1.8
+++ data/nation/dunedain.ruleset 20 Sep 2003 18:40:04 -0000
@@ -20,10 +20,6 @@
"Monarchy", _("King"), _("Queen")
}
-attack=0
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Iron Working", "Feudalism", "Construction"
wonder="Magellan's Expedition"
Index: data/nation/dutch.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/dutch.ruleset,v
retrieving revision 1.8
diff -u -r1.8 dutch.ruleset
--- data/nation/dutch.ruleset 15 Sep 2003 17:03:24 -0000 1.8
+++ data/nation/dutch.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=2
-expand=2
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Map Making", "The Republic", "Trade", "Navigation",
Index: data/nation/egyptian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/egyptian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 egyptian.ruleset
--- data/nation/egyptian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/egyptian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -19,10 +19,6 @@
"Monarchy", _("Great Pharaoh"), _("Great Pharaoh")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "Navigation", "Iron Working",
Index: data/nation/english.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/english.ruleset,v
retrieving revision 1.8
diff -u -r1.8 english.ruleset
--- data/nation/english.ruleset 15 Sep 2003 17:03:24 -0000 1.8
+++ data/nation/english.ruleset 20 Sep 2003 18:40:04 -0000
@@ -19,10 +19,6 @@
"Fundamentalism", _("Lord Protector"), _("Lady Protector")
}
-attack=1
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Chivalry", "Trade", "Theology", "Monotheism",
Index: data/nation/estonian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/estonian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 estonian.ruleset
--- data/nation/estonian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/estonian.ruleset 20 Sep 2003 18:40:04 -0000
@@ -14,10 +14,6 @@
flag_alt = "-"
city_style = "European"
-attack=2
-expand=1
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy","Chivalry","The Republic","Democracy","Conscription"
wonder="United Nations"
Index: data/nation/filipino.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/filipino.ruleset,v
retrieving revision 1.10
diff -u -r1.10 filipino.ruleset
--- data/nation/filipino.ruleset 15 Sep 2003 17:03:24 -0000 1.10
+++ data/nation/filipino.ruleset 20 Sep 2003 18:40:04 -0000
@@ -12,10 +12,6 @@
flag_alt = "-"
city_style = "Asian"
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Gunpowder", "Democracy"
wonder="Hoover Dam"
Index: data/nation/finnish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/finnish.ruleset,v
retrieving revision 1.7
diff -u -r1.7 finnish.ruleset
--- data/nation/finnish.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/finnish.ruleset 20 Sep 2003 18:40:04 -0000
@@ -19,10 +19,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=2
-expand=0
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Iron Working", "Literacy", "Engineering", "Map Making",
Index: data/nation/french.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/french.ruleset,v
retrieving revision 1.8
diff -u -r1.8 french.ruleset
--- data/nation/french.ruleset 15 Sep 2003 17:03:24 -0000 1.8
+++ data/nation/french.ruleset 20 Sep 2003 18:40:04 -0000
@@ -14,10 +14,6 @@
"Fundamentalism", _("Archbishop"), _("Archbishop")
}
-attack=2
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Chivalry", "Philosophy", "The Republic",
Index: data/nation/greek.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/greek.ruleset,v
retrieving revision 1.8
diff -u -r1.8 greek.ruleset
--- data/nation/greek.ruleset 15 Sep 2003 17:03:24 -0000 1.8
+++ data/nation/greek.ruleset 20 Sep 2003 18:40:05 -0000
@@ -13,10 +13,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=2
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Philosophy", "Trade", "Engineering",
"Iron Working", "Railroad"
Index: data/nation/hungarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/hungarian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 hungarian.ruleset
--- data/nation/hungarian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/hungarian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -10,10 +10,6 @@
flag_alt = "-"
city_style = "European"
-attack=2
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Iron Working", "Chivalry", "Theology",
Index: data/nation/inca.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/inca.ruleset,v
retrieving revision 1.7
diff -u -r1.7 inca.ruleset
--- data/nation/inca.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/inca.ruleset 20 Sep 2003 18:40:05 -0000
@@ -18,10 +18,6 @@
"Despotism", _("Warlord"), _("Warlord")
}
-attack=2
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Chivalry","Philosophy","Monotheism", "Invention"
Index: data/nation/indian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/indian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 indian.ruleset
--- data/nation/indian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/indian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -13,10 +13,6 @@
"Monarchy", _("Maharaja"), _("Maharaja")
}
-attack=0
-expand=0
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "The Republic", "Iron Working",
"Engineering", "Railroad"
Index: data/nation/irish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/irish.ruleset,v
retrieving revision 1.7
diff -u -r1.7 irish.ruleset
--- data/nation/irish.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/irish.ruleset 20 Sep 2003 18:40:05 -0000
@@ -9,10 +9,6 @@
flag_alt = "-"
city_style = "European"
-attack=2
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Engineering", "Gunpowder", "Explosives"
wonder = "Marco Polo's Embassy"
Index: data/nation/israeli.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/israeli.ruleset,v
retrieving revision 1.7
diff -u -r1.7 israeli.ruleset
--- data/nation/israeli.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/israeli.ruleset 20 Sep 2003 18:40:05 -0000
@@ -16,10 +16,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Iron Working","Trade","Monotheism","Navigation",
Index: data/nation/italian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/italian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 italian.ruleset
--- data/nation/italian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/italian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -15,10 +15,6 @@
flag_alt = "-"
city_style = "European"
-attack=1
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "The Wheel", "Iron Working", "Construction",
"Railroad"
Index: data/nation/japanese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/japanese.ruleset,v
retrieving revision 1.6
diff -u -r1.6 japanese.ruleset
--- data/nation/japanese.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/japanese.ruleset 20 Sep 2003 18:40:05 -0000
@@ -14,10 +14,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=2
-expand=0
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "The Republic", "Iron Working",
"Engineering", "Railroad"
Index: data/nation/kenyan.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/kenyan.ruleset,v
retrieving revision 1.5
diff -u -r1.5 kenyan.ruleset
--- data/nation/kenyan.ruleset 21 Mar 2003 17:32:09 -0000 1.5
+++ data/nation/kenyan.ruleset 20 Sep 2003 18:40:05 -0000
@@ -11,7 +11,6 @@
attack = 2
expand = 2
civilized = 1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Warrior Code","Iron Working","Navigation"
wonder="Sun Tzu's War Academy"
Index: data/nation/korean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/korean.ruleset,v
retrieving revision 1.6
diff -u -r1.6 korean.ruleset
--- data/nation/korean.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/korean.ruleset 20 Sep 2003 18:40:05 -0000
@@ -9,10 +9,6 @@
flag_alt = "-"
city_style = "Asian"
-attack=0
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Iron Working","Philosophy","Invention","Gunpowder",
Index: data/nation/latvian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/latvian.ruleset,v
retrieving revision 1.7
diff -u -r1.7 latvian.ruleset
--- data/nation/latvian.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/latvian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -11,10 +11,6 @@
flag_alt = "-"
city_style = "European"
-attack=2
-expand=1
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy","Chivalry","Gunpowder","Industrialization"
wonder="Cure For Cancer"
Index: data/nation/lithuanian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/lithuanian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 lithuanian.ruleset
--- data/nation/lithuanian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/lithuanian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -15,10 +15,6 @@
"Monarchy", _("Great Duke"), _("Great Duchess")
}
-attack=2
-expand=1
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy","Chivalry","The Republic","Railroad","Explosives"
wonder="Copernicus' Observatory"
Index: data/nation/mongol.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mongol.ruleset,v
retrieving revision 1.6
diff -u -r1.6 mongol.ruleset
--- data/nation/mongol.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/mongol.ruleset 20 Sep 2003 18:40:05 -0000
@@ -17,10 +17,6 @@
"Monarchy", _("Great Khan"), _("Great Khan")
}
-attack=2
-expand=2
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Chivalry", "Trade", "Bridge Building",
Index: data/nation/mordor.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mordor.ruleset,v
retrieving revision 1.6
diff -u -r1.6 mordor.ruleset
--- data/nation/mordor.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/mordor.ruleset 20 Sep 2003 18:40:05 -0000
@@ -16,10 +16,6 @@
"Monarchy", _("Dark Lord"), _("Dark Lord")
}
-attack=0
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Bronze Working", "Iron Working", "Construction"
wonder="Sun Tzu's War Academy"
Index: data/nation/persian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/persian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 persian.ruleset
--- data/nation/persian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/persian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -15,10 +15,6 @@
"Monarchy", _("Shah"), _("Shah")
}
-attack=1
-expand=2
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Polytheism", "Philosophy", "Trade", "Engineering",
"Iron Working", "Railroad"
Index: data/nation/polish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/polish.ruleset,v
retrieving revision 1.12
diff -u -r1.12 polish.ruleset
--- data/nation/polish.ruleset 15 Sep 2003 17:03:24 -0000 1.12
+++ data/nation/polish.ruleset 20 Sep 2003 18:40:05 -0000
@@ -21,10 +21,6 @@
"Democracy", _("Prezydent"), _("Prezydent")
}
-attack=2
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Trade", "Engineering", "Monotheism",
"Gunpowder", "Railroad"
Index: data/nation/portuguese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/portuguese.ruleset,v
retrieving revision 1.7
diff -u -r1.7 portuguese.ruleset
--- data/nation/portuguese.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/portuguese.ruleset 20 Sep 2003 18:40:05 -0000
@@ -18,10 +18,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=2
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Iron Working", "Navigation", "Trade",
"The Republic", "Railroad"
Index: data/nation/roman.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/roman.ruleset,v
retrieving revision 1.10
diff -u -r1.10 roman.ruleset
--- data/nation/roman.ruleset 15 Sep 2003 17:03:24 -0000 1.10
+++ data/nation/roman.ruleset 20 Sep 2003 18:40:05 -0000
@@ -17,10 +17,6 @@
"Monarchy", _("Imperator"), _("Imperatrix")
}
-attack=1
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "The Wheel", "Iron Working", "Construction",
"Railroad"
Index: data/nation/russian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/russian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 russian.ruleset
--- data/nation/russian.ruleset 15 Sep 2003 17:03:24 -0000 1.5
+++ data/nation/russian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -16,10 +16,6 @@
"Fundamentalism", _("Patriarch"), _("Matriarch")
}
-attack=2
-expand=1
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "Chivalry", "Trade",
Index: data/nation/scottish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/scottish.ruleset,v
retrieving revision 1.11
diff -u -r1.11 scottish.ruleset
--- data/nation/scottish.ruleset 15 Sep 2003 17:03:24 -0000 1.11
+++ data/nation/scottish.ruleset 20 Sep 2003 18:40:05 -0000
@@ -19,10 +19,6 @@
"Democracy", _("First Minister"), _("First Minister")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Iron Working","Trade","Navigation","Railroad","Steel",
Index: data/nation/serbian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/serbian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 serbian.ruleset
--- data/nation/serbian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/serbian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -22,10 +22,6 @@
"Democracy", _("President"), _("President")
}
-attack=2
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="The Republic", "The Wheel", "Iron Working", "Construction",
Index: data/nation/silesian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/silesian.ruleset,v
retrieving revision 1.6
diff -u -r1.6 silesian.ruleset
--- data/nation/silesian.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/silesian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -15,10 +15,6 @@
"Monarchy", _("Prince"), _("Princess")
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=0
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="The Republic", "Trade", "Feudalism", "Railroad", "Steel"
Index: data/nation/singaporean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/singaporean.ruleset,v
retrieving revision 1.6
diff -u -r1.6 singaporean.ruleset
--- data/nation/singaporean.ruleset 30 Jan 2003 00:05:54 -0000 1.6
+++ data/nation/singaporean.ruleset 20 Sep 2003 18:40:05 -0000
@@ -33,10 +33,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Iron Working", "Trade", "Monotheism", "Navigation",
"Railroad", "Steel", "Industrialization"
Index: data/nation/sioux.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/sioux.ruleset,v
retrieving revision 1.6
diff -u -r1.6 sioux.ruleset
--- data/nation/sioux.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/sioux.ruleset 20 Sep 2003 18:40:05 -0000
@@ -14,10 +14,6 @@
"Monarchy", _("Great Chief"), _("Great Chief")
}
-attack=2
-expand=0
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "The Republic", "Iron Working"
wonder="Sun Tzu's War Academy"
Index: data/nation/slovenian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/slovenian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 slovenian.ruleset
--- data/nation/slovenian.ruleset 15 Sep 2003 17:03:24 -0000 1.5
+++ data/nation/slovenian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -16,10 +16,6 @@
"Democracy", _("President"), _("President")
}
-attack=0
-expand=1
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="The Republic", "Trade", "Engineering", "Democracy",
Index: data/nation/spanish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/spanish.ruleset,v
retrieving revision 1.7
diff -u -r1.7 spanish.ruleset
--- data/nation/spanish.ruleset 15 Sep 2003 17:03:24 -0000 1.7
+++ data/nation/spanish.ruleset 20 Sep 2003 18:40:05 -0000
@@ -21,10 +21,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "Navigation", "Iron Working",
"Railroad"
Index: data/nation/swedish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/swedish.ruleset,v
retrieving revision 1.11
diff -u -r1.11 swedish.ruleset
--- data/nation/swedish.ruleset 15 Sep 2003 17:03:24 -0000 1.11
+++ data/nation/swedish.ruleset 20 Sep 2003 18:40:05 -0000
@@ -16,10 +16,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=2
-expand=2
-civilized=0
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Map Making", "The Republic", "Trade", "Gunpowder"
Index: data/nation/thai.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/thai.ruleset,v
retrieving revision 1.8
diff -u -r1.8 thai.ruleset
--- data/nation/thai.ruleset 15 Sep 2003 17:03:24 -0000 1.8
+++ data/nation/thai.ruleset 20 Sep 2003 18:40:05 -0000
@@ -14,10 +14,6 @@
flag_alt = "-"
city_style = "Asian"
-attack=1
-expand=2
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "Engineering", "Invention", "Railroad",
"Explosives"
Index: data/nation/turk.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/turk.ruleset,v
retrieving revision 1.6
diff -u -r1.6 turk.ruleset
--- data/nation/turk.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/turk.ruleset 20 Sep 2003 18:40:05 -0000
@@ -19,10 +19,6 @@
"Monarchy", _("Sultan"), _("Sultan")
}
-attack=1
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "Mathematics", "Chivalry",
Index: data/nation/ukrainian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/ukrainian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 ukrainian.ruleset
--- data/nation/ukrainian.ruleset 15 Sep 2003 17:03:24 -0000 1.5
+++ data/nation/ukrainian.ruleset 20 Sep 2003 18:40:05 -0000
@@ -15,10 +15,6 @@
"Despotism", _("Hetman"), _("Hetman")
}
-attack=0
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Chivalry","The Republic","Gunpowder","Leadership","Explosives"
wonder="Sun Tzu's War Academy"
Index: data/nation/vietnamese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/vietnamese.ruleset,v
retrieving revision 1.5
diff -u -r1.5 vietnamese.ruleset
--- data/nation/vietnamese.ruleset 30 Jan 2003 00:05:54 -0000 1.5
+++ data/nation/vietnamese.ruleset 20 Sep 2003 18:40:05 -0000
@@ -12,10 +12,6 @@
flag_alt = "-"
city_style = "Asian"
-attack=0
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Feudalism", "The Republic", "Gunpowder", "Explosives",
"Guerilla Warfare"
Index: data/nation/viking.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/viking.ruleset,v
retrieving revision 1.9
diff -u -r1.9 viking.ruleset
--- data/nation/viking.ruleset 20 Sep 2003 18:30:19 -0000 1.9
+++ data/nation/viking.ruleset 20 Sep 2003 18:40:05 -0000
@@ -17,10 +17,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=2
-expand=2
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "The Republic", "The Wheel", "Iron Working", "Construction",
Index: data/nation/welsh.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/welsh.ruleset,v
retrieving revision 1.6
diff -u -r1.6 welsh.ruleset
--- data/nation/welsh.ruleset 15 Sep 2003 17:03:24 -0000 1.6
+++ data/nation/welsh.ruleset 20 Sep 2003 18:40:05 -0000
@@ -22,10 +22,6 @@
"Democracy", _("Prime Minister"), _("Prime Minister")
}
-attack=1
-expand=1
-civilized=2
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals="Monarchy","Iron Working","Trade","Navigation","Railroad","Steel",
Index: data/nation/zulu.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/zulu.ruleset,v
retrieving revision 1.8
diff -u -r1.8 zulu.ruleset
--- data/nation/zulu.ruleset 30 Jan 2003 00:05:54 -0000 1.8
+++ data/nation/zulu.ruleset 20 Sep 2003 18:40:05 -0000
@@ -24,10 +24,6 @@
flag_alt = "f.rwanda" ; used previously
city_style = "Tropical"
-attack=2
-expand=1
-civilized=1
-advisors=100,100,100,100,100,100,100
init_techs=""
tech_goals = "Monarchy", "Philosophy", "Chivalry", "Trade", "Bridge Building",
Index: server/ruleset.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/ruleset.c,v
retrieving revision 1.153
diff -u -r1.153 ruleset.c
--- server/ruleset.c 15 Sep 2003 16:51:07 -0000 1.153
+++ server/ruleset.c 20 Sep 2003 18:40:06 -0000
@@ -2048,7 +2048,7 @@
char *datafile_options, *bad_leader, *g;
struct nation_type *pl;
struct government *gov;
- int *res, dim, val, i, j, k, nval;
+ int dim, val, i, j, k, nval;
char temp_name[MAX_LEN_NAME];
char **techs, **leaders, **sec, **civilwar_nations;
const char *filename = secfile_filename(file);
@@ -2198,22 +2198,6 @@
* of being chosen. */
pl->civilwar_nations[j] = NO_NATION_SELECTED;
-
- /* AI stuff */
-
- pl->attack = secfile_lookup_int_default(file, 2, "%s.attack", sec[i]);
- pl->expand = secfile_lookup_int_default(file, 2, "%s.expand", sec[i]);
- pl->civilized = secfile_lookup_int_default(file, 2, "%s.civilized",
sec[i]);
-
- res = secfile_lookup_int_vec(file, &dim, "%s.advisors", sec[i]);
- if (dim != ADV_LAST) {
- freelog(LOG_FATAL, "Nation %s: number of advisors must be %d but is %d",
- pl->name_plural, ADV_LAST, dim);
- exit(EXIT_FAILURE);
- }
- for ( j=0; j<ADV_LAST; j++)
- pl->advisors[j] = res[j];
- if(res) free(res);
/* Load nation specific initial techs */
- [Freeciv-Dev] (PR#6214) Remove AI advisors,
Per I. Mathisen <=
|
|
