1 files changed, 38 insertions, 5 deletions

diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 031530d29..e2e671100 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -235,8 +235,10 @@ OnMinute02:
 
 003-0-2,34,21,0	script	Alliance Officer	NPC_HALBERDBARBARIAN,{
     mesn;
-    mesq l("Good %s, %s. The council is not in session right now.", (is_night() ? l("evening") : l("morning")), lg("peasant"));
-    if (($BETASERVER || debug) && BaseLevel < 60) goto L_PowerUp;
+    mesq l("Good %s, %s. The council is not in session right now.",
+          (is_night() ? l("evening") : l("morning")),
+          (strcharinfo(0) == $MOST_HEROIC$ ? lg("hero") : lg("peasant")));
+    if (($BETASERVER || debug) && BaseLevel < 60 && !#BETA_REVIVE) goto L_PowerUp;
     close;
 
 L_PowerUp:
@@ -249,6 +251,25 @@ L_PowerUp:
     next;
     mesc l("Awake lost potential? This will mess with your char data irreversibly, beware."), 1;
     if (askyesno() == ASK_NO) close;
+    inventoryplace Iten, 1, NPCEyes, 4;
+
+    // Chose a stage (NO TTL)
+    mesc l("Please select where you left off on Main Quest.");
+    mesc l("The one with a star (*) is advised.");
+    mesc l("It is NOT advised for new players to skip parts of the Main Quest.");
+    mesc l("Skipping will FORSAKE rewards for the quest and related; So choose wisely!");
+    mes "";
+    menuint
+        "Nard Quest finished", 1,
+        "Lua Quest finished", 3,
+        "Airlia Quest finished", 6,
+        "Librarian Quest finished", 10,
+        "Blue Sage Quest finished", 12,
+        "(*) King Gelid Quest complete", 17,
+        "Lightbringer/Barbara finished", 19;
+    mes "";
+    // Save stage
+    .@mq = @menuret;
 
     // IP Blacklist
     if (array_find($@IPBLIST$, getcharip()) < 0)
@@ -262,13 +283,20 @@ L_PowerUp:
 
     // Skip a few quests
     setq ShipQuests_Arpan, 5;
-    if (getq(General_Narrator) < 17) {
-        // Homunculus
+    if (.@mq > 10)
+        setq NivalisQuest_BlueSage, 12;
+    if (.@mq >= 17) {
         sk_lvup(AM_REST);
         sk_lvup(AM_RESURRECTHOMUN);
         sk_lvup(AM_CALLHOMUN);
-        setq General_Narrator, 17;
     }
+    if (.@mq >= 18) {
+        BARBARA_STATE=any(1, 2, 3);
+    }
+
+    // Update main quest
+    if (getq(General_Narrator) < .@mq)
+        setq General_Narrator, .@mq;
 
     // Monster points
     MPQUEST=true;
@@ -302,14 +330,19 @@ L_PowerUp:
     getitembound Bread, 10, 4;
 
     // Regeneration and misc
+    getitem StrangeCoin, 100;
+    Zeny+=50000;
     percentheal 100,100;
     mesc l("You awake a long forgotten potential, and feel ready to take over the world.");
+    #BETA_REVIVE=true;
     close;
 
 OnInit:
     .distance=4;
+    /*
     if (!$BETASERVER && !debug)
         disablenpc .name$;
+    */
     end;
 }