diff options
| -rw-r--r-- | npc/020-5/bracco.txt | 4 | ||||
| -rw-r--r-- | npc/functions/aurora.txt | 2 | ||||
| -rw-r--r-- | npc/items/emptybox.txt | 13 |
3 files changed, 13 insertions, 6 deletions
diff --git a/npc/020-5/bracco.txt b/npc/020-5/bracco.txt index b725f3dde..881b842ca 100644 --- a/npc/020-5/bracco.txt +++ b/npc/020-5/bracco.txt @@ -138,6 +138,7 @@ delitem .@id, .@total; // Delete first, no refunds + freeloop(true); for (.@index=0; .@index < @inventorylist_count; .@index++) { .@x=@inventorylist_id[.@index]; if (.@x == getarg(0) && Zeny >= .@price) { @@ -147,9 +148,10 @@ mesc l("@@ melt down your @@...", .name$, getitemlink(.@x)), 2; // Really melt it down - NewMeltdown(.@x); + NewMeltdown(getarg(0)); } } + freeloop(false); @indexisbroken=true; return; } diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt index 42977e2f8..3204767a6 100644 --- a/npc/functions/aurora.txt +++ b/npc/functions/aurora.txt @@ -723,7 +723,7 @@ function script FYE_Submit { // Stops any Aurora Event function script FYStopEvent { - setarray .@av$, "Kamelot", "Regnum", "Expo", "Fishing", "Candor", "Mining", "Tower", "Raid", "Olympics"; + setarray .@av$, "Kamelot", "Regnum", "Expo", "Fishing", "Candor", "Mining", "Tower", "Raid", "Olympics", "Celestia", "Rebirth", "Gemini"; if (array_find(.@av$, $EVENT$) >= 0) { sClear(); $EVENT$=""; diff --git a/npc/items/emptybox.txt b/npc/items/emptybox.txt index ec667ebdc..2f676b115 100644 --- a/npc/items/emptybox.txt +++ b/npc/items/emptybox.txt @@ -18,10 +18,11 @@ OnUse: mesc l("Fill with what?"); select l("Don't fill"), - rif(countitem(GrassCarp) >= 7, l("7 Grass Carp")), - rif(countitem(Croconut) >= 8, l("8 Croconut")), - rif(countitem(CommonCarp) >= 20, l("20 Common Carp")), - rif(countitem(Plushroom) >= 87, l("87 Plushroom")); + rif(countitem(GrassCarp) >= 7, l("7 Grass Carps")), + rif(countitem(Croconut) >= 8, l("8 Croconuts")), + rif(countitem(CommonCarp) >= 20, l("20 Common Carps")), + rif(countitem(Aquada) >= 50, l("50 Aquadas")), + rif(countitem(Plushroom) >= 87, l("87 Plushrooms")); mes ""; switch (@menu) { case 2: @@ -37,6 +38,10 @@ OnUse: getitem FishBox, 1; break; case 5: + delitem Aquada, 50; + getitem AquadaBox, 1; + break; + case 6: delitem Plushroom, 87; getitem PlushroomBox, 1; break; |