From ff6f23e94c4ac068dae9e7441b9dc4e600787aa5 Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 5 Nov 2014 11:09:21 -0600 Subject: NPCs on 009-* fixed --- world/map/npc/009-1/dock.txt | 2 +- world/map/npc/009-1/jack.txt | 2 +- world/map/npc/009-1/milly.txt | 4 ++-- world/map/npc/009-1/old_man.txt | 2 +- world/map/npc/009-1/old_woman.txt | 2 +- world/map/npc/009-1/sabine.txt | 2 +- world/map/npc/009-1/soul-menhir.txt | 2 +- world/map/npc/009-1/water_pump.txt | 2 +- world/map/npc/009-2/airlia.txt | 2 +- world/map/npc/009-2/alan.txt | 2 +- world/map/npc/009-2/doctor.txt | 2 +- world/map/npc/009-2/drunks.txt | 4 ++-- world/map/npc/009-2/inspector.txt | 2 +- world/map/npc/009-2/kfahr.txt | 2 +- world/map/npc/009-2/lena.txt | 2 +- world/map/npc/009-2/misc.txt | 4 ++-- world/map/npc/009-2/nicholas.txt | 2 +- world/map/npc/009-2/nurse.txt | 2 +- world/map/npc/009-2/olana.txt | 2 +- world/map/npc/009-2/peter.txt | 2 +- world/map/npc/009-2/richard.txt | 2 +- world/map/npc/009-2/selim.txt | 2 +- world/map/npc/009-2/waitress.txt | 2 +- world/map/npc/009-2/wyara.txt | 2 +- world/map/npc/009-3/sword.txt | 2 +- world/map/npc/009-3/warp.txt | 2 +- world/map/npc/009-4/barriers.txt | 14 ++++++------- world/map/npc/009-4/orum.txt | 6 +++--- world/map/npc/009-4/orum_warps.txt | 6 +++--- world/map/npc/009-4/torches.txt | 24 +++++++++++------------ world/map/npc/009-4/waric.txt | 6 +++--- world/map/npc/009-6/brodomir.txt | 10 +++++----- world/map/npc/009-7/battlemaster.txt | 12 ++++++------ world/map/npc/009-7/core.txt | 38 ++++++++++++++++++------------------ world/map/npc/009-7/debug.txt | 4 ++-- world/map/npc/009-7/eventHandler.txt | 10 +++++----- world/map/npc/009-7/rouge.txt | 2 +- 37 files changed, 95 insertions(+), 95 deletions(-) (limited to 'world') diff --git a/world/map/npc/009-1/dock.txt b/world/map/npc/009-1/dock.txt index a6fa2553..a3ed067d 100644 --- a/world/map/npc/009-1/dock.txt +++ b/world/map/npc/009-1/dock.txt @@ -1,6 +1,6 @@ // Ferry Sign -009-1.gat,46,34,0|script|FerrySchedule#4|397, +009-1.gat,46,34,0|script|FerrySchedule#4|397 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index c25624cc..c2206faa 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -14,7 +14,7 @@ //################################################################################# // Lumberjack -009-1.gat,40,45,0|script|Jack|141, +009-1.gat,40,45,0|script|Jack|141 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt index 4dc99cce..0e488c13 100644 --- a/world/map/npc/009-1/milly.txt +++ b/world/map/npc/009-1/milly.txt @@ -6,7 +6,7 @@ // // Inspector quest -009-1.gat,81,41,0|script|Milly|114, +009-1.gat,81,41,0|script|Milly|114 { callfunc "ClearVariables"; @@ -385,7 +385,7 @@ L_Return: return; } -009-1.gat,82,41,0|script|MillyDebugHelper|114, +009-1.gat,82,41,0|script|MillyDebugHelper|114 { mes "You can set certain quests as finished or not finished. What would you like to do?"; menu diff --git a/world/map/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt index cebd0f59..7328cd1f 100644 --- a/world/map/npc/009-1/old_man.txt +++ b/world/map/npc/009-1/old_man.txt @@ -1,6 +1,6 @@ // Old man -009-1.gat,85,51,0|script|Old Man|159, +009-1.gat,85,51,0|script|Old Man|159 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt index d8c063dc..7442e174 100644 --- a/world/map/npc/009-1/old_woman.txt +++ b/world/map/npc/009-1/old_woman.txt @@ -1,6 +1,6 @@ // Old woman -009-1.gat,29,43,0|script|Old Woman|154, +009-1.gat,29,43,0|script|Old Woman|154 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/sabine.txt b/world/map/npc/009-1/sabine.txt index 48d7e441..8c74819a 100644 --- a/world/map/npc/009-1/sabine.txt +++ b/world/map/npc/009-1/sabine.txt @@ -1,6 +1,6 @@ // Girl sitting on bench -009-1.gat,88,27,0|script|Sabine|106, +009-1.gat,88,27,0|script|Sabine|106 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt index cc711625..9ffd8614 100644 --- a/world/map/npc/009-1/soul-menhir.txt +++ b/world/map/npc/009-1/soul-menhir.txt @@ -1,6 +1,6 @@ // -009-1.gat,53,40,0|script|Soul Menhir#hurnscald|344, +009-1.gat,53,40,0|script|Soul Menhir#hurnscald|344 { callfunc "ClearVariables"; set @map$, "009-1.gat"; diff --git a/world/map/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt index 9f15355f..b7de62a5 100644 --- a/world/map/npc/009-1/water_pump.txt +++ b/world/map/npc/009-1/water_pump.txt @@ -1,6 +1,6 @@ // Water pump. You can fill empty bottles here -009-1.gat,76,33,0|script|Water Pump|400, +009-1.gat,76,33,0|script|Water Pump|400 { callfunc "WaterBottle"; end; diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 3748269d..df430683 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -6,7 +6,7 @@ // * Airlia quest = 2 unlocks other options, perhaps with future Warrior Guild prospects (this is long term) -009-2.gat,123,71,0|script|Airlia|108, +009-2.gat,123,71,0|script|Airlia|108 { // Subquest 1a: Caretaker's daughter (initial, once) set @LETTER_REWARD_GOLD_INITIAL, 1000; diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt index a6209b70..b02b1904 100644 --- a/world/map/npc/009-2/alan.txt +++ b/world/map/npc/009-2/alan.txt @@ -8,7 +8,7 @@ //################################################################################# // Archer Shop Master -009-2.gat,99,23,0|script|Alan|125, +009-2.gat,99,23,0|script|Alan|125 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt index 1f2ecbd3..8810e4e3 100644 --- a/world/map/npc/009-2/doctor.txt +++ b/world/map/npc/009-2/doctor.txt @@ -1,6 +1,6 @@ // Doctor -009-2.gat,148,25,0|script|Doctor|107, +009-2.gat,148,25,0|script|Doctor|107 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt index 73158c14..c5585d59 100644 --- a/world/map/npc/009-2/drunks.txt +++ b/world/map/npc/009-2/drunks.txt @@ -1,6 +1,6 @@ //Left drinking contest guy -009-2.gat,65,55,0|script|Drinker#1|121, +009-2.gat,65,55,0|script|Drinker#1|121 { mes "[Binge Drinker]"; mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\""; @@ -9,7 +9,7 @@ //Right drinking contest guy -009-2.gat,68,55,0|script|Drinker#2|121, +009-2.gat,68,55,0|script|Drinker#2|121 { mes "[Binge Drinker]"; mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\""; diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt index 662b0c74..476b4596 100644 --- a/world/map/npc/009-2/inspector.txt +++ b/world/map/npc/009-2/inspector.txt @@ -1,6 +1,6 @@ // -009-2.gat,24,99,0|script|Inspector#Hurnscald|150, +009-2.gat,24,99,0|script|Inspector#Hurnscald|150 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt index 9c772452..ef5cb001 100644 --- a/world/map/npc/009-2/kfahr.txt +++ b/world/map/npc/009-2/kfahr.txt @@ -13,7 +13,7 @@ //# //################################################################################# -009-2.gat,67,57,0|script|Kfahr|125, +009-2.gat,67,57,0|script|Kfahr|125 { set @halloween_npc_id, $@halloween_npc_kfahr; callfunc "TrickOrTreat"; diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt index d5ce1d8e..e29863c5 100644 --- a/world/map/npc/009-2/lena.txt +++ b/world/map/npc/009-2/lena.txt @@ -1,7 +1,7 @@ // Quest for Fairy Hat and Forest Armor // Variables used: nibble 0 of QUEST_Hurnscald -009-2.gat,146,43,0|script|Lena|182, +009-2.gat,146,43,0|script|Lena|182 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt index 1959ad9c..ff350b88 100644 --- a/world/map/npc/009-2/misc.txt +++ b/world/map/npc/009-2/misc.txt @@ -1,6 +1,6 @@ //Note in bar -009-2.gat,54,49,0|script|Note#bar|400, +009-2.gat,54,49,0|script|Note#bar|400 { mes "[Note]"; mes "\"We refuse service to anyone who:\""; @@ -12,7 +12,7 @@ } //Bookshelf -009-2.gat,109,44,0|script|#Book|400, +009-2.gat,109,44,0|script|#Book|400 { if (getskilllv(SKILL_MAGIC)) goto L_magic; diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt index 31a1d0da..568f9a71 100644 --- a/world/map/npc/009-2/nicholas.txt +++ b/world/map/npc/009-2/nicholas.txt @@ -11,7 +11,7 @@ //# //################################################################################# -009-2.gat,185,55,0|script|Nicholas|135, +009-2.gat,185,55,0|script|Nicholas|135 { set @SETZER_XP, 100000; set @SHIELD_XP, 20000; diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt index 44605134..3c6be98a 100644 --- a/world/map/npc/009-2/nurse.txt +++ b/world/map/npc/009-2/nurse.txt @@ -22,7 +22,7 @@ //###################################################################################### -009-2.gat,147,65,0|script|Nurse|119, +009-2.gat,147,65,0|script|Nurse|119 { callfunc "ClearVariables"; set @halloween_npc_id, $@halloween_npc_nurse; diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt index cf200391..7c654759 100644 --- a/world/map/npc/009-2/olana.txt +++ b/world/map/npc/009-2/olana.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -009-2.gat,63,79,0|script|Olana|190, +009-2.gat,63,79,0|script|Olana|190 { set @MinLevel, 60; diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt index 4c0d2bd2..2c739055 100644 --- a/world/map/npc/009-2/peter.txt +++ b/world/map/npc/009-2/peter.txt @@ -1,6 +1,6 @@ // Nicholas' Apprentice and Armorsmith -009-2.gat,183,57,0|script|Peter|157, +009-2.gat,183,57,0|script|Peter|157 { set @peter_chain_mail_coal, 10; set @peter_chain_mail_ingot, 5; diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt index 143de014..f7c48633 100644 --- a/world/map/npc/009-2/richard.txt +++ b/world/map/npc/009-2/richard.txt @@ -1,6 +1,6 @@ // -009-2.gat,20,99,0|script|Richard|161, +009-2.gat,20,99,0|script|Richard|161 { callfunc "ClearVariables"; set @npcname$, "Richard"; diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt index 81531749..4a19336a 100644 --- a/world/map/npc/009-2/selim.txt +++ b/world/map/npc/009-2/selim.txt @@ -5,7 +5,7 @@ //# # //################################################################################# -009-2.gat,32,104,0|script|Selim|326, +009-2.gat,32,104,0|script|Selim|326 { setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green"; diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt index 553e20f6..57eca972 100644 --- a/world/map/npc/009-2/waitress.txt +++ b/world/map/npc/009-2/waitress.txt @@ -1,6 +1,6 @@ // Waitress -009-2.gat,60,52,0|script|Melinda|140, +009-2.gat,60,52,0|script|Melinda|140 { mes "[Melinda]"; mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\""; diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt index a9b738a0..65c16fc7 100644 --- a/world/map/npc/009-2/wyara.txt +++ b/world/map/npc/009-2/wyara.txt @@ -1,7 +1,7 @@ // ---------------------------------------- // Wyara the Hurnscald witch // ---------------------------------------- -009-2.gat,121,26,0|script|Wyara#_M|103, +009-2.gat,121,26,0|script|Wyara#_M|103 { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt index d419dbaa..12c85bbd 100644 --- a/world/map/npc/009-3/sword.txt +++ b/world/map/npc/009-3/sword.txt @@ -1,4 +1,4 @@ -009-3.gat,26,100,0|script|#MysticSword#_M|400, +009-3.gat,26,100,0|script|#MysticSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt index bc828df4..739751bf 100644 --- a/world/map/npc/009-3/warp.txt +++ b/world/map/npc/009-3/warp.txt @@ -1,4 +1,4 @@ -009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0, +009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0 { mes "Do you want to enter the PVP cave? It costs 150GP."; menu diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index ae960d97..9e3e85b9 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -1,5 +1,5 @@ //# see detailed description at orum.txt -function|script|GetBarrierColor|, +function|script|GetBarrierColor { if (@Barrier < 0 || @Barrier > 2) goto L_Error; @@ -22,7 +22,7 @@ L_Error2: goto L_GetBarrierColor; } -function|script|SetBarrierColor|, +function|script|SetBarrierColor { if (@Barrier < 0 || @Barrier > 2) goto L_Error; @@ -44,7 +44,7 @@ L_Error2: // Starting Barrier / Quest Entrance -009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0, +009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0 { if (OrumQuest >= 3) close; if (OrumQuest == 2) goto L_Started; @@ -60,7 +60,7 @@ L_Started: } // First Barrier -009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0, +009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0 { if (OrumQuest >= 5) close; @@ -70,7 +70,7 @@ L_Started: } // Second Barrier -009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0, +009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0 { if (OrumQuest == 3) set OrumQuest, 4; @@ -99,7 +99,7 @@ L_Advance_Quest: } // Third Barrier -009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0, +009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0 { if (OrumQuest == 3) set OrumQuest, 4; @@ -143,7 +143,7 @@ L_Advance_Quest: } // Ending Barrier -009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0, +009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0 { if (OrumQuest >= 11) close; if (OrumQuest == 3) set OrumQuest, 4; diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt index c547af05..db99d50c 100644 --- a/world/map/npc/009-4/orum.txt +++ b/world/map/npc/009-4/orum.txt @@ -18,7 +18,7 @@ //# OrumQuestBarrier nibble (0,1,2) stores the color of the barriers # //################################################################################# -009-4.gat,35,115,0|script|OrumDebug|158, +009-4.gat,35,115,0|script|OrumDebug|158 { mes "[Orum Debug]"; menu @@ -49,7 +49,7 @@ OnInit: disablenpc "OrumDebug"; end; } -009-4.gat,37,115,0|script|Orum#barrier|158, +009-4.gat,37,115,0|script|Orum#barrier|158 { // needed to pass the very first barrier set @B0_WISPPOWDER, 4; @@ -592,7 +592,7 @@ L_Close: set @TorchColor, 0; close; } -function|script|SetUpOrumQuest|, +function|script|SetUpOrumQuest { // Second Barrier set @BarrierColor, 1 + rand(3) * 4; diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt index d4267eb1..86afb56f 100644 --- a/world/map/npc/009-4/orum_warps.txt +++ b/world/map/npc/009-4/orum_warps.txt @@ -1,4 +1,4 @@ -009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0, +009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0 { if (OrumQuest >= 12) goto L_Second_Entrance; warp "009-4.gat", 37, 113; @@ -8,7 +8,7 @@ L_Second_Entrance: warp "009-4.gat", 72, 126; close; } -009-4.gat,36,26,0|script|#LairExit|45,0,0, +009-4.gat,36,26,0|script|#LairExit|45,0,0 { if (OrumQuest >= 12) goto L_Second_Entrance; warp "009-4.gat", 37, 122; @@ -19,7 +19,7 @@ L_Second_Entrance: close; } -009-4.gat,51,47,0|script|#CavernEnter|45,0,0, +009-4.gat,51,47,0|script|#CavernEnter|45,0,0 { if (OrumQuest >= 14) goto L_Second_Cavern; if (OrumQuest < 12) goto L_See_Orum; diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index e9d8ff3e..b92098c0 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -1,5 +1,5 @@ //# see detailed description at orum.txt -function|script|GetTorchColor|, +function|script|GetTorchColor { if (@Torch < 0 || @Torch > 2) goto L_Error; @@ -13,7 +13,7 @@ L_Error: close; } -function|script|SetTorchColor|, +function|script|SetTorchColor { if (@Torch < 0 || @Torch > 2) goto L_Error; if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2; @@ -31,7 +31,7 @@ L_Error2: close; } -function|script|GetTorchIntensity|, +function|script|GetTorchIntensity { if (@Torch < 0 || @Torch > 2) goto L_Error; @@ -45,7 +45,7 @@ L_Error: close; } -function|script|SetTorchIntensity|, +function|script|SetTorchIntensity { if (@Torch < 0 || @Torch > 2) goto L_Error; if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2; @@ -63,7 +63,7 @@ L_Error2: close; } -function|script|DoneWithTorches|, +function|script|DoneWithTorches { if (OrumQuest < 11 && OrumQuest >= 8) goto L_Return; @@ -87,7 +87,7 @@ L_Return: } // To make sure in range of torches -function|script|InRangeTorch1|, +function|script|InRangeTorch1 { if (isin("009-4.gat",67,20,69,25)) goto L_Return; @@ -97,7 +97,7 @@ function|script|InRangeTorch1|, L_Return: return; } -function|script|InRangeTorch2|, +function|script|InRangeTorch2 { if (isin("009-4.gat",65,41,69,46)) goto L_Return; @@ -107,7 +107,7 @@ function|script|InRangeTorch2|, L_Return: return; } -function|script|InRangeTorch3|, +function|script|InRangeTorch3 { if (isin("009-4.gat",33,84,37,88)) goto L_Return; @@ -118,7 +118,7 @@ L_Return: return; } -function|script|TorchLoop|, +function|script|TorchLoop { // Variables used here: // @Torch - pass before calling @@ -281,7 +281,7 @@ L_Failed: } // First Torch -009-4.gat,68,21,0|script|Torch#1|400, +009-4.gat,68,21,0|script|Torch#1|400 { callfunc "InRangeTorch1"; callfunc "DoneWithTorches"; @@ -293,7 +293,7 @@ L_Failed: } // Second Torch -009-4.gat,67,42,0|script|Torch#2|400, +009-4.gat,67,42,0|script|Torch#2|400 { callfunc "InRangeTorch2"; callfunc "DoneWithTorches"; @@ -305,7 +305,7 @@ L_Failed: } // Third Torch -009-4.gat,33,86,0|script|Torch#3|400, +009-4.gat,33,86,0|script|Torch#3|400 { callfunc "InRangeTorch3"; callfunc "DoneWithTorches"; diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt index ca28d2f7..b83a14cc 100644 --- a/world/map/npc/009-4/waric.txt +++ b/world/map/npc/009-4/waric.txt @@ -1,6 +1,6 @@ //# see detailed description at orum.txt -009-4.gat,99,33,0|script|#WizardTrap|127,2,1, +009-4.gat,99,33,0|script|#WizardTrap|127,2,1 { set @gender$, "They're"; if (Sex == 0) @@ -19,7 +19,7 @@ close; } -009-4.gat,120,43,0|script|Orum#trap|158, +009-4.gat,120,43,0|script|Orum#trap|158 { mes "[Orum]"; mes "\"I told you to forget about this place but you did not heed my advice!\""; @@ -28,7 +28,7 @@ close; } -009-4.gat,118,42,0|script|Waric#trap|153, +009-4.gat,118,42,0|script|Waric#trap|153 { set @EXP_LEARNED_ALOT, 10000; if (OrumQuest >= 13) diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt index e981e603..5e332814 100644 --- a/world/map/npc/009-6/brodomir.txt +++ b/world/map/npc/009-6/brodomir.txt @@ -1,6 +1,6 @@ // Last Man Standing PvP Event NPC // Authors: tux9th, Jenalya -// many thanks to Jenalaya, o11c, Ablu :) +// many thanks to Jenalaya, o11c, Ablu:*) // CAVE: this script requires a patch by o11c that makes it possible for // getareausers to check if players are alive or dead. @@ -18,7 +18,7 @@ // $@BRODOMIR_MONEY: Amount of money given by the sponsor -009-6.gat,36,40,0|script|Brodomir|116, +009-6.gat,36,40,0|script|Brodomir|116 { set @brodomir_money, 0; set @brodomir_item_amount, 0; @@ -133,11 +133,11 @@ L_Go: set $@BRODOMIR_MONEY, @brodomir_money; set $@brodomir_delay_seconds, 600; set $@BRODOMIR_PVP_STATUS, 1; - announce "Brodomir : In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; + announce "Brodomir:* In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; if ($@BRODOMIR_ITEM_AMOUNT > 0) - announce "Brodomir : The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0; + announce "Brodomir:* The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0; if ($@BRODOMIR_MONEY > 0) - announce "Brodomir : The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; + announce "Brodomir:* The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; mes "[Brodomir]"; mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\""; set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds; diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt index cdb79923..d5c2a37f 100644 --- a/world/map/npc/009-7/battlemaster.txt +++ b/world/map/npc/009-7/battlemaster.txt @@ -1,4 +1,4 @@ -009-7.gat,40,35,0|script|Battle Master#Duels|322, +009-7.gat,40,35,0|script|Battle Master#Duels|322 { if(($fightclub_enabled % 6) != 3) goto L_Disabled; mes "[Battle Master]"; @@ -49,7 +49,7 @@ L_NoMoney: // death and exit handlers below -function|script|fightclub_GoBack|, +function|script|fightclub_GoBack { set @Duel_PVP, DUELS & $@DuelPvpBit; if((@Duel_PVP == 0) && ((getmap() == "009-6") || (getmap() == "009-5"))) goto L_NormalExit; @@ -78,24 +78,24 @@ L_NormalExit: gmcommand "@alive"; return; } -009-6.gat,36,48,0|script|#GoBack2#Duels|127,0,1, +009-6.gat,36,48,0|script|#GoBack2#Duels|127,0,1 { callfunc "fightclub_GoBack"; end; } -009-5.gat,53,74,0|script|#GoBack3#Duels|127,3,1, +009-5.gat,53,74,0|script|#GoBack3#Duels|127,3,1 { callfunc "fightclub_GoBack"; end; } -001-2.gat,130,22,0|script|#GoBack4#Duels|127,1,1, +001-2.gat,130,22,0|script|#GoBack4#Duels|127,1,1 { callfunc "fightclub_GoBack"; end; } -001-3.gat,73,28,0|script|#GoBack#Duels|127,0,1, +001-3.gat,73,28,0|script|#GoBack#Duels|127,0,1 { callfunc "fightclub_GoBack"; end; diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt index 167c4458..ab033c66 100644 --- a/world/map/npc/009-7/core.txt +++ b/world/map/npc/009-7/core.txt @@ -1,6 +1,6 @@ // this file contains the game logic of the fight club -function|script|fightclub_sendrequest|, +function|script|fightclub_sendrequest { set @loop, 0; goto L_Loop; @@ -30,7 +30,7 @@ L_Proceed: return; } -function|script|fightclub_getrules|, +function|script|fightclub_getrules { set $@fightclub_myself, getcharid(3); if(@target < 1) goto L_Proceed; // get our own rules @@ -57,7 +57,7 @@ L_Proceed2: } // ** called when someone agree to duel -function|script|fightclub_AddToQueue|, +function|script|fightclub_AddToQueue { set @Duel_Loop, 0; goto L_Loop; @@ -110,7 +110,7 @@ L_Request: } // ** called when a duel is finished -function|script|fightclub_NextBattle|, +function|script|fightclub_NextBattle { set $@Duel_Queue_Blue$[0], ""; // clean the 0 index set $@Duel_Queue_Red$[0], ""; @@ -155,7 +155,7 @@ L_Proceed2: } // ** called after the delay -function|script|fightclub_NextBattleProceed|, +function|script|fightclub_NextBattleProceed { set $@Duel_NoMagic, (DUELS & $@NoMagicBit); // get the rules of the caster donpcevent "Rouge#Duels::OnAnnounceNext"; @@ -164,7 +164,7 @@ function|script|fightclub_NextBattleProceed|, return; } -function|script|fightclub_StartBattle|, +function|script|fightclub_StartBattle { set $@Duel_Started, 1; npcwarp 40, 45, "Rouge#Duels"; @@ -181,7 +181,7 @@ L_Missing: return; } -function|script|fightclub_TimeOut|, +function|script|fightclub_TimeOut { debugmes "on time out"; donpcevent "Rouge#Duels::OnAnnounceTimeOut"; @@ -200,13 +200,13 @@ L_Missing: } // ** called when someone uninvited is on stage -function|script|fightclub_Intrusion|, +function|script|fightclub_Intrusion { // nothing to do here (yet) return; } -function|script|fightclub_EmergencyWipe|, +function|script|fightclub_EmergencyWipe { callfunc "fightclub_CleanStage"; callfunc "fightclub_StartUp"; @@ -215,7 +215,7 @@ function|script|fightclub_EmergencyWipe|, } // ** called whenever someone wins (to handle rewards and bids) -function|script|fightclub_Victory|, +function|script|fightclub_Victory { // TODO: give some sort of reward // TODO: increase score @@ -224,7 +224,7 @@ function|script|fightclub_Victory|, } // ** called when the player needs to be reset -function|script|fightclub_DestroyMe|, +function|script|fightclub_DestroyMe { callfunc "fightclub_exit"; percentheal -100, 0; // dying removes @killable, @killer or any temp buff @@ -232,7 +232,7 @@ function|script|fightclub_DestroyMe|, } // ** called when the red or blue player disappears from stage -function|script|fightclub_Missing|, +function|script|fightclub_Missing { // $@Duel_Missing 1 = red, 2 = blue if (attachrid($@Duel_BluePlayer) == 1) goto L_Proceed; // we need to attach to at least one player @@ -276,7 +276,7 @@ L_Resume: } // ** called after the server boots up -function|script|fightclub_StartUp|, +function|script|fightclub_StartUp { if($fightclub_enabled < 1) set $fightclub_enabled, 1; // init the (permanent) enabled global (this will only be done once, when the duel system is merged with master) if($@Duel_TimeBeforeNext < 1) set $@Duel_TimeBeforeNext, 5; // init the (temporary) TimeBeforeNext global @@ -300,7 +300,7 @@ function|script|fightclub_StartUp|, } // ** called before and after each duel to wipe the vars -function|script|fightclub_CleanStage|, +function|script|fightclub_CleanStage { if($@Duel_NoWarp != 1) areawarp "009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, "009-7.gat", 31, 40; // kick all players from stage set $@Duel_NoWarp, 0; @@ -318,7 +318,7 @@ function|script|fightclub_CleanStage|, } // ** called by npc; allows the player to change their custom rules -function|script|fightclub_setrules|, +function|script|fightclub_setrules { goto L_Main; @@ -355,7 +355,7 @@ L_Return: } // ** called by event handler whenever someone dies -function|script|fightclub_death|, +function|script|fightclub_death { if(@Duel_Fighter != 1) goto L_NoDuel; if(($@Duel_CurrentDuel < 1) || ($@Duel_Started != 1)) goto L_Reset; @@ -421,7 +421,7 @@ L_Reset: // the player has duel_fighter but no duel is ongoing (happens if the p } // ** called every time a player enters the ring -function|script|fightclub_enter|, +function|script|fightclub_enter { set @Duel_Fighter, 1; warp "009-7.gat", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); @@ -432,7 +432,7 @@ function|script|fightclub_enter|, } // ** called 3 seconds after a player enters the ring -function|script|fightclub_enter_killer|, +function|script|fightclub_enter_killer { gmcommand "@killable"; gmcommand "@killer"; // add both killable and killer so if one doesn't kick in, the other (hopefully) will @@ -442,7 +442,7 @@ function|script|fightclub_enter_killer|, } // ** called every time a player exits the ring -function|script|fightclub_exit|, +function|script|fightclub_exit { set @Duel_Fighter, 0; if(getmap() == "009-7") warp "009-7.gat", 31, 40; // do not warp if player left the room diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt index 6ca0de8d..da780bc7 100644 --- a/world/map/npc/009-7/debug.txt +++ b/world/map/npc/009-7/debug.txt @@ -1,4 +1,4 @@ -function|script|fightclub_Debug|, +function|script|fightclub_Debug { goto L_Menu; @@ -134,7 +134,7 @@ L_End: return; } -009-7.gat,41,45,0|script|Debug#Duels|181, +009-7.gat,41,45,0|script|Debug#Duels|181 { mes "The debug menu can also be accessed by wearing a dev cap while talking to Rouge."; mes "For the documentation, @@https://wiki.themanaworld.org/index.php/User:Meko/FightClub/debug|click here@@##0"; diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt index 4098e14a..dcaae899 100644 --- a/world/map/npc/009-7/eventHandler.txt +++ b/world/map/npc/009-7/eventHandler.txt @@ -1,6 +1,6 @@ // this file handles every events related to the fight club and calls the appropriate functions from core -009-7.gat,45,33,0|script|#trapdoor2#FightClub|327,0,0, +009-7.gat,45,33,0|script|#trapdoor2#FightClub|327,0,0 { if(countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)) goto L_Enter; end; @@ -9,13 +9,13 @@ L_Enter: warp "009-7.gat",34,22; // this warp is a special thanks for contributors end; } -009-7.gat,33,21,0|script|#trapdoor3#FightClub|327,0,0, +009-7.gat,33,21,0|script|#trapdoor3#FightClub|327,0,0 { warp "009-7.gat",44,32; end; } -009-7.gat,22,38,0|script|#FightClub#utils|127, +009-7.gat,22,38,0|script|#FightClub#utils|127 { end; @@ -44,7 +44,7 @@ OnCommandIntrusion: end; } -009-7.gat,20,45,0|script|#FightClub#TimeLimit|127,0,0, +009-7.gat,20,45,0|script|#FightClub#TimeLimit|127,0,0 { end; @@ -76,7 +76,7 @@ OnInit: end; } -009-7.gat,20,44,0|script|#FightClub#handler|127,0,0, +009-7.gat,20,44,0|script|#FightClub#handler|127,0,0 { end; diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt index 34df9dd4..bf872566 100644 --- a/world/map/npc/009-7/rouge.txt +++ b/world/map/npc/009-7/rouge.txt @@ -1,4 +1,4 @@ -009-7.gat,32,45,0|script|Rouge#Duels|181, +009-7.gat,32,45,0|script|Rouge#Duels|181 { if (getgmlevel() >= 40 && getequipid(equip_head) == 647) goto L_CallDebug; if (!debug && (strcharinfo(0) == "meko")) goto L_CallDebug; // allow meko to debug (has no dev cap) -- cgit v1.2.3-60-g2f50