From d91c5a64e7d816034686aa1865a4f8962a47c301 Mon Sep 17 00:00:00 2001 From: Cekis Date: Thu, 19 Jan 2017 17:24:49 +0000 Subject: [PATCH] adjusted some logic stupidity --- .../script/city/bestine/terminal_items.java | 46 ++++++++----------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java b/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java index 7c59af395..783fad3e0 100755 --- a/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java +++ b/sku.0/sys.server/compiled/game/script/city/bestine/terminal_items.java @@ -21,40 +21,30 @@ public class terminal_items extends script.base_script if (volumeName.equals(GET_QUEST_ITEM_VOLUME_NAME)) { String template = getStringObjVar(self, "disk"); - if ((template != null) && (!template.equals(""))) + if ((template != null) && (!template.equals("")) && template.indexOf("history") > -1 && isPlayer(breacher) && canSearch(self, breacher)) { - int stringCheck = template.indexOf("history"); - if (stringCheck > -1) + if (hasObjVar(breacher, "bestine.searched")) { - if (isPlayer(breacher)) + sendSystemMessage(breacher, new string_id(CONVO, "history_disk_found_already")); + return SCRIPT_CONTINUE; + } + obj_id playerInv = utils.getInventoryContainer(breacher); + if (isIdValid(playerInv)) + { + int free_space = getVolumeFree(playerInv); + if (free_space > 0) { - if (canSearch(self, breacher)) + obj_id objectReceived = createObject(template, playerInv, ""); + if (isIdValid(objectReceived)) { - if (hasObjVar(breacher, "bestine.searched")) - { - sendSystemMessage(breacher, new string_id(CONVO, "history_disk_found_already")); - return SCRIPT_CONTINUE; - } - obj_id playerInv = utils.getInventoryContainer(breacher); - if (isIdValid(playerInv)) - { - int free_space = getVolumeFree(playerInv); - if (free_space > 0) - { - obj_id objectReceived = createObject(template, playerInv, ""); - if (isIdValid(objectReceived)) - { - sendSystemMessage(breacher, new string_id(CONVO, "history_disk_found")); - setObjVar(breacher, "bestine.searched", 1); - } - } - else - { - sendSystemMessage(breacher, new string_id(CONVO, "inv_full")); - } - } + sendSystemMessage(breacher, new string_id(CONVO, "history_disk_found")); + setObjVar(breacher, "bestine.searched", 1); } } + else + { + sendSystemMessage(breacher, new string_id(CONVO, "inv_full")); + } } } }