summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-02 17:18:17 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-02 17:18:17 -0300
commit6490d9175ba17732cd8a078e40903ee423f2747f (patch)
treec5ba985222c5e7de165a2a9d35fcca599ac18bdd
parent15109ff591fb688b945d1062243ceffb0ae6c717 (diff)
downloadserverdata-6490d9175ba17732cd8a078e40903ee423f2747f.tar.gz
serverdata-6490d9175ba17732cd8a078e40903ee423f2747f.tar.bz2
serverdata-6490d9175ba17732cd8a078e40903ee423f2747f.tar.xz
serverdata-6490d9175ba17732cd8a078e40903ee423f2747f.zip
Charge taxes at Tulimshar.
Because Tulimshar shops are still the 'classic' shop style, some shops are tax-exempt. Right-click sell also allows you to evade taxes. Now, is this a feature or a bug?
-rw-r--r--npc/003-1/eugene.txt12
-rw-r--r--npc/003-1/itka.txt12
-rw-r--r--npc/003-1/neko.txt14
-rw-r--r--npc/003-5/jeweler.txt12
-rw-r--r--npc/012-1/shoppakep.txt4
5 files changed, 51 insertions, 3 deletions
diff --git a/npc/003-1/eugene.txt b/npc/003-1/eugene.txt
index c7bb3c580..0936a4afd 100644
--- a/npc/003-1/eugene.txt
+++ b/npc/003-1/eugene.txt
@@ -87,6 +87,7 @@ L_QuestDone:
case 2:
speech S_FIRST_BLANK_LINE,
l("Earlier I hadn't any, but now that I have the baits, I will be glad to sell some to you!");
+ npcshopattach(.name$);
openshop;
closedialog;
}
@@ -116,5 +117,16 @@ OnClock0003:
restoreshopitem CommonCarp, 3;
restoreshopitem GrassCarp, 1;
end;
+
+// Pay your taxes!
+OnBuyItem:
+ debugmes("Purchase confirmed");
+ PurchaseTaxes();
+ end;
+
+OnSellItem:
+ debugmes("Sale confirmed");
+ SaleTaxes();
+ end;
}
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index 4daf67a40..ff4d7fdbd 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -12,6 +12,7 @@
mesq l("Anyway, I am selling Cherry Cakes to sponsor my studies. Please buy as many as you want!");
if (TUTORIAL) mesc l("Protip: Ducks and Giant Maggots also drops Cherry Cakes.");
next;
+ npcshopattach(.name$);
openshop;
closedialog;
close;
@@ -31,4 +32,15 @@ OnInit:
.sex = G_FEMALE;
.distance = 5;
end;
+
+// Pay your taxes!
+OnBuyItem:
+ debugmes("Purchase confirmed");
+ PurchaseTaxes();
+ end;
+
+OnSellItem:
+ debugmes("Sale confirmed");
+ SaleTaxes();
+ end;
}
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index 610c49d71..a5818baba 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -49,8 +49,10 @@
}
closedialog;
- if (@menu == 1)
+ if (@menu == 1) {
+ npcshopattach(.name$);
shop .name$;
+ }
goodbye;
close;
@@ -93,4 +95,14 @@ OnClock2359:
restoreshopitem EmptyBox, 2;
end;
+// Pay your taxes!
+OnBuyItem:
+ debugmes("Purchase confirmed");
+ PurchaseTaxes();
+ end;
+
+OnSellItem:
+ debugmes("Sale confirmed");
+ SaleTaxes();
+ end;
}
diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt
index d0dd74d94..25642c522 100644
--- a/npc/003-5/jeweler.txt
+++ b/npc/003-5/jeweler.txt
@@ -29,6 +29,7 @@ L_Menu:
l("I want to remove all stuff applied to my ring!"), L_Clear,
l("Nothing, sorry."), L_Close;
+ npcshopattach(.name$);
openshop;
closedialog;
close;
@@ -194,4 +195,15 @@ OnInit:
sellitem GoldenBlackPearlRing, 1000000; // I'm joking of course. Don't tell me you'll pay 1M for... this?
end;
+// Pay your taxes!
+OnBuyItem:
+ debugmes("Purchase confirmed");
+ PurchaseTaxes();
+ end;
+
+OnSellItem:
+ debugmes("Sale confirmed");
+ SaleTaxes();
+ end;
+
}
diff --git a/npc/012-1/shoppakep.txt b/npc/012-1/shoppakep.txt
index 5da112f34..60dc0f700 100644
--- a/npc/012-1/shoppakep.txt
+++ b/npc/012-1/shoppakep.txt
@@ -74,12 +74,12 @@ OnClock0546:
// Pay your taxes!
OnBuyItem:
debugmes("Purchase confirmed");
- PurchaseTaxes("Hurns");
+ PurchaseTaxes();
end;
OnSellItem:
debugmes("Sale confirmed");
- SaleTaxes("Hurns");
+ SaleTaxes();
end;
}