summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-06 22:10:54 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-06 22:10:54 +0000
commit87bb3aad7d8adc4075cf75ce6088ddaa6f571721 (patch)
treeb902d0da558d0a9a47ee40820695335cfb513e55 /npc/merchants
parentd48bc7cc19f8722cf46febfb9853de0b0e820c57 (diff)
downloadhercules-87bb3aad7d8adc4075cf75ce6088ddaa6f571721.tar.gz
hercules-87bb3aad7d8adc4075cf75ce6088ddaa6f571721.tar.bz2
hercules-87bb3aad7d8adc4075cf75ce6088ddaa6f571721.tar.xz
hercules-87bb3aad7d8adc4075cf75ce6088ddaa6f571721.zip
- Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)
- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654) - Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677) - Removed level requirement for the Viens Stone gathering quest. (bugreport:4678) - Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707) It's worth noting how much I hate the system for restricting skills per zone. - Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709) - Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711) - Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719) - Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/icecream.txt9
-rw-r--r--npc/merchants/socket_enchant.txt21
-rw-r--r--npc/merchants/socket_enchant2.txt12
3 files changed, 25 insertions, 17 deletions
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index eb1dd0c63..ddc5fce03 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= KOOK SWU, Kisuka
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -12,10 +12,10 @@
//= 1.1 Optimized, changed overlapping coords in Alberta [Lupus]
//= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus]
//= 1.3 No more label menu and updated to match AEGIS script. [Kisuka]
+//= 1.4 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-// Alberta
-alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{
+- script Ice Cream Maker::IceCreamer -1,{
mes "[Ice Cream Maker]";
mes "Fresh Ice Cream made with snow from Lutie!";
mes "Enjoy it now, it won't be on sale for long!";
@@ -75,6 +75,9 @@ alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{
close;
}
+// Alberta
+alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 85
+
// Morroc Field
moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 8f8a13b0d..9e9af6d68 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -26,9 +26,10 @@
//= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka]
//= 1.9 Moved Episode 12 items to separate NPC.
//= Some cleanup & optimization. [Gepard]
+//= 2.0 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-payon,140,151,5 script Seiyablem#pay 84,{
+- script Seiyablem#dummy::SocketEnchant -1,{
if (checkweight(1201,1) == 0)
{
mes "- Wait a minute !! -";
@@ -333,11 +334,12 @@ function script Func_Socket {
}
}
-lhz_in02,281,35,5 duplicate(Seiyablem#pay) Seiyablem#lhz 84
-prt_in,33,70,5 duplicate(Seiyablem#pay) Seiyablem#prt 84
-morocc,51,41,4 duplicate(Seiyablem#pay) Seiyablem#moc 84
+payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 84
+lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 84
+prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 84
+morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84
-prt_in,31,57,1 script Young Man#prt 97,{
+- script Young Man#dummy::SocketMan -1,{
mes "[Young Man]";
mes "I'm considering becoming a Slotting Engineer.";
mes "It's a new field where you can add Slots to equipment, and it'd be cool if I can work in such a lucrative career.";
@@ -354,6 +356,7 @@ prt_in,31,57,1 script Young Man#prt 97,{
close;
}
-payon,143,143,7 duplicate(Young Man#prt) Young Man#pay 97
-morocc,60,42,3 duplicate(Young Man#prt) Young Man#moc 97
-lhz_in02,269,33,5 duplicate(Young Man#prt) Young Man#lhz 97
+prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 97
+payon,143,143,7 duplicate(SocketMan) Young Man#pay 97
+morocc,60,42,3 duplicate(SocketMan) Young Man#moc 97
+lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 97
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 58b934b24..e7f14c37c 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Gepard
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -11,9 +11,10 @@
//= Adds slots to selected weapons and armor.
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-payon,236,199,3 script Leablem 86,{
+- script Leablem#dummy::SocketEnchant2 -1,{
if (checkweight(1201,1) == 0)
{
mes "- Wait a seconds !! -";
@@ -377,9 +378,10 @@ payon,236,199,3 script Leablem 86,{
}
}
-lighthalzen,96,137,3 duplicate(Leablem) Leablem#lhz 86
-prontera,244,169,5 duplicate(Leablem) Leablem#prt 86
-moc_ruins,154,86,3 duplicate(Leablem) Leablem#moc 86
+payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86,{
+lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86
+prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86
+moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86
function script Func_Socket2 {