diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/default/cities.ruleset styles/data/default/cities.ruleset --- freeciv/data/default/cities.ruleset Sat Jan 1 20:29:47 2000 +++ styles/data/default/cities.ruleset Sat Jan 27 17:46:36 2001 @@ -22,6 +22,20 @@ ; tech = technology required for style to be used ; replaced_by = which style replaced this one +[citystyle_oriental] +name = _("Oriental") +graphic = "city.oriental" +graphic_alt = "-" +tech = "None" +replaced_by = "Industrial" + +[citystyle_bronze] +name = _("Bronze") +graphic = "city.bronze" +graphic_alt = "-" +tech = "None" +replaced_by = "Industrial" + [citystyle_european] name = _("European") graphic = "city.european" diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/engels/cities.spec styles/data/engels/cities.spec --- freeciv/data/engels/cities.spec Wed Dec 29 17:47:00 1999 +++ styles/data/engels/cities.spec Sat Jan 27 17:16:46 2001 @@ -63,6 +63,19 @@ 1, 3, "city.classical_wall" 1, 4, "city.classical_occupied" +;these need to be drawn + 1, 0, "city.oriental_0" + 1, 1, "city.oriental_5" + 1, 2, "city.oriental_10" + 1, 3, "city.oriental_wall" + 1, 4, "city.oriental_occupied" + 1, 0, "city.bronze_0" + 1, 1, "city.bronze_5" + 1, 2, "city.bronze_10" + 1, 3, "city.bronze_wall" + 1, 4, "city.bronze_occupied" + + 1, 0, "city.industrial_0" 1, 1, "city.industrial_5" 1, 2, "city.industrial_10" diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/hires/cities.spec styles/data/hires/cities.spec --- freeciv/data/hires/cities.spec Thu Jan 25 20:39:43 2001 +++ styles/data/hires/cities.spec Sat Jan 27 17:43:36 2001 @@ -49,11 +49,22 @@ ; city tiles ; + + 0, 0, "city.bronze_0" + 0, 1, "city.bronze_5" + 0, 2, "city.bronze_10" + 0, 3, "city.bronze_15" + 1, 0, "city.classical_0" 1, 1, "city.classical_5" 1, 2, "city.classical_10" 1, 3, "city.classical_15" + 2, 0, "city.oriental_0" + 2, 1, "city.oriental_5" + 2, 2, "city.oriental_10" + 2, 3, "city.oriental_15" + 3, 0, "city.european_0" 3, 1, "city.european_5" 3, 2, "city.european_10" @@ -104,6 +115,7 @@ tiles = { "row", "column", "tag" 0, 6, "city.european_occupied", "city.classical_occupied", + "city.oriental_occupied", "city.bronze_occupied", "city.industrial_occupied", "city.modern_occupied", "city.postmodern_occupied" } @@ -120,10 +132,20 @@ ; city tiles + 0, 0, "city.bronze_0_wall" + 0, 1, "city.bronze_5_wall" + 0, 2, "city.bronze_10_wall" + 0, 3, "city.bronze_15_wall" + 1, 0, "city.classical_0_wall" 1, 1, "city.classical_5_wall" 1, 2, "city.classical_10_wall" 1, 3, "city.classical_15_wall" + + 2, 0, "city.oriental_0_wall" + 2, 1, "city.oriental_5_wall" + 2, 2, "city.oriental_10_wall" + 2, 3, "city.oriental_15_wall" 3, 0, "city.european_0_wall" 3, 1, "city.european_5_wall" diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/arab.ruleset styles/data/nation/arab.ruleset --- freeciv/data/nation/arab.ruleset Tue Mar 21 12:26:13 2000 +++ styles/data/nation/arab.ruleset Sat Jan 27 17:58:20 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag ="f.arab" flag_alt = "-" -city_style = "Classical" +city_style = "Bronze" ruler_titles = { "government", "male_title", "female_title" "Monarchy", _("Caliph"), _("Caliph") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/aztec.ruleset styles/data/nation/aztec.ruleset --- freeciv/data/nation/aztec.ruleset Tue Mar 21 12:26:14 2000 +++ styles/data/nation/aztec.ruleset Sat Jan 27 17:58:48 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag="f.mexico" flag_alt = "-" -city_style = "Classical" +city_style = "Bronze" attack=1 expand=0 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/babylonian.ruleset styles/data/nation/babylonian.ruleset --- freeciv/data/nation/babylonian.ruleset Tue Mar 21 12:26:14 2000 +++ styles/data/nation/babylonian.ruleset Sat Jan 27 17:58:58 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male" flag = "f.iraq_old" flag_alt = "-" -city_style = "Classical" +city_style = "Bronze" attack=0 expand=0 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/carthaginian.ruleset styles/data/nation/carthaginian.ruleset --- freeciv/data/nation/carthaginian.ruleset Tue Mar 21 12:26:15 2000 +++ styles/data/nation/carthaginian.ruleset Sat Jan 27 17:59:22 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Female" flag="f.tunisia" flag_alt = "-" -city_style = "Classical" +city_style = "Bronze" attack=2 expand=1 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/chinese.ruleset styles/data/nation/chinese.ruleset --- freeciv/data/nation/chinese.ruleset Thu Jul 13 15:57:54 2000 +++ styles/data/nation/chinese.ruleset Sat Jan 27 17:59:47 2001 @@ -8,7 +8,7 @@ "Male", "Male", "Male" flag="f.china" flag_alt = "-" -city_style = "Classical" +city_style = "Oriental" ruler_titles = { "government", "male_title", "female_title" "Monarchy", _("Emperor"), _("Dowager") "Communism", _("Chairman"), _("Chairperson") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/egyptian.ruleset styles/data/nation/egyptian.ruleset --- freeciv/data/nation/egyptian.ruleset Tue Mar 21 12:26:17 2000 +++ styles/data/nation/egyptian.ruleset Sat Jan 27 18:00:04 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Female", "Male", "Female", "Female", "Male" flag="f.egypt" flag_alt = "-" -city_style = "Classical" +city_style = "Bronze" ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Pharaoh"), _("Pharaoh") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/filipino.ruleset styles/data/nation/filipino.ruleset --- freeciv/data/nation/filipino.ruleset Sun Apr 16 18:31:41 2000 +++ styles/data/nation/filipino.ruleset Sat Jan 27 18:00:21 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag="f.philippines" flag_alt = "-" -city_style = "European" +city_style = "Oriental" attack=1 expand=1 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/inca.ruleset styles/data/nation/inca.ruleset --- freeciv/data/nation/inca.ruleset Tue Mar 21 12:26:18 2000 +++ styles/data/nation/inca.ruleset Sat Jan 27 18:00:39 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag="f.peru" flag_alt = "-" -city_style = "Classical" +city_style = "Bronze" ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Warlord"), _("Warlord") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/indian.ruleset styles/data/nation/indian.ruleset --- freeciv/data/nation/indian.ruleset Tue Mar 21 12:26:19 2000 +++ styles/data/nation/indian.ruleset Sat Jan 27 18:00:59 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Female" flag="f.india" flag_alt = "-" -city_style = "European" +city_style = "Oriental" ruler_titles = { "government", "male_title", "female_title" "Monarchy", _("Maharaja"), _("Maharaja") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/israeli.ruleset styles/data/nation/israeli.ruleset --- freeciv/data/nation/israeli.ruleset Fri Jan 5 23:59:09 2001 +++ styles/data/nation/israeli.ruleset Sat Jan 27 18:01:15 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag="f.israel" flag_alt = "-" -city_style = "European" +city_style = "Bronze" ruler_titles = { "government", "male_title", "female_title" "Democracy", _("Prime Minister"), _("Prime Minister") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/japanese.ruleset styles/data/nation/japanese.ruleset --- freeciv/data/nation/japanese.ruleset Tue Mar 21 12:26:19 2000 +++ styles/data/nation/japanese.ruleset Sat Jan 27 17:31:13 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag="f.japan" flag_alt = "-" -city_style = "European" +city_style = "Oriental" ruler_titles = { "government", "male_title", "female_title" "Monarchy", _("Shogun"), _("Shogun") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/mongol.ruleset styles/data/nation/mongol.ruleset --- freeciv/data/nation/mongol.ruleset Tue Mar 21 12:26:20 2000 +++ styles/data/nation/mongol.ruleset Sat Jan 27 18:01:45 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male", "Male" flag="f.mongolia" flag_alt = "-" -city_style = "European" +city_style = "Oriental" ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Khan"), _("Khan") "Monarchy", _("Great Khan"), _("Great Khan") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/singaporean.ruleset styles/data/nation/singaporean.ruleset --- freeciv/data/nation/singaporean.ruleset Mon Sep 4 14:36:51 2000 +++ styles/data/nation/singaporean.ruleset Sat Jan 27 18:02:08 2001 @@ -20,7 +20,7 @@ "Male", "Male", "Male", "Male", "Female" flag="f.singapore" flag_alt = "-" -city_style = "European" +city_style = "Oriental" ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Ah"), _("Ah") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/sioux.ruleset styles/data/nation/sioux.ruleset --- freeciv/data/nation/sioux.ruleset Tue Mar 21 12:26:22 2000 +++ styles/data/nation/sioux.ruleset Sat Jan 27 18:02:23 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male" flag="f.cheyenne" flag_alt = "-" -city_style = "European" +city_style = "Bronze" ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Chief"), _("Chief") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/thai.ruleset styles/data/nation/thai.ruleset --- freeciv/data/nation/thai.ruleset Tue Mar 21 12:26:23 2000 +++ styles/data/nation/thai.ruleset Sat Jan 27 18:02:39 2001 @@ -8,7 +8,7 @@ "Male", "Male" flag="f.thailand" flag_alt = "-" -city_style = "European" +city_style = "Oriental" attack=1 expand=2 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/turk.ruleset styles/data/nation/turk.ruleset --- freeciv/data/nation/turk.ruleset Tue Mar 21 12:26:23 2000 +++ styles/data/nation/turk.ruleset Sat Jan 27 18:02:50 2001 @@ -8,7 +8,7 @@ "Male", "Male" flag="f.turkey" flag_alt = "-" -city_style = "European" +city_style = "Bronze" ruler_titles = { "government", "male_title", "female_title" "Monarchy", _("Sultan"), _("Sultan") diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/vietnamese.ruleset styles/data/nation/vietnamese.ruleset --- freeciv/data/nation/vietnamese.ruleset Tue Mar 21 12:26:23 2000 +++ styles/data/nation/vietnamese.ruleset Sat Jan 27 18:03:02 2001 @@ -6,7 +6,7 @@ leader_sex="Male", "Male", "Male", "Male", "Male" flag="f.vietnam" flag_alt = "-" -city_style = "European" +city_style = "Oriental" attack=0 expand=0 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/nation/zulu.ruleset styles/data/nation/zulu.ruleset --- freeciv/data/nation/zulu.ruleset Tue Mar 21 12:26:24 2000 +++ styles/data/nation/zulu.ruleset Sat Jan 27 18:03:19 2001 @@ -6,7 +6,7 @@ leader_sex="Male" flag="f.south_africa" flag_alt = "f.rwanda" ; used previously -city_style = "European" +city_style = "Bronze" attack=2 expand=1 diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/data/trident/cities.spec styles/data/trident/cities.spec --- freeciv/data/trident/cities.spec Wed Dec 29 17:47:01 1999 +++ styles/data/trident/cities.spec Sat Jan 27 17:15:48 2001 @@ -64,6 +64,19 @@ 5, 3, "city.classical_wall" 5, 4, "city.classical_occupied" +; These need to be drawn + 1, 0, "city.oriental_0" + 1, 1, "city.oriental_5" + 1, 2, "city.oriental_10" + 1, 3, "city.oriental_wall" + 1, 4, "city.oriental_occupied" + 1, 0, "city.bronze_0" + 1, 1, "city.bronze_5" + 1, 2, "city.bronze_10" + 1, 3, "city.bronze_wall" + 1, 4, "city.bronze_occupied" + + 2, 0, "city.industrial_0" 2, 1, "city.industrial_5" 2, 2, "city.industrial_10"