summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/001-8/hub.txt10
-rw-r--r--npc/012-1/_import.txt1
-rw-r--r--npc/012-1/mahad.txt59
-rw-r--r--npc/015-5/_import.txt1
-rw-r--r--npc/015-5/sign.txt22
-rw-r--r--npc/015-6/_import.txt1
-rw-r--r--npc/015-6/mapflags.txt1
7 files changed, 95 insertions, 0 deletions
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index d11352926..fcf565786 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -377,6 +377,16 @@ OnPCLogoutEvent:
//percentheal 100, 100;
warp "000-1", 22, 22;
}
+
+ // TODO: Checks which doesn't belong here shouldn't be here!
+ if (.@mapa$ == "015-6") {
+ if (readparam(BaseExp) < readparam(BaseExp)*2/100)
+ end;
+ recovery(getcharid(3));
+ getexp readparam(BaseExp)*2/100, 0;
+ warp "Save", 0, 0;
+ }
+
@qhub_victor=0;
@qhub_died=0;
end;
diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt
index 9dfbc1df7..30947961e 100644
--- a/npc/012-1/_import.txt
+++ b/npc/012-1/_import.txt
@@ -11,6 +11,7 @@
"npc/012-1/jack.txt",
"npc/012-1/locamit.txt",
"npc/012-1/luffyx.txt",
+"npc/012-1/mahad.txt",
"npc/012-1/mapflags.txt",
"npc/012-1/richard.txt",
"npc/012-1/ship.txt",
diff --git a/npc/012-1/mahad.txt b/npc/012-1/mahad.txt
new file mode 100644
index 000000000..de1b02728
--- /dev/null
+++ b/npc/012-1/mahad.txt
@@ -0,0 +1,59 @@
+// TMW-2 Script
+// Author:
+// Saulc
+// Jesusalva
+// Description:
+// Mahad is the Hurnscald Well Master
+// ...Well, he takes the water from the pond, but you shouldn't mind this.
+// It's still safe to drink, 100% warranted!
+
+012-1,117,54,0 script Mahad NPC_PLAYER,{
+ mesn;
+ 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 BottleOfWoodlandWater, .@count;
+
+ Zeny=Zeny-.@Cost;
+ delitem EmptyBottle, .@count;
+ getitem BottleOfWoodlandWater, .@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 = 60;
+ .sex = G_MALE;
+ .distance = 7;
+
+ .@npcId = getnpcid(0, .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/015-5/_import.txt b/npc/015-5/_import.txt
index 310602f5d..de4f5e1c2 100644
--- a/npc/015-5/_import.txt
+++ b/npc/015-5/_import.txt
@@ -2,3 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/015-5/_mobs.txt",
"npc/015-5/_warps.txt",
+"npc/015-5/sign.txt",
diff --git a/npc/015-5/sign.txt b/npc/015-5/sign.txt
new file mode 100644
index 000000000..9d92af600
--- /dev/null
+++ b/npc/015-5/sign.txt
@@ -0,0 +1,22 @@
+// TMW2 Script.
+// Author:
+// Jesusalva
+// Description:
+// You're at a PVP Area
+
+015-5,356,61,0 script WARNING#015535661 NPC_SWORDS_SIGN2,{
+ mesn;
+ mesc l("You are entering on a PVP Area with lowered death penalty.");
+ next;
+ mesn;
+ mesc l("The mines beyond this point have been shut at 280 AT because Terranite. You've been warned!");
+ close;
+
+OnInit:
+ .sex = G_OTHER;
+ .distance = 3;
+ end;
+}
+
+015-5,350,61,0 duplicate(WARNING#015535661) WARNING#015535061 NPC_SWORDS_SIGN2
+
diff --git a/npc/015-6/_import.txt b/npc/015-6/_import.txt
index f87cb8bfa..cebd2b9d2 100644
--- a/npc/015-6/_import.txt
+++ b/npc/015-6/_import.txt
@@ -2,3 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/015-6/_mobs.txt",
"npc/015-6/_warps.txt",
+"npc/015-6/mapflags.txt",
diff --git a/npc/015-6/mapflags.txt b/npc/015-6/mapflags.txt
new file mode 100644
index 000000000..4ec943d32
--- /dev/null
+++ b/npc/015-6/mapflags.txt
@@ -0,0 +1 @@
+015-6 mapflag pvp