From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001 From: Michieru Date: Thu, 24 Oct 2013 12:10:43 +0200 Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt --- npc/kafras/dts_warper.txt | 62 ++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'npc/kafras/dts_warper.txt') diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index b2fb64ba8..8819779d9 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -1,9 +1,9 @@ //===== Hercules Script ====================================== //= Dungeon Teleport Service -//===== By: ================================================== +//===== By: ================================================== //= Evera -//===== Current Version: ===================================== -//= 2.8 +//===== Current Version: ===================================== +//= 2.9 //===== Description: ========================================= //= [Official Conversion] //= Cool Event Corp NPCs vs. Kafra Dungeon Teleport Service and voting system. @@ -23,27 +23,27 @@ // For Detailed information on what each varibale does, see // the "Vote Globalvar Girl#yuno" NPC at the end of the file. // Character Variable in use: lhz_vote (how many times player has voted, keeps htem from re-voting.) -//===== Additional Comments: ================================= -//= 1.0 Initial release [Evera] -//= 1.1 SVN release, removed from major town (found true info after research), -//= put more arg(2) parameters, fixed a few bugs [Evera] +//===== Additional Comments: ================================= +//= 1.0 Initial release [Evera] +//= 1.1 SVN release, removed from major town (found true info after research), +//= put more arg(2) parameters, fixed a few bugs [Evera] //= 1.2 Mushed some variables together, optimized a bit [Evera] //= 1.3 Removed selfconfig [Evera] //= 1.4 Changed global variables to read from 3 global variables, updated names, -//= fixed array bug [Evera] +//= fixed array bug [Evera] //= 1.5 Mushed voting varialbes into 1 variable. [Evera] //= 1.6 Removed Duplicates [Silent] -//= 1.7 Fixed bug of DTS_Admin not running by itself [Evera] -//= 1.8 Changed requirement to lvl 60 [Evera] +//= 1.7 Fixed bug of DTS_Admin not running by itself [Evera] +//= 1.8 Changed requirement to lvl 60 [Evera] //= 1.9 Removed global eligibility option [Evera] //= 2.0 Fixed zeny bug [Evera] //= 2.1 Fixed headers with and updated with newer information [Evera] //= 2.2 Changed dtseligible 2 to MISC_QUEST|128, to clean up variable usage. [Evera] -//= Also added F_ClearGarbage function to the scripts. [Evera] -//= 2.3 Changed dtseligible to be $dtsday when MISC_QUEST|128 -//= Added $dtsday for vote session counter -//= Fixed bug that involved having both warpers enabled at the same time. [Evera] -//= New $dtsday system and bug fix[Evera] +//= Also added F_ClearGarbage function to the scripts. [Evera] +//= 2.3 Changed dtseligible to be $dtsday when MISC_QUEST|128 +//= Added $dtsday for vote session counter +//= Fixed bug that involved having both warpers enabled at the same time. [Evera] +//= New $dtsday system and bug fix[Evera] //= 2.3a fixed 2 bugs with comparision [Lupus] //= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan //= 2.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] @@ -51,7 +51,8 @@ //= 2.6 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf] //= 2.7 Fixed a typo, a - to a +. Not sure how that happened. [L0ne_w0lf] //= 2.8 Corrected another typo this time in a variable. -//============================================================ +//= 2.9 Added GM management function. [Euphy] +//============================================================ einbroch,246,70,0 script Vote Timer#ein -1,{ OnInit: @@ -533,7 +534,7 @@ function script F_VoteKafra { case 1: if (Zeny >= 4000) { cutin "",255; - set zeny,zeny-4000; + set Zeny, Zeny-4000; warp "xmas_dun02",130,123; end; } @@ -557,7 +558,7 @@ function script F_VoteKafra { switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "xmas_dun02",130,123; end; @@ -573,7 +574,7 @@ function script F_VoteKafra { break; case 2: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "alde_dun03",265,22; end; @@ -598,7 +599,7 @@ function script F_VoteKafra { switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Lava Dungeon, Level 2 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "xmas_dun02",130,123; end; @@ -614,7 +615,7 @@ function script F_VoteKafra { break; case 2: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "alde_dun03",265,22; end; @@ -630,7 +631,7 @@ function script F_VoteKafra { break; case 3: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "mag_dun02",47,40; end; @@ -932,7 +933,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -960,7 +961,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -975,7 +976,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ break; case 2: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "c_tower3",64,143; end; @@ -1010,7 +1011,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Glast Heim Entrance -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -1025,7 +1026,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ break; case 2: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "c_tower3",64,143; end; @@ -1040,7 +1041,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ break; case 3: if (Zeny >= 4000) { - set zeny,zeny-4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "glast_01",368,303; end; @@ -1173,12 +1174,13 @@ OnTimer15000: /* // GM only NPC used for modifying values related to the DTS system. +// Disabled in official script. sec_in02,17,160,4 script Vote Globalvar Girl#yuno 864,{ + callfunc "F_GM_NPC"; mes "[Christy's Maid]"; mes "Lady Christy!"; next; - input .@input,0,9000; - if (.@input == 1854) { + if (callfunc("F_GM_NPC",1854,0) == 1) { mes "[Christy's Maid]"; mes "I am Lady Christy's Maid."; next; -- cgit v1.2.3-60-g2f50