summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-16 18:13:37 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-16 18:13:37 -0300
commitfb39a4812462985bbc2fe1f59fe448fbfbe618d1 (patch)
treea8e896df4eeec75dd6572f08c7d57df9bab9b4d4
parentf2c08c3a5a82b92aa4a926a75e7321bf9d1169bd (diff)
downloadserverdata-fb39a4812462985bbc2fe1f59fe448fbfbe618d1.tar.gz
serverdata-fb39a4812462985bbc2fe1f59fe448fbfbe618d1.tar.bz2
serverdata-fb39a4812462985bbc2fe1f59fe448fbfbe618d1.tar.xz
serverdata-fb39a4812462985bbc2fe1f59fe448fbfbe618d1.zip
Minor changes, prepare new NPC for Tulimshar Guard house
-rw-r--r--db/quest_db.conf2
-rw-r--r--npc/003-1/jakod.txt2
-rw-r--r--npc/003-10/_import.txt1
-rw-r--r--npc/003-10/kreist.txt29
-rw-r--r--npc/024-16/generals.txt3
5 files changed, 34 insertions, 3 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 66b36b945..5b5992501 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -356,7 +356,7 @@ quest_db: (
// ID 151 to 170: Artis Quests
// ID 171 to 190: Esperia Quests
-// ID 191 to 249: Dungeon Quests
+// ID 191 to 249: General Quests II (eg. Dungeon Quests)
{
Id: 191
Name: "MineQuest_Tycoon"
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index 3b5bc660e..e0955e1d3 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -21,7 +21,7 @@
rif(!MAGIC_LVL, l("How do I get magic?")), L_HowTo,
rif(MAGIC_LVL >= 1 && !getskilllv(AL_HEAL), l("Can you teach me a basic tier 1 magic skill?")), L_Tier1,
rif(MAGIC_LVL >= 2 && !getskilllv(EVOL_MASS_PROVOKE), l("Can you teach me a basic tier 2 magic skill?")), L_Tier2,
- //rif(MAGIC_LVL >= 3 && !getskilllv(AL_TELEPORT),
+ //rif(MAGIC_LVL >= 3 && !getskilllv(AL_TELEPORT), SM_ENDURE is in ragger
l("Good bye."), -;
close;
diff --git a/npc/003-10/_import.txt b/npc/003-10/_import.txt
index d4f08802c..32c8028ba 100644
--- a/npc/003-10/_import.txt
+++ b/npc/003-10/_import.txt
@@ -3,5 +3,6 @@
"npc/003-10/_warps.txt",
"npc/003-10/arnea.txt",
"npc/003-10/guarddevoir.txt",
+"npc/003-10/kreist.txt",
"npc/003-10/officer.txt",
"npc/003-10/slots.txt",
diff --git a/npc/003-10/kreist.txt b/npc/003-10/kreist.txt
new file mode 100644
index 000000000..8b55db0a1
--- /dev/null
+++ b/npc/003-10/kreist.txt
@@ -0,0 +1,29 @@
+// TMW2 Scripts
+// Author:
+// Jesusalva
+// Description:
+// Tulimshar Guardhouse Taskmaster
+
+003-10,41,63,0 script Kreist NPC_PLAYER,{
+ mesn l("Kreist, Taskmaster");
+ mesq l("Hello, and welcome to Tulimshar guard house.");
+ close;
+
+OnInit:
+ // Check items.xml for info about this.
+ .@npcId = getnpcid(.name$);
+ setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet);
+ setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
+ setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
+ setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins); // TODO FIXME: Display Boots
+ setunitdata(.@npcId, UDT_WEAPON, Backsword);
+ setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
+ setunitdata(.@npcId, UDT_HAIRCOLOR, 15);
+
+ npcsit;
+ .sex = G_MALE;
+ .distance = 4;
+ end;
+
+}
+
diff --git a/npc/024-16/generals.txt b/npc/024-16/generals.txt
index 5699e68a6..d7d6c83ba 100644
--- a/npc/024-16/generals.txt
+++ b/npc/024-16/generals.txt
@@ -23,7 +23,7 @@ function script FrostiaGeneralQuest {
next;
inventoryplace ElixirOfLife, 1, MercCard_Saulc, 1;
mesn;
- mesq l("Take this @@. It might save your life on the secret mission you're about to be assigned to.");
+ mesq l("Take this @@. It might save your life on the secret mission you're about to be assigned to.", getitemlink(MercCard_Saulc));
next;
mesn;
mesq l("Now go talk to the King.");
@@ -31,6 +31,7 @@ function script FrostiaGeneralQuest {
getitem MercCard_Saulc, 1;
getitem ElixirOfLife, 1;
getexp 0, 400; // Get 10% JEXP. Reference: 3988~5564
+ close;
}
mesn;
mesq l("Now, a simple @@ quest to make you stronger...", .@at$);