Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Really fixed bugreport:407 (eA doesn't do lazy boolean expression evaluation)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11736 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-11-15 02:20:22 +00:00
parent 3c4c7617e1
commit 6debac1c6e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -1,5 +1,7 @@
Date Added Date Added
====== ======
2007/11/16
* Really fixed bugreport:407 [ultramage]
2007/11/15 2007/11/15
* Rev. 11733 Several fixes to various scripts. [L0ne_W0lf] * Rev. 11733 Several fixes to various scripts. [L0ne_W0lf]
- Resolves: bugreport:351, bugreport:379, bugreport:393, bugreport:407, - Resolves: bugreport:351, bugreport:379, bugreport:393, bugreport:407,

11
npc/merchants/dye_maker.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= eAthena Dev Team //= eAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.4 //= 1.3b
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena SVN //= eAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -14,7 +14,7 @@
//= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf] //= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
//= 1.2b Fixed typos in variable names [ultramage] //= 1.2b Fixed typos in variable names [ultramage]
//= 1.3 Made the checks more dynamic [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,{ morocc_in,146,99,3 script Java Dullihan 58,{
@ -168,9 +168,12 @@ S_MakeDye:
} }
next; next;
if (select("Make Dyestuffs:Cancel") == 1) { if (select("Make Dyestuffs:Cancel") == 1) {
set .@size, (getarraysize(.@item)-1); set .@size, getarraysize(.@item);
mes "Size is "+.@size+" entries!";
// check requirements // 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 ) { if( .@i < .@size || Zeny < .@cost ) {
mes "[Dye Maker Java Dullihan]"; mes "[Dye Maker Java Dullihan]";
mes "Hmmm. Not enough..."; mes "Hmmm. Not enough...";