Mahoud/Well testing

2 files changed, 45 insertions, 37 deletions

diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index ae169bbe5..a1705b5eb 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -1,13 +1,55 @@
 // Author:
 //    Saulc
+//    Jesusalva
 
-003-1,46,79,0	script	Mahoud	NPC_MONA,{
+003-1,46,79,0	script	Mahoud	NPC_PLAYER,{
 
+    .@COST_PER_BOTTLE = 50;
 
-hello;
+    mes l("I can fill your bottle with water for only @@ gp the bottle.", .@COST_PER_BOTTLE);
+    mes l("After all, I am the Well Master!");
+    input .@count;
+
+    if (.@count == 0)
+        close;
+    .@Cost = .@count * .@COST_PER_BOTTLE;
+    .@empty = countitem("EmptyBottle");
+
+    if (.@empty < .@count)
+        goto L_NotEnoughBottles;
+    if (Zeny < .@Cost)
+        goto L_NotEnoughMoney;
+    getinventorylist;
+    if (@inventorylist_count == 100
+        && countitem("BottleOfSweaWater") == 0
+        && .@empty > .@count)
+            goto L_NotEnoughSlots;
+
+    set Zeny, Zeny - .@Cost;
+    delitem "EmptyBottle", .@count;
+    getitem "BottleOfSweaWater", .@count; // TODO FIXME: "Swea" water? Also, this is not sea water...
+    close;
+
+L_NotEnoughBottles:
+    mes l("You don't have that many empty bottles!");
+    close;
+
+L_NotEnoughMoney:
+    mes l("You don't have enough gp! You need @@ gp.", .@Cost);
+    close;
+
+L_NotEnoughSlots:
+    mes l("You don't have room for these bottles!");
+    close;
 
 OnInit:
     .sex = G_MALE;
     .distance = 3;
+
+    .@npcId = getnpcid(0, "Mahoud");
+    setunitdata(.@npcId, UDT_HEADTOP, 1304);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
+
     end;
 }
diff --git a/npc/003-1/well.txt b/npc/003-1/well.txt
index 272deda1a..926a14dac 100644
--- a/npc/003-1/well.txt
+++ b/npc/003-1/well.txt
@@ -3,42 +3,8 @@
 //    Jesusalva
 
 003-1,45,80,0	script	Well	NPC_NO_SPRITE,{
-    .@COST_PER_BOTTLE = 50;
 
-    mes l("This well have a mechanism to fill water bottles. It costs @@ gp per bottle.", .@COST_PER_BOTTLE);
-    mes l("You need the bottle, too. Too bad, not even water is free in this world!");
-    input .@count;
-
-    if (.@count == 0)
-        close;
-    .@Cost = .@count * .@COST_PER_BOTTLE;
-    .@empty = countitem("EmptyBottle");
-
-    if (.@empty < .@count)
-        goto L_NotEnoughBottles;
-    if (Zeny < .@Cost)
-        goto L_NotEnoughMoney;
-    getinventorylist;
-    if (@inventorylist_count == 100
-        && countitem("BottleOfSweaWater") == 0
-        && .@empty > .@count)
-            goto L_NotEnoughSlots;
-
-    set Zeny, Zeny - .@Cost;
-    delitem "EmptyBottle", .@count;
-    getitem "BottleOfSweaWater", .@count; // TODO FIXME: "Swea" water? Also, this is not sea water...
-    close;
-
-L_NotEnoughBottles:
-    mes l("You don't have that many empty bottles!");
-    close;
-
-L_NotEnoughMoney:
-    mes l("You don't have enough gp! You need @@ gp.", .@Cost);
-    close;
-
-L_NotEnoughSlots:
-    mes l("You don't have room for these bottles!");
+    mes l("This well is too deep and you don't have a bucket.");
     close;
 
 OnInit: