summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/mob_db.txt26
-rw-r--r--world/map/npc/006-1/pachua.txt1
-rw-r--r--world/map/npc/027-4/monsters.txt10
-rw-r--r--world/map/npc/027-6/general_krukan.txt2
-rw-r--r--world/map/npc/functions/undead_debug.txt12
5 files changed, 32 insertions, 19 deletions
diff --git a/world/map/db/mob_db.txt b/world/map/db/mob_db.txt
index 9711273e..2ee4d2c5 100644
--- a/world/map/db/mob_db.txt
+++ b/world/map/db/mob_db.txt
@@ -118,19 +118,19 @@
1112, Santaboo, Santaboo, 50, 2200, 0, 0, 59, 2, 80, 125, 50, 10, 25, 10, 25, 0, 60, 30, 2, 2, 1, 3, 20, 129, 600, 1872, 672, 480, 512, 1000, 736, 1200, 737, 1200, 738, 1200, 739, 1200, 511, 50, 4042, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30
1113, Pollett, Pollett, 30, 500, 0, 0, 7, 1, 6, 10, 1, 5, 1, 2, 1, 0, 20, 25, 1, 1, 1, 3, 20, 129, 800, 1600, 672, 480, 4026, 1000, 4023, 500, 700, 300, 862, 100, 1189, 400, 1189, 400, 1189, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40
1114, Nutcracker, Nutcracker, 110, 6000, 0, 0, 769, 1, 81, 281, 20, 42, 40, 20, 10, 5, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 569, 1000, 660, 750, 539, 750, 503, 250, 640, 200, 4004, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
-1115, SeaSlimeMother, SeaSlimeMother, 90, 8000, 0, 0, 900, 5, 100, 150, 10, 20, 1, 15, 10, 10, 10, 10, 1, 1, 1, 0, 44, 175, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
+1115, SeaSlimeMother, SeaSlimeMother, 90, 8000, 0, 0, 900, 5, 100, 150, 10, 20, 1, 15, 10, 10, 10, 10, 1, 1, 1, 0, 44, 175, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1116, UndeadWitch, UndeadWitch, 80, 4200, 0, 0, 722, 3, 50, 110, 8, 31, 15, 20, 10, 25, 50, 40, 1, 1, 1, 0, 29, 175, 550, 1500, 672, 700, 631, 1000, 775, 400, 776, 300, 704, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1117, UndeadTroll, UndeadTroll, 75, 3100, 0, 0, 179, 2, 60, 140, 20, 10, 50, 40, 20, 10, 40, 49, 1, 1, 1, 0, 20, 133, 650, 1500, 672, 480, 1199, 2000, 631, 1000, 529, 500, 539, 300, 526, 250, 4023, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
//ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength
-1118, GreenSlimeMother, GreenSlimeMother, 90, 8000, 0, 0, 900, 5, 100, 150, 15, 20, 20, 25, 20, 30, 20, 20, 1, 1, 1, 0, 21, 175, 1400, 1872, 672, 480, 502, 200, 4004, 20, 501, 100, 521, 250, 522, 200, 526, 500, 503, 500, 535, 750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
-1119, Thug, Thug, 180, 5000, 0, 8000, 999, 1, 125, 250, 40, 6, 0, 10, 50, 0, 40, 80, 1, 10, 1, 0, 2, 175, 500, 1200, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
-1120, Swashbuckler, Swashbuckler, 180, 5000, 0, 7000, 999, 1, 75, 250, 18, 22, 10, 20, 30, 20, 80, 80, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
-1121, Grenadier, Grenadier, 180, 5000, 0, 9000, 999, 8, 100, 200, 8, 60, 2, 10, 40, 50, 80, 80, 1, 10, 1, 0, 5, 175, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
-1122, DreadPirateMarley, DreadPirateMarley, 180, 10000, 0, 15000, 20000, 4, 175, 250, 38, 32, 10, 20, 40, 20, 90, 80, 1, 30, 1, 0, 2, 175, 400, 700, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1123, DreadPirateMarleyClone, DreadPirateMarleyClone, 150, 2000, 0, 0, 0, 4, 175, 250, 18, 22, 10, 40, 30, 20, 80, 40, 1, 30, 1, 0, 2, 175, 500, 1200, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1124, Wight, Wight, 90, 8000, 0, 9000, 1900, 2, 56, 294, 32, 15, 28, 25, 15, 15, 50, 65, 3, 3, 1, 1, 29, 175, 340, 1400, 672, 950, 775, 100, 775, 140, 776, 150, 631, 50, 631, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
-1125, ManaGhost, ManaGhost, 82, 8000, 0, 7500, 2400, 3, 150, 300, 23, 30, 35, 15, 3, 50, 50, 40, 2, 2, 1, 1, 29, 131, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5110, 700, 631, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
-1126, PsiBrain, PsiBrain, 100, 10000, 0, 0, 4000, 2, 220, 500, 23, 30, 35, 15, 3, 50, 50, 50, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5111, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
-1127, GeneralKurkan, GeneralKurkan, 140, 80000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 1000, 776, 1000, 631, 1000, 5128, 2, 636, 6, 637, 25, 638, 50, 639, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 50
-1128, GeneralRazha, GeneralRazha, 140, 80000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50
-1129, GeneralTerogan, GeneralTerogan, 140, 80000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50
+1118, GreenSlimeMother, GreenSlimeMother, 90, 8000, 0, 0, 900, 5, 100, 150, 15, 20, 20, 25, 20, 30, 20, 20, 1, 1, 1, 0, 21, 175, 1400, 1872, 672, 480, 502, 200, 4004, 20, 501, 100, 521, 250, 522, 200, 526, 500, 503, 500, 535, 750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
+1119, Thug, Thug, 180, 5000, 0, 8000, 999, 1, 125, 250, 40, 6, 0, 10, 50, 0, 40, 80, 1, 10, 1, 0, 2, 175, 500, 1200, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1120, Swashbuckler, Swashbuckler, 180, 5000, 0, 7000, 999, 1, 75, 250, 18, 22, 10, 20, 30, 20, 80, 80, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1121, Grenadier, Grenadier, 180, 5000, 0, 9000, 999, 8, 100, 200, 8, 60, 2, 10, 40, 50, 80, 80, 1, 10, 1, 0, 5, 175, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1122, DreadPirateMarley, DreadPirateMarley, 180, 10000, 0, 15000, 20000, 4, 175, 250, 38, 32, 10, 20, 40, 20, 90, 80, 1, 30, 1, 0, 2, 175, 400, 700, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1123, DreadPirateMarleyClone, DreadPirateMarleyClone, 150, 2000, 0, 0, 0, 4, 175, 250, 18, 22, 10, 40, 30, 20, 80, 40, 1, 30, 1, 0, 2, 175, 500, 1200, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1124, Wight, Wight, 90, 8000, 0, 9000, 1900, 2, 56, 294, 32, 15, 28, 25, 15, 15, 50, 65, 3, 3, 1, 1, 29, 175, 340, 1400, 672, 950, 775, 100, 775, 140, 776, 150, 631, 50, 631, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
+1125, ManaGhost, ManaGhost, 82, 8000, 0, 7500, 2400, 3, 150, 300, 23, 30, 35, 15, 3, 50, 50, 40, 2, 2, 1, 1, 29, 131, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5110, 700, 631, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
+1126, PsiBrain, PsiBrain, 100, 10000, 0, 0, 4000, 2, 220, 500, 23, 30, 35, 15, 3, 50, 50, 50, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5111, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
+1127, GeneralKurkan, GeneralKurkan, 140, 80000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 1000, 776, 1000, 631, 1000, 5128, 2, 636, 6, 637, 25, 638, 50, 639, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 50
+1128, GeneralRazha, GeneralRazha, 140, 80000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50
+1129, GeneralTerogan, GeneralTerogan, 140, 80000, 0, 7812, 1663, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index 43681d84..c9fc1210 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -6,6 +6,7 @@
goto L_Close;
set @LEATHER_PATCH_PRICE, 300;
+ set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK;
if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat;
if (QUEST_MIRIAM_start != 0) goto L_smoke;
diff --git a/world/map/npc/027-4/monsters.txt b/world/map/npc/027-4/monsters.txt
index adc89a88..c575f056 100644
--- a/world/map/npc/027-4/monsters.txt
+++ b/world/map/npc/027-4/monsters.txt
@@ -1,11 +1,11 @@
// 027-4 Graveyard zombies and fallens
// they need to be in an extra file because of the crying child quest
-027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000,8000,Mob027-4::On1045
-027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
-027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000,8000,Mob027-4::On1045
-027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
-027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
+027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000,8000,specialMob027-4::On1045
+027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036
+027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000,8000,specialMob027-4::On1045
+027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036
+027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036
027-4.gat,0,0,0|script|specialMob027-4|-1,
{
diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt
index 67213b49..ea37051c 100644
--- a/world/map/npc/027-6/general_krukan.txt
+++ b/world/map/npc/027-6/general_krukan.txt
@@ -26,7 +26,7 @@ L_TomeMain:
"Nothing.", L_Close;
L_SummonReagents:
- mes "Says we need " + @KRUKAN_SOUL_REQ + " Souls, " + @KRUKAN_SKULL_REQ + " Diseased Hearts, " + @KRUKAN_DARK_CRYSTAL_REQ + " Undead Eyes, and " + @KRUKAN_BONE_REQ + " Undead Ears to perform the ritual.";
+ mes "Says we need " + @KRUKAN_SOUL_REQ + " Soul, " + @KRUKAN_SKULL_REQ + " Skulls, " + @KRUKAN_DARK_CRYSTAL_REQ + " Dark Crystals, and " + @KRUKAN_BONE_REQ + " Bones to perform the ritual.";
next;
goto L_TomeMain;
diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt
index 4f01a78c..4b2a015a 100644
--- a/world/map/npc/functions/undead_debug.txt
+++ b/world/map/npc/functions/undead_debug.txt
@@ -87,6 +87,10 @@ L_Close:
set @undeaddebug, 3;
callfunc "UndeadDebug";
end;
+OnInit:
+ if (!debug)
+ disablenpc "UndeadDebug3";
+ end;
}
// Debug for Razha
@@ -95,6 +99,10 @@ L_Close:
set @undeaddebug, 4;
callfunc "UndeadDebug";
end;
+OnInit:
+ if (!debug)
+ disablenpc "UndeadDebug4";
+ end;
}
// Debug for Terogan
@@ -103,4 +111,8 @@ L_Close:
set @undeaddebug, 5;
callfunc "UndeadDebug";
end;
+OnInit:
+ if (!debug)
+ disablenpc "UndeadDebug5";
+ end;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-11 20:55:25 +0000