summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-15 02:20:22 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-15 02:20:22 +0000
commit73a788059d8943247b0741b8867ccb32099efb8b (patch)
tree4289c3a71669616cd61ab225b4b4fac4150e725f /npc
parente0ca7e477f47d99ce03be3a580da22133fe70f51 (diff)
downloadhercules-73a788059d8943247b0741b8867ccb32099efb8b.tar.gz
hercules-73a788059d8943247b0741b8867ccb32099efb8b.tar.bz2
hercules-73a788059d8943247b0741b8867ccb32099efb8b.tar.xz
hercules-73a788059d8943247b0741b8867ccb32099efb8b.zip
Really fixed bugreport:407 (eA doesn't do lazy boolean expression evaluation)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11736 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/merchants/dye_maker.txt11
2 files changed, 9 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index fe002906d..8e84954a3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2007/11/16
+ * Really fixed bugreport:407 [ultramage]
2007/11/15
* Rev. 11733 Several fixes to various scripts. [L0ne_W0lf]
- Resolves: bugreport:351, bugreport:379, bugreport:393, bugreport:407,
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 41c492c2e..d8a938ff6 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.4
+//= 1.3b
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,7 +14,7 @@
//= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
//= 1.2b Fixed typos in variable names [ultramage]
//= 1.3 Made the checks more dynamic [ultramage]
-//= 1.4 Fixed offset in getarraysize. (counting starts at 1.) [L0ne_W0lf]
+//= 1.3b Fixed incorrect checking loop structure [ultramage]
//============================================================
morocc_in,146,99,3 script Java Dullihan 58,{
@@ -168,9 +168,12 @@ S_MakeDye:
}
next;
if (select("Make Dyestuffs:Cancel") == 1) {
- set .@size, (getarraysize(.@item)-1);
+ set .@size, getarraysize(.@item);
+ mes "Size is "+.@size+" entries!";
// check requirements
- for( set .@i,0 ; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 );
+ for( set .@i,0 ; .@i < .@size ; set .@i,.@i+1 )
+ if( countitem(.@item[.@i]) < .@count[.@i] )
+ break;
if( .@i < .@size || Zeny < .@cost ) {
mes "[Dye Maker Java Dullihan]";
mes "Hmmm. Not enough...";