012-1 Mahad code updated (more modern now)

1 files changed, 7 insertions, 13 deletions

diff --git a/npc/012-1/mahad.txt b/npc/012-1/mahad.txt
index 5195b7045..a62ade08a 100644
--- a/npc/012-1/mahad.txt
+++ b/npc/012-1/mahad.txt
@@ -13,20 +13,24 @@
     mes l("I can fill your bottle with water for only @@ gp the bottle.", .price);
     mes l("After all, I am the Well Master!");
     input .@count;
-
+    mes "";
 
     if (!.@count)
         close;
 
     .@gp = .@count * .price;
 
+    // Not enough cash
     if (Zeny < .@gp) {
-        mesc l("Not enough money.");
+        mesn;
+        mes l("You don't have enough gold! You need @@ gp.", .@gp);
         close;
     }
 
+    // Not enough bottles
     if (countitem(EmptyBottle) < .@count) {
-        mesc l("Not enough bottles.");
+        mesn;
+        mes l("You don't have that many empty bottles!");
         close;
     }
 
@@ -46,17 +50,7 @@
     getitem BottleOfWoodlandWater, .@count-.@iced;
     close;
 
-L_NotEnoughBottles:
-    mes "";
-    mesn;
-    mes l("You don't have that many empty bottles!");
-    close;
-
 L_NotEnoughMoney:
-    mes "";
-    mesn;
-    mes l("You don't have enough gold! You need @@ gp.", .@Cost);
-    close;
 
 OnInit:
     .price = 60;