Author: jtn
Date: Thu Jan 29 01:31:34 2015
New Revision: 27881

URL: http://svn.gna.org/viewcvs/freeciv?rev=27881&view=rev
Log:
Stop trying to document bridge building rules automatically.

See gna patch #5759.

Modified:
    branches/S2_6/client/helpdata.c
    branches/S2_6/data/civ1/techs.ruleset
    branches/S2_6/data/civ2/techs.ruleset
    branches/S2_6/data/civ2civ3/techs.ruleset
    branches/S2_6/data/classic/techs.ruleset
    branches/S2_6/data/experimental/techs.ruleset
    branches/S2_6/data/multiplayer/techs.ruleset

Modified: branches/S2_6/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/client/helpdata.c     (original)
+++ branches/S2_6/client/helpdata.c     Thu Jan 29 01:31:34 2015
@@ -4041,14 +4041,6 @@
                  advance_name_translation(vap));
   }
 
-  if (advance_has_flag(i, TF_BRIDGE)
-      && role_units_translations(&astr, UTYF_SETTLERS, FALSE)) {
-    cat_snprintf(buf, bufsz,
-                 /* TRANS: %s is list of units separated by "and". */
-                 _("* Allows %s to build roads on river tiles.\n"),
-                 astr_str(&astr));
-  }
-
   for (flagid = TECH_USER_1 ; flagid <= TECH_USER_LAST; flagid++) {
     if (advance_has_flag(i, flagid)) {
       const char *helptxt = tech_flag_helptxt(flagid);
@@ -4422,15 +4414,6 @@
       CATLSTR(buf, bufsz,
               _("* Allows the owner to see normally invisible units in an "
                 "area around the tile.\n"));
-    }
-  }
-
-  if (proad != NULL) {
-    if (road_has_flag(proad, RF_REQUIRES_BRIDGE)) {
-      /* TODO: List actual technologies. */
-      CATLSTR(buf, bufsz,
-              _("* Cannot be built to river tiles unless some technology "
-                "allowing bridge building is knowns.\n"));
     }
   }
 

Modified: branches/S2_6/data/civ1/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/techs.ruleset?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/data/civ1/techs.ruleset       (original)
+++ branches/S2_6/data/civ1/techs.ruleset       Thu Jan 29 01:31:34 2015
@@ -111,6 +111,7 @@
 flags    = "Bridge"
 graphic     = "a.bridge_building"
 graphic_alt = "-"
+helptext = _("Allows roads to be built on river tiles.")
 
 [advance_bronze_working]
 name     = _("Bronze Working")

Modified: branches/S2_6/data/civ2/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/techs.ruleset?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/data/civ2/techs.ruleset       (original)
+++ branches/S2_6/data/civ2/techs.ruleset       Thu Jan 29 01:31:34 2015
@@ -119,6 +119,7 @@
 flags    = "Bridge"
 graphic     = "a.bridge_building"
 graphic_alt = "-"
+helptext = _("Allows roads to be built on river tiles.")
 
 [advance_bronze_working]
 name     = _("Bronze Working")

Modified: branches/S2_6/data/civ2civ3/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/techs.ruleset?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/techs.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/techs.ruleset   Thu Jan 29 01:31:34 2015
@@ -140,6 +140,7 @@
 graphic     = "a.bridge_building"
 graphic_alt = "-"
 cost     = 70
+helptext = _("Allows roads to be built on river tiles.")
 
 [advance_bronze_working]
 name     = _("Bronze Working")

Modified: branches/S2_6/data/classic/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/techs.ruleset?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/data/classic/techs.ruleset    (original)
+++ branches/S2_6/data/classic/techs.ruleset    Thu Jan 29 01:31:34 2015
@@ -130,6 +130,7 @@
 flags    = "Bridge"
 graphic     = "a.bridge_building"
 graphic_alt = "-"
+helptext = _("Allows roads to be built on river tiles.")
 
 [advance_bronze_working]
 name     = _("Bronze Working")

Modified: branches/S2_6/data/experimental/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/techs.ruleset?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/data/experimental/techs.ruleset       (original)
+++ branches/S2_6/data/experimental/techs.ruleset       Thu Jan 29 01:31:34 2015
@@ -139,6 +139,7 @@
 flags    = "Bridge"
 graphic     = "a.bridge_building"
 graphic_alt = "-"
+helptext = _("Allows roads to be built on river tiles.")
 
 [advance_bronze_working]
 name     = _("Bronze Working")

Modified: branches/S2_6/data/multiplayer/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/techs.ruleset?rev=27881&r1=27880&r2=27881&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/techs.ruleset        (original)
+++ branches/S2_6/data/multiplayer/techs.ruleset        Thu Jan 29 01:31:34 2015
@@ -130,6 +130,7 @@
 flags    = "Bridge"
 graphic     = "a.bridge_building"
 graphic_alt = "-"
+helptext = _("Allows roads to be built on river tiles.")
 
 [advance_bronze_working]
 name     = _("Bronze Working")


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

Reply via email to