diff options
| author | Freeyorp <Freeyorp101@hotmail.com> | 2010-10-03 05:53:22 +1300 |
|---|---|---|
| committer | Freeyorp <Freeyorp101@hotmail.com> | 2010-10-03 06:13:37 +1300 |
| commit | 3dc13da84ef8237d8072deaa4ae595abcee5e15d (patch) | |
| tree | ee0eef368c41346d9374fbf056d0007ad65fdf43 /npc | |
| parent | ed0075fcb386f8afe03b0a935835778c1ec846a1 (diff) | |
| download | serverdata-3dc13da84ef8237d8072deaa4ae595abcee5e15d.tar.gz serverdata-3dc13da84ef8237d8072deaa4ae595abcee5e15d.tar.bz2 serverdata-3dc13da84ef8237d8072deaa4ae595abcee5e15d.tar.xz serverdata-3dc13da84ef8237d8072deaa4ae595abcee5e15d.zip | |
Critical fixes for Nicholas and Lora Tay
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/009-2_Hurnscald/nicholas.txt | 17 | ||||
| -rw-r--r-- | npc/010-2_Dimonds_Cove/loratay.txt | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt index 639b8be3..fe4af0c3 100644 --- a/npc/009-2_Hurnscald/nicholas.txt +++ b/npc/009-2_Hurnscald/nicholas.txt @@ -47,9 +47,9 @@ L_Check: mes "[Nicholas]"; mes "\"Let me take at look at how much you have...\""; next; - if ( (countitem("IngotIron")<3) | (countitem("Coal") < 6) ) goto L_NoItem; - if ( (countitem("IngotIron")<6) | (countitem("Coal") < 12) ) goto L_StageA; - if ( (countitem("IngotIron")<9) | (countitem("Coal") < 18) ) goto L_StageB; + if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem; + if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_StageA; + if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_StageB; goto L_StageC; L_Info: @@ -107,12 +107,12 @@ L_main_menu: L_main_menu_post_setzer: - if ( (countitem("IngotIron")<3) | (countitem("Coal") <6) ) goto L_no_more_helmets; + if ( (countitem("IngotIron")<3) || (countitem("Coal") <6) ) goto L_no_more_helmets; set @choice$[@choices_nr], "Knight's Helmet (3 Iron Ingots & 6 Coal)."; set @choice_idx[@choices_nr], @CHOICE_KNIGHT; set @choices_nr, 1 + @choices_nr; - if ( (countitem("IngotIron")<6) | (countitem("Coal") < 12) ) goto L_no_more_helmets; + if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_no_more_helmets; set @choice$[@choices_nr], "Crusade Helmet. (6 Iron Ingots & 12 Coal)"; set @choice_idx[@choices_nr], @CHOICE_CRUSADE; @@ -122,7 +122,7 @@ L_main_menu_post_setzer: set @choice_idx[@choices_nr], @CHOICE_SHIELD; set @choices_nr, 1 + @choices_nr; - if ( (countitem("IngotIron")<9) | (countitem("Coal") < 18) ) goto L_no_more_helmets; + if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_no_more_helmets; set @choice$[@choices_nr], "Warlord Helmet. (9 Iron Ingots & 18 Coal)"; set @choice_idx[@choices_nr], @CHOICE_WARLORD; @@ -173,6 +173,7 @@ L_NoMoney: L_YesKnight: if (zeny < 10000) goto L_NoMoney; + if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; set zeny, zeny - 10000; @@ -183,6 +184,7 @@ L_YesKnight: L_YesCrusade: if (zeny < 10000) goto L_NoMoney; + if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_NoItem; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; set zeny, zeny-10000; @@ -193,6 +195,7 @@ L_YesCrusade: L_YesWarlord: if (zeny < 10000) goto L_NoMoney; + if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_NoItem; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; set zeny, zeny-10000; @@ -316,7 +319,7 @@ L_SetzerQuest: "HOW much? Nevermind then!", L_Pass; if (zeny < 50000) goto L_SetzerNoZeny; - if ( (countitem("IngotIron") < 3) | (countitem("Coal") < 6) ) goto L_SetzerNoIngot; + if ( (countitem("IngotIron") < 3) || (countitem("Coal") < 6) ) goto L_SetzerNoIngot; if (countitem("MonsterOilPotion") < 1) goto L_SetzerNoMonsterOil; if (countitem("ShortSword") < 1) goto L_SetzerNoSword; // No inventory check needed, as the short sword is removed, opening a slot diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt index 47d5ea1d..c336de32 100644 --- a/npc/010-2_Dimonds_Cove/loratay.txt +++ b/npc/010-2_Dimonds_Cove/loratay.txt @@ -315,6 +315,9 @@ L_trim: if (@item >= 2100 && @item <= 2109) set @genitem, @item + 70; if (@genitem == 0) goto L_trim_impossible; if (zeny < 100) goto L_trim_nozeny; + + if (countitem(@delitem) < 1) + goto L_main_menu; delitem @delitem, 1; getitem @genitem, 1; @@ -368,6 +371,9 @@ L_lengthen: if (@genitem == 0) goto L_lengthen_impossible; if (zeny < 500) goto L_lengthen_nozeny; if (countitem ("CottonCloth") < 1) goto L_lengthen_nocotton; + + if (countitem(@delitem) < 1) + goto L_main_menu; delitem @delitem, 1; delitem "CottonCloth", 1; |