Merge branch 'darktileset' into 'master'

add mana ghost mob and Valia NPC

See merge request evol/serverdata!149

12 files changed, 110 insertions, 1 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 5beb8db8..2f478a97 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4125,6 +4125,7 @@ constants_db: {
     NPC_ROWBOATHELPER:      459
     NPC_BLOSSOM:            460
     NPC_GALIMATIA:          461
+    NPC_VALIA:              462
     NPC_TEST1:              800
     NPC_PLAYER:             801
 
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index c7da6eff..db7e67a4 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -2629,4 +2629,44 @@ mob_db: (
     Drops: {
     }
 },
+{
+    Id: 1101
+    SpriteName: "ManaGhost"
+    Name: "Mana Ghost"
+    Lv: 40
+    Hp: 5500
+    Sp: 0
+    Exp: 180
+    JExp: 25
+    AttackRange: 2
+    Attack: [500, 750]
+    Def: 45
+    Mdef: 0
+    Stats: {
+        Str: 20
+        Agi: 50
+        Vit: 50
+        Int: 10
+        Dex: 15
+        Luk: 30
+    }
+    ViewRange: 5
+    ChaseRange: 8
+    Size: 0
+    Race: 2
+    Element: (5, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+    }
+    MoveSpeed: 700
+    AttackDelay: 625
+    AttackMotion: 550
+    DamageMotion: 450
+    MvpExp: 0
+    Drops: {
+    }
+},
 )
diff --git a/maps/re/008-2-17.mcache b/maps/re/008-2-17.mcache
index 29b25a3b..f39517e4 100644
--- a/maps/re/008-2-17.mcache
+++ b/maps/re/008-2-17.mcache
diff --git a/maps/re/008-2-18.mcache b/maps/re/008-2-18.mcache
index e00a0398..8be8336e 100644
--- a/maps/re/008-2-18.mcache
+++ b/maps/re/008-2-18.mcache
diff --git a/maps/re/008-2-19.mcache b/maps/re/008-2-19.mcache
index 7f97f4d9..ee05da2b 100644
--- a/maps/re/008-2-19.mcache
+++ b/maps/re/008-2-19.mcache
diff --git a/maps/re/008-2-20.mcache b/maps/re/008-2-20.mcache
index b7492f56..06a0ade4 100644
--- a/maps/re/008-2-20.mcache
+++ b/maps/re/008-2-20.mcache
diff --git a/maps/re/008-2-21.mcache b/maps/re/008-2-21.mcache
index 7630549e..0455bd4a 100644
--- a/maps/re/008-2-21.mcache
+++ b/maps/re/008-2-21.mcache
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
index 8fc5e8ff..a34ccc1c 100644
--- a/npc/008-1-1/_mobs.txt
+++ b/npc/008-1-1/_mobs.txt
@@ -9,7 +9,6 @@
 008-1-1,156,51,10,4	monster	Alizarin Plant	1037,3,1000,25000
 008-1-1,167,61,2,2	monster	Pink Flower	1034,1,100,10000
 008-1-1,153,176,9,7	monster	Silkworm	1040,4,3000,6000
-008-1-1,96,47,3,2	monster	Mauve Plant	1036,3,1000,2000
 008-1-1,162,78,6,3	monster	Gamboge Plant	1038,2,1000,10000
 008-1-1,197,67,7,5	monster	Cobalt Plant	1039,2,1000,30000
 008-1-1,165,109,2,2	monster	Pink Flower	1034,1,100,10000
@@ -21,3 +20,47 @@
 008-1-1,68,29,7,7	monster	Mouboo	1023,3,30000,60000
 008-1-1,126,45,0,0	monster	Beehive	1056,1,30000,100000
 008-1-1,121,45,0,0	monster	Beehive	1056,1,30000,100000
+008-1-1,94,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,94,38,0,0	monster	Blue Rose	1061,1,20000,15000
+008-1-1,94,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,93,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,93,39,0,0	monster	Blue Rose	1061,1,20000,15000
+008-1-1,94,39,0,0	monster	Blue Rose	1061,1,20000,15000
+008-1-1,95,39,0,0	monster	Blue Rose	1061,1,20000,15000
+008-1-1,94,40,0,0	monster	Blue Rose	1061,1,20000,15000
+008-1-1,93,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,94,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,94,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,95,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,96,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,96,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,97,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,97,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,99,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,99,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
+008-1-1,94,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,94,46,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,95,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,95,44,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,96,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,97,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,97,46,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,97,44,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,98,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,99,45,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,98,46,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,95,46,0,0	monster	Red Rose	1062,1,20000,15000
+008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,94,47,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,95,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,96,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,96,47,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,97,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,98,47,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,99,48,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,98,49,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,97,49,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,95,49,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,94,49,0,0	monster	Yellow Rose	1060,1,20000,15000
diff --git a/npc/008-2-20/_import.txt b/npc/008-2-20/_import.txt
index bb22ec30..03f5f287 100644
--- a/npc/008-2-20/_import.txt
+++ b/npc/008-2-20/_import.txt
@@ -1,3 +1,4 @@
 // Map 008-2-20: Forsaken Inn
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-2-20/_warps.txt",
+"npc/008-2-20/valia.txt",
diff --git a/npc/008-2-20/valia.txt b/npc/008-2-20/valia.txt
new file mode 100644
index 00000000..030bcf92
--- /dev/null
+++ b/npc/008-2-20/valia.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Our beloved Evil Witch Valia.
+// THIS IS A PLACEHOLDER!
+
+008-2-20,32,22,0	script	Valia	NPC_VALIA,{
+    speech
+        l("Hi!"),
+        lg("You may remember me, I am Valia.");
+        l("Better stay away from my basement, you may end up like the poor guys down there.");
+
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-2-21/_import.txt b/npc/008-2-21/_import.txt
index efdf5df8..c5594e03 100644
--- a/npc/008-2-21/_import.txt
+++ b/npc/008-2-21/_import.txt
@@ -1,3 +1,4 @@
 // Map 008-2-21: Forsaken Inn Basement
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-21/_mobs.txt",
 "npc/008-2-21/_warps.txt",
diff --git a/npc/008-2-21/_mobs.txt b/npc/008-2-21/_mobs.txt
new file mode 100644
index 00000000..d44662d6
--- /dev/null
+++ b/npc/008-2-21/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-21: Forsaken Inn Basement mobs
+008-2-21,25,38,2,1	monster	Mana Ghost	1101,1,75000,250000