Taxes on Candor!

5 files changed, 56 insertions, 2 deletions

diff --git a/npc/005-4/shop.txt b/npc/005-4/shop.txt
index d39930105..01ec2d57d 100644
--- a/npc/005-4/shop.txt
+++ b/npc/005-4/shop.txt
@@ -32,5 +32,16 @@ OnClock0004:
     restoreshopitem TrainingBow, -1, 3;
     end;
 
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
 }
 
diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt
index 91b04e71c..18c3d3148 100644
--- a/npc/005-5/nylo.txt
+++ b/npc/005-5/nylo.txt
@@ -204,5 +204,18 @@ OnClock1800:
 OnClock0004:
     restoreshopitem Beer, 320, 100;
     end;
+
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
+
 }
 
diff --git a/npc/005-6/morgan.txt b/npc/005-6/morgan.txt
index 3647b50eb..fcc7ff67e 100644
--- a/npc/005-6/morgan.txt
+++ b/npc/005-6/morgan.txt
@@ -138,4 +138,18 @@ OnClock0003:
     restoreshopitem CottonCloth, 7;
     restoreshopitem Fungus, 10;
     restoreshopitem Bread, 15;
+    end;
+
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
+
 }
diff --git a/npc/006-2-1/server.txt b/npc/006-2-1/server.txt
index 5375cb9e6..8f0d04c62 100644
--- a/npc/006-2-1/server.txt
+++ b/npc/006-2-1/server.txt
@@ -37,5 +37,18 @@ OnClock0003:
     restoreshopitem LettuceLeaf, 30, 15;
     restoreshopitem Bread, 46, 10;
     restoreshopitem Cheese, 55, 15;
+    end;
+
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
 
 }
diff --git a/npc/034-4/lobby.txt b/npc/034-4/lobby.txt
index 7ea30bb47..2b88d037f 100644
--- a/npc/034-4/lobby.txt
+++ b/npc/034-4/lobby.txt
@@ -47,6 +47,10 @@ OnTouch:
     end;
 
 OnABC:
+    // Extra drop chance (20% chance)
+    getmapxy(.@m$, .@x, .@y, 0);
+    if (!rand2(5))
+        makeitem BronzeBossGift, 1, .@m$, .@x, .@y;
     end;
 
 OnTimer1000:
@@ -241,8 +245,7 @@ OnTimer30000:
         break;
     }
 
-    // FIXME: Spawn other stuff as well, stronger stuff.
-    // Let them come from the doors
+    // And we're done! Wait 10 seconds before next casting
     setnpctimer 20000;
     end;