Add mobs to instanced maps + misc fixes

7 files changed, 43 insertions, 104 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 09c40cde1..399597011 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3823,12 +3823,15 @@ constants_db: {
     comment__: "races"
     Human:  0
     Ukar:   1
-    Demon:  2
+    Redy:   2
     Elven:  3
     Orc:    4
     Raijin: 5
     Tritan: 6
 
+    // FIXIT
+    Demon:  2
+
     comment__: "directions"
     DOWN:           0
     DOWNLEFT:       1
@@ -3847,11 +3850,11 @@ constants_db: {
 
     comment__: "npcs"
     NPC_KNIVES:             100
-    NPC_DEMON_MAN:          101
+    NPC_REDY_MAN:           101
     NPC_HAT_BOX:            102
     NPC_RAIJIN_MAN:         103
     NPC_ORC_MAN:            104
-    NPC_DEMON_MAN_SITTING:  105
+    NPC_REDY_MAN_SITTING:   105
     NPC_ELVEN_MAN_BLONDE:   106
     NPC_ELVEN_MAN_RED:      107
     NPC_ELVEN_MAN_TRADER:   108
@@ -3860,13 +3863,13 @@ constants_db: {
     NPC_TRITAN_MAN_SAILOR:  111
     NPC_ELVEN_MAN_TRADER_SITTING: 112
     NPC_TRITAN_MAN_SAILOR2: 113
-    NPC_DEMON_MAN_SITTING_BOOTS: 114
-    NPC_DEMON_MAN_SITTING_UNDER_TREE: 115
+    NPC_REDY_MAN_SITTING_BOOTS: 114
+    NPC_REDY_MAN_SITTING_UNDER_TREE: 115
     NPC_PAPER_NOTE:         116
     NPC_ELVEN_FEMALE_ARMOR_SHOP: 117
     NPC_ELVEN_MAN_MOUBOO_SHOP: 118
     NPC_HUMAN_FEMALE_NOOB:  119
-    NPC_DEMON_MALE_SWORD:   120
+    NPC_REDY_MALE_SWORD:   120
     NPC_ELVEN_FEMALE_READING: 121
     NPC_HUMAN_MALE_OLD:     122
     NPC_RAIJIN_GIRL:        123
@@ -3942,7 +3945,7 @@ constants_db: {
     NPC_CHELIOS:            429
     NPC_EDOUARD:            430
     NPC_UKAR_MALE_LEGION_ARTIS: 431
-    NPC_DEMON_MALE_LEGION_ARTIS: 432
+    NPC_REDY_MALE_LEGION_ARTIS: 432
     NPC_RAIJIN_FEMALE_LEGION_ARTIS: 433
     NPC_HUMAN_MALE_LEGION_ARTIS: 434
     NPC_HUMAN_FEMALE_LEGION_ARTIS: 435
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 517cd2539..a75ccdf7e 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -58,6 +58,10 @@ quest_db: (
 	Id: 7
 	Name: "ShipQuests_ChefGado"
 },
+{
+	Id: 8
+	Name: "ShipQuests_Dan"
+},
 
 // ID 11 to 30: General quests
 {
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 141586550..708fcb183 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -50,7 +50,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 */
 //====================================================
 Human: {
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -98,7 +98,7 @@ Human: {
 }
 
 Ukar: {
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -145,8 +145,8 @@ Ukar: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Demon: {
-    MoveSpeed: 170
+Redy: {
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -194,7 +194,7 @@ Demon: {
 }
 
 Elven: {
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -242,7 +242,7 @@ Elven: {
 }
 
 Orc: {
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -290,7 +290,7 @@ Orc: {
 }
 
 Raijin: {
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
@@ -338,7 +338,7 @@ Raijin: {
 }
 
 Tritan: {
-    MoveSpeed: 170
+    MoveSpeed: 150
     Weight: 20000
     BaseASPD: {
         Fist: 40
diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt
index 461307e1e..459d26fd2 100644
--- a/npc/002-1/_import.txt
+++ b/npc/002-1/_import.txt
@@ -12,5 +12,4 @@
 "npc/002-1/hammock.txt",
 "npc/002-1/knife.txt",
 "npc/002-1/mapflags.txt",
-"npc/002-1/mobs_override.txt",
 "npc/002-1/peter.txt",
diff --git a/npc/002-1/dan.txt b/npc/002-1/dan.txt
index bc2191c16..bc5a5c76e 100644
--- a/npc/002-1/dan.txt
+++ b/npc/002-1/dan.txt
@@ -1,94 +1,33 @@
-// Evol scripts.
+// TMW-2 Script
 // Authors:
-//    Qwerty Dragon
-//    Reid
+//    Qwerty Dragon and Reid (originals)
+//    Jesusalva
 // Description:
-//    There are two kinds of dialogues in this script.
-//    Dan will randomly choose between a useless sentence, and a quest in Artis.
-
-002-1,32,31,0	script	Dan#002-1	NPC_DEMON_MAN,{
-    if (getq(General_Narrator) > 0)
-    {
-        sailortalk;
-        close;
-    }
+//    Dan is a sailor from Nard ship (TODO another Redy? Seriously?) who is afraid
+//    of Pious.
+// Variables:
+//    ShipQuests_Dan
 
+002-1,32,31,0	script	Dan#002-1	NPC_REDY_MAN,{
+    .@q=getq(ShipQuests_Dan);
     mesn;
-    .@q = rand(3);
-    if (.@q == 0) goto L_QuestStory;
-
     mesq l("You see these pious around us?");
     next;
     mesq l("It seems that we are close to an island, we should take a look at the upper level.");
-
-    close;
-
-L_QuestStory:
-    mesq l("It's so hard to find the motivation...");
-    next;
-
-    menu
-        l("Why?"), -,
-        l("I guess so... I will leave you alone."), L_Quit;
-
-    mes "";
-    mesn;
-    mesq l("Oh, it's you.");
-    next;
-    mesq lg("So, you finally woke up? We all thought you were in something like... You know, one of these long comas.");
-    next;
-
-    menu
-        l("I'm still in a coma, but my ghost is haunting you!"), L_Quit,
-        l("It was something like a long nap."), -;
-
-    mes "";
-    mesn;
-    mesq l("It's good, good... I have a friend who is still in a coma, but I can't be with her without working...");
-    next;
-    mesq l("The fear to see her sleeping on this quiet and lonely bed is becoming more and more unbearable, I think that I won't get the bravery to see her this time...");
-    next;
-
-    menu
-        l("Who is she?"), L_She,
-        l("Do you want me to go see her instead of you?"), L_Quest;
-        l("I don't know what to say..."), -;
-
-    mes "";
-    mesn;
-    mesq lg("There's nothing to say, don't worry miss.", "There's nothing to say, don't worry sir.");
-
-    close;
-
-L_She:
-    mes "";
-    mesn;
-    mesq l("She is a good friend of mine... We wanted to marry a few weeks before her accident but...");
-    next;
-
-    goto L_Quit2;
-
-L_Quest:
-    mes "";
-    mesn;
-    mesq l("I don't think that we are in a good place to talk about this...");
-    next;
-
-L_Quit:
-    mes "";
-    mesn "Narrator";
-    mes col(l("Dan keeps silent since your last question."), 9);
-
-    close;
-
-L_Quit2:
-    mesn "Narrator";
-    mes col(l("Dan ends the conversation and resumes to write his letter."), 9);
-
     close;
 
 OnInit:
     .sex = G_MALE;
-    .distance = 2;
+    .distance = 5;
     end;
+
+OnRespawnPiou:
+    areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 1, instance_npcname("Dan#002-1")+"::OnRespawnPiou");
+    end;
+
+OnInstanceInit:
+    //instance_set_respawn instance_mapname("002-1"), 52, 32;
+    areamonster(instance_mapname("002-1"), 52, 32, 73, 41, "Piou", 1002, 3, instance_npcname("Dan#002-1")+"::OnRespawnPiou");
+    end;
+
 }
diff --git a/npc/002-1/mobs_override.txt b/npc/002-1/mobs_override.txt
deleted file mode 100644
index eea1f91c2..000000000
--- a/npc/002-1/mobs_override.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// TMW2 Script. Overrides mobs for Candor and Tulimshar's instances (LOCATION$)
-// Map 002-1: Second Deck mobs
-002-1@Candor,52,32,21,9	monster	Piou	1002,3,30000,20000
-002-1@Candor,27,31,1,3	monster	Maggot	1030,1,30000,20000
-002-1@Tulim,52,32,21,9	monster	Piou	1002,3,30000,20000
-002-1@Tulim,27,31,1,3	monster	Maggot	1030,1,30000,20000
diff --git a/npc/005-6/morgan.txt b/npc/005-6/morgan.txt
index 1e8ce9d60..0bf0a3396 100644
--- a/npc/005-6/morgan.txt
+++ b/npc/005-6/morgan.txt
@@ -52,7 +52,7 @@ OnClock0556:
 OnClock1201:
 OnClock1759:
 OnClock0003:
-    restoreshopitem CottonClotch, 7;
+    restoreshopitem CottonCloth, 7;
     restoreshopitem Fungus, 10;
     restoreshopitem Bread, 15;
 }