diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-24 17:30:14 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-24 17:30:14 +0000 |
| commit | ea1a321438e75b66b3fc8148b6eaa41d049761dd (patch) | |
| tree | 80dfac0c03ba915146e52cf10fe91c4b5558da9f /npc/custom | |
| parent | 90e5648a7865e72846c9a41754c4f71e89a1739d (diff) | |
| download | hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.tar.gz hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.tar.bz2 hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.tar.xz hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.zip | |
> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041).
* Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042).
* Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/custom')
| -rw-r--r-- | npc/custom/quests/quest_shop.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index a6ae634a7..539c29f23 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -165,13 +165,13 @@ function Add { debugmes "Quest reward #"+getarg(1)+" invalid (skipped)."; return; } - for(set .@i,2; .@i<getargcount(); set .@i,.@i+1) - set .@j[.@i-2],getarg(.@i); - for(set .@i,3; .@i<getarraysize(.@j); set .@i,.@i+2) { - if (getitemname(.@j[.@i]) == "null") { - debugmes "Quest requirement #"+.@j[.@i]+" invalid (skipped)."; + setarray .@j[0],getarg(2),getarg(3),getarg(4); + for(set .@i,5; .@i<getargcount(); set .@i,.@i+2) { + if (getitemname(getarg(.@i)) == "null") { + debugmes "Quest requirement #"+getarg(.@i)+" invalid (skipped)."; return; - } + } else + setarray .@j[.@i-2],getarg(.@i),getarg(.@i+1); } copyarray getd(".q_"+getarg(1)+"[0]"),.@j[0],getarraysize(.@j); npcshopadditem "qshop"+getarg(0),getarg(1),((.ShowZeny)?getarg(3):0); |