Moved magic quests constants to const.txt (import didn't work for some reason)

6 files changed, 49 insertions, 20 deletions

diff --git a/data/004-1.wlk b/data/004-1.wlk
index 68d9c716..55ed9b21 100644
--- a/data/004-1.wlk
+++ b/data/004-1.wlk
diff --git a/db/const.txt b/db/const.txt
index 080efbad..f372ff14 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -175,4 +175,22 @@ NIBBLE_6_MASK 251658240
 NIBBLE_7_SHIFT 28
 NIBBLE_7_MASK 4026531840
 
-import: db/magic_const.txt
+// Magic skills
+SKILL_MAGIC		340
+SKILL_MAGIC_LIFE	341
+SKILL_MAGIC_WAR		342
+SKILL_MAGIC_TRANSMUTE	343
+SKILL_MAGIC_NATURE	344
+SKILL_MAGIC_ASTRAL	345
+
+// Flags for the magic quests
+MFLAG_DRANK_POTION	1	// Character drank at least one magic potion as prerequisite for the mana seed quest
+MFLAG_KNOWS_MANASEED	2	// Character has found the Mana Seed
+MFLAG_TOUCHED_MANASEED	4	// Character has touched the Mana Seed
+MFLAG_MANASEED_MAXEDOUT	8	// Character has touched the Mana Seed while maxed out on magic
+
+MFLAG_KNOWS_AULDSBEL	16	// Character has met Auldsbel
+MFLAG_KNOWS_WYARA	32	// Character has met Wyara
+MFLAG_KNOWS_SAGATHA	64	// Character has met Sagatha
+MFLAG_KNOWS_MANAPOTION	128	// Has heard about the mana potion
+
diff --git a/db/magic_const.txt b/db/magic_const.txt
deleted file mode 100644
index 791c446e..00000000
--- a/db/magic_const.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-SKILL_MAGIC		340
-SKILL_MAGIC_LIFE	341
-SKILL_MAGIC_WAR		342
-SKILL_MAGIC_TRANSMUTE	343
-SKILL_MAGIC_NATURE	344
-SKILL_MAGIC_ASTRAL	345
-
-// Flags for the magic quests
-MFLAG_DRANK_POTION	1	// Character drank at least one magic potion as prerequisite for the mana seed quest
-MFLAG_KNOWS_MANASEED	2	// Character has found the Mana Seed
-MFLAG_TOUCHED_MANASEED	4	// Character has touched the Mana Seed
-MFLAG_MANASEED_MAXEDOUT	8	// Character has touched the Mana Seed while maxed out on magic
-
-MFLAG_KNOWS_AULDSBEL	16	// Character has met Auldsbel
-MFLAG_KNOWS_WYARA	32	// Character has met Wyara
-MFLAG_KNOWS_SAGATHA	64	// Character has met Sagatha
-MFLAG_KNOWS_MANAPOTION	128	// Has heard about the mana potion
diff --git a/npc/004-1_Beach/_mobs.txt b/npc/004-1_Beach/_mobs.txt
index bc8e68a9..ba1436e1 100644
--- a/npc/004-1_Beach/_mobs.txt
+++ b/npc/004-1_Beach/_mobs.txt
@@ -1,7 +1,35 @@
 // 004-1 Beach mobs
 
+004-1.gat,39,52,5,19	monster	Sea slime	1033,5,0,0,Mob004-1::On1033
+004-1.gat,33,88,5,14	monster	Sea Slime	1033,5,0,0,Mob004-1::On1033
+004-1.gat,27,107,8,6	monster	Sea slime	1033,4,0,0,Mob004-1::On1033
+004-1.gat,31,99,5,7	monster	Sea slime	1033,3,0,0,Mob004-1::On1033
+004-1.gat,71,103,27,19	monster	Giant maggot	1006,5,0,0,Mob004-1::On1006
+004-1.gat,76,68,21,49	monster	Red scorpion	1004,13,0,0,Mob004-1::On1004
+004-1.gat,69,23,10,6	monster	Giant maggot	1006,2,0,0,Mob004-1::On1006
+004-1.gat,93,27,1,1	monster	Black scorpion	1009,1,120000,60000,Mob004-1::On1009
 
 
 004-1.gat,0,0,0	script	Mob004-1	-1,{
+On1004:
+	set @mobID, 1004;
+	callfunc "MobPoints";
+	break;
+
+On1006:
+	set @mobID, 1006;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1033:
+	set @mobID, 1033;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt
index c0de99b6..c8ca6c38 100644
--- a/npc/013-3_Cave/_mobs.txt
+++ b/npc/013-3_Cave/_mobs.txt
@@ -3,7 +3,7 @@
 013-3.gat,28,89,16,52	monster	Cave Snake	1021,10,120000,60000,Mob013-3::On1021
 013-3.gat,61,22,2,2	monster	Fire Skull	1023,3,120000,60000,Mob013-3::On1023
 013-3.gat,81,22,2,2	monster	Poison Skull	1024,3,120000,60000,Mob013-3::On1024
-013-3.gat,109,31,6,22	monster	Black Scorpion	1009,20,80000,40000,Mob013-3::On1009
+013-3.gat,109,31,6,22	monster	Black Scorpion	1009,20,50000,25000,Mob013-3::On1009
 013-3.gat,119,84,27,38	monster	Spider	1012,20,120000,40000,Mob013-3::On1012
 013-3.gat,176,23,5,6	monster	Spider	1012,10,100000,40000,Mob013-3::On1012
 013-3.gat,82,75,2,2	monster	Fire skull	1023,1,180000,60000,Mob013-3::On1023
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index 7e06eed1..0a7c1c47 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -22,7 +22,7 @@
 018-1.gat,106,52,15,6	monster	Cobalt Plant	1030,1,240000,120000,Mob018-1::On1030
 018-1.gat,78,55,37,6	monster	Red Slime	1008,7,100000,50000,Mob018-1::On1008
 018-1.gat,145,24,10,9	monster	Red Slime	1008,3,100000,50000,Mob018-1::On1008
-018-1.gat,68,89,14,17	monster	Grass Snake	1034,3,100000,50000,Mob018-1::On1034
+018-1.gat,68,89,14,17	monster	Bat	1017,3,100000,50000,Mob018-1::On1017
 018-1.gat,160,31,11,18	monster	Red Slime	1008,5,100000,50000,Mob018-1::On1008