summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-25 15:22:54 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-25 15:22:54 +0000
commitca8acfddf85f6a4826f72eb279328c96490d32f5 (patch)
treee6b7f0031e145af18cf86ad947a6a8e2ca16808c /npc
parent4d2d99c0ac7d70d3d19284c499cd74066ebec197 (diff)
downloadhercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.tar.gz
hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.tar.bz2
hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.tar.xz
hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.zip
* Corrected Luna Bow Bonuses. (bugreport:1919)
* Swapped dis/enable for hideon/off in wedding script. * Corrected Slotting NPCs triggering on touch. (bugreport:1916) * Added a missing close in juperos quest. (bugreport:1918) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12993 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/merchants/socket_enchant.txt15
-rw-r--r--npc/other/marriage.txt24
-rw-r--r--npc/quests/quests_juperos.txt2
4 files changed, 26 insertions, 19 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 33bb418b1..42c71905e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2008/07/25
+ * Rev. 12993 Swapped dis/enable for hideon/off in wedding script. [L0ne_W0lf]
+ * Corrected Slotting NPCs triggering on touch. (bugreport:1916)
+ * Added a missing close in juperos quest. (bugreport:1918)
2008/07/24
* Rev. 12988 Enabled Ontouchnpc event in a rachel quest. [L0ne_W0lf]
2008/07/22
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 266408697..63f67a920 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.2 Fixed some typos and a nasty bug. [SinSloth]
//= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth]
//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf]
//============================================================
payon,140,151,5 script Seiyablem 84,{
@@ -401,9 +402,9 @@ function script Func_Socket {
}
}
-lhz_in02,281,35,5 duplicate(Seiyablem) Seiyablem#lhz 84,0,0
-prt_in,33,70,5 duplicate(Seiyablem) Seiyablem#prt 84,0,0
-morocc,51,41,5 duplicate(Seiyablem) Seiyablem#moc 84,0,0
+lhz_in02,281,35,5 duplicate(Seiyablem) Seiyablem#lhz 84
+prt_in,33,70,5 duplicate(Seiyablem) Seiyablem#prt 84
+morocc,51,41,5 duplicate(Seiyablem) Seiyablem#moc 84
payon,143,143,7 script Young Man#socket 97,{
@@ -423,6 +424,6 @@ payon,143,143,7 script Young Man#socket 97,{
close;
}
-lhz_in02,269,33,5 duplicate(Young Man#socket) Young Man#lhz 97,0,0
-prt_in,31,57,1 duplicate(Young Man#socket) Young Man#prt 97,0,0
-morocc,60,42,3 duplicate(Young Man#socket) Young Man#moc 97,0,0
+lhz_in02,269,33,5 duplicate(Young Man#socket) Young Man#lhz 97
+prt_in,31,57,1 duplicate(Young Man#socket) Young Man#prt 97
+morocc,60,42,3 duplicate(Young Man#socket) Young Man#moc 97
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index d5fa4890f..a5c5b9d6e 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -451,11 +451,11 @@ prt_church,97,102,0 script Single Army#Prontera 105,{
close;
OnInit:
- disablenpc "Single Army#Prontera";
+ hideonnpc "Single Army#Prontera";
end;
OnEnable:
- enablenpc "Single Army#Prontera";
+ hideoffnpc "Single Army#Prontera";
Emotion e_go;
end;
@@ -473,11 +473,11 @@ prt_church,98,102,0 script Single Army#Geffen 705,{
close;
OnInit:
- disablenpc "Single Army#Geffen";
+ hideonnpc "Single Army#Geffen";
end;
OnEnable:
- enablenpc "Single Army#Geffen";
+ hideoffnpc "Single Army#Geffen";
Emotion e_go;
end;
@@ -495,11 +495,11 @@ prt_church,99,102,0 script Single Army#Morocc 707,{
close;
OnInit:
- disablenpc "Single Army#Morocc";
+ hideonnpc "Single Army#Morocc";
end;
OnEnable:
- enablenpc "Single Army#Morocc";
+ hideoffnpc "Single Army#Morocc";
Emotion e_go;
end;
@@ -517,11 +517,11 @@ prt_church,100,102,0 script Single Army#Payon 708,{
close;
OnInit:
- disablenpc "Single Army#Payon";
+ hideonnpc "Single Army#Payon";
end;
OnEnable:
- enablenpc "Single Army#Payon";
+ hideoffnpc "Single Army#Payon";
Emotion e_go;
end;
@@ -538,11 +538,11 @@ prt_church,101,102,0 script Single Army#Amatsu 767,{
close;
OnInit:
- disablenpc "Single Army#Amatsu";
+ hideonnpc "Single Army#Amatsu";
end;
OnEnable:
- enablenpc "Single Army#Amatsu";
+ hideoffnpc "Single Army#Amatsu";
Emotion e_go;
end;
@@ -558,11 +558,11 @@ prt_church,102,102,0 script Single Army#Gonryun 780,{
close;
OnInit:
- disablenpc "Single Army#Gonryun";
+ hideonnpc "Single Army#Gonryun";
end;
OnEnable:
- enablenpc "Single Army#Gonryun";
+ hideoffnpc "Single Army#Gonryun";
Emotion e_go;
end;
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 8f8e6edf5..a8a29be93 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -20,6 +20,7 @@
//= 1.3b Minor updates to juperos elevator NPCs. [L0ne_W0lf]
//= 1.4 Fixed Elevator not working after failing once. [L0ne_W0lf]
//= 1.5 Lots of Fixes, missing stopnpctimers, cleanup. [Zephyrus]
+//= 1.6 Added missing close in "Popular Feats" [L0ne_W0lf]
//============================================================
yuno_in04,190,125,4 script Scholar 700,{
@@ -1499,6 +1500,7 @@ yuno_in04,102,106,1 script Popular Feasts 111,{
mes "I guess Poring Salad is";
mes "the most popular feast";
mes "in this entire book.";
+ close;
case 3:
mes "^8B6914...";