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

 - Units with "Trireme"-flag cannot leave coast at all. They no longer
have risk of sinking in high seas. Automatic helptext generation
adjusted accordingly.
 - Triremes in default ruleset cannot enter deep ocean tiles. Static
helptext adjusted accordingly.


 - ML

diff -Nurd -X.diff_ignore freeciv/client/helpdata.c freeciv/client/helpdata.c
--- freeciv/client/helpdata.c   2008-07-06 17:26:29.000000000 +0300
+++ freeciv/client/helpdata.c   2008-07-21 22:13:59.000000000 +0300
@@ -1063,9 +1063,6 @@
                   " training facilities (see Port Facility).\n"));
         CATLSTR(buf, bufsz,
                 _("* May be promoted after defeating an enemy unit.\n"));
-        if (utype_has_flag(utype, F_TRIREME))
-          CATLSTR(buf, bufsz,
-                  _("* May be promoted after survival on the high seas.\n"));
         break;
       default:          /* should never happen in default rulesets */
         CATLSTR(buf, bufsz,
@@ -1073,12 +1070,6 @@
         break;
     };
   }
-  if (utype_has_flag(utype, F_TRIREME)) {
-    CATLSTR(buf, bufsz,
-           /* xgettext:no-c-format */
-           _("* Must end turn in a city or next to land,"
-             " or has a 50% risk of being lost at sea.\n"));
-  }
   if (utype->fuel > 0) {
     char allowed_units[10][64];
     int num_allowed_units = 0;
diff -Nurd -X.diff_ignore freeciv/data/default/units.ruleset 
freeciv/data/default/units.ruleset
--- freeciv/data/default/units.ruleset  2008-06-26 21:53:51.000000000 +0300
+++ freeciv/data/default/units.ruleset  2008-07-21 22:17:02.000000000 +0300
@@ -1313,7 +1313,7 @@
 helptext      = _("\
 The Trireme is your first boat unit. It can act\
  as a transport ship and has rudimentary offensive\
- capabilities, but may not stray too far from the shore.\
+ capabilities, but may not enter deep ocean tiles.\
 ")
 
 [unit_caravel]
@@ -1345,8 +1345,8 @@
 flags         = "BadCityDefender"
 roles         = "Ferryboat", "BarbarianBoat"
 helptext      = _("\
-The Caravel replaces the Trireme and is much\
- more reliable on the open seas.\
+The Caravel replaces the Trireme and can enter\
+ any ocean tile.\
 ")
 
 [unit_galleon]
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to