summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-07-17 14:37:28 -0400
committergumi <git@gumi.ca>2018-07-17 14:37:28 -0400
commitb8cfd6d94d48fb5e20e2ace923d4bb07328d3f48 (patch)
treed06a9170e4defb2c7ac51ef973861b6df1855d90
parent64ae495730b4df7d85256ff62ecb878f0e70a097 (diff)
downloadserverdata-b8cfd6d94d48fb5e20e2ace923d4bb07328d3f48.tar.gz
serverdata-b8cfd6d94d48fb5e20e2ace923d4bb07328d3f48.tar.bz2
serverdata-b8cfd6d94d48fb5e20e2ace923d4bb07328d3f48.tar.xz
serverdata-b8cfd6d94d48fb5e20e2ace923d4bb07328d3f48.zip
nerf the swamp ghost
m---------client-data0
-rw-r--r--world/map/db/mob_db_80_99.txt4
-rw-r--r--world/map/db/mob_db_over_100.txt2
-rw-r--r--world/map/npc/functions/ghost.txt11
4 files changed, 13 insertions, 4 deletions
diff --git a/client-data b/client-data
-Subproject bb61edb1cfbdcad376e723880719b90c85ba385
+Subproject eb29906bf3e23cbf1dad937c10a72f4b9aee85f
diff --git a/world/map/db/mob_db_80_99.txt b/world/map/db/mob_db_80_99.txt
index d6cdde0c..40215b80 100644
--- a/world/map/db/mob_db_80_99.txt
+++ b/world/map/db/mob_db_80_99.txt
@@ -9,8 +9,8 @@
1066, VampireBat, VampireBat, 80, 800, 0, 0, 9, 1, 55, 150, 10, 8, 8, 8, 1, 4, 20, 4, 6, 1, 1, 3, 24, 129, 800, 1872, 672, 480, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 5115, 3000, 754, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1069, Scythe, Scythe, 80, 3000, 0, 0, 617, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 1, 50, 1, 0, 40, 133, 220, 700, 672, 500, 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
1070, BallLightning, BallLightning, 80, 300, 0, 0, 1, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 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, 0
-1073, TheLost, TheLost, 83, 5000, 0, 8750, 2840, 5, 125, 150, 10, 70, 5, 40, 10, 70, 70, 40, 4, 9, 1, 1, 69, 141, 500, 2000, 672, 300, 5110, 500, 5110, 500, 631, 500, 566, 500, 778, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1074, RedBone, RedBone, 90, 8000, 0, 9750, 3434, 2, 100, 330, 24, 30, 35, 25, 3, 50, 80, 75, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 4, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
+1073, TheLost, TheLost, 83, 5000, 0, 8750, 2840, 5, 125, 150, 10, 70, 5, 40, 10, 70, 70, 40, 4, 9, 1, 1, 69, 141, 500, 2000, 672, 300, 5110, 500, 5110, 500, 631, 500, 566, 500, 778, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1074, RedBone, RedBone, 90, 8000, 0, 9750, 3434, 2, 100, 330, 24, 30, 35, 25, 3, 50, 80, 75, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 4, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
1077, DrunkenSkeleton, DrunkenSkeleton, 90, 7200, 0, 0, 530, 1, 55, 284, 30, 10, 35, 10, 3, 8, 71, 65, 1, 1, 1, 0, 29, 137, 350, 1800, 672, 950, 790, 300, 789, 280, 3003, 100, 3000, 50, 3009, 250, 3006, 400, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1078, TipsySkeleton, TipsySkeleton, 90, 7000, 0, 0, 493, 1, 60, 284, 33, 10, 35, 10, 3, 8, 71, 65, 1, 1, 1, 0, 29, 137, 350, 1800, 672, 950, 787, 300, 788, 280, 3002, 100, 3000, 50, 3007, 400, 3010, 250, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1079, DrunkenLadySkeleton, DrunkenLadySkeleton, 90, 6000, 0, 0, 389, 2, 75, 146, 40, 8, 20, 20, 15, 8, 51, 48, 1, 1, 1, 0, 29, 137, 660, 750, 672, 700, 785, 300, 786, 280, 3001, 100, 3000, 50, 3010, 250, 3009, 250, 778, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index a99bf22b..bb3a4870 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -22,6 +22,7 @@
1096, SoulSnake, SoulSnake, 115, 850, 0, 0, 56, 1, 75, 90, 4, 6, 20, 11, 10, 10, 35, 10, 1, 1, 1, 0, 20, 137, 900, 1300, 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, 2, 30
1102, Luvia, Luvia, 127, 48044, 60, 0, 12172, 5, 339, 364, 50, 92, 1, 29, 55, 255, 255, 255, 31, 30, 1, 0, 69, 181, 220, 1200, 672, 50, 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
1106, WickedMushroom, WickedMushroom, 110, 550, 0, 0, 30, 1, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 800, 1800, 672, 480, 613, 600, 4007, 50, 567, 100, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60
+//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
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, 4001, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1119, Thug, Thug, 180, 5000, 0, 0, 999, 1, 125, 250, 30, 6, 0, 10, 50, 0, 40, 60, 1, 10, 1, 0, 2, 175, 500, 1200, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 764, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1120, Swashbuckler, Swashbuckler, 180, 5000, 0, 0, 999, 1, 75, 250, 23, 27, 10, 20, 30, 20, 80, 60, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 622, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
@@ -37,3 +38,4 @@
1133, Anne, Anne, 110, 12000, 0, 0, 889, 1, 200, 300, 20, 40, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 380, 872, 672, 900, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1134, SUSAN, SUSAN, 255, 696969, 0, 0, 0, 1, 0, 0, 69, 69, 69, 69, 69, 69, 69, 69, 1, 1, 1, 0, 29, 161, 1500, 1872, 672, 480, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1135, LovelyMaggot, LovelyMaggot, 1, 50, 0, 0, 3, 1, 69, 6969, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 200, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1136, LesserGhost, LesserGhost, 1, 1, 0, 0, 0, 0, 150, 300, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 29, 131, 340, 1800, 672, 950, 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, 4, 20
diff --git a/world/map/npc/functions/ghost.txt b/world/map/npc/functions/ghost.txt
index 1439d543..09a10680 100644
--- a/world/map/npc/functions/ghost.txt
+++ b/world/map/npc/functions/ghost.txt
@@ -1,8 +1,15 @@
function|script|SpawnGhost
{
+ if ($GHOSTS_DISABLED)
+ return;
+
if (BaseLevel >= 40 &&
(getmap() == "026-1" ||
- getmap() == "027-1"))
+ getmap() == "027-1" ||
+ getmap() == "027-2" ||
+ getmap() == "027-3" ||
+ getmap() == "027-4" ||
+ getmap() == "027-5"))
goto L_Spawn;
return;
@@ -21,6 +28,6 @@ L_Spawn:
set @GHOST_MAP$, getmap();
specialeffect2 39;
- monster getmap(), .@x, .@y, strcharinfo(0), 1125, 1, "~GH~" + getcharid(0);
+ monster getmap(), .@x, .@y, strcharinfo(0), 1136, 1, "~GH~" + getcharid(0);
return;
}