From af290ce7812b32f616dfdb0377ffd668ed696165 Mon Sep 17 00:00:00 2001
From: Reedux <r@r.r>
Date: Sat, 11 Jan 2020 15:25:37 +0000
Subject: [PATCH] Adjusted to check if ITV has already been learned

Idea from tyrones PR https://github.com/SWG-Source/dsrc/pull/77
---
 .../compiled/game/datatables/item/itv_command_list.tab     | 1 +
 .../tangible/veteran_reward/instant_travel_terminal.tpf    | 1 +
 .../veteran_reward/instant_travel_terminal_deed.java       | 7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab b/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab
index 340e0a650..e51e3c1a6 100644
--- a/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab
+++ b/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab
@@ -7,3 +7,4 @@ tcg_itv_home	callforsolarsailerpickup
 tcg_itv_location	callforg9riggerpickup
 itv_snowspeeder	callforsnowspeeder
 itv_slave_1	callforslave1pickup
+default_itv	callforpickup
diff --git a/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf b/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf
index 4d5c9fd31..ccfb2fa77 100755
--- a/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf
+++ b/sku.0/sys.server/compiled/game/object/tangible/veteran_reward/instant_travel_terminal.tpf
@@ -7,3 +7,4 @@
 sharedTemplate = "object/tangible/veteran_reward/shared_instant_travel_terminal.iff"
 scripts = ["systems.veteran_reward.instant_travel_terminal_deed", "item.special.nomove"]
 persistByDefault = true
+objvars = +["default_itv" = 1]
diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java
index f19d0b627..2862ad6ee 100755
--- a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java
+++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/instant_travel_terminal_deed.java
@@ -30,16 +30,19 @@ public class instant_travel_terminal_deed extends script.base_script
                 sendSystemMessage(player, "Instant Travel vehicles may not be used until you have reached level " + minLevelSetting + ". Please use this deed again when you reach level " + minLevelSetting + " or higher.", null);
                 return SCRIPT_CONTINUE;
             }
+            // Make sure the default_itv is always at the bottom of the table else you will get false hits
             int rows = dataTableGetNumRows(ITV_COMMAND_TABLE);
             for (int i=0;i<rows;i++) {
                 if (hasObjVar(self, dataTableGetString(ITV_COMMAND_TABLE, i, 0))) {
+                    if (hasCommand(player,dataTableGetString(ITV_COMMAND_TABLE, i, 1))) {
+                        sendSystemMessageTestingOnly(player, "You have already used this item.");
+                        return SCRIPT_CONTINUE;
+                    }
                     grantCommand(player, dataTableGetString(ITV_COMMAND_TABLE, i, 1));
                     destroyObject(self);
                     return SCRIPT_CONTINUE;
                 }
             }
-            grantCommand(player, "callforpickup");
-            destroyObject(self);
         }
         return SCRIPT_CONTINUE;
     }