summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-16 14:30:30 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-16 14:30:30 +0000
commitcbe2af93ee74b2cf7664816926ac8dbddb12abfb (patch)
tree8779189ed1d3a101345e02a7f1ba993f61e42492 /npc
parent86bb3c1d99afd4fe7e7699d55a768102cff3bfbc (diff)
downloadhercules-cbe2af93ee74b2cf7664816926ac8dbddb12abfb.tar.gz
hercules-cbe2af93ee74b2cf7664816926ac8dbddb12abfb.tar.bz2
hercules-cbe2af93ee74b2cf7664816926ac8dbddb12abfb.tar.xz
hercules-cbe2af93ee74b2cf7664816926ac8dbddb12abfb.zip
* Fixed the AI mode for Zombie, change I made while testing new the Luciola AI.
* Updated item_trade with several new items, hopefully retaining most white space. * Added messing 'end;' in one of the 13.1 lighthalzen guard. * Fixed NPC IDs in niflheim quests again. Should be 111 and "non-clickable" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14060 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/quests/quests_13_1.txt4
-rw-r--r--npc/quests/quests_niflheim.txt20
3 files changed, 21 insertions, 6 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d4ef98240..d423a21bc 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2009/09/16
+ * Rev. 14060 Added messing 'end;' in one of the 13.1 lighthalzen guard. [L0ne_W0lf]
+ * Fixed NPC IDs in niflheim quests again. Should be 111 and "non-clickable"
2009/09/10
* Rev. 14052 Added some, and enabled existing episode 13.1 content. [L0ne_W0lf]
2009/08/18
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 62b9133cb..706d27475 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= - Contains untranslated dialog.
//===== Additional Comments: =================================
//= 1.0 First Version. [L0ne_W0lf]
+//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
//============================================================
// Onward to the New World
@@ -1533,6 +1534,7 @@ OnTouch:
mes "This is a restricted area.";
close2;
warp "lhz_in01",123,229;
+ end;
}
if (ep13_ryu > 8) {
mes "[Guard]";
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index 177a7ad23..e28400199 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= The eAthena Dev Team
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -24,6 +24,8 @@
//= Updated to Aegis 10.3 Standed, added Message Delivery Quest.
//= Rescripted Piano Quest. Prior quest progress will be lost.
//= 1.4 Fixed NPCs using ID 111 when it shoudl have been 139. [L0ne_W0lf]
+//= 1.5 Swapped NPC IDs back from last change (139 back to 111). [L0ne_W0lf]
+//= Clicking will do nothing, you have to still "touch" the npc.
//============================================================
//=============================================================
@@ -178,7 +180,9 @@ nif_in,31,20,3 script Kuzkahina#nif 794,{
close;
}
-niflheim,208,103,1 script #Graveyard1 139,1,1,{
+niflheim,208,103,1 script #Graveyard1 111,1,1,{
+ end;
+
OnTouch:
if (nif_esc == 5 || nif_esc == 7 || nif_esc == 8 || nif_esc == 10) {
mes "^3355FFYou found something";
@@ -200,7 +204,9 @@ OnTouch:
end;
}
-niflheim,169,71,1 script #Graveyard2 139,1,1,{
+niflheim,169,71,1 script #Graveyard2 111,1,1,{
+ end;
+
OnTouch:
if (nif_esc == 6 || nif_esc == 9) {
mes "^3355FFYou found something";
@@ -217,7 +223,9 @@ OnTouch:
end;
}
-nif_in,115,181,0 script #Piano 139,1,1,{
+nif_in,115,181,0 script #Piano 111,1,1,{
+ end;
+
OnTouch:
if (nif_esc == 0 && (MISC_QUEST & 32) == 0) {
mes "^3355FFYou see a big, heavy piano.";
@@ -248,7 +256,9 @@ OnTouch:
end;
}
-nif_in,114,181,0 script #Piano3 139,1,1,{
+nif_in,114,181,0 script #Piano3 111,1,1,{
+ end;
+
OnTouch:
if (nif_esc == 12 || nif_esc == 13 || MISC_QUEST & 32) {
mes "^3355FFAs you bend towards";