From bb371e2c62c176f80e48cbb2e079e8235b28a9ca Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 30 May 2021 21:08:35 -0300
Subject: Politics - Be more clear about the term on the messages

---
 npc/functions/politics.txt | 20 +++++++++++++-------
 npc/functions/util.txt     |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/npc/functions/politics.txt b/npc/functions/politics.txt
index 2cc6eb076..cbeaadb73 100644
--- a/npc/functions/politics.txt
+++ b/npc/functions/politics.txt
@@ -159,40 +159,46 @@ OnSun0000:
 
     // Send salary to Town Administrators (20% from exports and 5GP/reputation)
     // Strange Coins: 1 each 10 reputation points
+    .@msg$=sprintf(
+            "You've received the money for the term (%02d/%02d, the %dth legislature)",
+            gettime(GETTIME_DAYOFMONTH),
+            gettime(GETTIME_MONTH),
+            gettimeparam(GETTIME_WEEKDAY));
+
     .@tax=$TULIM_EXPORT/500;
     .@tax+=$TULIM_REPUTATION*5;
     .@tax=min($TULIM_MONEY, .@tax);
     .@cp=limit(1, $TULIM_REPUTATION/10, 10);
     $TULIM_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($TULIM_MAYOR$), "Tulimshar Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($TULIM_MAYOR$), "Tulimshar Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
 
     .@tax=$HALIN_EXPORT/500;
     .@tax+=$HALIN_REPUTATION*5;
     .@tax=min($HALIN_MONEY, .@tax);
     .@cp=limit(1, $HALIN_REPUTATION/10, 10);
     $HALIN_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($HALIN_MAYOR$), "Halinarzo Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($HALIN_MAYOR$), "Halinarzo Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
 
     .@tax=$HURNS_EXPORT/500;
     .@tax+=$HURNS_REPUTATION*5;
     .@tax=min($HURNS_MONEY, .@tax);
     .@cp=limit(1, $HURNS_REPUTATION/10, 10);
     $HURNS_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($HURNS_MAYOR$), "Hurnscald Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($HURNS_MAYOR$), "Hurnscald Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
 
     .@tax=$LOF_EXPORT/500;
     .@tax+=$LOF_REPUTATION*5;
     .@tax=min($LOF_MONEY, .@tax);
     .@cp=limit(1, $LOF_REPUTATION/10, 10);
     $LOF_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($LOF_MAYOR$), "LoF Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($LOF_MAYOR$), "LoF Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
 
     .@tax=$NIVAL_EXPORT/500;
     .@tax+=$NIVAL_REPUTATION*5;
     .@tax=min($NIVAL_MONEY, .@tax);
     .@cp=limit(1, $NIVAL_REPUTATION/10, 10);
     $NIVAL_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($NIVAL_MAYOR$), "Nivalis Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($NIVAL_MAYOR$), "Nivalis Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
 
     /* Towns with volunteer town admins
     .@tax=$FROSTIA_EXPORT/500;
@@ -200,14 +206,14 @@ OnSun0000:
     .@tax=min($FROSTIA_MONEY, .@tax);
     .@cp=limit(1, $FROSTIA_REPUTATION/10, 10);
     $FROSTIA_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($FROSTIA_MAYOR$), "Frostia Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($FROSTIA_MAYOR$), "Frostia Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
 
     .@tax=$CANDOR_EXPORT/500;
     .@tax+=$CANDOR_REPUTATION*5;
     .@tax=min($CANDOR_MONEY, .@tax);
     .@cp=limit(1, $CANDOR_REPUTATION/10, 10);
     $CANDOR_MONEY-=.@tax;
-    rodex_sendmail(gf_charnameid($CANDOR_MAYOR$), "Candor Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
+    rodex_sendmail(gf_charnameid($CANDOR_MAYOR$), "Candor Townhall", "Term Income", .@msg$, .@tax, StrangeCoin, .@cp);
     */
 
     // Conduct elections
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 2ee553b51..5ca6c3d6e 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -991,7 +991,7 @@ function	script	gettimeparam	{
     if (.@p == GETTIME_WEEKDAY)
         return .@a;
 
-    // Months (estimative)
+    // Months (estimative. FIXME - use (gettime(YEAR)-1970)*12 + gettime(MONTH))
     .@t=.@t/30;
     if (.@p == GETTIME_MONTH)
         return .@t;
-- 
cgit v1.2.3-60-g2f50