[Freeciv-Dev] (PR#12914) make flags-versus-shields a client option
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12914 >
This patch makes the flags versus shields tileset choice into a client
(user) option. The option, if set, applies only to units (not to
cities), though this could be changed in the future.
1. An option is added.
2. Both flags and shields are loaded by the tilespec code.
3. This means all the shield sprite tag names must be changed.
4. This means all the tag names in the ruleset must be changed.
In the old model the ruleset specified "f.usa" in the ruleset file, and
the client loaded the sprite tag with this exact name. In the new model
the ruleset specifies "usa" in the ruleset file, and the client uses
this text to assemble various sprite names (currently "f.usa" and
"f.shield.usa") which it loads. The new model could be extended to even
more types of flag graphics (different sizes, etc.).
-jason
Index: client/options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.126
diff -u -r1.126 options.c
--- client/options.c 25 Apr 2005 06:19:31 -0000 1.126
+++ client/options.c 27 Apr 2005 19:53:40 -0000
@@ -165,6 +165,11 @@
"name and attributes, a large amount of data will be "
"drawn beneach each city in the 'citybar'."),
COC_GRAPHICS),
+ GEN_BOOL_OPTION(draw_unit_shields, N_("Draw shield graphics for units"),
+ N_("If set, then special shield graphics will be drawn "
+ "as the flags on units. If unset, the full flag will "
+ "be drawn."),
+ COC_GRAPHICS),
GEN_BOOL_OPTION(ai_manual_turn_done, N_("Manual Turn Done in AI Mode"),
N_("If this option is disabled, then you will not have "
"to press the turn done button manually when watching "
@@ -234,6 +239,7 @@
bool draw_fog_of_war = TRUE;
bool draw_borders = TRUE;
bool draw_full_citybar = TRUE;
+bool draw_unit_shields = TRUE;
#define VIEW_OPTION(name) { #name, &name }
#define VIEW_OPTION_TERMINATOR { NULL, NULL }
Index: client/options.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.h,v
retrieving revision 1.49
diff -u -r1.49 options.h
--- client/options.h 25 Apr 2005 06:19:31 -0000 1.49
+++ client/options.h 27 Apr 2005 19:53:41 -0000
@@ -138,6 +138,7 @@
extern bool draw_fog_of_war;
extern bool draw_borders;
extern bool draw_full_citybar;
+extern bool draw_unit_shields;
typedef struct {
const char *name;
Index: client/tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.296
diff -u -r1.296 tilespec.c
--- client/tilespec.c 25 Apr 2005 06:19:31 -0000 1.296
+++ client/tilespec.c 27 Apr 2005 19:53:41 -0000
@@ -134,6 +134,7 @@
struct sprite *unittype[U_LAST];
struct sprite_vector nation_flag;
+ struct sprite_vector nation_shield;
struct citizen_graphic {
/* Each citizen type has up to MAX_NUM_CITIZEN_SPRITES different
@@ -383,7 +384,7 @@
struct tileset *tileset;
-#define TILESPEC_CAPSTR "+tilespec3 duplicates_ok +Freeciv.Devel.2005.Apr.8"
+#define TILESPEC_CAPSTR "+tilespec3 duplicates_ok +Freeciv.Devel.2005.Apr.27"
/*
* Tilespec capabilities acceptable to this program:
*
@@ -2221,6 +2222,7 @@
t->sprites.city.tile_wall = NULL;
t->sprites.city.tile = NULL;
sprite_vector_init(&t->sprites.nation_flag);
+ sprite_vector_init(&t->sprites.nation_shield);
}
/**************************************************************************
@@ -2572,21 +2574,30 @@
struct nation_type *nation = get_nation_by_idx(id);
char *tags[] = {nation->flag_graphic_str,
nation->flag_graphic_alt,
- "f.unknown", NULL};
+ "unknown", NULL};
int i;
- struct sprite *sprite = NULL;
+ struct sprite *flag = NULL, *shield = NULL;
+ char buf[1024];
- for (i = 0; tags[i] && !sprite; i++) {
- sprite = load_sprite(t, tags[i]);
+ for (i = 0; tags[i] && !flag; i++) {
+ my_snprintf(buf, sizeof(buf), "f.%s", tags[i]);
+ flag = load_sprite(t, buf);
+ }
+ for (i = 0; tags[i] && !shield; i++) {
+ my_snprintf(buf, sizeof(buf), "f.shield.%s", tags[i]);
+ shield = load_sprite(t, buf);
}
- if (!sprite) {
+ if (!flag || !shield) {
/* Should never get here because of the f.unknown fallback. */
freelog(LOG_FATAL, "No national flag for %s.", nation->name);
exit(EXIT_FAILURE);
}
sprite_vector_reserve(&t->sprites.nation_flag, game.nation_count);
- t->sprites.nation_flag.p[id] = sprite;
+ t->sprites.nation_flag.p[id] = flag;
+
+ sprite_vector_reserve(&t->sprites.nation_shield, game.nation_count);
+ t->sprites.nation_shield.p[id] = shield;
}
/**********************************************************************
@@ -2604,7 +2615,13 @@
static struct sprite *get_unit_nation_flag_sprite(const struct tileset *t,
const struct unit *punit)
{
- return get_nation_flag_sprite(t, unit_owner(punit)->nation);
+ Nation_Type_id nation = unit_owner(punit)->nation;
+
+ if (draw_unit_shields) {
+ return t->sprites.nation_shield.p[nation];
+ } else {
+ return t->sprites.nation_flag.p[nation];
+ }
}
/**************************************************************************
Index: common/capstr.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v
retrieving revision 1.235
diff -u -r1.235 capstr.c
--- common/capstr.c 23 Apr 2005 04:26:57 -0000 1.235
+++ common/capstr.c 27 Apr 2005 19:53:41 -0000
@@ -82,7 +82,7 @@
* as long as possible. We want to maintain network compatibility with
* the stable branch for as long as possible.
*/
-#define CAPABILITY "+Freeciv.Devel.2005.Apr.23"
+#define CAPABILITY "+Freeciv.Devel.2005.Apr.27"
void init_our_capability(void)
{
Index: data/isophex.tilespec
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/isophex.tilespec,v
retrieving revision 1.15
diff -u -r1.15 isophex.tilespec
--- data/isophex.tilespec 25 Apr 2005 06:19:31 -0000 1.15
+++ data/isophex.tilespec 27 Apr 2005 19:53:41 -0000
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = "+tilespec3 +Freeciv.Devel.2005.Apr.8"
+options = "+tilespec3 +Freeciv.Devel.2005.Apr.27"
; A simple name for the tileset specified by this file:
name = "isophex"
@@ -74,6 +74,7 @@
"trident/units.spec",
"isotrident/unitextras.spec",
"misc/flags.spec",
+ "misc/shields.spec",
"misc/cursors.spec",
"misc/space.spec",
"misc/treaty.spec",
Index: data/isotrident.tilespec
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/isotrident.tilespec,v
retrieving revision 1.38
diff -u -r1.38 isotrident.tilespec
--- data/isotrident.tilespec 25 Apr 2005 06:19:32 -0000 1.38
+++ data/isotrident.tilespec 27 Apr 2005 19:53:42 -0000
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = "+tilespec3 +Freeciv.Devel.2005.Apr.8"
+options = "+tilespec3 +Freeciv.Devel.2005.Apr.27"
; A simple name for the tileset specified by this file:
name = "MacroIsoTrident"
@@ -64,6 +64,7 @@
"isotrident/unitextras.spec",
"isotrident/select.spec",
"misc/flags.spec",
+ "misc/shields.spec",
"misc/cursors.spec",
"misc/buildings.spec",
"misc/space.spec",
Index: data/trident.tilespec
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/trident.tilespec,v
retrieving revision 1.38
diff -u -r1.38 trident.tilespec
--- data/trident.tilespec 25 Apr 2005 06:19:32 -0000 1.38
+++ data/trident.tilespec 27 Apr 2005 19:53:42 -0000
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = "+tilespec3 +Freeciv.Devel.2005.Apr.8"
+options = "+tilespec3 +Freeciv.Devel.2005.Apr.27"
; A simple name for the tileset specified by this file:
name = "Trident"
@@ -55,6 +55,7 @@
"misc/small.spec",
"trident/units.spec",
"misc/flags.spec",
+ "misc/shields.spec",
"misc/cursors.spec",
"trident/grid.spec",
"trident/roads.spec",
Index: data/misc/shields.spec
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/misc/shields.spec,v
retrieving revision 1.20
diff -u -r1.20 shields.spec
--- data/misc/shields.spec 23 Jan 2005 02:11:09 -0000 1.20
+++ data/misc/shields.spec 27 Apr 2005 19:53:42 -0000
@@ -12,110 +12,110 @@
[extra]
sprites =
{ "tag", "file"
- "f.afghanistan", "flags/afghanistan-shield"
- "f.arab", "flags/arab-shield" ; Saudi Arabia
- "f.argentina", "flags/argentina-shield"
- "f.armenia", "flags/armenia-shield"
- "f.assyria", "flags/assyria-shield"
- "f.australia", "flags/australia-shield"
- "f.austria", "flags/austria-shield"
- "f.azerbaijan", "flags/azerbaijan-shield"
- "f.barbarian", "flags/barbarian-shield"
- "f.bavarian", "flags/bavarian-shield"
- "f.belgium", "flags/belgium-shield"
- "f.boer", "flags/boer-shield" ; old south african
- "f.bosnia", "flags/bosnia-shield"
- "f.brasil", "flags/brasil-shield"
- "f.bulgaria", "flags/bulgaria-shield"
- "f.byzantium", "flags/byzantium-shield"
- "f.canada", "flags/canada-shield"
- "f.catalan", "flags/catalan-shield"
- "f.cheyenne", "flags/cheyenne-shield"
- "f.chile", "flags/chile-shield"
- "f.china", "flags/china-shield"
- "f.columbia", "flags/columbia-shield"
-; "f.constantine", "flags/constantine"
- "f.cornwall", "flags/cornwall-shield"
- "f.croatia", "flags/croatia-shield"
- "f.cuba", "flags/cuba-shield"
- "f.czech", "flags/czech-shield"
- "f.denmark", "flags/denmark-shield"
- "f.dunedain", "flags/dunedain-shield"
- "f.egypt", "flags/egypt-shield"
- "f.elves", "flags/elves-shield"
- "f.england", "flags/england-shield"
- "f.estonia", "flags/estonia-shield"
- "f.ethiopia", "flags/ethiopia-shield"
- "f.europe", "flags/europe-shield"
- "f.finland", "flags/finland-shield"
- "f.france", "flags/france-shield"
- "f.galicia", "flags/galicia-shield"
- "f.germany", "flags/germany-shield"
- "f.greece", "flags/greece-shield"
- "f.greenland", "flags/greenland-shield"
- "f.hobbits", "flags/hobbits-shield"
- "f.holland", "flags/netherlands-shield" ; backward compatabiliy
- "f.hungary", "flags/hungary-shield"
- "f.iceland", "flags/iceland-shield"
- "f.india", "flags/india-shield"
- "f.indonesia", "flags/indonesia-shield"
- "f.iran", "flags/iran-shield"
- "f.iraq_old", "flags/iraq_old-shield"
- "f.ireland", "flags/ireland-shield"
-; "f.ireland", "flags/stpatrick-shield"
- "f.israel", "flags/israel-shield"
- "f.italy", "flags/italy-shield"
- "f.japan", "flags/japan-shield"
- "f.kampuchea", "flags/kampuchea-shield"
- "f.kenya", "flags/kenya-shield"
- "f.korea", "flags/korea-shield"
- "f.krev", "flags/krev-shield"
- "f.latvia", "flags/latvia-shield"
- "f.lithuania", "flags/lithuania-shield"
- "f.macedonia", "flags/macedonia-shield"
- "f.malaysia", "flags/malaysia-shield"
- "f.mars", "flags/mars-shield"
- "f.mexico", "flags/mexico-shield"
- "f.mongolia", "flags/mongolia-shield"
- "f.mordor", "flags/mordor-shield"
- "f.nato", "flags/nato-shield"
- "f.netherlands", "flags/netherlands-shield"
- "f.nigeria", "flags/nigeria-shield"
- "f.norway", "flags/norway-shield"
- "f.observer", "flags/observer-shield"
- "f.pakistan", "flags/pakistan-shield"
- "f.peru", "flags/peru-shield"
- "f.philippines", "flags/philippines-shield"
- "f.phoenicia", "flags/phoenicia-shield"
- "f.poland", "flags/poland-shield"
- "f.portugal", "flags/portugal-shield"
- "f.quebec", "flags/quebec-shield"
- "f.rome", "flags/rome-shield" ; Roman republic flag
- "f.russia", "flags/russia-shield"
- "f.rwanda", "flags/rwanda-shield" ; Alternate Zulu
- "f.scotland", "flags/scotland-shield"
- "f.serbia", "flags/serbia-shield"
- "f.silesia", "flags/silesia-shield"
- "f.singapore", "flags/singapore-shield"
- "f.slovenia", "flags/slovenia-shield"
- "f.south_africa", "flags/south_africa-shield" ; for Zulus
- "f.soviet", "flags/soviet-shield"
- "f.spain", "flags/spain-shield"
- "f.sumeria", "flags/sumeria-shield"
- "f.sweden", "flags/sweden-shield"
- "f.switzerland", "flags/swiss-shield"
- "f.syria", "flags/syria-shield"
- "f.taiwan", "flags/taiwan-shield"
- "f.thailand", "flags/thailand-shield"
- "f.tunisia", "flags/tunisia-shield"
- "f.turkey", "flags/turkey-shield"
- "f.ukraine", "flags/ukraine-shield"
- "f.united_kingdom", "flags/united_kingdom-shield"
- "f.united_nations", "flags/united_nations-shield"
- "f.unknown", "flags/unknown-shield" ; useful for alternates
- "f.usa", "flags/usa-shield"
- "f.venezuela", "flags/venezuela-shield"
- "f.vietnam", "flags/vietnam-shield"
- "f.wales", "flags/wales-shield"
- "f.alien", "flags/alien-shield"
+ "f.shield.afghanistan", "flags/afghanistan-shield"
+ "f.shield.arab", "flags/arab-shield" ; Saudi Arabia
+ "f.shield.argentina", "flags/argentina-shield"
+ "f.shield.armenia", "flags/armenia-shield"
+ "f.shield.assyria", "flags/assyria-shield"
+ "f.shield.australia", "flags/australia-shield"
+ "f.shield.austria", "flags/austria-shield"
+ "f.shield.azerbaijan", "flags/azerbaijan-shield"
+ "f.shield.barbarian", "flags/barbarian-shield"
+ "f.shield.bavarian", "flags/bavarian-shield"
+ "f.shield.belgium", "flags/belgium-shield"
+ "f.shield.boer", "flags/boer-shield" ; old south
african
+ "f.shield.bosnia", "flags/bosnia-shield"
+ "f.shield.brasil", "flags/brasil-shield"
+ "f.shield.bulgaria", "flags/bulgaria-shield"
+ "f.shield.byzantium", "flags/byzantium-shield"
+ "f.shield.canada", "flags/canada-shield"
+ "f.shield.catalan", "flags/catalan-shield"
+ "f.shield.cheyenne", "flags/cheyenne-shield"
+ "f.shield.chile", "flags/chile-shield"
+ "f.shield.china", "flags/china-shield"
+ "f.shield.columbia", "flags/columbia-shield"
+; "f.shield.constantine", "flags/constantine"
+ "f.shield.cornwall", "flags/cornwall-shield"
+ "f.shield.croatia", "flags/croatia-shield"
+ "f.shield.cuba", "flags/cuba-shield"
+ "f.shield.czech", "flags/czech-shield"
+ "f.shield.denmark", "flags/denmark-shield"
+ "f.shield.dunedain", "flags/dunedain-shield"
+ "f.shield.egypt", "flags/egypt-shield"
+ "f.shield.elves", "flags/elves-shield"
+ "f.shield.england", "flags/england-shield"
+ "f.shield.estonia", "flags/estonia-shield"
+ "f.shield.ethiopia", "flags/ethiopia-shield"
+ "f.shield.europe", "flags/europe-shield"
+ "f.shield.finland", "flags/finland-shield"
+ "f.shield.france", "flags/france-shield"
+ "f.shield.galicia", "flags/galicia-shield"
+ "f.shield.germany", "flags/germany-shield"
+ "f.shield.greece", "flags/greece-shield"
+ "f.shield.greenland", "flags/greenland-shield"
+ "f.shield.hobbits", "flags/hobbits-shield"
+ "f.shield.holland", "flags/netherlands-shield" ; backward
compatabiliy
+ "f.shield.hungary", "flags/hungary-shield"
+ "f.shield.iceland", "flags/iceland-shield"
+ "f.shield.india", "flags/india-shield"
+ "f.shield.indonesia", "flags/indonesia-shield"
+ "f.shield.iran", "flags/iran-shield"
+ "f.shield.iraq_old", "flags/iraq_old-shield"
+ "f.shield.ireland", "flags/ireland-shield"
+; "f.shield.ireland", "flags/stpatrick-shield"
+ "f.shield.israel", "flags/israel-shield"
+ "f.shield.italy", "flags/italy-shield"
+ "f.shield.japan", "flags/japan-shield"
+ "f.shield.kampuchea", "flags/kampuchea-shield"
+ "f.shield.kenya", "flags/kenya-shield"
+ "f.shield.korea", "flags/korea-shield"
+ "f.shield.krev", "flags/krev-shield"
+ "f.shield.latvia", "flags/latvia-shield"
+ "f.shield.lithuania", "flags/lithuania-shield"
+ "f.shield.macedonia", "flags/macedonia-shield"
+ "f.shield.malaysia", "flags/malaysia-shield"
+ "f.shield.mars", "flags/mars-shield"
+ "f.shield.mexico", "flags/mexico-shield"
+ "f.shield.mongolia", "flags/mongolia-shield"
+ "f.shield.mordor", "flags/mordor-shield"
+ "f.shield.nato", "flags/nato-shield"
+ "f.shield.netherlands", "flags/netherlands-shield"
+ "f.shield.nigeria", "flags/nigeria-shield"
+ "f.shield.norway", "flags/norway-shield"
+ "f.shield.observer", "flags/observer-shield"
+ "f.shield.pakistan", "flags/pakistan-shield"
+ "f.shield.peru", "flags/peru-shield"
+ "f.shield.philippines", "flags/philippines-shield"
+ "f.shield.phoenicia", "flags/phoenicia-shield"
+ "f.shield.poland", "flags/poland-shield"
+ "f.shield.portugal", "flags/portugal-shield"
+ "f.shield.quebec", "flags/quebec-shield"
+ "f.shield.rome", "flags/rome-shield" ; Roman
republic flag
+ "f.shield.russia", "flags/russia-shield"
+ "f.shield.rwanda", "flags/rwanda-shield" ; Alternate Zulu
+ "f.shield.scotland", "flags/scotland-shield"
+ "f.shield.serbia", "flags/serbia-shield"
+ "f.shield.silesia", "flags/silesia-shield"
+ "f.shield.singapore", "flags/singapore-shield"
+ "f.shield.slovenia", "flags/slovenia-shield"
+ "f.shield.south_africa", "flags/south_africa-shield" ; for
Zulus
+ "f.shield.soviet", "flags/soviet-shield"
+ "f.shield.spain", "flags/spain-shield"
+ "f.shield.sumeria", "flags/sumeria-shield"
+ "f.shield.sweden", "flags/sweden-shield"
+ "f.shield.switzerland", "flags/swiss-shield"
+ "f.shield.syria", "flags/syria-shield"
+ "f.shield.taiwan", "flags/taiwan-shield"
+ "f.shield.thailand", "flags/thailand-shield"
+ "f.shield.tunisia", "flags/tunisia-shield"
+ "f.shield.turkey", "flags/turkey-shield"
+ "f.shield.ukraine", "flags/ukraine-shield"
+ "f.shield.united_kingdom", "flags/united_kingdom-shield"
+ "f.shield.united_nations", "flags/united_nations-shield"
+ "f.shield.unknown", "flags/unknown-shield" ; useful for
alternates
+ "f.shield.usa", "flags/usa-shield"
+ "f.shield.venezuela", "flags/venezuela-shield"
+ "f.shield.vietnam", "flags/vietnam-shield"
+ "f.shield.wales", "flags/wales-shield"
+ "f.shield.alien", "flags/alien-shield"
}
Index: data/nation/afghani.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/afghani.ruleset,v
retrieving revision 1.5
diff -u -r1.5 afghani.ruleset
--- data/nation/afghani.ruleset 25 Mar 2005 18:03:16 -0000 1.5
+++ data/nation/afghani.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
"Zahir Shah", "Daoud Khan"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male"
-flag="f.afghanistan"
+flag="afghanistan"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/american.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/american.ruleset,v
retrieving revision 1.13
diff -u -r1.13 american.ruleset
--- data/nation/american.ruleset 25 Mar 2005 18:03:16 -0000 1.13
+++ data/nation/american.ruleset 27 Apr 2005 19:53:42 -0000
@@ -57,7 +57,7 @@
"Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Female"
-flag="f.usa"
+flag="usa"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/arab.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/arab.ruleset,v
retrieving revision 1.9
diff -u -r1.9 arab.ruleset
--- data/nation/arab.ruleset 30 Mar 2005 04:46:18 -0000 1.9
+++ data/nation/arab.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
leader="Mohammad", "Umar", "Harun al-Rashid", "Saladin",
"Al-Mansur", "Al-Hakim"
leader_sex="Male", "Male", "Male", "Male", "Male", "Male"
-flag ="f.arab"
+flag ="arab"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/argentine.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/argentine.ruleset,v
retrieving revision 1.13
diff -u -r1.13 argentine.ruleset
--- data/nation/argentine.ruleset 25 Mar 2005 18:03:17 -0000 1.13
+++ data/nation/argentine.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
leader_sex="Male", "Male", "Male",
"Male", "Male", "Male",
"Female", "Male"
-flag="f.argentina"
+flag="argentina"
flag_alt = "-"
city_style = "European"
Index: data/nation/assyrian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/assyrian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 assyrian.ruleset
--- data/nation/assyrian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/assyrian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -6,7 +6,7 @@
leader="Ashurbanipal", "Tiglat Pileser III", "Ashurnasirpal II", "Shamiram",
"Agha Petros", "Naoum Faik"
leader_sex="Male", "Male", "Male", "Female", "Male", "Male"
-flag = "f.assyria"
+flag = "assyria"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/australian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/australian.ruleset,v
retrieving revision 1.11
diff -u -r1.11 australian.ruleset
--- data/nation/australian.ruleset 25 Mar 2005 18:03:17 -0000 1.11
+++ data/nation/australian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
the only country on earth to occupy an entire continent.")
leader = "Robert Menzies", "Helen Leonard", "John Curtin", "Edna Lyon"
leader_sex = "Male", "Female", "Male", "Female"
-flag="f.australia"
+flag="australia"
flag_alt = "-"
city_style = "European"
Index: data/nation/austrian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/austrian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 austrian.ruleset
--- data/nation/austrian.ruleset 25 Mar 2005 18:03:17 -0000 1.3
+++ data/nation/austrian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("European")
leader="Maria Theresia", "Franz Joseph", "Luitpold"
leader_sex="Female", "Male", "Male"
-flag="f.austria"
+flag="austria"
flag_alt = "-"
city_style = "European"
Index: data/nation/aztec.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/aztec.ruleset,v
retrieving revision 1.11
diff -u -r1.11 aztec.ruleset
--- data/nation/aztec.ruleset 30 Mar 2005 04:46:18 -0000 1.11
+++ data/nation/aztec.ruleset 27 Apr 2005 19:53:42 -0000
@@ -9,7 +9,7 @@
They were conquered by the Spanish under Cortez in 1524.")
leader="Montezuma", "Cuahtemoc", "Itzcoatl", "Axayacatl"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.mexico"
+flag="mexico"
flag_alt = "-"
city_style = "Tropical"
Index: data/nation/babylonian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/babylonian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 babylonian.ruleset
--- data/nation/babylonian.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/babylonian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,7 +8,7 @@
Kassites, Assyrians, and Chaldeans.")
leader="Hammurabi", "Sargon", "Nebuchadnezzar", "Tiglath-Pileser"
leader_sex="Male", "Male", "Male", "Male"
-flag = "f.iraq_old"
+flag = "iraq_old"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/barbarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/barbarian.ruleset,v
retrieving revision 1.8
diff -u -r1.8 barbarian.ruleset
--- data/nation/barbarian.ruleset 24 Jul 2004 12:26:06 -0000 1.8
+++ data/nation/barbarian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -4,7 +4,7 @@
plural=_("?plural:Barbarians")
leader="Genseric", "Alaric", "Theodoric", "Stilicho", "Attila", "Boadicea"
leader_sex="Male", "Male", "Male", "Male", "Male", "Female"
-flag="f.barbarian"
+flag="barbarian"
flag_alt = "-"
city_style = "European"
Index: data/nation/bavarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/bavarian.ruleset,v
retrieving revision 1.11
diff -u -r1.11 bavarian.ruleset
--- data/nation/bavarian.ruleset 25 Mar 2005 18:03:17 -0000 1.11
+++ data/nation/bavarian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,7 +8,7 @@
leader = "Tassilo III", "Welf I", "Ludwig II", "Maximilian", "Adelheid",
"Max II Emanuel", "Joseph"
leader_sex = "Male", "Male", "Male", "Male", "Female", "Male", "Male"
-flag="f.bavarian"
+flag="bavarian"
flag_alt = "-"
city_style = "European"
Index: data/nation/belgian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/belgian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 belgian.ruleset
--- data/nation/belgian.ruleset 25 Mar 2005 18:03:17 -0000 1.5
+++ data/nation/belgian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -9,7 +9,7 @@
Walloon's nationalist (almost) peaceful fights.")
leader="Leopold", "Albert", "Boudewijn", "Baudouin"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.belgium"
+flag="belgium"
flag_alt = "-"
city_style = "European"
Index: data/nation/boer.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/boer.ruleset,v
retrieving revision 1.12
diff -u -r1.12 boer.ruleset
--- data/nation/boer.ruleset 25 Mar 2005 18:03:17 -0000 1.12
+++ data/nation/boer.ruleset 27 Apr 2005 19:53:42 -0000
@@ -11,7 +11,7 @@
"Paulus Krüger", "Piet Retief", "Jan Smuts"
leader_sex= "Male", "Male", "Male",
"Male", "Male", "Male"
-flag="f.boer"
+flag="boer"
flag_alt = "-"
city_style = "European"
Index: data/nation/bosnia.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/bosnia.ruleset,v
retrieving revision 1.4
diff -u -r1.4 bosnia.ruleset
--- data/nation/bosnia.ruleset 25 Mar 2005 18:03:17 -0000 1.4
+++ data/nation/bosnia.ruleset 27 Apr 2005 19:53:42 -0000
@@ -11,8 +11,8 @@
"Male", "Male", "Male",
"Male","Male", "Male",
"Male", "Male", "Male"
-flag="f.bosnia"
-flag_alt = "f.unknown"
+flag="bosnia"
+flag_alt = "unknown"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/brazilian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/brazilian.ruleset,v
retrieving revision 1.14
diff -u -r1.14 brazilian.ruleset
--- data/nation/brazilian.ruleset 25 Mar 2005 18:03:17 -0000 1.14
+++ data/nation/brazilian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -9,7 +9,7 @@
leader="Dom Pedro I", "Princesa Isabel", "Marechal Deodoro",
"Tancredo Neves", "Juscelino Kubitscheck", "Getúlio Vargas"
leader_sex="Male", "Female", "Male", "Male", "Male", "Male"
-flag = "f.brasil"
+flag = "brasil"
flag_alt = "-"
city_style = "Tropical"
Index: data/nation/byzantium.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/byzantium.ruleset,v
retrieving revision 1.3
diff -u -r1.3 byzantium.ruleset
--- data/nation/byzantium.ruleset 30 Mar 2005 04:46:18 -0000 1.3
+++ data/nation/byzantium.ruleset 27 Apr 2005 19:53:42 -0000
@@ -12,8 +12,8 @@
Africa, Italy and parts of Spain.")
leader="Justinian I", "Heraclius I", "Michael VIII Paleologus", "Maurice",
"Basil II Bulgaroctonus"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag="f.byzantium"
-flag_alt = "f.greek"
+flag="byzantium"
+flag_alt = "greek"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
"Despotism", _("Imperator"), _("Imperatrix")
Index: data/nation/canadian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/canadian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 canadian.ruleset
--- data/nation/canadian.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/canadian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,8 +5,8 @@
groups=_("Modern"), _("American")
leader="Pierre Trudeau", "John A. MacDonald", "John Diefenbaker", "Mackenzie
King"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.canada"
-flag_alt = "f.united_kingdom"
+flag="canada"
+flag_alt = "united_kingdom"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
"Democracy", _("Prime Minister"), _("Prime Minister")
Index: data/nation/carthaginian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/carthaginian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 carthaginian.ruleset
--- data/nation/carthaginian.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/carthaginian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,7 +8,7 @@
BC. Carthage was destroyed by Rome in 146BC.")
leader="Hannibal", "Hasdrubal", "Hamilcar", "Dido"
leader_sex="Male", "Male", "Male", "Female"
-flag="f.tunisia"
+flag="tunisia"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/catalan.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/catalan.ruleset,v
retrieving revision 1.13
diff -u -r1.13 catalan.ruleset
--- data/nation/catalan.ruleset 25 Mar 2005 18:03:17 -0000 1.13
+++ data/nation/catalan.ruleset 27 Apr 2005 19:53:42 -0000
@@ -9,7 +9,7 @@
"Lluis Companys", "Josep Tarradellas"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male"
-flag="f.catalan"
+flag="catalan"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/chilean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/chilean.ruleset,v
retrieving revision 1.15
diff -u -r1.15 chilean.ruleset
--- data/nation/chilean.ruleset 25 Mar 2005 18:03:17 -0000 1.15
+++ data/nation/chilean.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
leader_sex="Male", "Male", "Male",
"Male", "Male", "Male",
"Male", "Male"
-flag="f.chile"
+flag="chile"
flag_alt = "-"
city_style = "European"
Index: data/nation/chinese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/chinese.ruleset,v
retrieving revision 1.11
diff -u -r1.11 chinese.ruleset
--- data/nation/chinese.ruleset 30 Mar 2005 04:46:18 -0000 1.11
+++ data/nation/chinese.ruleset 27 Apr 2005 19:53:42 -0000
@@ -14,7 +14,7 @@
"Qianlong", "Cixi", "Sun Yat-Sen", "Mao Zedong", "Deng Xiaoping"
leader_sex="Male", "Male", "Male", "Male", "Female",
"Male", "Female", "Male", "Male", "Male"
-flag="f.china"
+flag="china"
flag_alt = "-"
city_style = "Asian"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/columbian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/columbian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 columbian.ruleset
--- data/nation/columbian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/columbian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("American")
leader="S. Bolívar", "G.J. Quesada"
leader_sex="Male", "Male"
-flag="f.columbia"
+flag="columbia"
flag_alt = "-"
city_style = "European"
Index: data/nation/cornish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/cornish.ruleset,v
retrieving revision 1.10
diff -u -r1.10 cornish.ruleset
--- data/nation/cornish.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/cornish.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,8 +8,8 @@
leader = "Arthur", "Jonathen Trelawny", "Thomas Flamank", "Michael Joseph",
"William Bligh"
leader_sex = "Male", "Male", "Male", "Male", "Male"
-flag = "f.cornwall"
-flag_alt = "f.england"
+flag = "cornwall"
+flag_alt = "england"
city_style = "European"
init_techs=""
Index: data/nation/croatian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/croatian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 croatian.ruleset
--- data/nation/croatian.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/croatian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -15,7 +15,7 @@
leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Male", "Male", "Male",
"Male"
-flag="f.croatia"
+flag="croatia"
flag_alt = "-"
city_style = "European"
Index: data/nation/czech.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/czech.ruleset,v
retrieving revision 1.10
diff -u -r1.10 czech.ruleset
--- data/nation/czech.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/czech.ruleset 27 Apr 2005 19:53:42 -0000
@@ -14,7 +14,7 @@
"Female", "Female", "Female", "Female",
"Male", "Male", "Male"
-flag = "f.czech"
+flag = "czech"
flag_alt = "-"
city_style = "European"
Index: data/nation/danish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/danish.ruleset,v
retrieving revision 1.17
diff -u -r1.17 danish.ruleset
--- data/nation/danish.ruleset 30 Mar 2005 04:46:18 -0000 1.17
+++ data/nation/danish.ruleset 27 Apr 2005 19:53:42 -0000
@@ -19,7 +19,7 @@
"Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male",
"Male", "Female", "Male", "Male"
-flag="f.denmark"
+flag="denmark"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/dunedain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/dunedain.ruleset,v
retrieving revision 1.12
diff -u -r1.12 dunedain.ruleset
--- data/nation/dunedain.ruleset 25 Mar 2005 18:03:17 -0000 1.12
+++ data/nation/dunedain.ruleset 27 Apr 2005 19:53:42 -0000
@@ -12,7 +12,7 @@
"Tarannon Falastur", "Thorongil", "Ar-Pharazon", "Beruthiel"
leader_sex="Male", "Female", "Female", "Male", "Male", "Male",
"Male", "Male", "Male", "Female"
-flag = "f.dunedain"
+flag = "dunedain"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/dutch.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/dutch.ruleset,v
retrieving revision 1.13
diff -u -r1.13 dutch.ruleset
--- data/nation/dutch.ruleset 30 Mar 2005 04:46:18 -0000 1.13
+++ data/nation/dutch.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,8 +5,8 @@
groups=_("Modern"), _("Medieval"), _("European")
leader="Willem", "Maurits", "Emma", "Wilhelmina", "Juliana", "Beatrix"
leader_sex="Male", "Male", "Female", "Female", "Female", "Female"
-flag="f.netherlands"
-flag_alt = "f.holland"
+flag="netherlands"
+flag_alt = "holland"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
"Democracy", _("Prime Minister"), _("Prime Minister")
Index: data/nation/egyptian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/egyptian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 egyptian.ruleset
--- data/nation/egyptian.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/egyptian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
"Hatshepsut", "Nefertiti", "Cheops", "Akhenaten"
leader_sex="Male", "Female", "Male", "Male", "Male",
"Female", "Female", "Male", "Male"
-flag="f.egypt"
+flag="egypt"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/elvish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/elvish.ruleset,v
retrieving revision 1.3
diff -u -r1.3 elvish.ruleset
--- data/nation/elvish.ruleset 25 Mar 2005 18:03:17 -0000 1.3
+++ data/nation/elvish.ruleset 27 Apr 2005 19:53:42 -0000
@@ -13,7 +13,7 @@
"Celeborn", "Elrond"
leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Female",
"Male", "Male", "Male", "Male"
-flag="f.elves"
+flag="elves"
flag_alt = "-"
city_style = "European"
; Melian was the Queen of Doriath
Index: data/nation/english.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/english.ruleset,v
retrieving revision 1.12
diff -u -r1.12 english.ruleset
--- data/nation/english.ruleset 30 Mar 2005 04:46:18 -0000 1.12
+++ data/nation/english.ruleset 27 Apr 2005 19:53:42 -0000
@@ -11,8 +11,8 @@
"Victoria", "Winston Churchill", "John Lackland"
leader_sex="Female", "Male", "Male", "Male", "Male",
"Male", "Female", "Male", "Male"
-flag="f.england"
-flag_alt = "f.united_kingdom"
+flag="england"
+flag_alt = "united_kingdom"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
"Democracy", _("Prime Minister"), _("Prime Minister")
Index: data/nation/estonian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/estonian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 estonian.ruleset
--- data/nation/estonian.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/estonian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
"Tunne Kelam", "Lennart Meri", "Mart Laar"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male", "Male"
-flag="f.estonia"
+flag="estonia"
flag_alt = "-"
city_style = "European"
Index: data/nation/ethiopian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/ethiopian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 ethiopian.ruleset
--- data/nation/ethiopian.ruleset 25 Mar 2005 18:03:17 -0000 1.4
+++ data/nation/ethiopian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,8 +7,8 @@
"Lalibela", "Yekuno Amlak", "Tewodros II"
leader_sex="Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male"
-flag="f.ethiopia"
-flag_alt = "f.italy"
+flag="ethiopia"
+flag_alt = "italy"
city_style = "Classical"
ruler_titles = { "government", "male_title", "female_title"
"Monarchy", _("Emporer"), _("Emporer")
Index: data/nation/filipino.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/filipino.ruleset,v
retrieving revision 1.13
diff -u -r1.13 filipino.ruleset
--- data/nation/filipino.ruleset 25 Mar 2005 18:03:17 -0000 1.13
+++ data/nation/filipino.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,7 +8,7 @@
leader="Ramon Magsagay","Jose Rizal", "Luis Taruc", "Sergio Osmena",
"Ferdinand Marcos", "Corazon Aquino"
leader_sex="Male", "Male", "Male", "Male", "Male", "Female"
-flag="f.philippines"
+flag="philippines"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/finnish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/finnish.ruleset,v
retrieving revision 1.11
diff -u -r1.11 finnish.ruleset
--- data/nation/finnish.ruleset 25 Mar 2005 18:03:17 -0000 1.11
+++ data/nation/finnish.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
"Tarja Halonen", "Linus Torvalds"
leader_sex="Male", "Male", "Male",
"Female", "Male"
-flag="f.finland"
+flag="finland"
flag_alt = "-"
city_style = "European"
Index: data/nation/french.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/french.ruleset,v
retrieving revision 1.13
diff -u -r1.13 french.ruleset
--- data/nation/french.ruleset 30 Mar 2005 04:46:18 -0000 1.13
+++ data/nation/french.ruleset 27 Apr 2005 19:53:42 -0000
@@ -6,7 +6,7 @@
leader="Napoleon", "Charlemagne", "Louis XIV", "Charles de Gaulle",
"Vercingetorix", "Chlodwig", "Charles Martel"
leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
-flag="f.france"
+flag="france"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/galician.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/galician.ruleset,v
retrieving revision 1.3
diff -u -r1.3 galician.ruleset
--- data/nation/galician.ruleset 25 Mar 2005 18:03:17 -0000 1.3
+++ data/nation/galician.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
"Rosalía de Castro", "Don Manuel"
leader_sex="Male", "Male", "Male", "Male",
"Female", "Male"
-flag="f.galicia"
+flag="galicia"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/german.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/german.ruleset,v
retrieving revision 1.19
diff -u -r1.19 german.ruleset
--- data/nation/german.ruleset 30 Mar 2005 04:46:18 -0000 1.19
+++ data/nation/german.ruleset 27 Apr 2005 19:53:42 -0000
@@ -16,7 +16,7 @@
leader_sex = "Male", "Male", "Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Male", "Male"
-flag = "f.germany"
+flag = "germany"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/greek.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/greek.ruleset,v
retrieving revision 1.12
diff -u -r1.12 greek.ruleset
--- data/nation/greek.ruleset 30 Mar 2005 04:46:18 -0000 1.12
+++ data/nation/greek.ruleset 27 Apr 2005 19:53:42 -0000
@@ -6,7 +6,7 @@
legend=_("The ancient Greeks, between Mycenae and the Roman conquest.")
leader="Alexander", "Perikles", "Leonidas", "Solon"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.greece"
+flag="greece"
flag_alt = "-"
city_style = "Classical"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/hobbits.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/hobbits.ruleset,v
retrieving revision 1.4
diff -u -r1.4 hobbits.ruleset
--- data/nation/hobbits.ruleset 25 Mar 2005 18:03:17 -0000 1.4
+++ data/nation/hobbits.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
leader="Will Whitfoot", "Samwise Gamgee", "Tolman Cotton",
"Peregrin Took", "Meriadoc Brandybuck"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag="f.hobbits"
+flag="hobbits"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/hungarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/hungarian.ruleset,v
retrieving revision 1.11
diff -u -r1.11 hungarian.ruleset
--- data/nation/hungarian.ruleset 30 Mar 2005 04:46:18 -0000 1.11
+++ data/nation/hungarian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -6,7 +6,7 @@
leader="Árpád", "Szent István", "Károly Róbert",
"Hunyadi Mátyás", "Mária Terézia", "Batthyány"
leader_sex="Male", "Male", "Male", "Male", "Female", "Male"
-flag="f.hungary"
+flag="hungary"
flag_alt = "-"
city_style = "European"
Index: data/nation/icelandic.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/icelandic.ruleset,v
retrieving revision 1.3
diff -u -r1.3 icelandic.ruleset
--- data/nation/icelandic.ruleset 25 Mar 2005 18:03:17 -0000 1.3
+++ data/nation/icelandic.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,8 +10,8 @@
leader_sex="Male", "Male", "Male", "Male"
-flag="f.iceland"
-flag_alt = "f.norway"
+flag="iceland"
+flag_alt = "norway"
city_style = "Classical"
ruler_titles = { "government", "male_title", "female_title"
"Democracy", _("President"), _("President")
Index: data/nation/inca.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/inca.ruleset,v
retrieving revision 1.11
diff -u -r1.11 inca.ruleset
--- data/nation/inca.ruleset 30 Mar 2005 04:46:18 -0000 1.11
+++ data/nation/inca.ruleset 27 Apr 2005 19:53:42 -0000
@@ -10,7 +10,7 @@
arrived in their part of the world in the mid-1500s AD.")
leader="Tupac", "Manco Capac", "Atahualpa", "Pachacuti"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.peru"
+flag="peru"
flag_alt = "-"
city_style = "Tropical"
Index: data/nation/indian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/indian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 indian.ruleset
--- data/nation/indian.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/indian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
plural=_("?plural:Indians")
leader="Gandhi", "Ashoka", "Chandragupta", "Indira Gandhi"
leader_sex="Male", "Male", "Male", "Female"
-flag="f.india"
+flag="india"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/indonesian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/indonesian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 indonesian.ruleset
--- data/nation/indonesian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/indonesian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern")
leader="Sukarno", "Suharto", "Habibie", "Wahid"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.indonesia"
+flag="indonesia"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/irish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/irish.ruleset,v
retrieving revision 1.13
diff -u -r1.13 irish.ruleset
--- data/nation/irish.ruleset 30 Mar 2005 04:46:18 -0000 1.13
+++ data/nation/irish.ruleset 27 Apr 2005 19:53:42 -0000
@@ -29,7 +29,7 @@
"Male", "Male", "Male", "Male", "Male",
"Female", "Female", "Female", "Female",
"Male", "Male"
-flag="f.ireland"
+flag="ireland"
flag_alt = "-"
city_style = "European"
Index: data/nation/israeli.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/israeli.ruleset,v
retrieving revision 1.10
diff -u -r1.10 israeli.ruleset
--- data/nation/israeli.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/israeli.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,7 +8,7 @@
a series of wars launched against it in 1948, 1967 and 1973.")
leader="Solomon", "David", "David Ben-Gurion", "Ze'ev Zabotinsky", "Golda Meir"
leader_sex="Male", "Male", "Male", "Male", "Female"
-flag="f.israel"
+flag="israel"
flag_alt = "-"
city_style = "European"
Index: data/nation/italian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/italian.ruleset,v
retrieving revision 1.11
diff -u -r1.11 italian.ruleset
--- data/nation/italian.ruleset 30 Mar 2005 04:46:18 -0000 1.11
+++ data/nation/italian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -11,7 +11,7 @@
"Giacomo Matteotti"
leader_sex = "Male", "Male", "Male",
"Male"
-flag = "f.italy"
+flag = "italy"
flag_alt = "-"
city_style = "European"
Index: data/nation/japanese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/japanese.ruleset,v
retrieving revision 1.12
diff -u -r1.12 japanese.ruleset
--- data/nation/japanese.ruleset 30 Mar 2005 04:46:18 -0000 1.12
+++ data/nation/japanese.ruleset 27 Apr 2005 19:53:42 -0000
@@ -6,7 +6,7 @@
leader="Jimmu Tenno", "Mutsuhito", "Hirohito",
"Oda Nobunaga", "Tokugawa Ieyasu"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag="f.japan"
+flag="japan"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/kampuchean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/kampuchean.ruleset,v
retrieving revision 1.3
diff -u -r1.3 kampuchean.ruleset
--- data/nation/kampuchean.ruleset 25 Mar 2005 18:03:17 -0000 1.3
+++ data/nation/kampuchean.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("Asian")
leader="Pol Pot", "Norodom Sihanouk", "Hun Sen", "Ang Chan", "Jayavarman"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag="f.kampuchea"
+flag="kampuchea"
flag_alt = "-"
city_style = "European"
Index: data/nation/kenyan.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/kenyan.ruleset,v
retrieving revision 1.10
diff -u -r1.10 kenyan.ruleset
--- data/nation/kenyan.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/kenyan.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("African")
leader = "Kenyatta", "Nabongo", "Wangari Maathai", "Ezekiel Apindi"
leader_sex = "Male", "Male", "Female", "Male"
-flag = "f.kenya"
+flag = "kenya"
flag_alt = "-"
city_style = "Tropical"
init_techs=""
Index: data/nation/korean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/korean.ruleset,v
retrieving revision 1.10
diff -u -r1.10 korean.ruleset
--- data/nation/korean.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/korean.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("Medieval"), _("Asian")
leader="T'aejong", "Kim Ir Sen", "Pak Dzonghyi", "Wang Gon"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.korea"
+flag="korea"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/latvian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/latvian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 latvian.ruleset
--- data/nation/latvian.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/latvian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
"Vaira Vike Freiberga", "Namejs"
leader_sex="Male", "Male",
"Female", "Male"
-flag="f.latvia"
+flag="latvia"
flag_alt = "-"
city_style = "European"
Index: data/nation/lithuanian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/lithuanian.ruleset,v
retrieving revision 1.10
diff -u -r1.10 lithuanian.ruleset
--- data/nation/lithuanian.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/lithuanian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -8,7 +8,7 @@
the northern Indo-European languages")
leader="Gediminas", "Mindaugas", "Vytautas", "Antanas Smetona"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.lithuania"
+flag="lithuania"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/malaysian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/malaysian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 malaysian.ruleset
--- data/nation/malaysian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/malaysian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern")
leader="Mahathir", "Anwar Ibrahim"
leader_sex="Male", "Male"
-flag="f.malaysia"
+flag="malaysia"
flag_alt = "-"
city_style = "European"
Index: data/nation/martian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/martian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 martian.ruleset
--- data/nation/martian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/martian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -6,7 +6,7 @@
leader="Ray Bradbury", "Wernher von Braun", "Arthur C. Clarke",
"Isaac Asimov", "Gene Roddenberry"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag="f.mars"
+flag="mars"
flag_alt = "-"
city_style = "European"
Index: data/nation/mexican.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mexican.ruleset,v
retrieving revision 1.2
diff -u -r1.2 mexican.ruleset
--- data/nation/mexican.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/mexican.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("American")
leader="B. Juárez", "Cárdenas"
leader_sex="Male", "Male"
-flag="f.mexico"
+flag="mexico"
flag_alt = "-"
city_style = "European"
Index: data/nation/mongol.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mongol.ruleset,v
retrieving revision 1.10
diff -u -r1.10 mongol.ruleset
--- data/nation/mongol.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/mongol.ruleset 27 Apr 2005 19:53:42 -0000
@@ -9,7 +9,7 @@
in warfare.")
leader="Genghis", "Bortai", "Ogodei", "Bayan", "Timur", "Batu", "Tokhtamysh"
leader_sex="Male", "Female", "Male", "Male", "Male", "Male", "Male"
-flag="f.mongolia"
+flag="mongolia"
flag_alt = "-"
city_style = "Asian"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/mordor.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mordor.ruleset,v
retrieving revision 1.10
diff -u -r1.10 mordor.ruleset
--- data/nation/mordor.ruleset 25 Mar 2005 18:03:17 -0000 1.10
+++ data/nation/mordor.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
Middle Earth fantasies.")
leader="Sauron", "Angmar", "Gorthaur", "Melkor"
leader_sex="Male", "Male", "Male", "Male"
-flag = "f.mordor"
+flag = "mordor"
flag_alt = "-"
city_style = "Tropical"
Index: data/nation/nigerian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/nigerian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 nigerian.ruleset
--- data/nation/nigerian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/nigerian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("African")
leader="Balewa", "Obasanjo"
leader_sex="Male", "Male"
-flag="f.nigeria"
+flag="nigeria"
flag_alt = "-"
city_style = "European"
Index: data/nation/observer.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/observer.ruleset,v
retrieving revision 1.1
diff -u -r1.1 observer.ruleset
--- data/nation/observer.ruleset 29 Aug 2004 19:03:32 -0000 1.1
+++ data/nation/observer.ruleset 27 Apr 2005 19:53:42 -0000
@@ -4,7 +4,7 @@
plural=_("?plural:Observers")
leader="None"
leader_sex="Male"
-flag="f.observer"
+flag="observer"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/persian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/persian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 persian.ruleset
--- data/nation/persian.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/persian.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
the second (Sassanid) from 226AD to 642AD.")
leader="Cyrus", "Darius", "Xerxes", "Ardashir"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.iran"
+flag="iran"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/phoenician.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/phoenician.ruleset,v
retrieving revision 1.2
diff -u -r1.2 phoenician.ruleset
--- data/nation/phoenician.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/phoenician.ruleset 27 Apr 2005 19:53:42 -0000
@@ -7,7 +7,7 @@
"Abd'ashtart"
leader_sex="Male", "Male", "Male", "Male", "Male",
"Male"
-flag="f.phoenicia"
+flag="phoenicia"
flag_alt = "-"
city_style = "Classical"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/polish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/polish.ruleset,v
retrieving revision 1.19
diff -u -r1.19 polish.ruleset
--- data/nation/polish.ruleset 30 Mar 2005 04:46:18 -0000 1.19
+++ data/nation/polish.ruleset 27 Apr 2005 19:53:43 -0000
@@ -16,7 +16,7 @@
"Józef Piłsudski"
leader_sex="Male", "Male", "Male", "Male", "Female",
"Male", "Male", "Male", "Male", "Male", "Male"
-flag="f.poland"
+flag="poland"
flag_alt = "-"
city_style = "European"
Index: data/nation/portuguese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/portuguese.ruleset,v
retrieving revision 1.12
diff -u -r1.12 portuguese.ruleset
--- data/nation/portuguese.ruleset 30 Mar 2005 04:46:18 -0000 1.12
+++ data/nation/portuguese.ruleset 27 Apr 2005 19:53:43 -0000
@@ -10,7 +10,7 @@
"João I", "João II", "Manuel I", "João IV", "Maria II", "Salazar"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Female", "Male"
-flag="f.portugal"
+flag="portugal"
flag_alt = "-"
city_style = "European"
Index: data/nation/quebecois.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/quebecois.ruleset,v
retrieving revision 1.2
diff -u -r1.2 quebecois.ruleset
--- data/nation/quebecois.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/quebecois.ruleset 27 Apr 2005 19:53:43 -0000
@@ -6,7 +6,7 @@
leader="Champlain", "Frontenac", "Montcalm", "Papineau",
"Rene Levesque"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag = "f.quebec"
+flag = "quebec"
flag_alt = "-"
city_style = "European"
Index: data/nation/roman.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/roman.ruleset,v
retrieving revision 1.14
diff -u -r1.14 roman.ruleset
--- data/nation/roman.ruleset 25 Mar 2005 18:03:17 -0000 1.14
+++ data/nation/roman.ruleset 27 Apr 2005 19:53:43 -0000
@@ -11,8 +11,8 @@
"Livia", "Messalina"
leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
"Female", "Female"
-flag = "f.rome"
-flag_alt = "f.italy"
+flag = "rome"
+flag_alt = "italy"
city_style = "Classical"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/russian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/russian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 russian.ruleset
--- data/nation/russian.ruleset 30 Mar 2005 04:46:18 -0000 1.9
+++ data/nation/russian.ruleset 27 Apr 2005 19:53:43 -0000
@@ -7,7 +7,7 @@
early medieval period by Vikings from what is now Sweden.")
leader="Catherine II", "Ivan the Terrible", "Stalin", "Peter", "Anne"
leader_sex="Female", "Male", "Male", "Male", "Female"
-flag="f.russia"
+flag="russia"
flag_alt = "-"
city_style = "European"
Index: data/nation/scottish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/scottish.ruleset,v
retrieving revision 1.16
diff -u -r1.16 scottish.ruleset
--- data/nation/scottish.ruleset 30 Mar 2005 04:46:18 -0000 1.16
+++ data/nation/scottish.ruleset 27 Apr 2005 19:53:43 -0000
@@ -9,8 +9,8 @@
"Robert the Bruce", "William Wallace", "Mary Stuart"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male", "Female"
-flag="f.scotland"
-flag_alt = "f.united_kingdom"
+flag="scotland"
+flag_alt = "united_kingdom"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/serbian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/serbian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 serbian.ruleset
--- data/nation/serbian.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/serbian.ruleset 27 Apr 2005 19:53:43 -0000
@@ -12,7 +12,7 @@
"Stefan Supljikac", "Milan II Obrenovic", "Petar Karadordevic"
leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male"
-flag="f.serbia"
+flag="serbia"
flag_alt = "-"
city_style = "European"
Index: data/nation/silesian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/silesian.ruleset,v
retrieving revision 1.15
diff -u -r1.15 silesian.ruleset
--- data/nation/silesian.ruleset 30 Mar 2005 04:46:18 -0000 1.15
+++ data/nation/silesian.ruleset 27 Apr 2005 19:53:43 -0000
@@ -13,7 +13,7 @@
"Jan Kustos",
"Wojciech Korfanty"
leader_sex = "Male", "Male", "Male", "Male", "Male", "Male", "Male"
-flag="f.silesia"
+flag="silesia"
flag_alt = "-"
city_style = "European"
Index: data/nation/singaporean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/singaporean.ruleset,v
retrieving revision 1.9
diff -u -r1.9 singaporean.ruleset
--- data/nation/singaporean.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/singaporean.ruleset 27 Apr 2005 19:53:43 -0000
@@ -21,7 +21,7 @@
"S.R. Nathan", "Lee Kuan Yew", "Yusof bin Ishak", "Ah Beng", "Ah Lian"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Female"
-flag="f.singapore"
+flag="singapore"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/sioux.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/sioux.ruleset,v
retrieving revision 1.10
diff -u -r1.10 sioux.ruleset
--- data/nation/sioux.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/sioux.ruleset 27 Apr 2005 19:53:43 -0000
@@ -5,7 +5,7 @@
groups=_("Medieval"), _("American")
leader="Sitting Bull", "Crazy Horse", "Little Crow", "Red Cloud"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.cheyenne"
+flag="cheyenne"
flag_alt = "-"
city_style = "European"
Index: data/nation/slovenian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/slovenian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 slovenian.ruleset
--- data/nation/slovenian.ruleset 30 Mar 2005 04:46:18 -0000 1.9
+++ data/nation/slovenian.ruleset 27 Apr 2005 19:53:43 -0000
@@ -7,7 +7,7 @@
Yugoslav Federation.")
leader="Valuka", "Valtunk", "Kocelj", "Primoz Trubar"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.slovenia"
+flag="slovenia"
flag_alt = "-"
city_style = "European"
Index: data/nation/spanish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/spanish.ruleset,v
retrieving revision 1.12
diff -u -r1.12 spanish.ruleset
--- data/nation/spanish.ruleset 30 Mar 2005 04:46:18 -0000 1.12
+++ data/nation/spanish.ruleset 27 Apr 2005 19:53:43 -0000
@@ -11,7 +11,7 @@
"Carlos I", "Felipe II", "Carlos III", "Franco", "Mortadelo"
leader_sex="Male", "Male", "Male", "Male", "Female",
"Male", "Male", "Male", "Male", "Male"
-flag="f.spain"
+flag="spain"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/sumerian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/sumerian.ruleset,v
retrieving revision 1.2
diff -u -r1.2 sumerian.ruleset
--- data/nation/sumerian.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/sumerian.ruleset 27 Apr 2005 19:53:43 -0000
@@ -5,7 +5,7 @@
groups=_("Ancient"), _("Asian")
leader="Gilgamesh", "Lagislazuli", "Urukagina", "Urnammu", "Ibissin"
leader_sex="Male", "Male", "Male", "Male", "Male"
-flag = "f.sumeria"
+flag = "sumeria"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/swedish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/swedish.ruleset,v
retrieving revision 1.16
diff -u -r1.16 swedish.ruleset
--- data/nation/swedish.ruleset 30 Mar 2005 04:46:18 -0000 1.16
+++ data/nation/swedish.ruleset 27 Apr 2005 19:53:43 -0000
@@ -9,7 +9,7 @@
"Christine"
leader_sex="Male", "Male", "Male", "Male", "Male", "Female"
-flag="f.sweden"
+flag="sweden"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/swiss.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/swiss.ruleset,v
retrieving revision 1.5
diff -u -r1.5 swiss.ruleset
--- data/nation/swiss.ruleset 25 Mar 2005 18:03:17 -0000 1.5
+++ data/nation/swiss.ruleset 27 Apr 2005 19:53:43 -0000
@@ -8,7 +8,7 @@
"Christoph Blocher"
leader_sex="Male", "Male", "Male", "Male", "Male",
"Female", "Male", "Male"
-flag="f.switzerland"
+flag="switzerland"
flag_alt = "-"
city_style = "European"
Index: data/nation/taiwanese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/taiwanese.ruleset,v
retrieving revision 1.4
diff -u -r1.4 taiwanese.ruleset
--- data/nation/taiwanese.ruleset 25 Mar 2005 18:03:17 -0000 1.4
+++ data/nation/taiwanese.ruleset 27 Apr 2005 19:53:43 -0000
@@ -5,7 +5,7 @@
groups=_("Modern"), _("Asian")
leader="Sun Yat Sen", "Chiang Kai Shek", "Lee Teng Hui", "Kung Fu Tse"
leader_sex="Male", "Male", "Male", "Male"
-flag="f.taiwan"
+flag="taiwan"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/thai.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/thai.ruleset,v
retrieving revision 1.11
diff -u -r1.11 thai.ruleset
--- data/nation/thai.ruleset 25 Mar 2005 18:03:17 -0000 1.11
+++ data/nation/thai.ruleset 27 Apr 2005 19:53:43 -0000
@@ -10,7 +10,7 @@
"Pibul Songgram", "Seni Pramoya"
leader_sex = "Male", "Male", "Male", "Male",
"Male", "Male"
-flag="f.thailand"
+flag="thailand"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/turk.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/turk.ruleset,v
retrieving revision 1.11
diff -u -r1.11 turk.ruleset
--- data/nation/turk.ruleset 30 Mar 2005 04:46:18 -0000 1.11
+++ data/nation/turk.ruleset 27 Apr 2005 19:53:43 -0000
@@ -11,7 +11,7 @@
"Selim", "Mehmet"
leader_sex="Male", "Male", "Male", "Male",
"Male", "Male"
-flag="f.turkey"
+flag="turkey"
flag_alt = "-"
city_style = "European"
Index: data/nation/ukrainian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/ukrainian.ruleset,v
retrieving revision 1.9
diff -u -r1.9 ukrainian.ruleset
--- data/nation/ukrainian.ruleset 25 Mar 2005 18:03:17 -0000 1.9
+++ data/nation/ukrainian.ruleset 27 Apr 2005 19:53:43 -0000
@@ -8,7 +8,7 @@
cropland on Earth.")
leader = "Bohdan Khmelnitskyi", "Simon Petlura", "Basil Kapnist"
leader_sex = "Male", "Male", "Male"
-flag="f.ukraine"
+flag="ukraine"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/venezuelan.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/venezuelan.ruleset,v
retrieving revision 1.2
diff -u -r1.2 venezuelan.ruleset
--- data/nation/venezuelan.ruleset 25 Mar 2005 18:03:17 -0000 1.2
+++ data/nation/venezuelan.ruleset 27 Apr 2005 19:53:43 -0000
@@ -9,7 +9,7 @@
"Rómulo Betancourt", "Gral. Marcos Pérez Jiménez"
leader_sex="Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Male"
-flag="f.venezuela"
+flag="venezuela"
flag_alt = "-"
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
Index: data/nation/vietnamese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/vietnamese.ruleset,v
retrieving revision 1.8
diff -u -r1.8 vietnamese.ruleset
--- data/nation/vietnamese.ruleset 25 Mar 2005 18:03:17 -0000 1.8
+++ data/nation/vietnamese.ruleset 27 Apr 2005 19:53:43 -0000
@@ -8,7 +8,7 @@
military governor.")
leader="Trung Trac", "Trung Nhi", "Ly Bon", "Gia Long", "Bao Dai", "Ho Chi
Minh", "Ngo Ding Diem"
leader_sex="Female","Female", "Male", "Male", "Male", "Male", "Male"
-flag="f.vietnam"
+flag="vietnam"
flag_alt = "-"
city_style = "Asian"
Index: data/nation/viking.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/viking.ruleset,v
retrieving revision 1.16
diff -u -r1.16 viking.ruleset
--- data/nation/viking.ruleset 30 Mar 2005 04:46:18 -0000 1.16
+++ data/nation/viking.ruleset 27 Apr 2005 19:53:43 -0000
@@ -25,8 +25,8 @@
"Male", "Male", "Female", "Male",
"Male"
-flag="f.norway"
-flag_alt = "f.denmark" ; Now used by Danish
+flag="norway"
+flag_alt = "denmark" ; Now used by Danish
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
"Democracy", _("Prime Minister"), _("Prime Minister")
Index: data/nation/welsh.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/welsh.ruleset,v
retrieving revision 1.10
diff -u -r1.10 welsh.ruleset
--- data/nation/welsh.ruleset 30 Mar 2005 04:46:18 -0000 1.10
+++ data/nation/welsh.ruleset 27 Apr 2005 19:53:43 -0000
@@ -7,8 +7,8 @@
until being driven into the mountainous western reaches by invading Saxons.")
leader="Llywelyn ap Gruffudd", "Hywel Dda", "Owain Glyndwr"
leader_sex="Male", "Male", "Male"
-flag="f.wales"
-flag_alt = "f.united_kingdom"
+flag="wales"
+flag_alt = "united_kingdom"
city_style = "European"
;names = "Yr Ymerodreath Gymreig" "empire" (depotism)
Index: data/nation/zulu.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/zulu.ruleset,v
retrieving revision 1.11
diff -u -r1.11 zulu.ruleset
--- data/nation/zulu.ruleset 25 Mar 2005 18:03:17 -0000 1.11
+++ data/nation/zulu.ruleset 27 Apr 2005 19:53:43 -0000
@@ -20,8 +20,8 @@
"Male", "Male", "Male", "Male", "Male",
"Male", "Male", "Male", "Male", "Male",
"Male"
-flag="f.south_africa"
-flag_alt = "f.rwanda" ; used previously
+flag="south_africa"
+flag_alt = "rwanda" ; used previously
city_style = "Tropical"
init_techs=""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Freeciv-Dev] (PR#12914) make flags-versus-shields a client option,
Jason Short <=
|
|
