diff options
-rw-r--r-- | world/map/npc/099-2/logic.txt | 4 | ||||
-rw-r--r-- | world/map/npc/099-5/boss.txt | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/world/map/npc/099-2/logic.txt b/world/map/npc/099-2/logic.txt index 870ec87e..e0147a03 100644 --- a/world/map/npc/099-2/logic.txt +++ b/world/map/npc/099-2/logic.txt @@ -13,9 +13,9 @@ OnStorage: if ($DOOMSDAY != 3) end; - if (getmap() != "099-5" && getmap() != "099-4") + if (getmap() != "099-5" && getmap() != "099-4" && getmap() != "099-3") end; - if ($@DD5_STATUS != 1 && $@DD5_STATUS != 2 && $@DD5_STATUS != 4 && $@DD5_STATUS != 6) + if ($@DD5_STATUS != 1 && $@DD5_STATUS != 2 && $@DD5_STATUS != 4 && $@DD5_STATUS != 6 && getmap() != "099-3") end; openstorage; end; diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt index 2d36a0e5..4556b898 100644 --- a/world/map/npc/099-5/boss.txt +++ b/world/map/npc/099-5/boss.txt @@ -435,8 +435,8 @@ OnPrologue4: npctalk "Zax De'Kagen#0", "Catch me if you can!"; set $@DD5_STATUS, 3; set $@DD5_HP, 20000; - set $@DD5_PRIMARY, 3+getmapusers("099-5")*2; - set $@DD5_SUPPORT, 3+getmapusers("099-4")*2; + set $@DD5_PRIMARY, 5+getmapusers("099-5"); + set $@DD5_SUPPORT, 3+getmapusers("099-4"); set $@DD5_TOTALPC, $@DD5_PRIMARY+$@DD5_SUPPORT; // Spawn first assault areamonster "099-5", 43, 44, 56, 55, "", $@DD5MB_AVERAGE[rand(getarraysize($@DD5MB_AVERAGE))], $@DD5_TOTALPC, "#TMWFinalExam::OnKillAverage"; @@ -529,8 +529,8 @@ OnWarmedUp5: OnWarmedUp6: set $@DD5_STATUS, 5; set $@DD5_HP, 40000; - set $@DD5_PRIMARY, 1+getmapusers("099-5")*2; - set $@DD5_SUPPORT, 1+getmapusers("099-4")*2; + 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; initnpctimer; donpcevent "Xakelbael the Dark#0::OnEnable"; @@ -948,7 +948,7 @@ L_DD5PSResume: /////////////////////////////////////////////////////////// // Timer Subsystem, spawns every 30 seconds -OnTimer30000: +OnTimer40000: // Imperial Chamber areamonster "099-5", 43, 44, 56, 55, "", $@DD5MB_WEAK[rand(getarraysize($@DD5MB_WEAK))], $@DD5_PRIMARY, "#TMWFinalExam::OnKillWeak"; // Map @@ -1451,10 +1451,10 @@ OnFPS19: OnFPS20: message strcharinfo(0), "##2##BTHE MANA WORLD: REVOLT##b##0"; - if (debug) + //if (debug) addtimer 5000, "Gema III::OnDebugPrompt"; - if (!debug) - addtimer 5000, "Gema III::OnPrompt"; + //if (!debug) + // addtimer 5000, "Gema III::OnPrompt"; end; OnPrompt: @@ -1480,7 +1480,7 @@ OnDebugPrompt: mes ""; mes "##BCOMING SOON##b"; mes ""; - mes "Thanks for testing!"; + mes "Thanks for playing!"; mes "Stay tuned for updates!"; mes ""; mes "-- The Mana World Team"; |