summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-03-20 21:39:46 -0800
committerStreusel <advance_me@hotmail.de>2013-03-20 21:39:46 -0800
commit4c79f825b0de36021af8de337e34b44835d363eb (patch)
tree2d60616ae20ae679991b6524461e0fb0d52acc2b
parente29d30559c862ddcdffcd9f76d24c5deb4c110d4 (diff)
downloadhercules-4c79f825b0de36021af8de337e34b44835d363eb.tar.gz
hercules-4c79f825b0de36021af8de337e34b44835d363eb.tar.bz2
hercules-4c79f825b0de36021af8de337e34b44835d363eb.tar.xz
hercules-4c79f825b0de36021af8de337e34b44835d363eb.zip
-Part 2 of 'the great commit', all credits to L0ne_W0lf
-NPC updates mostly Izlude related
-rw-r--r--npc/instances/EndlessTower.txt12
-rw-r--r--npc/instances/NydhoggsNest.txt10
-rw-r--r--npc/instances/OrcsMemory.txt10
-rw-r--r--npc/instances/SealedShrine.txt10
-rw-r--r--npc/jobs/valkyrie.txt15
-rw-r--r--npc/re/warps/dungeons/iz_dun.txt53
6 files changed, 81 insertions, 29 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 39119d6e9..7edbc618f 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -1,16 +1,14 @@
//===== Hercules Script ======================================
//= Endless Tower
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.1
-//===== Compatible With: =====================================
-//= Hercules
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Endless Tower Memorial Dungeon
//= Consists of 101 floors.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.1 Removed a disablenpc from #102FShadowDust1. (bugreport:4415)
//= 1.2 Added ends to several NPCs which would allow you to restart timers.
@@ -33,7 +31,7 @@
//= the invoking party meets the requirements to join the Memorial Dungeon.
//= 2.0 Fixed broken else/if chaining. [Joseph]
//= 2.1 Updated to match latest official script. [Euphy]
-//============================================================
+//============================================================
alberta,214,77,6 script Captain Janssen 709,{
if (checkweight(1201,1) == 0) {
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index b404df86b..fffe47227 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -1,20 +1,20 @@
//===== Hercules Script ======================================
//= Nidhoggr's Nest
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf, various sources
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.4
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Nidhoggr's Nest Instance
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.1 Minor dialog updates.
//= 1.2 No longer glitches when anyone but party leader talks to the first NPC.
//= 1.3 Added 'instance_check_party' command to the script for proper checking if
//= the invoking party meets the requirements to join the Memorial Dungeon.
//= 1.4 Cleaning. [Euphy]
-//============================================================
+//============================================================
nyd_dun02,100,201,3 script Yggdrasil Gatekeeper 111,8,8,{
if (ins_nyd == 0) {
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index f355ae289..a23499d7e 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -1,13 +1,13 @@
//===== Hercules Script ======================================
//= Orc's Memory
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.6
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Relive the memory of an orc.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 First round of bugfixes. (bugreport:3928) [L0ne_W0lf]
//= Fixed some npcs calling wrong events.
@@ -28,7 +28,7 @@
//= 1.5 Fixed a checkquest condition never setting quest. [L0ne_W0lf]
//= 1.6 Added 'instance_check_party' command to the script for proper checking if
//= the invoking party meets the requirements to join the Memorial Dungeon.
-//============================================================
+//============================================================
// Entrance
//============================================================
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 8f9d97591..fe376c688 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -1,13 +1,13 @@
//===== Hercules Script ======================================
//= Sealed Shrine
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.2
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Seal away the Great Demon Baphomet.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Added setquest for instance cooldown. [L0ne_W0lf]
//= 1.2 Fixed Torch#12 not being disabled. (bugreport:4044) [L0ne_w0lf]
@@ -24,7 +24,7 @@
//= 2.0 Some optimization. [Euphy]
//= 2.1 Fixed quest being removed before the 12 hours cool down. [Joseph]
//= 2.2 Removed extra setquest (quest id:3040). [Joseph]
-//============================================================
+//============================================================
// Sealed Catacomb Entrance
//============================================================
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index eadb39847..c2357d0bb 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -5,7 +5,7 @@
//= finished, optimized and tested by Lupus
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 3.0
+//= 3.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -37,6 +37,7 @@
//= 2.9 Corrected Valkyrie case spicifying where to warp after rebirthing. [L0ne_W0lf]
//= 2.9b Fixed Verdandi typo, fixed resetting vars [Lupus]
//= 3.0 Added quest log commands. [L0ne_W0lf]
+//= 3.1 Added Izlude Renewal coordinates. [L0ne_W0lf]
//============================================================
valkyrie,48,86,4 script Valkyrie# 811,{
@@ -172,7 +173,11 @@ valkyrie,48,86,4 script Valkyrie# 811,{
switch (ADVJOB) {
case 4008:
case 4015:
- warp "izlude",94,103; break;
+ if (checkre(0))
+ warp "izlude",129,97;
+ else
+ warp "izlude",94,103;
+ break;
case 4009:
case 4016:
warp "prontera",273,354; break;
@@ -376,7 +381,11 @@ valkyrie,44,33,5 script Teleporter 124,{
case 3: callsub S_Warpchar,"payon",69,100;
case 4: callsub S_Warpchar,"geffen",120,39;
case 5: callsub S_Warpchar,"alberta",117,56;
- case 6: callsub S_Warpchar,"izlude",94,103;
+ case 6:
+ if (checkre(0))
+ callsub S_Warpchar,"izlude",129,97;
+ else
+ callsub S_Warpchar,"izlude",94,103;
case 7: callsub S_Warpchar,"aldebaran",91,105;
case 8: callsub S_Warpchar,"comodo",209,143;
case 9: callsub S_Warpchar,"yuno",328,101;
diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt
index b912f62e1..3ef9ab86e 100644
--- a/npc/re/warps/dungeons/iz_dun.txt
+++ b/npc/re/warps/dungeons/iz_dun.txt
@@ -4,15 +4,60 @@
//= Athena (1.0)
//= Nana (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Warp Points for Bibilyn Island & Undersea Cave
//===== Additional Comments: =================================
//= 1.2 Moved common warps to base path. [Euphy]
+//= 1.3 Added Undersea Tunnel 6th floor warper. [L0ne_W0lf]
//============================================================
-//= Undersea Cave ============================================
-iz_dun04,129,233,0 warp izd07 2,2,iz_dun05,141,187
-iz_dun05,141,190,0 warp izd07-1 2,2,iz_dun04,129,230
+// Undersea Tunnel Warper
+//============================================================
+iz_dun04,130,234,5 script Gatekeeper#iz_dun 413,{
+ mes "[Gatekeeper]";
+ mes "Halt!";
+ mes "What brings you here, Adventurer?";
+ mes "We've discovered a new floor of this underwater city.";
+ next;
+ mes "[Gatekeeper]";
+ mes "Do you think you're up to the challenge?";
+ mes "The monsters here are between levels 110 and 124.";
+ mes "And you must beware of the Kraken!";
+ next;
+ switch(select("Release the Kraken!:I'll stay here.")) {
+ case 1:
+ mes "[Gatekeeper]";
+ mes "Be cautious and good luck.";
+ mes "If you see the Kraken be sure you have your friends to help or do what we do and run.";
+ close2;
+ warp "iz_dun05",141,187;
+ end;
+ case 2:
+ mes "[Gatekeeper]";
+ mes "It's always best to be prepared before exploring a new area.";
+ mes "Come back when you're ready to go.";
+ close;
+ }
+}
+
+iz_dun05,142,190,5 script Guard#iz_dun 413,{
+ mes "[Gatekeeper]";
+ mes "So I guess you want to go back to the fifth floor?";
+ next;
+ switch(select("Yes!:No, I'll stay.")) {
+ case 1:
+ mes "[Gatekeeper]";
+ mes "Be safe, adventurer.";
+ close2;
+ warp "iz_dun04",129,232;
+ end;
+ case 2:
+ mes "[Gatekeeper]";
+ mes "You're not going?";
+ mes "You're braver than I thought.";
+ close;
+ }
+} \ No newline at end of file