summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/merchants/socket_enchant.txt10
2 files changed, 6 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d8896b953..bc70ba074 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2009/05/03
+ - Switched the slot enchanter's checks so they come AFTER the final 'next' pause. (bugreport:2664)
* Removed the obfuscation of the #kafra_code password, following ultramage's suggestion. [brianluau]
2009/05/02
- Changed a misleading message in the custom Job Changer. (bugreport:682) [brianluau]
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 247d9dbc7..46392e0ef 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -340,9 +340,13 @@ function script Func_Socket {
close;
}
+ mes "[Seiyablem]";
+ mes "Alright then, let the work begin!";
+ mes "You'd better pray for a successful result.";
+ next;
switch(getarg(0))
{
- case 1:
+ case 1:
if((Zeny < getarg(5)*1000) || (countitem(getarg(6)) < getarg(7)) || (!countitem(getarg(1))))
{
mes "[Seiyablem]";
@@ -363,10 +367,6 @@ function script Func_Socket {
break;
}
- mes "[Seiyablem]";
- mes "Alright then, let the work begin!";
- mes "You'd better pray for a successful result.";
- next;
set .@socketrand,rand(1,100);
if((.@socketrand > getarg(3)) && (.@socketrand < getarg(4)))
{