Author: cazfi
Date: Sun Feb 28 13:33:21 2016
New Revision: 32118

URL: http://svn.gna.org/viewcvs/freeciv?rev=32118&view=rev
Log:
Prevented moving Small Wonders other than Palace around in multiplayer ruleset.
Added mention of the movability of the Palace to its helptext in all relevant 
rulesets.

Reported by Christian Knoke <chrisk>

See bug #24431

Modified:
    branches/S2_6/data/civ1/buildings.ruleset
    branches/S2_6/data/civ2/buildings.ruleset
    branches/S2_6/data/civ2civ3/buildings.ruleset
    branches/S2_6/data/classic/buildings.ruleset
    branches/S2_6/data/experimental/buildings.ruleset
    branches/S2_6/data/multiplayer/README.multiplayer
    branches/S2_6/data/multiplayer/buildings.ruleset
    branches/S2_6/data/sandbox/buildings.ruleset

Modified: branches/S2_6/data/civ1/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/civ1/buildings.ruleset   (original)
+++ branches/S2_6/data/civ1/buildings.ruleset   Sun Feb 28 13:33:21 2016
@@ -509,6 +509,10 @@
 Take good care of your capital, as its loss may result in your\
  empire plunging into civil war. Losing your current palace also\
  results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 ")
 
 [building_power_plant]

Modified: branches/S2_6/data/civ2/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/civ2/buildings.ruleset   (original)
+++ branches/S2_6/data/civ2/buildings.ruleset   Sun Feb 28 13:33:21 2016
@@ -597,6 +597,10 @@
 Take good care of your capital, as its loss may result in your\
  empire plunging into civil war. Losing your current palace also\
  results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 ")
 
 [building_police_station]

Modified: branches/S2_6/data/civ2civ3/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/buildings.ruleset       (original)
+++ branches/S2_6/data/civ2civ3/buildings.ruleset       Sun Feb 28 13:33:21 2016
@@ -769,6 +769,10 @@
 Take good care of your capital, as its loss may result in your \
 empire plunging into civil war. Losing your current palace also \
 results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 "),
 ; /* xgettext:no-c-format */
 _("\

Modified: branches/S2_6/data/classic/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/classic/buildings.ruleset        (original)
+++ branches/S2_6/data/classic/buildings.ruleset        Sun Feb 28 13:33:21 2016
@@ -650,6 +650,10 @@
 Take good care of your capital, as its loss may result in your\
  empire plunging into civil war. Losing your current palace also\
  results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 "),
 ; /* xgettext:no-c-format */
 _("\

Modified: branches/S2_6/data/experimental/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/experimental/buildings.ruleset   (original)
+++ branches/S2_6/data/experimental/buildings.ruleset   Sun Feb 28 13:33:21 2016
@@ -705,6 +705,10 @@
 Take good care of your capital, as its loss may result in your\
  empire plunging into civil war. Losing your current palace also\
  results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 "),
 ; /* xgettext:no-c-format */
 _("\

Modified: branches/S2_6/data/multiplayer/README.multiplayer
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/README.multiplayer?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/README.multiplayer   (original)
+++ branches/S2_6/data/multiplayer/README.multiplayer   Sun Feb 28 13:33:21 2016
@@ -43,7 +43,11 @@
 
 Unless otherwise noted, for these small wonders, all wonder effects
 that affect all of a player's cities have been changed to affect only
-cities on the same continent as the city with the small wonder. 
+cities on the same continent as the city with the small wonder.
+
+The Palace is still the only Small Wonder that can be moved around
+by rebuilding it to a new city. Other Small Wonders can be rebuilt
+only if you have lost them with the city where they were.
 
 For the Colossus, Copernicus' Observatory, Great Wall, Hoover Dam,
 King Richard's Crusade, Oracle, Shakespeare's Theater, Statue of

Modified: branches/S2_6/data/multiplayer/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/buildings.ruleset    (original)
+++ branches/S2_6/data/multiplayer/buildings.ruleset    Sun Feb 28 13:33:21 2016
@@ -635,6 +635,10 @@
 Take good care of your capital, as its loss may result in your\
  empire plunging into civil war. Losing your current palace also\
  results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 "),
 ; /* xgettext:no-c-format */
 _("\
@@ -1092,8 +1096,9 @@
 name           = _("Apollo Program")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Space Flight", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Space Flight", "Player", TRUE
+      "Building", "Apollo Program", "Player", FALSE
     }
 graphic        = "b.apollo_program"
 graphic_alt    = "-"
@@ -1115,8 +1120,9 @@
 name           = _("A.Smith's Trading Co.")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Economics", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Economics", "Player", TRUE
+      "Building", "A.Smith's Trading Co.", "Player", FALSE
     }
 graphic        = "b.asmiths_trading_co"
 graphic_alt    = "-"
@@ -1137,8 +1143,9 @@
 name           = _("Colossus")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Bronze Working", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Bronze Working", "Player", TRUE
+      "Building", "Colossus", "Player", FALSE
     }
 graphic        = "b.colossus"
 graphic_alt    = "-"
@@ -1160,8 +1167,9 @@
 name           = _("Copernicus' Observatory")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Astronomy", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Astronomy", "Player", TRUE
+      "Building", "Copernicus' Observatory", "Player", FALSE
     }
 graphic        = "b.copernicus_observatory"
 graphic_alt    = "-"
