From 0c4450668b8c09b371197b58f00f51073f965aea Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Sat, 21 Nov 2020 01:22:54 -0500 Subject: [PATCH] Revert Restore Tekil Barje (ref #174) --- .../buildout/tatooine/tatooine_2_1.tab | 1 - .../script/npc/static_quest/quest_convo.java | 25 +++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_2_1.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_2_1.tab index de35ea1b5..2079acd04 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_2_1.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_2_1.tab @@ -196,4 +196,3 @@ i i h i f f f f f f f s p -1572050364 0 object/tangible/spawning/city_sign_spawner.iff 0 922.333 75 1736.76 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s01.iff|$| -572442897 0 object/tangible/spawning/city_sign_spawner.iff 0 1110.59 75 1573.73 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s01.iff|$| -19844661 0 object/tangible/planet_map_location/city.iff 0 1054.89 74.983 1598.26 0.938444 0 0.345432 0 $| --1987264228 0 object/tangible/npc/tatooine_spawn/tekil_barje.iff 0 874.02 75 1628.17 0.877228 0 -0.4800726 0 $| diff --git a/sku.0/sys.server/compiled/game/script/npc/static_quest/quest_convo.java b/sku.0/sys.server/compiled/game/script/npc/static_quest/quest_convo.java index 1459f729b..c7a13161d 100755 --- a/sku.0/sys.server/compiled/game/script/npc/static_quest/quest_convo.java +++ b/sku.0/sys.server/compiled/game/script/npc/static_quest/quest_convo.java @@ -44,7 +44,7 @@ public class quest_convo extends script.base_script { if (creatureName == null || creatureName.length() <= 0) { return SCRIPT_CONTINUE; } - if (creatureName.startsWith("vana_sage") || creatureName.startsWith("ikka_gesul")) + if (creatureName.startsWith("vana_sage") || creatureName.startsWith("tekil_barje") || creatureName.startsWith("ikka_gesul")) { detachScript(self, "npc.static_quest.quest_convo"); return SCRIPT_CONTINUE; @@ -175,8 +175,15 @@ public class quest_convo extends script.base_script { } if (!gatingObject.equals("none")) { obj_id playerInv = utils.getInventoryContainer(speaker); +<<<<<<< HEAD if (!checkForGatingItem(playerInv, speaker, questNum, datatable)) { chat.chat(self, new string_id(CONVO, "notyet")); +======= + if (checkForGatingItem(playerInv, speaker, questNum, datatable) != true) + { + string_id rewardMessage = new string_id(CONVO, "notyet"); + chat.chat(self, speaker, rewardMessage); +>>>>>>> parent of 6525728a6... Restore Tekil Barje (ref #174) return SCRIPT_OVERRIDE; } } @@ -234,9 +241,18 @@ public class quest_convo extends script.base_script { else if (hasObjVar(speaker, questID + ".done")) { if (questType.equals("fetch") || questType.equals("retrieve")) { obj_id playerInv = utils.getInventoryContainer(speaker); +<<<<<<< HEAD if (checkForItem(playerInv, speaker, questNum)) { chat.chat(self, new string_id(CONVO, "npc_reward_" + questNum)); destroyObject(getObjIdObjVar(speaker, questID + ".deliver")); +======= + if (checkForItem(playerInv, speaker, questNum) == true) + { + string_id rewardMessage = new string_id(CONVO, "npc_reward_" + questNum); + chat.chat(self, speaker, rewardMessage); + obj_id retrieveObject = getObjIdObjVar(speaker, questID + ".deliver"); + destroyObject(retrieveObject); +>>>>>>> parent of 6525728a6... Restore Tekil Barje (ref #174) giveReward(self, speaker, questNum); return SCRIPT_OVERRIDE; } else { @@ -589,13 +605,6 @@ public class quest_convo extends script.base_script { npcSpeak(player, message); resetPlayer(self, player, questNum); npcEndConversation(player); - - // take back virus if you're talking to Tekil Barje - if(getCreatureName(self).startsWith("tekil_barje")) { - if(utils.playerHasItemByTemplate(player, "object/tangible/mission/quest_item/tekil_barje_q1_needed.iff")) { - destroyObject(utils.getItemPlayerHasByTemplate(player, "object/tangible/mission/quest_item/tekil_barje_q1_needed.iff")); - } - } return SCRIPT_CONTINUE; } if (response.getAsciiId().equals(response8)) //