From c1bea2545a779a7e2ec6a1d6f57607b2fd83b471 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 18 Dec 2021 15:17:46 -0300 Subject: Cyndala - Bleach anything This code needs a rewrite --- npc/003-6/cyndala.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/npc/003-6/cyndala.txt b/npc/003-6/cyndala.txt index 055cdce1f..fa901575c 100644 --- a/npc/003-6/cyndala.txt +++ b/npc/003-6/cyndala.txt @@ -122,15 +122,10 @@ function item_is_bleachable getitemlink(@inventorylist_id[.@item_index]), @inventorylist_id[.@item_index]; - if (@inventorylist_card1[.@item_index] != 0) { - if ((@inventorylist_card1[.@item_index] > YellowDye) || - (@inventorylist_card1[.@item_index] < CrimsonDye)) { + if (@inventorylist_card1[.@item_index] == 0) return false; - } - .@is_bleachable = true; - } - return .@is_bleachable; + return true; } function remove_cards_from_item @@ -152,10 +147,10 @@ function remove_cards_from_item } speech S_LAST_NEXT, - l("Your mind is set? You will probably lose the color dye during this process."); + l("Your mind is set? You will probably lose the dye or card during this process. You're bleaching a %s by the way.", getitemlink(@inventorylist_id[.@item_index])); switch (askyesno()) { - case 1: + case ASK_YES: speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Ok, let me see..."), l("..."); @@ -173,7 +168,7 @@ function remove_cards_from_item l("..."), l("Here it is, clean like a whistle!"); break; - case 2: + default: speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Is it truly a hard choice to make?"); break; -- cgit v1.2.3-60-g2f50