@@ -1208,8 +1216,9 @@
 name           = _("Darwin's Voyage")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Railroad", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Railroad", "Player", TRUE
+      "Building", "Darwin's Voyage", "Player", FALSE
     }
 graphic        = "b.darwins_voyage"
 graphic_alt    = "-"
@@ -1230,8 +1239,9 @@
 name           = _("Eiffel Tower")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Steam Engine", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Steam Engine", "Player", TRUE
+      "Building", "Eiffel Tower", "Player", FALSE
     }
 graphic        = "b.eiffel_tower"
 graphic_alt    = "-"
@@ -1253,8 +1263,9 @@
 name           = _("Great Library")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Literacy", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Literacy", "Player", TRUE
+      "Building", "Great Library", "Player", FALSE
     }
 graphic        = "b.great_library"
 graphic_alt    = "-"
@@ -1275,8 +1286,9 @@
 name           = _("Great Wall")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Masonry", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Masonry", "Player", TRUE
+      "Building", "Great Wall", "Player", FALSE
     }
 graphic        = "b.great_wall"
 graphic_alt    = "-"
@@ -1297,8 +1309,9 @@
 name           = _("Hanging Gardens")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Pottery", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Pottery", "Player", TRUE
+      "Building", "Hanging Gardens", "Player", FALSE
     }
 graphic        = "b.hanging_gardens"
 graphic_alt    = "-"
@@ -1323,9 +1336,10 @@
 name           = _("Hoover Dam")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Electronics", "Player"
-      "Extra", "River", "Adjacent"
+    { "type", "name", "range", "present"
+      "Tech", "Electronics", "Player", TRUE
+      "Extra", "River", "Adjacent", TRUE
+      "Building", "Hoover Dam", "Player", FALSE
     }
 graphic        = "b.hoover_dam"
 graphic_alt    = "-"
@@ -1347,8 +1361,9 @@
 name           = _("Isaac Newton's College")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Theory of Gravity", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Theory of Gravity", "Player", TRUE
+      "Building", "Isaac Newton's College", "Player", FALSE
     }
 graphic        = "b.isaac_newtons_college"
 graphic_alt    = "-"
@@ -1370,8 +1385,9 @@
 name           = _("J.S. Bach's Cathedral")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Theology", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Theology", "Player", TRUE
+      "Building", "J.S. Bach's Cathedral", "Player", FALSE
     }
 graphic        = "b.js_bachs_cathedral"
 graphic_alt    = "-"
@@ -1392,8 +1408,9 @@
 name           = _("King Richard's Crusade")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Engineering", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Engineering", "Player", TRUE
+      "Building", "King Richard's Crusade", "Player", FALSE
     }
 graphic        = "b.king_richards_crusade"
 graphic_alt    = "-"
@@ -1415,8 +1432,9 @@
 name           = _("Leonardo's Workshop")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Invention", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Invention", "Player", TRUE
+      "Building", "Leonardo's Workshop", "Player", FALSE
     }
 graphic        = "b.leonardos_workshop"
 graphic_alt    = "-"
@@ -1437,9 +1455,10 @@
 name           = _("Lighthouse")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Map Making", "Player"
-      "TerrainClass", "Oceanic", "Adjacent"
+    { "type", "name", "range", "present"
+      "Tech", "Map Making", "Player", TRUE
+      "TerrainClass", "Oceanic", "Adjacent", TRUE
+      "Building", "Lighthouse", "Player", FALSE
     }
 graphic        = "b.lighthouse"
 graphic_alt    = "-"
