<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40230 >

 Remove obsoleted entries from rulesets. Fixed a couple of misnamed
entries in S2_1 civ1 ruleset.


 - ML

diff -Nurd -X.diff_ignore freeciv/data/civ1/governments.ruleset freeciv/data/civ1/governments.ruleset
--- freeciv/data/civ1/governments.ruleset	2007-08-04 18:36:42.000000000 +0300
+++ freeciv/data/civ1/governments.ruleset	2008-05-06 03:24:56.000000000 +0300
@@ -17,7 +17,6 @@
 options="1.9"
 
 [governments]
-default="Despotism"
 when_anarchy="Anarchy"
 
 ; Below: The individual government types, one per section.
diff -Nurd -X.diff_ignore freeciv/data/civ1/units.ruleset freeciv/data/civ1/units.ruleset
--- freeciv/data/civ1/units.ruleset	2007-08-30 18:05:19.000000000 +0300
+++ freeciv/data/civ1/units.ruleset	2008-05-06 03:25:05.000000000 +0300
@@ -1161,6 +1161,3 @@
 When barbarian leader is killed on a tile without any defending units, \
 the 100 gold ransom is paid, but only to land units.\
 ")
-
-[u_specials]
-partisan_req = "" ; "Gunpowder","Communism"
diff -Nurd -X.diff_ignore freeciv/data/civ2/governments.ruleset freeciv/data/civ2/governments.ruleset
--- freeciv/data/civ2/governments.ruleset	2007-10-07 10:28:10.000000000 +0300
+++ freeciv/data/civ2/governments.ruleset	2008-05-06 03:24:40.000000000 +0300
@@ -15,7 +15,6 @@
 options="1.9"
 
 [governments]
-default="Despotism"
 when_anarchy="Anarchy"
 
 ; Below: The individual government types, one per section.
diff -Nurd -X.diff_ignore freeciv/data/civ2/units.ruleset freeciv/data/civ2/units.ruleset
--- freeciv/data/civ2/units.ruleset	2007-11-27 21:57:23.000000000 +0200
+++ freeciv/data/civ2/units.ruleset	2008-05-06 03:24:23.000000000 +0300
@@ -1946,6 +1946,3 @@
 When barbarian leader is killed on a tile without any defending units, \
 the 100 gold ransom is paid, but only to land units and helicopters.\
 ")
-
-[u_specials]
-partisan_req = "Gunpowder","Communism"
diff -Nurd -X.diff_ignore freeciv/data/nation/barbarian.ruleset freeciv/data/nation/barbarian.ruleset
--- freeciv/data/nation/barbarian.ruleset	2007-08-04 18:36:53.000000000 +0300
+++ freeciv/data/nation/barbarian.ruleset	2008-05-06 03:23:21.000000000 +0300
@@ -24,7 +24,6 @@
 cities = "Barbaricum"
 
 is_playable = 0
-is_observer = 0
 barbarian_type = "Land"
 
 ; nothing more needed for barbarians
diff -Nurd -X.diff_ignore freeciv/data/nation/pirate.ruleset freeciv/data/nation/pirate.ruleset
--- freeciv/data/nation/pirate.ruleset	2007-08-04 18:36:53.000000000 +0300
+++ freeciv/data/nation/pirate.ruleset	2008-05-06 03:23:29.000000000 +0300
@@ -29,7 +29,6 @@
  "Tortuga"
 
 is_playable = 0
-is_observer = 0
 barbarian_type = "Sea"
 
 ; nothing more needed for barbarians
diff -Nurd -X.diff_ignore freeciv/data/civ1/governments.ruleset freeciv/data/civ1/governments.ruleset
--- freeciv/data/civ1/governments.ruleset	2007-06-28 20:19:22.000000000 +0300
+++ freeciv/data/civ1/governments.ruleset	2008-05-06 03:18:01.000000000 +0300
@@ -17,7 +17,6 @@
 options="1.9"
 
 [governments]
-default="Despotism"
 when_anarchy="Anarchy"
 
 ; Below: The individual government types, one per section.
diff -Nurd -X.diff_ignore freeciv/data/civ1/terrain.ruleset freeciv/data/civ1/terrain.ruleset
--- freeciv/data/civ1/terrain.ruleset	2007-03-05 19:13:55.000000000 +0200
+++ freeciv/data/civ1/terrain.ruleset	2008-05-06 03:14:39.000000000 +0300
@@ -24,11 +24,11 @@
 
 ; Percentage of "land" tiles required to be adjacent to an ocean tile before
 ; it may be "reclaimed" into a land tile (0-101; 0=anywhere, 101=nowhere)
-ocean_reclaim_requirement=101
+ocean_reclaim_requirement_pct=101
 
 ; Percentage of "ocean" tiles required to be adjacent to a land tile before
 ; it may be "channeled" into an ocean tile (0-101; 0=anywhere, 101=nowhere)
-land_channel_requirement=101
+land_channel_requirement_pct=101
 
 ; special movement costs for rivers:
 ;   0 - normal movement cost for rivers (matches Civ1)
diff -Nurd -X.diff_ignore freeciv/data/civ1/units.ruleset freeciv/data/civ1/units.ruleset
--- freeciv/data/civ1/units.ruleset	2007-11-28 02:28:16.000000000 +0200
+++ freeciv/data/civ1/units.ruleset	2008-05-06 03:16:59.000000000 +0300
@@ -1081,6 +1081,3 @@
 When barbarian leader is killed on a tile without any defending units, \
 the 100 gold ransom is paid, but only to land units.\
 ")
-
-[u_specials]
-partisan_req = "" ; "Gunpowder","Communism"
diff -Nurd -X.diff_ignore freeciv/data/civ2/governments.ruleset freeciv/data/civ2/governments.ruleset
--- freeciv/data/civ2/governments.ruleset	2007-06-28 20:19:22.000000000 +0300
+++ freeciv/data/civ2/governments.ruleset	2008-05-06 03:18:56.000000000 +0300
@@ -15,7 +15,6 @@
 options="1.9"
 
 [governments]
-default="Despotism"
 when_anarchy="Anarchy"
 
 ; Below: The individual government types, one per section.
diff -Nurd -X.diff_ignore freeciv/data/civ2/units.ruleset freeciv/data/civ2/units.ruleset
--- freeciv/data/civ2/units.ruleset	2007-11-28 02:28:16.000000000 +0200
+++ freeciv/data/civ2/units.ruleset	2008-05-06 03:20:15.000000000 +0300
@@ -1842,6 +1842,3 @@
 When barbarian leader is killed on a tile without any defending units, \
 the 100 gold ransom is paid, but only to land units and helicopters.\
 ")
-
-[u_specials]
-partisan_req = "Gunpowder","Communism"
diff -Nurd -X.diff_ignore freeciv/data/nation/barbarian.ruleset freeciv/data/nation/barbarian.ruleset
--- freeciv/data/nation/barbarian.ruleset	2007-03-05 19:13:57.000000000 +0200
+++ freeciv/data/nation/barbarian.ruleset	2008-05-06 03:07:08.000000000 +0300
@@ -24,7 +24,6 @@
 cities = "Barbaricum"
 
 is_playable = 0
-is_observer = 0
 is_barbarian = 1
 
 ; nothing more needed for barbarians
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to