diff options
author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/warps/other | |
parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/warps/other')
-rw-r--r-- | npc/warps/other/arena.txt | 91 | ||||
-rw-r--r-- | npc/warps/other/bossnia.txt | 16 | ||||
-rw-r--r-- | npc/warps/other/god.txt | 4 | ||||
-rw-r--r-- | npc/warps/other/jobquests.txt | 43 | ||||
-rw-r--r-- | npc/warps/other/kiel.txt | 4 | ||||
-rw-r--r-- | npc/warps/other/other.txt | 4 |
6 files changed, 94 insertions, 68 deletions
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index 19a5fdc6a..efc2e42da 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -3,16 +3,19 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Description: ========================================= -//= Warp Points related to Izlude Arena && Control Panel +//= Warp Points related to Izlude Arena & Control Panel //===== Additional Comments: ================================= //= 1.0 First version, done by SinSloth. [MasterOfMuppets] //= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus] //= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth] -//= 1.3 Moved welcome_arena & bye_arena to pre-re [Streusel] +//= 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy] +//= 1.4 Added GM management function. [Euphy] //============================================================ +// Main Room Warps +//============================================================ arena_room,84,103,0 warp arn_room_11_1 1,1,arena_room,63,130 arena_room,63,126,0 warp arn_room_11_2 1,1,arena_room,87,100 arena_room,76,87,0 warp arn_room_9_1 1,1,arena_room,46,87 @@ -25,45 +28,67 @@ arena_room,123,88,0 warp arn_room_3_1 1,1,arena_room,153,87 arena_room,150,87,0 warp arn_room_3_2 1,1,arena_room,120,87 prt_are_in,54,13,0 warp toarn_room 1,1,arena_room,100,77 -sec_in02,79,180,3 script #arenacontrol 81,{ +// Acolyte Warps +//============================================================ +arena_room,135,126,0 warp byeaco#arena 1,1,arena_room,111,99 +force_5-1,25,44,0 warp force_01_02#aco 1,1,force_5-1,25,69 +force_5-1,25,134,0 warp force_02_03#aco 1,1,force_5-1,25,159 +force_5-1,44,174,0 warp force_03_04#aco 1,1,force_5-1,69,174 +force_5-1,134,174,0 warp force_04_05#aco 1,1,force_5-1,159,174 +force_5-1,174,155,0 warp force_05_06#aco 1,1,force_5-1,174,130 +force_5-1,174,65,0 warp force_06_07#aco 1,1,force_5-1,174,40 +force_5-1,155,26,0 warp force_07_08#aco 1,1,force_5-1,132,26 +force_5-1,99,54,0 warp force_08_09#aco 1,1,force_5-1,99,82 -DLGTEMP: - input @input_arena; - if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP; //CHECK - if (@input_arena == 0) - { +// Party Warps +//============================================================ +force_1-2,85,26,0 warp force_00_01 1,1,force_1-2,37,26 +force_1-2,114,26,0 warp force_00_02 1,1,force_1-2,162,26 +force_1-2,99,40,0 warp force_00_03 1,1,force_1-2,99,66 +force_1-2,41,26,0 warp force_01_00 1,1,force_1-2,89,26 +force_1-2,158,26,0 warp force_02_00 1,1,force_1-2,110,26 +force_1-2,99,63,0 warp force_03_00 1,1,force_1-2,99,36 +force_1-2,84,78,0 warp force_03_05 1,1,force_1-2,37,78 +force_1-2,115,78,0 warp force_03_04 1,1,force_1-2,162,78 +force_1-2,158,77,0 warp force_04_03 1,1,force_1-2,110,78 +force_1-2,41,77,0 warp force_05_03 1,1,force_1-2,37,78 +force_1-2,25,93,0 warp force_05_06 1,1,force_1-2,26,118 +force_1-2,49,130,0 warp force_06_07 1,1,force_1-2,91,125 +force_1-2,107,145,0 warp force_07_08 1,1,force_1-2,173,118 +force_1-2,158,178,0 warp force_08_09 1,1,force_1-2,133,178 +force_1-2,55,178,0 warp force_09_10 1,1,force_1-2,29,178 +force_1-2,33,178,0 warp force_10_09 1,1,force_1-2,59,178 + +// GM Control Panel +//============================================================ +sec_in02,79,180,3 script #arenacontrol 81,{ + set .@i, callfunc("F_GM_NPC",1357,0); + if (.@i == -1) { mes "Error!"; close; - } - else if (@input_arena == 1357) - { + } else if (.@i == 0) { + mes "Closing control panel."; + close; + } else { mes "Opening Control Panel"; mes "' A - R - E - N - A '"; next; mes "Please select a"; mes "state for the arena."; next; - switch( select( "Open.","Closed.") ) - { - case 1: - mes "Currently"; - mes "opening arena."; - misceffect EF_ENHANCE; //CHECK - enablenpc "welcome_arena"; - next; - break; - case 2: - mes "Currently"; - mes "closing arena."; - misceffect EF_EXIT; //CHECK - disablenpc "welcome_arena"; - next; - break; + switch(select("Open.:Closed.")) { + case 1: + mes "Currently"; + mes "opening arena."; + specialeffect EF_ENHANCE; + enablenpc "welcome_arena"; + close; + case 2: + mes "Currently"; + mes "closing arena."; + specialeffect EF_EXIT; + disablenpc "welcome_arena"; + close; } } - else - { - mes "Closing control panel."; - close; - } } diff --git a/npc/warps/other/bossnia.txt b/npc/warps/other/bossnia.txt deleted file mode 100644 index 2566f2479..000000000 --- a/npc/warps/other/bossnia.txt +++ /dev/null @@ -1,16 +0,0 @@ -//===== Hercules Script ====================================== -//= Bossnia Warps -//===== By: ================================================== -//= Masao -//===== Current Version: ===================================== -//= 1.0 -//===== Description: ========================================= -//= Back Warp Points related to the Bossnia event. -//===== Additional Comments: ================================= -//= 1.0 First Version. -//============================================================ - -bossnia_01,204,204,0 warp bossnia01 1,1,prontera,155,180 -bossnia_02,204,204,0 warp bossnia02 1,1,prontera,155,180 -bossnia_03,204,204,0 warp bossnia03 1,1,prontera,155,180 -bossnia_04,204,204,0 warp bossnia04 1,1,prontera,155,180 diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt index f649b7e57..2ee2faeea 100644 --- a/npc/warps/other/god.txt +++ b/npc/warps/other/god.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= God Seal Quest Warps //===== By: ================================================== //= MasterOfMuppets && SinSloth //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= //===== Description: ========================================= //= Warp Points related to the God Seal Quest. //===== Additional Comments: ================================= diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index e3c36ab51..41a433d31 100644 --- a/npc/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Job Quest Warp Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 2.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Version Ep4+ +//= 2.1 //===== Description: ========================================= //= Warp Points for Job Quest Maps //===== Additional Comments: ================================= @@ -23,17 +21,42 @@ //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.9 Added Gungslinger and Ninja warps. [L0ne_W0lf] //= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf] +//= 2.1 Added Novice warp duplicates. [Euphy] //============================================================ //============================================================================== //Novice //============================================================================== -new_1-1,148,112,0 warp newwarp6001 2,2,new_1-2,100,9 -new_1-2,100,6,0 warp newwarp6002 2,2,new_1-1,144,112 -new_1-2,126,106,0 warp newwarp6003 2,2,new_1-2,160,171 -new_1-2,156,171,0 warp newwarp6004 2,2,new_1-2,123,106 -new_1-2,73,106,0 warp newwarp6005 2,2,new_1-2,41,172 -new_1-2,46,172,0 warp newwarp6006 2,2,new_1-2,78,106 +new_1-1,148,112,0 warp newwarp6001a 2,2,new_1-2,100,9 +new_2-1,148,112,0 warp newwarp6001b 2,2,new_2-2,100,9 +new_3-1,148,112,0 warp newwarp6001c 2,2,new_3-2,100,9 +new_4-1,148,112,0 warp newwarp6001d 2,2,new_4-2,100,9 +new_5-1,148,112,0 warp newwarp6001e 2,2,new_5-2,100,9 +new_1-2,100,6,0 warp newwarp6002a 2,2,new_1-1,144,112 +new_2-2,100,6,0 warp newwarp6002b 2,2,new_2-1,144,112 +new_3-2,100,6,0 warp newwarp6002c 2,2,new_3-1,144,112 +new_4-2,100,6,0 warp newwarp6002d 2,2,new_4-1,144,112 +new_5-2,100,6,0 warp newwarp6002e 2,2,new_5-1,144,112 +new_1-2,126,106,0 warp newwarp6003a 2,2,new_1-2,160,171 +new_2-2,126,106,0 warp newwarp6003b 2,2,new_2-2,160,171 +new_3-2,126,106,0 warp newwarp6003c 2,2,new_3-2,160,171 +new_4-2,126,106,0 warp newwarp6003d 2,2,new_4-2,160,171 +new_5-2,126,106,0 warp newwarp6003e 2,2,new_5-2,160,171 +new_1-2,156,171,0 warp newwarp6004a 2,2,new_1-2,123,106 +new_2-2,156,171,0 warp newwarp6004b 2,2,new_2-2,123,106 +new_3-2,156,171,0 warp newwarp6004c 2,2,new_3-2,123,106 +new_4-2,156,171,0 warp newwarp6004d 2,2,new_4-2,123,106 +new_5-2,156,171,0 warp newwarp6004e 2,2,new_5-2,123,106 +new_1-2,73,106,0 warp newwarp6005a 2,2,new_1-2,41,172 +new_2-2,73,106,0 warp newwarp6005b 2,2,new_2-2,41,172 +new_3-2,73,106,0 warp newwarp6005c 2,2,new_3-2,41,172 +new_4-2,73,106,0 warp newwarp6005d 2,2,new_4-2,41,172 +new_5-2,73,106,0 warp newwarp6005e 2,2,new_5-2,41,172 +new_1-2,46,172,0 warp newwarp6006a 2,2,new_1-2,78,106 +new_2-2,46,172,0 warp newwarp6006b 2,2,new_2-2,78,106 +new_3-2,46,172,0 warp newwarp6006c 2,2,new_3-2,78,106 +new_4-2,46,172,0 warp newwarp6006d 2,2,new_4-2,78,106 +new_5-2,46,172,0 warp newwarp6006e 2,2,new_5-2,78,106 //============================================================================== //Thief diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt index 76df1b28f..3582ecfb9 100644 --- a/npc/warps/other/kiel.txt +++ b/npc/warps/other/kiel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kiel Warp Script (Kiel Buildings) //===== By: ================================================== //= Playtester; L0ne_W0lf //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for all Kiel Buildings //===== Additional Comments: ================================= diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt index 011494794..69461b8a7 100644 --- a/npc/warps/other/other.txt +++ b/npc/warps/other/other.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Other Warp Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; //===== Description: ========================================= //= Warp Points for Other Maps //===== Additional Comments: ================================= |