With three TODOs, Doomsday can make it.jesusalva/v20221111

3 files changed, 27 insertions, 19 deletions

diff --git a/world/map/npc/069-2/wizard.txt b/world/map/npc/069-2/wizard.txt
index 7747402a..8f2980ee 100644
--- a/world/map/npc/069-2/wizard.txt
+++ b/world/map/npc/069-2/wizard.txt
@@ -138,8 +138,16 @@ L_Doomsday:
     next;
     mes "[Rodium]";
     mes "\"##1##BNote: Sorry, Jesusalva broke the time again. Guess he is late to take a bus! Oh dear, these things happen, but I guess that to see the past... You must wait for the future...##b##0\"";
+    if (GM > G_DEV) goto L_Warp;
     goto L_Menu2;
 
+L_Warp:
+    // TODO: Require some sort of payment
+    // TODO: Revive all mobs from 099-1/-2/-3 (they do not respawn, iirc)
+    // TODO: Reduce amount of mobs >.<
+    warp "099-1", 34, 34;
+    close;
+
 L_Close:
     close;
 }
diff --git a/world/map/npc/099-2/logic.txt b/world/map/npc/099-2/logic.txt
index 902789f1..29d7e96d 100644
--- a/world/map/npc/099-2/logic.txt
+++ b/world/map/npc/099-2/logic.txt
@@ -286,7 +286,7 @@ OnJanitor:
 
     mes "Reading this is as hard as finding a needle in a haystack.";
     if (debug) goto L_Close;
-    if (countitem("FlawedLens") < 1) goto L_Tools;
+    if (countitem(FlawedLens) < 1) goto L_Tools;
 	mes "Although the painting also has no artistic value on its own...";
     mes "Something tells you there is something ominous with it.";
     next;
@@ -304,8 +304,8 @@ L_Tools:
     close;
 
 L_UseLens:
-    delitem "FlawedLens", 1;
-    getexp 10000, 10000;
+    //delitem FlawedLens, 1;
+    //getexp 10000, 10000;
     mes "~~~graphics/images/kirin.png~";
     mes "[@@https://wiki.themanaworld.org/images/5/57/Kirin_by_clef.jpg|There is the image of a woman on it@@].";
     next;
@@ -318,7 +318,7 @@ L_UseLens:
     mes "Rest in Peace. Damnatio memoriae. Effective immediately.";
     // ;-- TRANSLATORS: Damnatio memoriae - "condemnation of memory", indicating that a person is to be excluded from official accounts. History rewrite if required.
     next;
-    mes "The lens break! They were not only poorly effective but also of bad quality.";
+    //mes "The lens break! They were not only poorly effective but also of bad quality.";
     mes "If only we could make the real Lens, we would have been able to find out";
     mes "what is up with this ominous, eerie feeling this picture gives.";
     close;
diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt
index d36457d2..de61bdf0 100644
--- a/world/map/npc/099-5/boss.txt
+++ b/world/map/npc/099-5/boss.txt
@@ -133,7 +133,7 @@ OnMTChallenge:
     set @dd5_score, 0;
     set @dd5_timer, gettimetick(0);
     getexp 40000, 0;
-    set BOSS_POINTS, BOSS_POINTS + 5;
+    set BOSS_POINTS, BOSS_POINTS + 1;
     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, 1200;
@@ -158,8 +158,8 @@ OnMTReward50:
         end;
     getexp @dd5_share*100, @dd5_share;
     set Zeny, Zeny + @dd5_share;
-    set BOSS_POINTS, BOSS_POINTS + @dd5_share/100;
-    message strcharinfo(0), "Gained "+(@dd5_share/100)+" boss points!";
+    set BOSS_POINTS, BOSS_POINTS + @dd5_share/120;
+    message strcharinfo(0), "Gained "+(@dd5_share/120)+" boss points!";
     goto OnMTMusicOff;
 
 OnMTReward40:
@@ -168,8 +168,8 @@ OnMTReward40:
         end;
     getexp @dd5_share*10, @dd5_share/10;
     set Zeny, Zeny + @dd5_share/10;
-    set BOSS_POINTS, BOSS_POINTS + @dd5_share/200;
-    message strcharinfo(0), "Gained "+(@dd5_share/200)+" boss points!";
+    set BOSS_POINTS, BOSS_POINTS + @dd5_share/220;
+    message strcharinfo(0), "Gained "+(@dd5_share/220)+" boss points!";
     goto OnMTMusicOff;
 
 ////////////////////////////
@@ -180,8 +180,8 @@ OnMTReward51:
         end;
     getexp @dd5_share*200, @dd5_share*2;
     set Zeny, Zeny + (@dd5_share*2);
-    set BOSS_POINTS, BOSS_POINTS + @dd5_share/50;
-    message strcharinfo(0), "Gained "+(@dd5_share/50)+" boss points!";
+    set BOSS_POINTS, BOSS_POINTS + @dd5_share/70;
+    message strcharinfo(0), "Gained "+(@dd5_share/70)+" boss points!";
     goto OnMTMusicOff;
 
 OnMTReward41:
@@ -190,8 +190,8 @@ OnMTReward41:
         end;
     getexp @dd5_share*20, @dd5_share/5;
     set Zeny, Zeny + @dd5_share/5;
-    set BOSS_POINTS, BOSS_POINTS + @dd5_share/100;
-    message strcharinfo(0), "Gained "+(@dd5_share/100)+" boss points!";
+    set BOSS_POINTS, BOSS_POINTS + @dd5_share/120;
+    message strcharinfo(0), "Gained "+(@dd5_share/120)+" boss points!";
     goto OnMTMusicOff;
 
 ////////////////////////////
@@ -202,8 +202,8 @@ OnMTReward52:
         end;
     getexp @dd5_share*500, @dd5_share*5;
     set Zeny, Zeny + (@dd5_share*5);
-    set BOSS_POINTS, BOSS_POINTS + @dd5_share/20;
-    message strcharinfo(0), "Gained "+(@dd5_share/20)+" boss points!";
+    set BOSS_POINTS, BOSS_POINTS + @dd5_share/40;
+    message strcharinfo(0), "Gained "+(@dd5_share/40)+" boss points!";
     music "ghoulish-fun.ogg";
     mapmask 1;
 
@@ -223,8 +223,8 @@ OnMTReward42:
         end;
     getexp @dd5_share*50, @dd5_share;
     set Zeny, Zeny + @dd5_share;
-    set BOSS_POINTS, BOSS_POINTS + @dd5_share/50;
-    message strcharinfo(0), "Gained "+(@dd5_share/50)+" boss points!";
+    set BOSS_POINTS, BOSS_POINTS + @dd5_share/70;
+    message strcharinfo(0), "Gained "+(@dd5_share/70)+" boss points!";
     music "ghoulish-fun.ogg";
 
     // Warp to 099-5 or dispose dead bodies
@@ -1477,7 +1477,7 @@ OnPrompt:
     mes "";
     mes "Server Name: ##BThe Mana World##b";
     mes "Server Address: ##Bserver.themanaworld.org##b";
-    mes "Server Port: ##BXXXX##b";
+    mes "Server Port: ##B6969##b";
     mes "Server Type: ##BEvol2##b";
     mes "Server Description: ##BMain Server for The Mana World##b";
     mes "";
@@ -1511,7 +1511,7 @@ L_MissionComplete:
     close;
 
 L_Winner:
-    getitem "SaviorArmor", 1;
+    getitem SaviorArmor, 1;
     set $@DD5_TALLY$, "";
     set #DD5_TALLY, 1;
     mes "##2You were the MVP with "+$@DD5_TALLY_+" points!##0";