@@ -1460,9 +1479,10 @@
 name           = _("Magellan's Expedition")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Navigation", "Player"
-      "TerrainClass", "Oceanic", "Adjacent"
+    { "type", "name", "range", "present"
+      "Tech", "Navigation", "Player", TRUE
+      "TerrainClass", "Oceanic", "Adjacent", TRUE
+      "Building", "Magellan's Expedition", "Player", FALSE
     }
 graphic        = "b.magellans_expedition"
 graphic_alt    = "-"
@@ -1504,8 +1524,9 @@
 name           = _("Marco Polo's Embassy")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Trade", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Trade", "Player", TRUE
+      "Building", "Marco Polo's Embassy", "Player", FALSE
     }
 graphic        = "b.marco_polos_embassy"
 graphic_alt    = "-"
@@ -1527,8 +1548,9 @@
 name           = _("Michelangelo's Chapel")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Monotheism", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Monotheism", "Player", TRUE
+      "Building", "Michelangelo's Chapel", "Player", FALSE
     }
 graphic        = "b.michelangelos_chapel"
 graphic_alt    = "-"
@@ -1554,8 +1576,9 @@
 name           = _("Oracle")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Mysticism", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Mysticism", "Player", TRUE
+      "Building", "Oracle", "Player", FALSE
     }
 graphic        = "b.oracle"
 graphic_alt    = "-"
@@ -1578,8 +1601,9 @@
 name           = _("Pyramids")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Masonry", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Masonry", "Player", TRUE
+      "Building", "Pyramids", "Player", FALSE
     }
 graphic        = "b.pyramids"
 graphic_alt    = "-"
@@ -1601,8 +1625,9 @@
 name           = _("The Internet")
 genus          = "SmallWonder"
  reqs  =
-     { "type", "name", "range"
-       "Tech", "Computers", "Player"
+     { "type", "name", "range", "present"
+       "Tech", "Computers", "Player", TRUE
+       "Building", "The Internet", "Player", FALSE
      }
 graphic        = "b.internet"
 graphic_alt    = "b.seti_program"
@@ -1625,8 +1650,9 @@
 rule_name       = "Shakespeare's Theatre"       ; en_GB used originally
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Medicine", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Medicine", "Player", TRUE
+      "Building", "Shakespeare's Theatre", "Player", FALSE
     }
 graphic        = "b.shakespeares_theatre"
 graphic_alt    = "-"
@@ -1647,8 +1673,9 @@
 name           = _("Statue of Liberty")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Democracy", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Democracy", "Player", TRUE
+      "Building", "Statue of Liberty", "Player", FALSE
     }
 graphic        = "b.statue_of_liberty"
 graphic_alt    = "-"
@@ -1670,8 +1697,9 @@
 name           = _("Sun Tzu's War Academy")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Feudalism", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Feudalism", "Player", TRUE
+      "Building", "Sun Tzu's War Academy", "Player", FALSE
     }
 graphic        = "b.sun_tzus_war_academy"
 graphic_alt    = "-"
@@ -1717,8 +1745,9 @@
 name           = _("Women's Suffrage")
 genus          = "SmallWonder"
 reqs   =
-    { "type", "name", "range"
-      "Tech", "Industrialization", "Player"
+    { "type", "name", "range", "present"
+      "Tech", "Industrialization", "Player", TRUE
+      "Building", "Women's Suffrage", "Player", FALSE
     }
 graphic        = "b.womens_suffrage"
 graphic_alt    = "-"

Modified: branches/S2_6/data/sandbox/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/buildings.ruleset?rev=32118&r1=32117&r2=32118&view=diff
==============================================================================
--- branches/S2_6/data/sandbox/buildings.ruleset        (original)
+++ branches/S2_6/data/sandbox/buildings.ruleset        Sun Feb 28 13:33:21 2016
@@ -769,6 +769,10 @@
 Take good care of your capital, as its loss may result in your \
 empire plunging into civil war. Losing your current palace also \
 results in losing whatever spaceship you might have.\
+"), _("\
+If the city with palace is in dangerous location, or making some\
+ more central city your capital would give better corruption distribution,\
+ you can move Palace by rebuilding it to an other city.\
 "),
 ; /* xgettext:no-c-format */
 _("\


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to