[Freeciv-Dev] Re: (PR#6821) Update helptext

["Arnstein Lindgard" <a-l@xxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=6821 >

On Tue, 11 Nov 2003 02:05:58 -0800
"Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx> wrote:

> should be changed to: "... sea. Technologies may reduce this further."
> or insert the correct tech names. Use TF_REDUCE_TRIREME_LOSS1 and
> TF_REDUCE_TRIREME_LOSS2 for this.

Finally got a use for find_tech_by_flag() then. I updated the
technology help for visibility as well. This is important tactical
info, not even Eneg knew about it.

And I'd like to put an asterix and a space before lines in tech help,
as with unit help. I wasn't even aware that any useful info appeared
there. Hope that doesn't cause much trouble for translators.


Arnstein


Index: client/helpdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/helpdata.c,v
retrieving revision 1.65
diff -u -r1.65 helpdata.c
--- client/helpdata.c   2003/10/08 17:59:35     1.65
+++ client/helpdata.c   2003/11/14 10:40:24
@@ -692,9 +692,20 @@
                               " even when non-aggressive.\n"));
   }
   if (unit_type_flag(i, F_TRIREME)) {
+    Tech_Type_id tech1 = find_tech_by_flag(0, TF_REDUCE_TRIREME_LOSS1);
+    Tech_Type_id tech2 = find_tech_by_flag(0, TF_REDUCE_TRIREME_LOSS2);
     sprintf(buf+strlen(buf),
            _("* Must end turn in a city or next to land,"
-             " or has a 50%% risk of being lost at sea."));
+             " or has a 50%% risk of being lost at sea.\n"));
+    if (tech1 != A_LAST) {
+      sprintf(buf+strlen(buf),
+          _("* The discovery of %s reduces the risk to 25%%.\n"),
+          advances[tech1].name);
+    }
+    if (tech2 != A_LAST) {
+      sprintf(buf+strlen(buf),
+          _("* %s reduces the risk to 12%%.\n"), advances[tech2].name);
+    }
   }
   if (utype->fuel > 0) {
     char allowed_units[10][64];
@@ -807,57 +818,63 @@
 
   government_iterate(g) {
     if (g->required_tech == i) {
-      sprintf(buf+strlen(buf), _("Allows changing government to %s.\n"),
+      sprintf(buf+strlen(buf), _("* Allows changing government to %s.\n"),
              g->name);
     }
   } government_iterate_end;
   if(tech_flag(i,TF_BONUS_TECH)) {
     sprintf(buf+strlen(buf),
-           _("The first player to research %s gets an immediate advance.\n"),
+           _("* The first player to research %s gets an immediate advance.\n"),
            advances[i].name);
   }
   if(tech_flag(i,TF_BOAT_FAST))
-    sprintf(buf+strlen(buf), _("Gives sea units one extra move.\n"));
+    sprintf(buf+strlen(buf), _("* Gives sea units one extra move.\n"));
+  if(tech_flag(i,TF_REDUCE_TRIREME_LOSS1))
+    sprintf(buf+strlen(buf),
+      _("* Reduces the chance of losing boats on the high seas to 25%%.\n"));
+  if(tech_flag(i,TF_REDUCE_TRIREME_LOSS2))
+    sprintf(buf+strlen(buf),
+      _("* Reduces the chance of losing boats on the high seas to 12%%.\n"));
   if(tech_flag(i,TF_POPULATION_POLLUTION_INC))
-    sprintf(buf+strlen(buf), _("Increases the pollution generated by the 
population.\n"));
+    sprintf(buf+strlen(buf), _("* Increases the pollution generated by the 
population.\n"));
   if(game.rtech.cathedral_plus == i) 
-    sprintf(buf+strlen(buf), _("Improves the effect of Cathedrals.\n"));
+    sprintf(buf+strlen(buf), _("* Improves the effect of Cathedrals.\n"));
   if(game.rtech.cathedral_minus == i) 
-    sprintf(buf+strlen(buf), _("Reduces the effect of Cathedrals.\n"));
+    sprintf(buf+strlen(buf), _("* Reduces the effect of Cathedrals.\n"));
   if(game.rtech.colosseum_plus == i) 
-    sprintf(buf+strlen(buf), _("Improves the effect of Colosseums.\n"));
+    sprintf(buf+strlen(buf), _("* Improves the effect of Colosseums.\n"));
   if(game.rtech.temple_plus == i) 
-    sprintf(buf+strlen(buf), _("Improves the effect of Temples.\n"));
+    sprintf(buf+strlen(buf), _("* Improves the effect of Temples.\n"));
 
   if(tech_flag(i,TF_BRIDGE)) {
     const char *units_str = get_units_with_flag_string(F_SETTLERS);
-    sprintf(buf+strlen(buf), _("Allows %s to build roads on river 
squares.\n"),units_str);
+    sprintf(buf+strlen(buf), _("* Allows %s to build roads on river 
squares.\n"),units_str);
     free((void *) units_str);
   }
 
   if(tech_flag(i,TF_FORTRESS)) {
     const char *units_str = get_units_with_flag_string(F_SETTLERS);
-    sprintf(buf+strlen(buf), _("Allows %s to build fortresses.\n"),units_str);
+    sprintf(buf+strlen(buf), _("* Allows %s to build 
fortresses.\n"),units_str);
     free((void *) units_str);
   }
 
   if(tech_flag(i,TF_AIRBASE)) {
     const char *units_str = get_units_with_flag_string(F_AIRBASE);
     if (units_str) {
-      sprintf(buf+strlen(buf), _("Allows %s to build airbases.\n"),units_str);
+      sprintf(buf+strlen(buf), _("* Allows %s to build 
airbases.\n"),units_str);
       free((void *) units_str);
     }
   }
 
   if(tech_flag(i,TF_RAILROAD)) {
     const char *units_str = get_units_with_flag_string(F_SETTLERS);
-    sprintf(buf+strlen(buf), _("Allows %s to upgrade roads to 
railroads.\n"),units_str);
+    sprintf(buf+strlen(buf), _("* Allows %s to upgrade roads to 
railroads.\n"),units_str);
     free((void *) units_str);
   }
 
   if(tech_flag(i,TF_FARMLAND)) {
     const char *units_str = get_units_with_flag_string(F_SETTLERS);
-    sprintf(buf+strlen(buf), _("Allows %s to upgrade irrigation to 
farmland.\n"),units_str);
+    sprintf(buf+strlen(buf), _("* Allows %s to upgrade irrigation to 
farmland.\n"),units_str);
     free((void *) units_str);
   }
 }