summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/item_db_head.txt2
-rw-r--r--world/map/db/mob_db_over_100.txt10
-rw-r--r--world/map/npc/099-5/boss.txt45
-rw-r--r--world/map/npc/magic/level2-arrow-hail.txt2
4 files changed, 37 insertions, 22 deletions
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 3d3d6f74..33a6c0dd 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -206,7 +206,7 @@
5233, BluePresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
5234, YellowPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
5238, AFKCap, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
-5239, Aureole, 5, 1000, 1, 60, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bFlee, 10;}
+5239, Aureole, 5, 1000, 1, 60, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bFlee, 50;}
5240, SmileyCap, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
5241, RedShades, 5, 500, 100, 20, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
5242, GreenShades, 5, 500, 100, 20, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index 79abe759..607b6031 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -39,7 +39,7 @@
1134, SUSAN, SUSAN, 255, 696969, 0, 69000, 1400, 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, 1, 1, 1, 69, 6969, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 200, 1872, 672, 480, 505, 400, 501, 70, 518, 200, 533, 75, 502, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1136, LesserGhost, LesserGhost, 1, 1, 0, 1, 1, 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
-1137, Tormenta, Tormenta, 200, 18000, 60, 500000, 5000, 5, 360, 374, 48, 90, 1, 32, 60, 255, 255, 255, 31, 30, 1, 0, 69, 181, 210, 1200, 672, 50, 5258, 15, 5257, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1137, Tormenta, Tormenta, 200, 18000, 60, 500000, 5000, 5, 360, 374, 48, 90, 1, 32, 60, 255, 255, 255, 31, 30, 1, 0, 69, 181, 210, 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
//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
1138, ManaGuard, ManaGuardian, 180, 20000, 280, 27000, 5000, 2, 280, 324, 22, 67, 31, 22, 90, 127, 255, 95, 31, 30, 1, 0, 69, 181, 210, 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
1139, Virus, Virus, 170, 5000, 0, 0, 721, 6, 45, 75, 37, 12, 30, 30, 20, 20, 25, 60, 1, 1, 1, 3, 25, 175, 600, 1872, 672, 480, 787, 500, 743, 1100, 5236, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
@@ -58,12 +58,12 @@
1151, VoidFlower, VoidFlower, 115, 7000, 0, 0, 40, 12, 400, 420, 0, 5, 16, 12, 20, 20, 255, 50, 12, 12, 1, 3, 22, 128, 800, 2000, 672, 180, 535, 100, 540, 10, 1199, 100, 526, 400, 565, 1000, 565, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1152, VoidArchant, VoidArchant, 130, 6000, 0, 0, 14, 1, 140, 180, 36, 6, 10, 5, 1, 0, 12, 10, 1, 1, 1, 0, 25, 133, 800, 1500, 672, 200, 537, 300, 535, 100, 640, 40, 4001, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1153, VoidSlime, VoidSlime, 135, 4144, 0, 6000, 70, 2, 105, 160, 75, 40, 30, 15, 35, 10, 70, 250, 1, 1, 1, 0, 43, 135, 1100, 1500, 672, 200, 904, 10000, 703, 2500, 640, 1000, 701, 1000, 4001, 1000, 825, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1154, VoidSnake, VoidSnake, 130, 2000, 0, 0, 63, 1, 80, 120, 4, 6, 20, 40, 10, 10, 35, 45, 1, 1, 1, 0, 20, 133, 300, 1500, 672, 200, 532, 20, 641, 350, 715, 400, 715, 400, 711, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30
+1154, VoidSnake, VoidSnake, 130, 2000, 0, 0, 63, 1, 80, 120, 4, 6, 20, 40, 10, 10, 35, 45, 1, 1, 1, 0, 20, 133, 320, 1500, 672, 200, 532, 20, 641, 350, 715, 400, 715, 400, 711, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30
1155, VoidBat, VoidBat, 100, 400, 0, 0, 3, 1, 10, 25, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 24, 133, 200, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 753, 3000, 754, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1156, VoidMaggot, VoidMaggot, 100, 400, 0, 0, 1, 1, 10, 25, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 21, 133, 800, 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
-1157, VoidSoldier, VoidSoldier, 120, 11000, 0, 0, 663, 7, 30, 40, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 500, 1200, 672, 300, 779, 210, 780, 210, 698, 200, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50
+1157, VoidSoldier, VoidSoldier, 120, 8000, 0, 0, 663, 7, 20, 30, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 500, 1600, 672, 300, 779, 210, 780, 210, 698, 200, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 0, 0, 0, 0, 4, 50
1158, VoidMouboo, VoidMouboo, 100, 5000, 0, 0, 16, 2, 50, 65, 60, 5, 15, 5, 15, 0, 40, 10, 2, 2, 1, 3, 20, 129, 600, 1872, 672, 480, 660, 1000, 660, 500, 541, 750, 660, 50, 806, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30
-1159, VoidScorpion, VoidScorpion, 110, 6000, 0, 0, 37, 1, 60, 90, 4, 6, 16, 30, 10, 10, 35, 10, 1, 1, 1, 0, 20, 133, 700, 1600, 672, 480, 523, 150, 509, 100, 518, 800, 709, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1160, VoidShroom, VoidShroom, 110, 5500, 0, 0, 30, 3, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 550, 1600, 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, 0, 0
+1159, VoidScorpion, VoidScorpion, 110, 6000, 0, 0, 37, 1, 60, 90, 4, 6, 16, 30, 10, 10, 35, 10, 1, 1, 1, 0, 20, 133, 700, 1700, 672, 480, 523, 150, 509, 100, 518, 800, 709, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1160, VoidShroom, VoidShroom, 110, 5500, 0, 0, 30, 3, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 550, 1700, 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, 0, 0
1161, Xakelbael, Xakelbael, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 199, 2, 199, 197, 255, 175, 31, 30, 1, 0, 69, 181, 210, 672, 672, 50, 668, 10000, 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
diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt
index 4556b898..96b7cb93 100644
--- a/world/map/npc/099-5/boss.txt
+++ b/world/map/npc/099-5/boss.txt
@@ -83,10 +83,18 @@
// 1024 - DEFCON
// NOTE: Personal score overflows at 214,000 points
-099-5|mapflag|nosave|099-3,72,74
-099-5|mapflag|resave|099-3,72,74
-099-4|mapflag|nosave|099-3,72,74
-099-4|mapflag|resave|099-3,72,74
+099-5|mapflag|nosave|009-1,52,40
+099-5|mapflag|resave|009-1,52,40
+099-4|mapflag|nosave|009-1,52,40
+099-4|mapflag|resave|009-1,52,40
+
+// Additional mapflags
+099-3|mapflag|nosave|099-7,75,36
+099-3|mapflag|resave|099-7,75,36
+099-2|mapflag|nosave|099-7,75,36
+099-2|mapflag|resave|099-7,75,36
+099-1|mapflag|nosave|099-7,75,36
+099-1|mapflag|resave|099-7,75,36
099-5,0,0,0|script|#TMWFinalExam|32767
{
@@ -128,8 +136,8 @@ OnMTChallenge:
set BOSS_POINTS, BOSS_POINTS + 5;
message strcharinfo(0), "This battle experience distribution is different, and death is final. Be careful!";
// Give everyone some participation points simply for continued survival
- set @dd5_score, 1000;
- set $@DD5_PTS, $@DD5_PTS+1000;
+ set @dd5_score, 1200;
+ set $@DD5_PTS, $@DD5_PTS+1200;
end;
// FIXME not working for some reason
@@ -249,7 +257,7 @@ OnMTFourthFall:
end;
OnFourthFall:
- debugmes "FOURTH FALL";
+ //debugmes "FOURTH FALL";
// High Damage
if (sc_check(sc_raiseattackspeed0))
@@ -434,7 +442,7 @@ OnPrologue4:
mapannounce "099-4", "Zax De'Kagen : Catch me if you can!" , 0;
npctalk "Zax De'Kagen#0", "Catch me if you can!";
set $@DD5_STATUS, 3;
- set $@DD5_HP, 20000;
+ set $@DD5_HP, 20000+(getmapusers("099-5")*100);
set $@DD5_PRIMARY, 5+getmapusers("099-5");
set $@DD5_SUPPORT, 3+getmapusers("099-4");
set $@DD5_TOTALPC, $@DD5_PRIMARY+$@DD5_SUPPORT;
@@ -528,10 +536,14 @@ OnWarmedUp5:
OnWarmedUp6:
set $@DD5_STATUS, 5;
- set $@DD5_HP, 40000;
+ set $@DD5_HP, 40000+(getmapusers("099-5")*100);
set $@DD5_PRIMARY, 1+getmapusers("099-5")*15/10;
set $@DD5_SUPPORT, 1+getmapusers("099-4")*15/10;
set $@DD5_TOTALPC, $@DD5_PRIMARY+$@DD5_SUPPORT;
+ // Spawn second wave
+ areamonster "099-5", 20, 20, 75, 75, "", $@DD5MB_AVERAGE[rand(getarraysize($@DD5MB_AVERAGE))], $@DD5_PRIMARY, "#TMWFinalExam::OnKillAverage";
+ areamonster "099-4", 20, 20, 75, 75, "", $@DD5MB_AVERAGE[rand(getarraysize($@DD5MB_AVERAGE))], $@DD5_SUPPORT, "#TMWFinalExam::OnKillAverage";
+ // Begin timers
initnpctimer;
donpcevent "Xakelbael the Dark#0::OnEnable";
areatimer 0, "099-5", 20, 20, 75, 75, 10, "#TMWFinalExam::OnMTMusicOn";
@@ -612,11 +624,14 @@ OnShowdown5:
OnShowdown6:
set $@DD5_STATUS, 7;
- set $@DD5_HP, 115000;
- set $@DD5_PRIMARY, 3+getmapusers("099-5")*2;
- set $@DD5_SUPPORT, 3+getmapusers("099-4")*2;
- set $@DD5_TOTALPC, $@DD5_PRIMARY+$@DD5_SUPPORT;
+ set $@DD5_HP, 115000+(getmapusers("099-5")*100);
+ set $@DD5_PRIMARY, 3+getmapusers("099-5")*15/10;
+ set $@DD5_SUPPORT, 3+getmapusers("099-4")*15/10;
+ set $@DD5_TOTALPC, $@DD5_PRIMARY+$@DD5_SUPPORT-2;
+ areamonster "099-5", 20, 20, 75, 75, "", $@DD5MB_AVERAGE[rand(getarraysize($@DD5MB_WEAK))], $@DD5_PRIMARY, "#TMWFinalExam::OnKillWeak";
initnpctimer;
+ set $@DD5_DEFCON, rand(4, 8);
+ areatimer 0, "099-5", 20, 20, 75, 75, 10, "#TMWFinalExam::OnMTBlissOblivion";
donpcevent "Zax De'Kagen#0::OnFinal";
end;
@@ -1016,7 +1031,7 @@ OnKillStrong:
///////////////////////////////////////////////////////////
// Core
OnInit:
- setarray $@DD5MB_WEAK, 1155, 1156, 1155, 1156, 1155, 1156, 1157, 1158;
+ setarray $@DD5MB_WEAK, 1155, 1156, 1155, 1156, 1155, 1156, 1158;
setarray $@DD5MB_AVERAGE, 1159, 1160, 1159, 1160, 1159, 1160, 1157, 1158;
setarray $@DD5MB_STRONG, 1152, 1153, 1154, 1152, 1153, 1154, 1152, 1153, 1154;
setarray $@DD5MB_BOSSLV, 1146, 1147, 1140, 1141, 1143, 1149, 1148, 1140;
@@ -1462,7 +1477,7 @@ OnPrompt:
mes "";
mes "Server Name: ##BThe Mana World##b";
mes "Server Address: ##Bserver.themanaworld.org##b";
- mes "Server Port: ##B6969##b";
+ mes "Server Port: ##BXXXX##b";
mes "Server Type: ##BEvol2##b";
mes "Server Description: ##BMain Server for The Mana World##b";
mes "";
diff --git a/world/map/npc/magic/level2-arrow-hail.txt b/world/map/npc/magic/level2-arrow-hail.txt
index b1e713d0..24866b1c 100644
--- a/world/map/npc/magic/level2-arrow-hail.txt
+++ b/world/map/npc/magic/level2-arrow-hail.txt
@@ -9,7 +9,7 @@ OnCast:
if (getskilllv(SKILL_MAGIC) < .level) end;
if (Sp < 25) end;
explode .@map_ext[0], getmap(), "-";
- if (.@map_ext[1] != 1) end; // XXX this is fugly, in the future let's use MF_OUTSIDE to detect if a map is "outside" or "inside"
+ if (.@map_ext[1] != 1 && getmap() != "099-5") end; // XXX this is fugly, in the future let's use MF_OUTSIDE to detect if a map is "outside" or "inside"
if (getmapflag(getmap(), MF_TOWN)) end;
if (countitem("Arrow") >= 20 && countitem("SulphurPowder") >= 1) delitem "Arrow", 20;
elif (countitem("IronArrow") >= 20 && countitem("SulphurPowder") >= 1) delitem "IronArrow", 20;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-18 14:34:43 +0000