Mahul, Aeros Well Master. And, why not fishing on Aeros? I want fried fish!

(jk, I don't like eating fish)

4 files changed, 97 insertions, 0 deletions

diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index c65d775a4..71cb54d67 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -2,6 +2,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/001-1/bgmaster.txt",
 "npc/001-1/eventmaster.txt",
+"npc/001-1/mahul.txt",
 "npc/001-1/mapflags.txt",
 "npc/001-1/portal.txt",
 "npc/001-1/rewards.txt",
+"npc/001-1/wateranimation.txt",
diff --git a/npc/001-1/mahul.txt b/npc/001-1/mahul.txt
new file mode 100644
index 000000000..5d0483350
--- /dev/null
+++ b/npc/001-1/mahul.txt
@@ -0,0 +1,58 @@
+// TMW-2 Script
+// Author:
+//    Saulc
+//    Jesusalva
+// Description:
+//    Mahul is the Aeros Well Master
+
+001-1,299,45,0	script	Mahul	NPC_PLAYER,{
+    mesn;
+    mesq l("Uhul! My name is Mahul!");
+    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;
+    inventoryplace BottleOfDivineWater, .@count;
+
+    Zeny=Zeny-.@Cost;
+    delitem EmptyBottle, .@count;
+    getitem BottleOfDivineWater, .@count;
+    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:
+    .COST_PER_BOTTLE = 100;
+    .sex = G_MALE;
+    .distance = 7;
+
+    .@npcId = getnpcid(.name$);
+    // Check items.xml for info about this
+    setunitdata(.@npcId, UDT_HEADTOP, InfantryHelmet);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
+
+    end;
+}
diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt
index 68968d50c..3c44649df 100644
--- a/npc/001-1/rewards.txt
+++ b/npc/001-1/rewards.txt
@@ -65,6 +65,7 @@ OnInit:
 	sellitem HastePotion,15;
 	sellitem StrengthPotion,15;
 	sellitem Grenade,rand(9,14); // I really don't care about the price of this. Used to be 12.
+    sellitem BottleOfDivineWater, 10;
     sellitem CursedArrow,8;
 	sellitem Curshroom,6;
 	sellitem PetcaringGuide,5; // I needed to add this somewhere
diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt
new file mode 100644
index 000000000..1dc66c99f
--- /dev/null
+++ b/npc/001-1/wateranimation.txt
@@ -0,0 +1,36 @@
+// TMW2 scripts.
+// Author:
+//    Saulc
+//    Jesusalva
+// Description:
+//    Water animations, splash, fishes, etc...
+
+001-1,254,70,0	script	#water_animation_aeros0	NPC_WATER_SPLASH,{
+
+    fishing; // begin or continue fishing
+    close;
+
+OnInit:
+    // default fishes
+    setarray .common_fish,
+        CommonCarp, Roach, Tench;
+
+    // rare fishes
+    setarray .rare_fish,
+        GrassCarp;
+
+    .sex = G_OTHER;
+    .distance = 4;
+    end;
+}
+
+001-1,250,72,0	duplicate(#water_animation_aeros0)	#water_animation_aeros1	NPC_WATER_SPLASH
+001-1,254,76,0	duplicate(#water_animation_aeros0)	#water_animation_aeros2	NPC_WATER_SPLASH
+001-1,247,77,0	duplicate(#water_animation_aeros0)	#water_animation_aeros3	NPC_WATER_SPLASH
+
+001-1,105,112,0	duplicate(#water_animation_aeros0)	#water_animation_aeros4	NPC_WATER_SPLASH
+001-1,99,112,0	duplicate(#water_animation_aeros0)	#water_animation_aeros5	NPC_WATER_SPLASH
+001-1,94,110,0	duplicate(#water_animation_aeros0)	#water_animation_aeros6	NPC_WATER_SPLASH
+001-1,90,112,0	duplicate(#water_animation_aeros0)	#water_animation_aeros7	NPC_WATER_SPLASH
+
+