summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-11-27 14:12:07 -0300
committerJesusaves <cpntb1@ymail.com>2020-11-27 14:12:07 -0300
commit591308e0b1f4bc5f8c816e2af3298c8b7899209b (patch)
tree4600971af3f074743d316d8768ce68efb467c2c2
parent81d132b6c1e5e24b37f72f0155d705bd9f33fb94 (diff)
downloadserverdata-591308e0b1f4bc5f8c816e2af3298c8b7899209b.tar.gz
serverdata-591308e0b1f4bc5f8c816e2af3298c8b7899209b.tar.bz2
serverdata-591308e0b1f4bc5f8c816e2af3298c8b7899209b.tar.xz
serverdata-591308e0b1f4bc5f8c816e2af3298c8b7899209b.zip
Town Admin salary is now fixed to 20% of export values.
If reputation and tax are low, town may LOSE money due to this! And if exports are low, the reputation bonus will sink town income to null. More smart management is now needed :3
-rw-r--r--npc/functions/politics.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/functions/politics.txt b/npc/functions/politics.txt
index 2991436ff..2cc6eb076 100644
--- a/npc/functions/politics.txt
+++ b/npc/functions/politics.txt
@@ -159,35 +159,35 @@ OnSun0000:
// Send salary to Town Administrators (20% from exports and 5GP/reputation)
// Strange Coins: 1 each 10 reputation points
- .@tax=$TULIM_EXPORT*limit(0, $TULIM_REPUTATION, 100)/500;
+ .@tax=$TULIM_EXPORT/500;
.@tax+=$TULIM_REPUTATION*5;
.@tax=min($TULIM_MONEY, .@tax);
- .@cp=limit(1, $TULIM_REPUTATION/10, 10);;
+ .@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);
- .@tax=$HALIN_EXPORT*limit(0, $HALIN_REPUTATION, 100)/500;
+ .@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);
- .@tax=$HURNS_EXPORT*limit(0, $HURNS_REPUTATION, 100)/500;
+ .@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);
- .@tax=$LOF_EXPORT*limit(0, $LOF_REPUTATION, 100)/500;
+ .@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);
- .@tax=$NIVAL_EXPORT*limit(0, $NIVAL_REPUTATION, 100)/500;
+ .@tax=$NIVAL_EXPORT/500;
.@tax+=$NIVAL_REPUTATION*5;
.@tax=min($NIVAL_MONEY, .@tax);
.@cp=limit(1, $NIVAL_REPUTATION/10, 10);
@@ -195,14 +195,14 @@ OnSun0000:
rodex_sendmail(gf_charnameid($NIVAL_MAYOR$), "Nivalis Townhall", "Term Income", "You've received the money for the term.", .@tax, StrangeCoin, .@cp);
/* Towns with volunteer town admins
- .@tax=$FROSTIA_EXPORT*limit(0, $FROSTIA_REPUTATION, 100)/500;
+ .@tax=$FROSTIA_EXPORT/500;
.@tax+=$FROSTIA_REPUTATION*5;
.@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);
- .@tax=$CANDOR_EXPORT*limit(0, $CANDOR_REPUTATION, 100)/500;
+ .@tax=$CANDOR_EXPORT/500;
.@tax+=$CANDOR_REPUTATION*5;
.@tax=min($CANDOR_MONEY, .@tax);
.@cp=limit(1, $CANDOR_REPUTATION/10, 10);