Add mobs to instanced maps + misc fixes

3 files changed, 22 insertions, 15 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