Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

4 files changed, 333 insertions, 0 deletions

diff --git a/npc/027-8/_import.txt b/npc/027-8/_import.txt
new file mode 100644
index 00000000..a22c49df
--- /dev/null
+++ b/npc/027-8/_import.txt
@@ -0,0 +1,5 @@
+// Map 027-8: Crypt Sub-Basement Two
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-8/general_terogan.txt",
+"npc/027-8/general_terogan_exitdoor.txt",
+"npc/027-8/mapflags.txt",
diff --git a/npc/027-8/general_terogan.txt b/npc/027-8/general_terogan.txt
new file mode 100644
index 00000000..1038e4fe
--- /dev/null
+++ b/npc/027-8/general_terogan.txt
@@ -0,0 +1,315 @@
+
+027-8,39,24,0	script	General Terogan#Main	NPC400,{
+    if ($@CRYPT_FIGHT3 != 0)
+        end;
+
+    @TEROGAN_SOUL_REQ = 5;
+    @TEROGAN_ROTTEN_RAGS_REQ = 5;
+    @TEROGAN_UNDEAD_EYE_REQ = 3;
+    @TEROGAN_UNDEAD_EAR_REQ = 2;
+    @minLevel = 80;
+
+    mes "[Tome]";
+    mes "The Tome is open to a page about a summon ritual that can be performed in this chamber.";
+    next;
+    goto L_TomeMain;
+
+L_TomeMain:
+    mes "What do you want to do?";
+    menu
+        "Read reagent List.", L_SummonReagents,
+        "Assign myself left.", L_SummonLeft,
+        "Assign myself right.", L_SummonRight,
+        "Perform Ritual.", L_RitualMenu,
+        "Nothing.", L_close;
+
+L_SummonReagents:
+    mes "Says we need " + @TEROGAN_SOUL_REQ + " Souls, " + @TEROGAN_ROTTEN_RAGS_REQ + " Rotten Rags, " + @TEROGAN_UNDEAD_EYE_REQ + " Undead Eyes, and " + @TEROGAN_UNDEAD_EAR_REQ + " Undead Ears to perform the ritual. You will also need help, as the summon states both rooms need at least 1 occupant during the ritual.";
+    next;
+    goto L_TomeMain;
+
+L_MissingReagents:
+    mes "It appears we are missing something, lets check the reagent list again.";
+    next;
+    goto L_SummonReagents;
+
+L_SummonLeft:
+    warp "027-8", 27, 43;
+    goto L_close;
+
+L_SummonRight:
+    warp "027-8", 51, 43;
+    goto L_close;
+
+L_RitualMenu:
+    mes "Which side do you want to be on?";
+    menu
+        "Left.", L_RitualLeft,
+        "Right.", L_RitualRight;
+
+L_RitualLeft:
+    if (BaseLevel < @minLevel)
+        goto L_ToWeak;
+    if ( (countitem("Soul") < @TEROGAN_SOUL_REQ)
+        || (countitem("RottenRags") < @TEROGAN_ROTTEN_RAGS_REQ)
+        || (countitem("UndeadEye") < @TEROGAN_UNDEAD_EYE_REQ)
+        || (countitem("UndeadEar") < @TEROGAN_UNDEAD_EAR_REQ) )
+        goto L_MissingReagents;
+    if (getareausers("027-8", 43, 39, 58, 60) == 0)
+        goto L_NeedOther;
+    delitem "Soul", @TEROGAN_SOUL_REQ;
+    delitem "RottenRags", @TEROGAN_ROTTEN_RAGS_REQ;
+    delitem "UndeadEye", @TEROGAN_UNDEAD_EYE_REQ;
+    delitem "UndeadEar", @TEROGAN_UNDEAD_EAR_REQ;
+    mes "As you perform the ritual you can feel the energy amass.";
+    next;
+    mes "A cold shiver runs down your spine as you feel something manifesting out of the void.";
+    if ($@CRYPT_FIGHT3 != 0)
+        goto L_close;
+
+    // initialize fight
+    $@CRYPT_FIGHT3 = 1;
+    $@CRYPT_FIGHT3_WAVE = 0;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = 2;
+    $@CRYPT_FIGHT3_PLAYER_COUNT = getmapusers("027-8");
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath";
+
+    initnpctimer;
+    warp "027-8", 27, 43;
+    goto L_Announce;
+
+L_RitualRight:
+    if (BaseLevel < @minLevel)
+        goto L_ToWeak;
+    if ( (countitem("Soul") < @TEROGAN_SOUL_REQ)
+        || (countitem("RottenRags") < @TEROGAN_ROTTEN_RAGS_REQ)
+        || (countitem("UndeadEye") < @TEROGAN_UNDEAD_EYE_REQ)
+        || (countitem("UndeadEar") < @TEROGAN_UNDEAD_EAR_REQ) )
+        goto L_MissingReagents;
+    if (getareausers("027-8", 20, 39, 35, 60) == 0)
+        goto L_NeedOther;
+    delitem "Soul", @TEROGAN_SOUL_REQ;
+    delitem "RottenRags", @TEROGAN_ROTTEN_RAGS_REQ;
+    delitem "UndeadEye", @TEROGAN_UNDEAD_EYE_REQ;
+    delitem "UndeadEar", @TEROGAN_UNDEAD_EAR_REQ;
+    mes "As you perform the ritual you can feel the energy amass.";
+    next;
+    mes "A cold shiver runs down your spine as you feel something manifesting out of the void.";
+    warp "027-8", 51, 43;
+    if ($@CRYPT_FIGHT3 != 0)
+        goto L_close;
+
+    // initialize fight
+    $@CRYPT_FIGHT3 = 1;
+    $@CRYPT_FIGHT3_WAVE = 0;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = 2;
+    $@CRYPT_FIGHT3_PLAYER_COUNT = getmapusers("027-8");
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath";
+
+    initnpctimer;
+    goto L_Announce;
+
+L_NeedOther:
+    mes "You need at least one other person in the the other chamber to start.";
+    goto L_TomeMain;
+
+L_ToWeak:
+    mes "You try to perform the ritual but nothing happens. You don't seem experienced enough.";
+    goto L_close;
+
+L_close:
+    @bonus = 0;
+    @minLevel = 0;
+    @TEROGAN_SOUL_REQ = 0;
+    @TEROGAN_ROTTEN_RAGS_REQ = 0;
+    @TEROGAN_UNDEAD_EYE_REQ = 0;
+    @TEROGAN_UNDEAD_EAR_REQ = 0;
+    close;
+
+OnTimer5000:
+    setnpctimer 0;
+    if ($@CRYPT_FIGHT3 != 0)
+        goto L_CryptLogic;
+    goto L_Return_1;
+
+L_Return_1:
+    $@CRYPT_FIGHT3_PLAYER_COUNT = 0;
+    areatimer 0, "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnTick";
+    end;
+
+L_CryptLogic:
+    $@CRYPT_FIGHT3_ROUND_PEN = $@CRYPT_FIGHT3_PLAYER_COUNT;
+    if ($@CRYPT_FIGHT3_ROUND_PEN > 60)
+        $@CRYPT_FIGHT3_ROUND_PEN = 60;
+    if ($@CRYPT_FIGHT3_PLAYER_COUNT <= 0) goto L_CleanUpLosers;
+    if (getareausers("027-8", 20, 39, 35, 60, 1) < 1) goto L_Failure;
+    if (getareausers("027-8", 43, 39, 58, 60, 1) < 1) goto L_Failure;
+    set $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
+    if (mobcount("027-8", "General Terogan#Main::OnPetDeath") <= 0)
+        goto L_NextWave;
+    if ($@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT3_ROUND_PEN >= 120)
+        goto L_NextWave;
+    goto L_Return_1;
+
+L_NextWave:
+    $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT3_WAVE = $@CRYPT_FIGHT3_WAVE + 1;
+    if ( ($@CRYPT_FIGHT3_WAVE > 10) && ($@CRYPT_FIGHT3_SUMMONS_COUNT == 0) )
+        goto L_CleanUp;
+    if ( ($@CRYPT_FIGHT3_WAVE > 10) && ($@CRYPT_FIGHT3_WAVE < 22) )
+        goto L_Return_1;
+    if ($@CRYPT_FIGHT3_WAVE > 22)
+        goto L_SummonNuke;
+    if ($@CRYPT_FIGHT3_WAVE < 5)
+        goto L_WeakSummons;
+    if ( ($@CRYPT_FIGHT3_WAVE < 10) && ($@CRYPT_FIGHT3_WAVE >= 5) )
+        goto L_StrongSummons;
+    if ($@CRYPT_FIGHT3_WAVE == 10)
+        goto L_BossSummons;
+    goto L_SummonNuke;
+
+L_SummonNuke:
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4;
+    areamonster "027-8", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath";
+    goto L_Announce;
+
+L_WeakSummons:
+    $@CRYPT_FIGHT3_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2);
+
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1074, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    goto L_Announce;
+
+L_StrongSummons:
+    $@CRYPT_FIGHT3_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2));
+
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    goto L_Announce;
+
+L_BossSummons:
+    $@CRYPT_FIGHT3_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2)) + 2;
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 43, 39, 58, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath";
+    goto L_Announce;
+
+L_Announce:
+    $@msg$ = $@CRYPT_FIGHT3_MESSAGES$[$@CRYPT_FIGHT3_WAVE];
+    if ($@msg$ == "")
+        goto L_Return_1;
+    mapannounce "027-8", $@msg$, 0;
+    mapannounce "027-5", $@msg$, 0;
+    $@msg$ = "";
+    goto L_Return_1;
+
+OnTick:
+    if (ispcdead())
+        end;
+    $@CRYPT_FIGHT3_PLAYER_COUNT = $@CRYPT_FIGHT3_PLAYER_COUNT + 1;
+    end;
+
+OnPetDeath:
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT - 1;
+    end;
+
+L_Failure:
+    if ($@CRYPT_FAIL_ANNOUNCED) goto L_NextWave;
+    $@CRYPT_FAIL_ANNOUNCED = 1;
+    mapannounce "027-8", "Looks like your neighbour team to is finished off, this is your death sentence!", 0;
+    $@CRYPT_FIGHT3_WAVE = 23;
+    goto L_NextWave;
+
+L_CleanUpLosers:
+    mapannounce "027-8", "General Terogan : You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0;
+    $@CRYPT_FIGHT3 = 0;
+    $@CRYPT_FIGHT3_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT3_WAVE = 0;
+    $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT3_ROUND_PEN = 0;
+    $@CRYPT_FIGHT3_SUMMONS_NUMBER = 0;
+    $@CRYPT_FAIL_ANNOUNCED = 0;
+    killmonster "027-8", "General Terogan#Main::OnPetDeath";
+    stopnpctimer;
+    setnpctimer 0;
+    end;
+
+L_CleanUp:
+    mapannounce "027-8", "General Terogan : You might have won this battle, but you will never defeat me!", 0;
+    areatimer 0, "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward";
+    $@CRYPT_FIGHT3 = 0;
+    $@CRYPT_FIGHT3_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT3_WAVE = 0;
+    $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT3_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT3_ROUND_PEN = 0;
+    $@CRYPT_FIGHT3_SUMMONS_NUMBER = 0;
+    $@CRYPT_FAIL_ANNOUNCED = 0;
+    killmonster "027-8", "General Terogan#Main::OnPetDeath";
+    stopnpctimer;
+    setnpctimer 0;
+    end;
+
+OnReward:
+    if (ispcdead())
+        end;
+    @bonus = (BaseLevel/2);
+    DailyQuestBonus = DailyQuestBonus + @bonus;
+    message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
+    BOSS_POINTS = BOSS_POINTS + 75;
+    message strcharinfo(0), "You gain 75 Boss Points giving you a total of " + BOSS_POINTS + ".";
+    goto L_End;
+
+L_End:
+    @bonus = 0;
+    @minLevel = 0;
+    @TEROGAN_SOUL_REQ = 0;
+    @TEROGAN_ROTTEN_RAGS_REQ = 0;
+    @TEROGAN_UNDEAD_EYE_REQ = 0;
+    @TEROGAN_UNDEAD_EAR_REQ = 0;
+    end;
+
+OnInit:
+    setarray $@CRYPT_FIGHT3_MESSAGES$,
+        "General Terogan : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
+        "General Terogan : Ha, Looks like your tougher then I thought.",
+        "General Terogan : and here I thought I wasn't going to enjoy this.",
+        "General Terogan : More of them are coming!",
+        "General Terogan : Minions! Kill them already!",
+        "General Terogan : *facepalm* I knew I should have hired better help.",
+        "General Terogan : Well at least you will make a good addition to my army.",
+        "General Terogan : To the Abyss with you already!",
+        "General Terogan : How about you try a different approach and kill them already!",
+        "General Terogan : Minions! Last chance or it's back to being part of an ossuary for you!",
+        "General Terogan : Looks like if you want something done right you have to do it yourself.",
+        "General Terogan : Charge!.";
+    end;
+}
+
+027-8,27,41,0	script	General Terogan#Exit1	NPC400,{
+    if ($@CRYPT_FIGHT3 != 0)
+        message strcharinfo(0), "You are way too busy to check this book right now";
+    if ($@CRYPT_FIGHT3 != 0)
+        end;
+    mes "[General Terogan]";
+    mes "\"Let's get you out of here " + strcharinfo(0) + "\"";
+    warp "027-8", 38, 29;
+    end;
+}
+027-8,51,41,0	script	General Terogan#Exit2	NPC400,{
+    if ($@CRYPT_FIGHT3 != 0)
+        message strcharinfo(0), "You are way too busy to check this book right now";
+    if ($@CRYPT_FIGHT3 != 0)
+        end;
+    mes "[General Terogan]";
+    mes "\"Let's get you out of here " + strcharinfo(0) + "\"";
+    warp "027-8", 38, 29;
+    end;
+}
diff --git a/npc/027-8/general_terogan_exitdoor.txt b/npc/027-8/general_terogan_exitdoor.txt
new file mode 100644
index 00000000..e9643579
--- /dev/null
+++ b/npc/027-8/general_terogan_exitdoor.txt
@@ -0,0 +1,11 @@
+
+027-8,38,61,0	script	#GeneralExit3	NPC45,3,0,{
+    if ($@CRYPT_FIGHT3 != 0)
+        goto L_Block;
+    warp "027-5",70,26;
+    end;
+
+L_Block:
+    message strcharinfo(0), "A force field seems to be blocking you from exiting.";
+    end;
+}
diff --git a/npc/027-8/mapflags.txt b/npc/027-8/mapflags.txt
new file mode 100644
index 00000000..f19c8671
--- /dev/null
+++ b/npc/027-8/mapflags.txt
@@ -0,0 +1,2 @@
+027-8	mapflag	nosave	027-5,70,27
+027-8	mapflag	zone	MMO