Author: jtn
Date: Thu Jan 29 01:36:10 2015
New Revision: 27885
URL: http://svn.gna.org/viewcvs/freeciv?rev=27885&view=rev
Log:
Stop trying to document bridge building rules automatically.
See gna patch #5759.
Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/data/civ1/techs.ruleset
branches/S2_5/data/civ2/techs.ruleset
branches/S2_5/data/civ2civ3/techs.ruleset
branches/S2_5/data/classic/techs.ruleset
branches/S2_5/data/experimental/techs.ruleset
branches/S2_5/data/multiplayer/techs.ruleset
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Thu Jan 29 01:36:10 2015
@@ -2941,14 +2941,6 @@
_("* Increases the pollution generated by the population.\n"));
}
- 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));
- }
-
if (advance_has_flag(i, TF_FARMLAND)
&& role_units_translations(&astr, UTYF_SETTLERS, FALSE)) {
cat_snprintf(buf, bufsz,
@@ -3384,13 +3376,6 @@
if (proad->pillageable) {
CATLSTR(buf, bufsz,
_("* Can be pillaged by units.\n"));
- }
-
- 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"));
}
/* Table of terrain-specific attributes, if needed */
Modified: branches/S2_5/data/civ1/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/techs.ruleset?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/data/civ1/techs.ruleset (original)
+++ branches/S2_5/data/civ1/techs.ruleset Thu Jan 29 01:36:10 2015
@@ -110,6 +110,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_5/data/civ2/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/techs.ruleset?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/data/civ2/techs.ruleset (original)
+++ branches/S2_5/data/civ2/techs.ruleset Thu Jan 29 01:36:10 2015
@@ -118,6 +118,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_5/data/civ2civ3/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/techs.ruleset?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/techs.ruleset (original)
+++ branches/S2_5/data/civ2civ3/techs.ruleset Thu Jan 29 01:36:10 2015
@@ -142,6 +142,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_5/data/classic/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/techs.ruleset?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/data/classic/techs.ruleset (original)
+++ branches/S2_5/data/classic/techs.ruleset Thu Jan 29 01:36:10 2015
@@ -132,6 +132,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_5/data/experimental/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/techs.ruleset?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/data/experimental/techs.ruleset (original)
+++ branches/S2_5/data/experimental/techs.ruleset Thu Jan 29 01:36:10 2015
@@ -141,6 +141,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_5/data/multiplayer/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/techs.ruleset?rev=27885&r1=27884&r2=27885&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/techs.ruleset (original)
+++ branches/S2_5/data/multiplayer/techs.ruleset Thu Jan 29 01:36:10 2015
@@ -132,6 +132,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
