summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-02 17:12:29 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-02 17:12:29 -0300
commit15109ff591fb688b945d1062243ceffb0ae6c717 (patch)
treed33d5577368a354429b031dab459574ac813f559 /npc
parent063e64d933ffe0c7222ec7e7aec482d4f3aa8fbd (diff)
downloadserverdata-15109ff591fb688b945d1062243ceffb0ae6c717.tar.gz
serverdata-15109ff591fb688b945d1062243ceffb0ae6c717.tar.bz2
serverdata-15109ff591fb688b945d1062243ceffb0ae6c717.tar.xz
serverdata-15109ff591fb688b945d1062243ceffb0ae6c717.zip
Fix bugs involving the tax money going into MORE TAXES instead of town vault
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/politics.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/npc/functions/politics.txt b/npc/functions/politics.txt
index aa8ab81d5..773607b31 100644
--- a/npc/functions/politics.txt
+++ b/npc/functions/politics.txt
@@ -39,7 +39,8 @@ function script PurchaseTaxes {
.@tax=.@tax*.@vat/10000;
if (.@tax) {
debugmes "%s paid %d in taxes to %s prefecture!", strcharinfo(0), .@tax, .@loc$;
- setd("$"+.@loc$+"_TAX", .@vat+.@tax);
+ .@gp=getd("$"+.@loc$+"MONEY");
+ setd("$"+.@loc$+"_MONEY", .@gp+.@tax);
}
return;
}
@@ -59,9 +60,10 @@ function script SaleTaxes {
.@tax=.@tax*.@vat/10000;
if (.@tax) {
debugmes "Sale: %s paid %d in taxes to %s prefecture!", strcharinfo(0), .@tax, .@loc$;
- setd("$"+.@loc$+"_TAX", .@vat+.@tax);
- Zeny-=.@vat;
- dispbottom col(l("%s is happy because you've paid %d GP in taxes!", getd("$"+.@loc$+"_MAYOR$"), .@vat), 1);
+ .@gp=getd("$"+.@loc$+"MONEY");
+ setd("$"+.@loc$+"_MONEY", .@gp+.@tax);
+ Zeny-=.@tax;
+ dispbottom col(l("%s is happy because you've paid %d GP in taxes!", getd("$"+.@loc$+"_MAYOR$"), .@tax), 1);
}
return;
}