Author: jtn
Date: Fri Nov  4 00:51:29 2016
New Revision: 34374

URL: http://svn.gna.org/viewcvs/freeciv?rev=34374&view=rev
Log:
Warn the turn before a city in disorder provokes a national revolution.

See gna patch #7920.

Modified:
    branches/S2_6/server/cityturn.c

Modified: branches/S2_6/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=34374&r1=34373&r2=34374&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c     (original)
+++ branches/S2_6/server/cityturn.c     Fri Nov  4 00:51:29 2016
@@ -2997,16 +2997,29 @@
       }
     }
 
+    revolution_turns = get_city_bonus(pcity, EFT_REVOLUTION_UNHAPPINESS);
     if (city_unhappy(pcity)) {
+      const char *revomsg;
+
       pcity->anarchy++;
+      if (pcity->anarchy == revolution_turns) {
+        /* Revolution next turn if not dealt with */
+        /* TRANS: preserve leading space; this string will be appended to
+         * another sentence */
+        revomsg = _(" Unrest threatens to spread beyond the city.");
+      } else {
+        revomsg = "";
+      }
       if (pcity->anarchy == 1) {
         notify_player(pplayer, city_tile(pcity), E_CITY_DISORDER, ftc_server,
-                      _("Civil disorder in %s."),
-                      city_link(pcity));
+                      /* TRANS: second %s is an optional extra sentence */
+                      _("Civil disorder in %s.%s"),
+                      city_link(pcity), revomsg);
       } else {
         notify_player(pplayer, city_tile(pcity), E_CITY_DISORDER, ftc_server,
-                      _("CIVIL DISORDER CONTINUES in %s."),
-                      city_link(pcity));
+                      /* TRANS: second %s is an optional extra sentence */
+                      _("CIVIL DISORDER CONTINUES in %s.%s"),
+                      city_link(pcity), revomsg);
       }
     } else {
       if (pcity->anarchy != 0) {
@@ -3020,7 +3033,6 @@
 
     send_city_info(NULL, pcity);
 
-    revolution_turns = get_city_bonus(pcity, EFT_REVOLUTION_UNHAPPINESS);
     if (revolution_turns > 0 && pcity->anarchy > revolution_turns) {
       notify_player(pplayer, city_tile(pcity), E_ANARCHY, ftc_server,
                     _("The people have overthrown your %s, "


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

Reply via email to