From db074b0a8788a3436e707c2231d889572edb8ebc Mon Sep 17 00:00:00 2001 From: TyroneSWG Date: Wed, 1 Jan 2020 23:33:36 -0500 Subject: [PATCH 01/20] ITV deeds may no longer be used more than once. --- .gitignore | 1 + .../instant_travel_terminal_deed.java | 34 +++++++++++++------ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0ea8568dc..2ec20ee2a 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ object_template_crc_string_table.tab **/.idea/* *.iml +sku.0/sys.server/compiled/game/script/tyrone/* \ No newline at end of file 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 fad1ff20b..2a6b99408 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 @@ -28,46 +28,60 @@ public class instant_travel_terminal_deed extends script.base_script if(getLevel(player) < minimumLevel){ 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); } - else if (hasObjVar(self, "privateerShip")) + else if (hasObjVar(self, "privateerShip") && (!hasObjVar(player, "itv.owned.privateer"))) { grantCommand(player, "callforprivateerpickup"); + setObjVar(player, "itv.owned.privateer", 1); destroyObject(self); } - else if (hasObjVar(self, "royalShip")) + else if (hasObjVar(self, "royalShip") && (!hasObjVar(player, "itv.owned.royalship"))) { grantCommand(player, "callforroyalpickup"); + setObjVar(player, "itv.owned.royalship", 1); destroyObject(self); } - else if (hasObjVar(self, "junk")) + else if (hasObjVar(self, "junk") && (!hasObjVar(player, "itv.owned.junk"))) { grantCommand(player, "callforrattletrappickup"); + setObjVar(player, "itv.owned.junk", 1); destroyObject(self); } - else if (hasObjVar(self, "tcg_itv_home")) + else if (hasObjVar(self, "tcg_itv_home") && (!hasObjVar(player, "itv.owned.solar"))) { grantCommand(player, "callforsolarsailerpickup"); + setObjVar(player, "itv.owned.solar", 1); destroyObject(self); } - else if (hasObjVar(self, "tcg_itv_location")) + else if (hasObjVar(self, "tcg_itv_location") && (!hasObjVar(player, "itv.owned.g9rigger"))) { grantCommand(player, "callforg9riggerpickup"); + setObjVar(player, "itv.owned.g9rigger", 1); destroyObject(self); } - else if (hasObjVar(self, "itv_snowspeeder")) + else if (hasObjVar(self, "itv_snowspeeder") && (!hasObjVar(player, "itv.owned.snowspeeder"))) { grantCommand(player, "callforsnowspeeder"); + setObjVar(player, "itv.owned.snowspeeder", 1); destroyObject(self); } - else if (hasObjVar(self, "itv_slave_1")) + else if (hasObjVar(self, "itv_slave_1") && (!hasObjVar(player, "itv.owned.slave1"))) { grantCommand(player, "callforslave1pickup"); + setObjVar(player, "itv.owned.slave1", 1); destroyObject(self); } + else if (hasObjVar(self, "default_itv") && (!hasObjVar(player, "itv.owned.callforpickup"))) + { + grantCommand(player, "callforpickup"); + setObjVar(player, "itv.owned.callforpickup", 1); + destroyObject(self); + + } else { - grantCommand(player, "callforpickup"); - destroyObject(self); - } + sendSystemMessageTestingOnly(player, "You have already used this item."); + return SCRIPT_CONTINUE; + } } return SCRIPT_CONTINUE; } From b3666cf8391c8fd6bf5c6e0589a00dac3ac26614 Mon Sep 17 00:00:00 2001 From: TyroneSWG Date: Wed, 1 Jan 2020 23:07:01 -0600 Subject: [PATCH 02/20] ITV cont. --- .../instant_travel_terminal.tpf | 1 + .../instant_travel_terminal_deed.java | 33 +++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) 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..2073246b3 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 @@ -6,4 +6,5 @@ sharedTemplate = "object/tangible/veteran_reward/shared_instant_travel_terminal.iff" scripts = ["systems.veteran_reward.instant_travel_terminal_deed", "item.special.nomove"] +objvars = +["default_itv" = 1] persistByDefault = true 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 fad1ff20b..4f6d9e9ff 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 @@ -28,46 +28,59 @@ public class instant_travel_terminal_deed extends script.base_script if(getLevel(player) < minimumLevel){ 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); } - else if (hasObjVar(self, "privateerShip")) + else if (hasObjVar(self, "privateerShip") && (!hasObjVar(player, "itv.owned.privateer"))) { grantCommand(player, "callforprivateerpickup"); + setObjVar(player, "itv.owned.privateer", 1); destroyObject(self); } - else if (hasObjVar(self, "royalShip")) + else if (hasObjVar(self, "royalShip") && (!hasObjVar(player, "itv.owned.royalship"))) { grantCommand(player, "callforroyalpickup"); + setObjVar(player, "itv.owned.royalship", 1); destroyObject(self); } - else if (hasObjVar(self, "junk")) + else if (hasObjVar(self, "junk") && (!hasObjVar(player, "itv.owned.junk"))) { grantCommand(player, "callforrattletrappickup"); + setObjVar(player, "itv.owned.junk", 1); destroyObject(self); } - else if (hasObjVar(self, "tcg_itv_home")) + else if (hasObjVar(self, "tcg_itv_home") && (!hasObjVar(player, "itv.owned.solar"))) { grantCommand(player, "callforsolarsailerpickup"); + setObjVar(player, "itv.owned.solar", 1); destroyObject(self); } - else if (hasObjVar(self, "tcg_itv_location")) + else if (hasObjVar(self, "tcg_itv_location") && (!hasObjVar(player, "itv.owned.g9rigger"))) { grantCommand(player, "callforg9riggerpickup"); + setObjVar(player, "itv.owned.g9rigger", 1); destroyObject(self); } - else if (hasObjVar(self, "itv_snowspeeder")) + else if (hasObjVar(self, "itv_snowspeeder") && (!hasObjVar(player, "itv.owned.snowspeeder"))) { grantCommand(player, "callforsnowspeeder"); + setObjVar(player, "itv.owned.snowspeeder", 1); destroyObject(self); } - else if (hasObjVar(self, "itv_slave_1")) + else if (hasObjVar(self, "itv_slave_1") && (!hasObjVar(player, "itv.owned.slave1"))) { grantCommand(player, "callforslave1pickup"); + setObjVar(player, "itv.owned.slave1", 1); destroyObject(self); } + else if (hasObjVar(self, "default_itv") && (!hasObjVar(player, "itv.owned.callforpickup"))) + { + grantCommand(player, "callforpickup"); + setObjVar(player, "itv.owned.callforpickup", 1); + destroyObject(self); + } else { - grantCommand(player, "callforpickup"); - destroyObject(self); - } + sendSystemMessageTestingOnly(player, "You have already used this item."); + return SCRIPT_CONTINUE; + } } return SCRIPT_CONTINUE; } From 3be779386b8c951b9c6911869bdfaada6efc5c8a Mon Sep 17 00:00:00 2001 From: TyroneSWG Date: Thu, 9 Jan 2020 19:46:03 -0600 Subject: [PATCH 03/20] Arena Terminal --- .../tangible/terminal/terminal_arena.tpf | 24 +++++++++++++++++++ .../compiled/game/script/.gitignore | 2 ++ .../sys.server/compiled/game/script/java.bat | 1 + .../compiled/game/script/vector.java | 2 -- .../terminal/shared_terminal_arena.tpf | 15 ++++++++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf create mode 100644 sku.0/sys.server/compiled/game/script/java.bat create mode 100644 sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf diff --git a/sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf b/sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf new file mode 100644 index 000000000..d220844e2 --- /dev/null +++ b/sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf @@ -0,0 +1,24 @@ +// Filename: terminal_arena +// Directory: object/tangible/terminal +// +// Description: Arena Terminal to start arena. +// BASE TERMINAL +// +// Notes: +// +// +// Category: TERMINAL +// Sub-Category: BASE +// Classification: Null +// + +@base object/tangible/terminal/base/base_terminal.iff + +@class tangible_object_template 0 + + +@class object_template 5 + +sharedTemplate = "object/tangible/terminal/shared_terminal_arena.iff" + +scripts = ["tyrone.arena.portarena"] diff --git a/sku.0/sys.server/compiled/game/script/.gitignore b/sku.0/sys.server/compiled/game/script/.gitignore index 841ead5fd..65cc3d3cd 100755 --- a/sku.0/sys.server/compiled/game/script/.gitignore +++ b/sku.0/sys.server/compiled/game/script/.gitignore @@ -1 +1,3 @@ base_script.java +*.class +tyrone.* \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/java.bat b/sku.0/sys.server/compiled/game/script/java.bat new file mode 100644 index 000000000..ef15c8977 --- /dev/null +++ b/sku.0/sys.server/compiled/game/script/java.bat @@ -0,0 +1 @@ +for /r %%a in (.) do (javac %%a\*.java) \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/vector.java b/sku.0/sys.server/compiled/game/script/vector.java index 3192ff9c3..211bfd48f 100755 --- a/sku.0/sys.server/compiled/game/script/vector.java +++ b/sku.0/sys.server/compiled/game/script/vector.java @@ -1,5 +1,3 @@ -// vector.java - package script; import java.io.Serializable; diff --git a/sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf b/sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf new file mode 100644 index 000000000..92bdd8993 --- /dev/null +++ b/sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf @@ -0,0 +1,15 @@ + +@base object/tangible/terminal/base/shared_base_terminal.iff + +@class tangible_object_template 3 + +@class object_template 5 + +objectName = "terminal_name" "terminal_character_builder" +detailedDescription = "terminal_detail" "terminal_character_builder" + +appearanceFilename = "appearance/thm_corl_banner_govt_tall.apt" + +gameObjectType = GOT_terminal_misc + +scale = 3.00 \ No newline at end of file From 8a982726fb8ab8a84467f8c833ba39c172866c32 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Fri, 10 Jan 2020 18:49:45 -0500 Subject: [PATCH 04/20] In Work --- .../compiled/game/script/library/utils.java | 22 +++-------- .../ship_control_device.java | 38 ++++++++++++++++--- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/utils.java b/sku.0/sys.server/compiled/game/script/library/utils.java index c014e2234..0dcac6775 100755 --- a/sku.0/sys.server/compiled/game/script/library/utils.java +++ b/sku.0/sys.server/compiled/game/script/library/utils.java @@ -6065,26 +6065,21 @@ public class utils extends script.base_script String objVarValue; String[] objVarNameAndType; String objVarName; - - for (String pair : split(objVarList, ',')) { + String[] splitList = split(objVarList, ','); + for (String pair : splitList) { objVarToSet = split(pair, '='); objVarValue = objVarToSet[1]; objVarNameAndType = split(objVarToSet[0], ':'); objVarName = objVarNameAndType[1]; switch (objVarNameAndType[0]) { - case "string": - setObjVar(object, objVarName, objVarValue); - break; case "int": + case "boolean": + case "bool": setObjVar(object, objVarName, utils.stringToInt(objVarValue)); break; case "float": setObjVar(object, objVarName, utils.stringToFloat(objVarValue)); break; - case "boolean": - case "bool": - setObjVar(object, objVarName, utils.stringToInt(objVarValue)); - break; default: setObjVar(object, objVarName, objVarValue); break; @@ -6108,19 +6103,14 @@ public class utils extends script.base_script objVarNameAndType = split(objVarToSet[0], ';'); objVarName = objVarNameAndType[1]; switch (objVarNameAndType[0]) { - case "string": - setObjVar(object, objVarName, objVarValue); - break; case "int": + case "boolean": + case "bool": setObjVar(object, objVarName, utils.stringToInt(objVarValue)); break; case "float": setObjVar(object, objVarName, utils.stringToFloat(objVarValue)); break; - case "boolean": - case "bool": - setObjVar(object, objVarName, utils.stringToInt(objVarValue)); - break; default: setObjVar(object, objVarName, objVarValue); break; diff --git a/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java b/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java index a28ecfcec..011412aa8 100755 --- a/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java +++ b/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java @@ -101,6 +101,17 @@ public class ship_control_device extends script.base_script mi.addRootMenu(menu_info_types.SERVER_MENU4, strSpam2); } } + if(!isSpaceScene()) { + obj_id pilotShip = getPilotedShip(player); + // player must be either piloting a ship to land it or in world to launch it. + if (!isIdValid(pilotShip) && isInWorld(player)) { + string_id atmo = new string_id("space/space_interaction", "launch_ship"); + mi.addRootMenu(menu_info_types.SERVER_MENU5, atmo); + } else if(isIdValid(pilotShip)){ + string_id atmo = new string_id("space/space_interaction", "land_ship"); + mi.addRootMenu(menu_info_types.SERVER_MENU6, atmo); + } + } return SCRIPT_CONTINUE; } public int OnObjectMenuSelect(obj_id self, obj_id player, int item) throws InterruptedException @@ -123,7 +134,7 @@ public class ship_control_device extends script.base_script } } } - if (item == menu_info_types.SERVER_MENU1) + else if (item == menu_info_types.SERVER_MENU1) { if (isSpaceScene()) { @@ -133,7 +144,7 @@ public class ship_control_device extends script.base_script } sui.inputbox(self, player, utils.packStringId(PROMPT1), sui.OK_CANCEL, utils.packStringId(RENAME_SHIP), sui.INPUT_NORMAL, null, "renameShip", null); } - if (item == menu_info_types.SERVER_MENU2) + else if (item == menu_info_types.SERVER_MENU2) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); if (!isIdValid(objShip)) @@ -222,7 +233,7 @@ public class ship_control_device extends script.base_script return SCRIPT_CONTINUE; } } - if (item == menu_info_types.SERVER_MENU3) + else if (item == menu_info_types.SERVER_MENU3) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); if (!isIdValid(objShip)) @@ -247,7 +258,7 @@ public class ship_control_device extends script.base_script showSUIPage(pid); return SCRIPT_CONTINUE; } - if (item == menu_info_types.SERVER_MENU4) + else if (item == menu_info_types.SERVER_MENU4) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); obj_id pInv = utils.getInventoryContainer(player); @@ -273,7 +284,24 @@ public class ship_control_device extends script.base_script } return SCRIPT_CONTINUE; } - if (item == menu_info_types.DICE_ROLL) + else if (item == menu_info_types.SERVER_MENU5) + { + obj_id ship = space_transition.getShipFromShipControlDevice(self); + if(isIdValid(ship)) { + location loc = getLocation(player); + space_transition.unpackShipForPlayer(player, ship); + setLocation(ship, new location(loc.x, loc.y + 10, loc.z)); + } + } + else if (item == menu_info_types.SERVER_MENU6) + { + obj_id playerShip = getPilotedShip(player); + // player must be piloting ship in order to land/pack it. + if(isIdValid(playerShip)) { + space_transition.packShip(space_transition.getContainingShip(player)); + } + } + else if (item == menu_info_types.DICE_ROLL) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); if (!hasObjVar(objShip, player_structure.OBJVAR_STRUCTURE_STORAGE_INCREASE)) From 0683862226f8a289bf5d295b9e2f31c604c1cb30 Mon Sep 17 00:00:00 2001 From: TyroneSWG Date: Fri, 10 Jan 2020 22:57:58 -0600 Subject: [PATCH 05/20] Cleanup --- .../tangible/terminal/terminal_arena.tpf | 24 ------------------- .../compiled/game/script/.gitignore | 3 +-- .../sys.server/compiled/game/script/java.bat | 1 - .../compiled/game/script/vector.java | 1 + .../terminal/shared_terminal_arena.tpf | 15 ------------ 5 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf delete mode 100644 sku.0/sys.server/compiled/game/script/java.bat delete mode 100644 sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf diff --git a/sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf b/sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf deleted file mode 100644 index d220844e2..000000000 --- a/sku.0/sys.server/compiled/game/object/tangible/terminal/terminal_arena.tpf +++ /dev/null @@ -1,24 +0,0 @@ -// Filename: terminal_arena -// Directory: object/tangible/terminal -// -// Description: Arena Terminal to start arena. -// BASE TERMINAL -// -// Notes: -// -// -// Category: TERMINAL -// Sub-Category: BASE -// Classification: Null -// - -@base object/tangible/terminal/base/base_terminal.iff - -@class tangible_object_template 0 - - -@class object_template 5 - -sharedTemplate = "object/tangible/terminal/shared_terminal_arena.iff" - -scripts = ["tyrone.arena.portarena"] diff --git a/sku.0/sys.server/compiled/game/script/.gitignore b/sku.0/sys.server/compiled/game/script/.gitignore index 65cc3d3cd..7553a6411 100755 --- a/sku.0/sys.server/compiled/game/script/.gitignore +++ b/sku.0/sys.server/compiled/game/script/.gitignore @@ -1,3 +1,2 @@ base_script.java -*.class -tyrone.* \ No newline at end of file +*.class \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/java.bat b/sku.0/sys.server/compiled/game/script/java.bat deleted file mode 100644 index ef15c8977..000000000 --- a/sku.0/sys.server/compiled/game/script/java.bat +++ /dev/null @@ -1 +0,0 @@ -for /r %%a in (.) do (javac %%a\*.java) \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/vector.java b/sku.0/sys.server/compiled/game/script/vector.java index 211bfd48f..5ca50ecd5 100755 --- a/sku.0/sys.server/compiled/game/script/vector.java +++ b/sku.0/sys.server/compiled/game/script/vector.java @@ -1,3 +1,4 @@ +//vector.java package script; import java.io.Serializable; diff --git a/sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf b/sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf deleted file mode 100644 index 92bdd8993..000000000 --- a/sku.0/sys.shared/compiled/game/object/tangible/terminal/shared_terminal_arena.tpf +++ /dev/null @@ -1,15 +0,0 @@ - -@base object/tangible/terminal/base/shared_base_terminal.iff - -@class tangible_object_template 3 - -@class object_template 5 - -objectName = "terminal_name" "terminal_character_builder" -detailedDescription = "terminal_detail" "terminal_character_builder" - -appearanceFilename = "appearance/thm_corl_banner_govt_tall.apt" - -gameObjectType = GOT_terminal_misc - -scale = 3.00 \ No newline at end of file From 4b1364303d840d63a196aa7dd3d68eb127c6211e Mon Sep 17 00:00:00 2001 From: TyroneSWG Date: Fri, 10 Jan 2020 22:59:34 -0600 Subject: [PATCH 06/20] Cleanup pt.2 --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2ec20ee2a..0ea8568dc 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ object_template_crc_string_table.tab **/.idea/* *.iml -sku.0/sys.server/compiled/game/script/tyrone/* \ No newline at end of file From 2d661a23f7736d21b4bb4ae175c2d6b4359a41f9 Mon Sep 17 00:00:00 2001 From: Freddy <5607938+TyroneSWG@users.noreply.github.com> Date: Fri, 10 Jan 2020 23:14:47 -0600 Subject: [PATCH 07/20] Revert "In Work" --- .../compiled/game/script/library/utils.java | 22 ++++++++--- .../ship_control_device.java | 38 +++---------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/utils.java b/sku.0/sys.server/compiled/game/script/library/utils.java index ba88bcfb2..bc6230ac0 100755 --- a/sku.0/sys.server/compiled/game/script/library/utils.java +++ b/sku.0/sys.server/compiled/game/script/library/utils.java @@ -6069,21 +6069,26 @@ public class utils extends script.base_script String objVarValue; String[] objVarNameAndType; String objVarName; - String[] splitList = split(objVarList, ','); - for (String pair : splitList) { + + for (String pair : split(objVarList, ',')) { objVarToSet = split(pair, '='); objVarValue = objVarToSet[1]; objVarNameAndType = split(objVarToSet[0], ':'); objVarName = objVarNameAndType[1]; switch (objVarNameAndType[0]) { + case "string": + setObjVar(object, objVarName, objVarValue); + break; case "int": - case "boolean": - case "bool": setObjVar(object, objVarName, utils.stringToInt(objVarValue)); break; case "float": setObjVar(object, objVarName, utils.stringToFloat(objVarValue)); break; + case "boolean": + case "bool": + setObjVar(object, objVarName, utils.stringToInt(objVarValue)); + break; default: setObjVar(object, objVarName, objVarValue); break; @@ -6107,14 +6112,19 @@ public class utils extends script.base_script objVarNameAndType = split(objVarToSet[0], ';'); objVarName = objVarNameAndType[1]; switch (objVarNameAndType[0]) { + case "string": + setObjVar(object, objVarName, objVarValue); + break; case "int": - case "boolean": - case "bool": setObjVar(object, objVarName, utils.stringToInt(objVarValue)); break; case "float": setObjVar(object, objVarName, utils.stringToFloat(objVarValue)); break; + case "boolean": + case "bool": + setObjVar(object, objVarName, utils.stringToInt(objVarValue)); + break; default: setObjVar(object, objVarName, objVarValue); break; diff --git a/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java b/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java index 011412aa8..a28ecfcec 100755 --- a/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java +++ b/sku.0/sys.server/compiled/game/script/space/ship_control_device/ship_control_device.java @@ -101,17 +101,6 @@ public class ship_control_device extends script.base_script mi.addRootMenu(menu_info_types.SERVER_MENU4, strSpam2); } } - if(!isSpaceScene()) { - obj_id pilotShip = getPilotedShip(player); - // player must be either piloting a ship to land it or in world to launch it. - if (!isIdValid(pilotShip) && isInWorld(player)) { - string_id atmo = new string_id("space/space_interaction", "launch_ship"); - mi.addRootMenu(menu_info_types.SERVER_MENU5, atmo); - } else if(isIdValid(pilotShip)){ - string_id atmo = new string_id("space/space_interaction", "land_ship"); - mi.addRootMenu(menu_info_types.SERVER_MENU6, atmo); - } - } return SCRIPT_CONTINUE; } public int OnObjectMenuSelect(obj_id self, obj_id player, int item) throws InterruptedException @@ -134,7 +123,7 @@ public class ship_control_device extends script.base_script } } } - else if (item == menu_info_types.SERVER_MENU1) + if (item == menu_info_types.SERVER_MENU1) { if (isSpaceScene()) { @@ -144,7 +133,7 @@ public class ship_control_device extends script.base_script } sui.inputbox(self, player, utils.packStringId(PROMPT1), sui.OK_CANCEL, utils.packStringId(RENAME_SHIP), sui.INPUT_NORMAL, null, "renameShip", null); } - else if (item == menu_info_types.SERVER_MENU2) + if (item == menu_info_types.SERVER_MENU2) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); if (!isIdValid(objShip)) @@ -233,7 +222,7 @@ public class ship_control_device extends script.base_script return SCRIPT_CONTINUE; } } - else if (item == menu_info_types.SERVER_MENU3) + if (item == menu_info_types.SERVER_MENU3) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); if (!isIdValid(objShip)) @@ -258,7 +247,7 @@ public class ship_control_device extends script.base_script showSUIPage(pid); return SCRIPT_CONTINUE; } - else if (item == menu_info_types.SERVER_MENU4) + if (item == menu_info_types.SERVER_MENU4) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); obj_id pInv = utils.getInventoryContainer(player); @@ -284,24 +273,7 @@ public class ship_control_device extends script.base_script } return SCRIPT_CONTINUE; } - else if (item == menu_info_types.SERVER_MENU5) - { - obj_id ship = space_transition.getShipFromShipControlDevice(self); - if(isIdValid(ship)) { - location loc = getLocation(player); - space_transition.unpackShipForPlayer(player, ship); - setLocation(ship, new location(loc.x, loc.y + 10, loc.z)); - } - } - else if (item == menu_info_types.SERVER_MENU6) - { - obj_id playerShip = getPilotedShip(player); - // player must be piloting ship in order to land/pack it. - if(isIdValid(playerShip)) { - space_transition.packShip(space_transition.getContainingShip(player)); - } - } - else if (item == menu_info_types.DICE_ROLL) + if (item == menu_info_types.DICE_ROLL) { obj_id objShip = space_transition.getShipFromShipControlDevice(self); if (!hasObjVar(objShip, player_structure.OBJVAR_STRUCTURE_STORAGE_INCREASE)) From 795c1fe00d3922d9f7b3d4ebe165ac1a3f995d6f Mon Sep 17 00:00:00 2001 From: Reedux Date: Sat, 11 Jan 2020 21:53:26 +0000 Subject: [PATCH 08/20] Change ITV check to a datatable query for ease of adding future ITVs (#78) * Change ITV check to a datatable query for ease of adding future ITV vehicles * Adjusted to check if ITV has already been learned Idea from tyrones PR https://github.com/SWG-Source/dsrc/pull/77 Co-authored-by: rotations --- .../game/datatables/item/itv_command_list.tab | 10 +++ .../instant_travel_terminal.tpf | 1 + .../instant_travel_terminal_deed.java | 67 ++++--------------- 3 files changed, 25 insertions(+), 53 deletions(-) create mode 100644 sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab 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 new file mode 100644 index 000000000..e51e3c1a6 --- /dev/null +++ b/sku.0/sys.server/compiled/game/datatables/item/itv_command_list.tab @@ -0,0 +1,10 @@ +objVarName itvCommand +s s +privateerShip callforprivateerpickup +royalShip callforroyalpickup +junk callforrattletrappickup +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 2073246b3..2e7bbf8aa 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 @@ -8,3 +8,4 @@ sharedTemplate = "object/tangible/veteran_reward/shared_instant_travel_terminal. scripts = ["systems.veteran_reward.instant_travel_terminal_deed", "item.special.nomove"] objvars = +["default_itv" = 1] 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 2a6b99408..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 @@ -10,6 +10,7 @@ public class instant_travel_terminal_deed extends script.base_script public instant_travel_terminal_deed() { } + private static final String ITV_COMMAND_TABLE = "datatables/item/itv_command_list.iff"; public static final string_id LEARN_ABILITY = new string_id("item_n", "instant_travel_terminal_learn"); public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException { @@ -27,61 +28,21 @@ public class instant_travel_terminal_deed extends script.base_script { if(getLevel(player) < minimumLevel){ 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; } - else if (hasObjVar(self, "privateerShip") && (!hasObjVar(player, "itv.owned.privateer"))) - { - grantCommand(player, "callforprivateerpickup"); - setObjVar(player, "itv.owned.privateer", 1); - destroyObject(self); + // 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 Date: Sat, 11 Jan 2020 15:59:48 -0600 Subject: [PATCH 09/20] Remove redundant objvar --- .../object/tangible/veteran_reward/instant_travel_terminal.tpf | 1 - 1 file changed, 1 deletion(-) 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 2e7bbf8aa..2073246b3 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 @@ -8,4 +8,3 @@ sharedTemplate = "object/tangible/veteran_reward/shared_instant_travel_terminal. scripts = ["systems.veteran_reward.instant_travel_terminal_deed", "item.special.nomove"] objvars = +["default_itv" = 1] persistByDefault = true -objvars = +["default_itv" = 1] From 71e368bb75c246e3b2bc5867655009da6443d004 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Wed, 5 Feb 2020 01:27:26 -0500 Subject: [PATCH 10/20] DNA Extractor will now be destroyed after completing Miner DNA Quest --- .../compiled/game/script/conversation/rek_thelcar.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java b/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java index 1c3d81529..d8a5ccc95 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java +++ b/sku.0/sys.server/compiled/game/script/conversation/rek_thelcar.java @@ -137,6 +137,10 @@ public class rek_thelcar extends script.base_script { modifyCollectionSlotValue(player, "icon_nyms_master_collection_1_dna", 1); } + if(utils.playerHasStaticItemInBankOrInventory(player, "item_nym_themepark_dna_extractor")) { + obj_id dna_extractor = utils.getStaticItemInBankOrInventory(player, "item_nym_themepark_dna_extractor"); + if(isValidId(dna_extractor)) utils.destroyObject(dna_extractor); + } } public void rek_thelcar_action_completeQuestionQuest(obj_id player, obj_id npc) throws InterruptedException { From 310e703574b2a269d58104b09bc2dc47d2cfaadf Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Wed, 5 Feb 2020 01:43:23 -0500 Subject: [PATCH 11/20] DNA Extractor will be removed from inventory on login if the player has completed the relevant quest --- .../compiled/game/script/player/base/base_player.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/player/base/base_player.java b/sku.0/sys.server/compiled/game/script/player/base/base_player.java index 56d07a09d..9585b829e 100755 --- a/sku.0/sys.server/compiled/game/script/player/base/base_player.java +++ b/sku.0/sys.server/compiled/game/script/player/base/base_player.java @@ -1656,6 +1656,10 @@ public class base_player extends script.base_script outparams.put("player", self); messageTo(cityHall, "msgCheckMyCityMotd", outparams, 0, false); } + if(groundquests.hasCompletedQuest(self, "u16_nym_themepark_miner_dna_collection") && utils.playerHasStaticItemInBankOrInventory(self, "item_nym_themepark_dna_extractor")) { + obj_id dna_extractor = utils.getStaticItemInBankOrInventory(self, "item_nym_themepark_dna_extractor"); + if(isValidId(dna_extractor)) utils.destroyObject(dna_extractor); + } return SCRIPT_CONTINUE; } public int disconnectPlayerCtsCompletedOrInProgress(obj_id self, dictionary params) throws InterruptedException From 9ebe916c35ca0ee2aa6a586b91c33cc56ffcfe45 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Wed, 5 Feb 2020 01:43:23 -0500 Subject: [PATCH 12/20] DNA Extractor will be removed from inventory on login if the player has completed the relevant quest --- .../compiled/game/script/player/base/base_player.java | 4 ++++ .../systems/veteran_reward/character_respec_reset_device.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java diff --git a/sku.0/sys.server/compiled/game/script/player/base/base_player.java b/sku.0/sys.server/compiled/game/script/player/base/base_player.java index 56d07a09d..9585b829e 100755 --- a/sku.0/sys.server/compiled/game/script/player/base/base_player.java +++ b/sku.0/sys.server/compiled/game/script/player/base/base_player.java @@ -1656,6 +1656,10 @@ public class base_player extends script.base_script outparams.put("player", self); messageTo(cityHall, "msgCheckMyCityMotd", outparams, 0, false); } + if(groundquests.hasCompletedQuest(self, "u16_nym_themepark_miner_dna_collection") && utils.playerHasStaticItemInBankOrInventory(self, "item_nym_themepark_dna_extractor")) { + obj_id dna_extractor = utils.getStaticItemInBankOrInventory(self, "item_nym_themepark_dna_extractor"); + if(isValidId(dna_extractor)) utils.destroyObject(dna_extractor); + } return SCRIPT_CONTINUE; } public int disconnectPlayerCtsCompletedOrInProgress(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java new file mode 100644 index 000000000..2ea2cf3f9 --- /dev/null +++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java @@ -0,0 +1,4 @@ +package script.systems.veteran_reward; + +public class character_respec_reset_device { +} From e4c72231e9d7300c3f9dbbccc76933128fb72820 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Thu, 6 Feb 2020 00:49:35 -0500 Subject: [PATCH 13/20] Added scripting to support usage of the character respec reset device vet reward --- .../character_respec_reset_device.java | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java old mode 100644 new mode 100755 index 2ea2cf3f9..d3885ff93 --- a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java +++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java @@ -1,4 +1,38 @@ -package script.systems.veteran_reward; - -public class character_respec_reset_device { -} +package script.systems.veteran_reward; + +import script.menu_info; +import script.menu_info_types; +import script.obj_id; + +public class character_respec_reset_device extends script.base_script { + + public character_respec_reset_device() {} + + public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info item) throws InterruptedException { + item.addRootMenu(menu_info_types.ITEM_USE, null); + return SCRIPT_CONTINUE; + } + + public int OnObjectMenuSelect(obj_id self, obj_id player, int item) throws InterruptedException + { + if (item == menu_info_types.ITEM_USE) + { + // There is no way to know who the owner of this item is... expect that the container it is in is owned by the player. + if(!hasObjVar(player, "respecDeviceUsed")) { + if(getOwner(getTopMostContainer(self)) == player) { + // ok to reset respec. + if(destroyObject(self)) { + setObjVar(player, "respecDeviceUsed", 1); + setObjVar(player, "respecsBought", 0); + sendSystemMessage(player, "Your Respect Counter has been reset to zero.", null); + }; + } else { + sendSystemMessage(player, "You are not the owner of this device.", null); + } + } else { + sendSystemMessage(player, "Your Respec Counter has already been reset on this character.", null); + } + } + return SCRIPT_CONTINUE; + } +} From 597ab6f8d53b527fc92e1f6420cd899fda192e85 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Thu, 6 Feb 2020 01:41:15 -0500 Subject: [PATCH 14/20] Changed reset message on usage of vet respec reward device --- .../systems/veteran_reward/character_respec_reset_device.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java index d3885ff93..16b339cfb 100755 --- a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java +++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/character_respec_reset_device.java @@ -24,7 +24,7 @@ public class character_respec_reset_device extends script.base_script { if(destroyObject(self)) { setObjVar(player, "respecDeviceUsed", 1); setObjVar(player, "respecsBought", 0); - sendSystemMessage(player, "Your Respect Counter has been reset to zero.", null); + sendSystemMessage(player, "Your Respect Counter has been reset.", null); }; } else { sendSystemMessage(player, "You are not the owner of this device.", null); From 5a1a23dfabc13c67b9e35c54b1ec0c4a7e88678b Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Fri, 7 Feb 2020 01:09:33 -0500 Subject: [PATCH 15/20] Fixed issue with IG-88 Head timer not being stored correctly and thereby removing re-use timer on logout. --- sku.0/sys.server/compiled/game/script/item/ig_88_head.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/item/ig_88_head.java b/sku.0/sys.server/compiled/game/script/item/ig_88_head.java index b8aad714f..cdc425638 100755 --- a/sku.0/sys.server/compiled/game/script/item/ig_88_head.java +++ b/sku.0/sys.server/compiled/game/script/item/ig_88_head.java @@ -12,7 +12,7 @@ public class ig_88_head extends script.base_script } public static final string_id SID_MUST_BIO_LINK_FROM_INVENTORY = new string_id("base_player", "must_biolink_to_use_from_inventory"); public static final string_id SID_NOT_YET = new string_id("base_player", "not_yet"); - public static final float REUSE_TIME = 1800; + public static final int REUSE_TIME = 1800; public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException { menu_info_data mid = mi.getMenuItemByType(menu_info_types.ITEM_USE); @@ -42,7 +42,7 @@ public class ig_88_head extends script.base_script if (getGameTime() > buffTime || isGod(player)) { setObjVar(player, "clickItem.ig_head", (getGameTime() + REUSE_TIME)); - sendCooldownGroupTimingOnly(player, getStringCrc("epic_items"), REUSE_TIME); + sendCooldownGroupTimingOnly(player, getStringCrc("epic_items"), (float) REUSE_TIME); playClientEffectObj(player, "clienteffect/medic_reckless_stimulation.cef", player, ""); activateHead(self, player); } From fa49411b58460bfb224b770b64dc74890bf68a6b Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Fri, 7 Feb 2020 01:09:33 -0500 Subject: [PATCH 16/20] Fixed issue with IG-88 Head timer not being stored correctly and thereby removing re-use timer on logout. --- sku.0/sys.server/compiled/game/script/item/ig_88_head.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/item/ig_88_head.java b/sku.0/sys.server/compiled/game/script/item/ig_88_head.java index b8aad714f..7e139e5af 100755 --- a/sku.0/sys.server/compiled/game/script/item/ig_88_head.java +++ b/sku.0/sys.server/compiled/game/script/item/ig_88_head.java @@ -12,7 +12,7 @@ public class ig_88_head extends script.base_script } public static final string_id SID_MUST_BIO_LINK_FROM_INVENTORY = new string_id("base_player", "must_biolink_to_use_from_inventory"); public static final string_id SID_NOT_YET = new string_id("base_player", "not_yet"); - public static final float REUSE_TIME = 1800; + public static final int REUSE_TIME = 1800; public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException { menu_info_data mid = mi.getMenuItemByType(menu_info_types.ITEM_USE); @@ -38,11 +38,11 @@ public class ig_88_head extends script.base_script } if (item == menu_info_types.ITEM_USE) { - float buffTime = getFloatObjVar(player, "clickItem.ig_head"); + float buffTime = getIntObjVar(player, "clickItem.ig_head"); if (getGameTime() > buffTime || isGod(player)) { setObjVar(player, "clickItem.ig_head", (getGameTime() + REUSE_TIME)); - sendCooldownGroupTimingOnly(player, getStringCrc("epic_items"), REUSE_TIME); + sendCooldownGroupTimingOnly(player, getStringCrc("epic_items"), (float) REUSE_TIME); playClientEffectObj(player, "clienteffect/medic_reckless_stimulation.cef", player, ""); activateHead(self, player); } From 34d6a94a5d3c4c758388d0eacb48c39e07363aed Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Thu, 27 Feb 2020 10:50:26 -0500 Subject: [PATCH 17/20] Removed extra Restuss Galactic Information Broker spawners --- .../game/datatables/buildout/corellia/corellia_4_2.tab | 2 -- .../compiled/game/datatables/buildout/naboo/naboo_2_7.tab | 1 - .../game/datatables/buildout/tatooine/tatooine_4_3.tab | 4 ---- .../game/datatables/buildout/tatooine/tatooine_6_2.tab | 2 -- 4 files changed, 9 deletions(-) diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab index 2e873af0f..c54ba3ba8 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab @@ -268,14 +268,12 @@ i i h i f f f f f f f s p -821719718 0 object/tangible/ground_spawning/area_spawner.iff 0 2017.96 5.87111 960.343 0.903515 0 -0.428556 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|troemans_lackeys_01|strSpawnerType|4|area|strSpawns|4|corellia/troeman_lackey|$| -803565936 0 object/tangible/quest/corellia_murmur_shipment_datapad.iff 0 2014.15 28.588 1723.33 -0.507741 0.512436 -0.487439 -0.491946 quest.task.ground.retrieve_item_on_item $| -765763558 0 object/tangible/quest/u13_vengeance_archive_terminal.iff 0 1875.9 28 1700.32 1 0 0 0 quest.task.ground.retrieve_item_on_item $| --741107008 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1914.64 28 1433.23 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -736617077 0 object/tangible/collection/rock_bubbling_03.iff 0 286.198 -0.348493 547.608 1 0 0 0 systems.collections.consume_click collection.slotName|4|col_rock_bubbling:bubbling_rock_03|$| -723865718 0 object/static/structure/general/data_terminal_s1.iff 0 1918.21 28 1387.08 -0.181293 0 0.983429 0 $| -702515714 0 object/tangible/ground_spawning/area_spawner.iff 0 1805.94 18.043 829.437 0.963058 0 -0.269295 0 systems.spawning.spawner_area fltMaxSpawnTime|2|420.000000|fltMinSpawnTime|2|180.000000|fltRadius|2|10.000000|intDefaultBehavior|0|0|intGoodLocationSpawner|0|0|intSpawnCount|0|5|intSpawnSystem|0|1|registerWithController|0|1|strName|4|rogue3|strSpawnerType|4|area|strSpawns|4|corellia/murmur_rogue_corsec|$| -691727981 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1522.66 28 1680.94 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|smuggler_enemy_patrol_10064775_3|registerWithController|0|1|$| -658546056 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1523.84 28 1679.44 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|smuggler_enemy_patrol_10064775_1|registerWithController|0|1|$| -600580134 0 object/tangible/ground_spawning/area_spawner.iff 0 1875.68 28 1707.18 -0.279448 0 0.960161 0 systems.spawning.spawner_area fltMaxSpawnTime|2|5.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|mtp_corellia_times_vendor|strSpawnerType|4|area|strSpawns|4|mtp_corellia_times_vendor|$| --575435076 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1914.64 28 1433.23 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -549090885 0 object/static/structure/corellia/corl_tent_small.iff 0 1919.09 28.2923 1385.18 0.998988 0 0 0.0449848 $| -530910864 0 object/tangible/ground_spawning/area_spawner.iff 0 2018.29 3.88241 898.71 0.95755 0 -0.288267 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|troeman_lackeys_06|strSpawnerType|4|area|strSpawns|4|corellia/troeman_lackey|$| -491828361 0 object/tangible/ground_spawning/patrol_spawner.iff 0 1521.85 28 1585.31 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|100.000000|fltMinSpawnTime|2|60.000000|fltRadius|2|0.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|patrolPathType|4|cycle|registerWithController|0|1|strName|4|smuggler_enemy_patrol|strPatrolPointNames|5|smuggler_enemy_patrol_10064712_1:smuggler_enemy_patrol_10064712_2:smuggler_enemy_patrol_10064712_3:smuggler_enemy_patrol_10064712_4:|strSpawnerType|4|patrol|strSpawns|4|corellia/smuggler_patrol_5|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab index 4b13e5526..6d0ad5bdb 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab @@ -154,7 +154,6 @@ i i h i f f f f f f f s p -1885810115 0 object/tangible/quest/naboo_theed_xharnoh_plant.iff 0 15.3193 -207.162 722.72 -0.620572 -0.0504755 0.777105 -0.0919225 quest.task.ground.retrieve_item_on_item $| -1876026501 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 812.828 6 268.495 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_enemy_patrol_10020833_3|registerWithController|0|1|$| -1875877557 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1379.48 -196.436 784.068 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|naboo_skaak_bruiser_11_12341383_2|registerWithController|0|1|$| --1873243646 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1237 6 47 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1872834889 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 828.453 6 447.561 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|theed_imp_patrol_4_10003339_5|registerWithController|0|1|$| -1870666513 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1114.56 6 140.893 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|theed_imp_patrol_2_10003142_3|registerWithController|0|1|$| -1859404836 0 object/tangible/collection/rare_melee_grooved_2h_sword.iff 0 1216.42 6.78291 133.377 0.703839 0.00344458 -0.00362418 0.710341 systems.collections.consume_click collection.slotName|4|col_rare_melee_01:grooved_sword_01|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab index d560694e2..665759a92 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab @@ -2,7 +2,6 @@ objid container server_template_crc cell_index px py pz qw qx qy qz scripts objv i i h i f f f f f f f s p -2065830620 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1005.8 35.6222 102.531 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_7|registerWithController|0|1|$| -2014919809 0 object/tangible/ground_spawning/area_spawner.iff 0 1267.14 20.8576 41.8259 0.578749 0 0.815506 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_bantha|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_bantha|$| --1947770479 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1905547180 0 object/tangible/ground_spawning/area_spawner.iff 0 245.622 11.646 246.255 0.982156 0 0.188067 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| -1866569792 0 object/tangible/ground_spawning/area_spawner.iff 0 602.853 10 345.521 0.766702 0 0.642003 0 systems.spawning.spawner_area fltMaxSpawnTime|2|2.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|beast_master_trainer_tatooine_bestine|strSpawnerType|4|area|strSpawns|4|trainer_beast_master|$| -1826810507 0 object/tangible/ground_spawning/area_spawner.iff 0 202.3 8.88664 220.3 0.95283 0 -0.303503 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| @@ -13,7 +12,6 @@ i i h i f f f f f f f s p -1733406107 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 203.633 9.32885 225.993 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|roaming_dune_bantha_12621479_1|registerWithController|0|1|$| -1628819013 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1032.2 28.8904 93.1309 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_6|registerWithController|0|1|$| -1614337274 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 679.806 12 446.737 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10028545_1|registerWithController|0|1|$| --1561383607 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1534702832 0 object/tangible/ground_spawning/area_spawner.iff 0 212.705 8.27512 179.58 -0.55929 0 0.828972 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| -1503650413 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 246.826 7.64266 180.808 0.640997 0 0.767543 0 quest.task.ground.retrieve_item_on_item $| -1501410464 0 object/tangible/ground_spawning/patrol_spawner.iff 0 700.962 12 431.981 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|60.000000|fltRadius|2|1.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|patrolPathType|4|cycle|registerWithController|0|1|strName|4|Smuggler_Enemy_Patrol|strPatrolPointNames|5|Smuggler_Enemy_Patrol_10028545_1:Smuggler_Enemy_Patrol_10028545_2:Smuggler_Enemy_Patrol_10028545_3:|strSpawnerType|4|patrol|strSpawns|4|tatooine/smuggler_patrol_bh_2|$| @@ -29,7 +27,6 @@ i i h i f f f f f f f s p -1215847131 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 210.79 8.43133 178.803 1 0 0 0 quest.task.ground.retrieve_item_on_item $| -1194217681 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1095.56 20.5278 82.0183 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_commando_10826018_2|registerWithController|0|1|$| -1189182743 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 987.378 42.6961 115.614 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_8|registerWithController|0|1|$| --1138262739 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1126463617 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1118.9 19.254 74.9883 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_2|registerWithController|0|1|$| -1114884077 0 object/tangible/ground_spawning/area_spawner.iff 0 1303 16.3169 34 -0.0479312 0 0.998851 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_bantha|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_bantha|$| -1109089490 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 199.077 8.51831 214.935 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|roaming_dune_bantha_12621479_9|registerWithController|0|1|$| @@ -62,7 +59,6 @@ i i h i f f f f f f f s p -182208727 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 671.32 12 456.355 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10028545_2|registerWithController|0|1|$| -180762470 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 201.446 9.00667 222.212 0.999343 -0.0353187 -0.000288859 0.00817327 quest.task.ground.retrieve_item_on_item $| -161984126 0 object/tangible/ground_spawning/area_spawner.iff 0 845.708 12 483.491 0.99158 0 0.129493 0 systems.spawning.spawner_area fltMaxSpawnTime|2|2.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|1.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|fs_reward|strSpawnerType|4|area|strSpawns|4|tatooine/fs_11_reward|$| --156539612 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -76802086 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 680.746 12 448.936 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10027959_2|registerWithController|0|1|$| -26400255 0 object/tangible/theme_park/invisible_object.iff 0 772.241 12 505.011 0.862807 0 -0.505533 0 theme_park.controller_initialize scriptString|4|theme_park.restuss_event.stage_two_crier|$| -599 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 292.1 31.4761 772.685 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_head_hauler_10112410_6|registerWithController|0|1|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab index 5887585a7..22f16b828 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab @@ -282,7 +282,6 @@ i i h i f f f f f f f s p -1147174879 0 object/tangible/furniture/tatooine/frn_tato_table_small_style_01.iff 0 1221.59 5 1322.23 1 0 0 0 $| -1144708641 0 object/static/structure/tatooine/debris_tatt_drum_storage_1.iff 0 806.862 7.59167 1028.47 0.56848 0.364378 0.62099 0.398035 $| -1141460083 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1432.73 5 1137.62 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10043732_1|registerWithController|0|1|$| --1141197897 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1470.97 4 1332.37 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1116958851 0 object/tangible/furniture/jedi/frn_all_light_chair_s02.iff 0 1219.67 5 1325.67 -0.557023 0 0.830497 0 occupied.limit|0|1|$| -1115558886 0 object/tangible/ground_spawning/patrol_spawner.iff 0 1139.53 5 1483.5 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|270.000000|fltMinSpawnTime|2|90.000000|fltRadius|2|0.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|patrolPathType|4|oscillate|registerWithController|0|1|strName|4|legacy_niko_thugs|strPatrolPointNames|5|legacy_niko_thugs_10024124_1:legacy_niko_thugs_10024124_2:legacy_niko_thugs_10024124_3:legacy_niko_thugs_10024124_4:legacy_niko_thugs_10024124_5:legacy_niko_thugs_10024124_6:legacy_niko_thugs_10024124_7:legacy_niko_thugs_10024124_8:legacy_niko_thugs_10024124_9:legacy_niko_thugs_10024124_10:|strSpawnerType|4|patrol|strSpawns|4|tatooine/tat_smuggler_15|$| -1107715798 0 object/tangible/collection/publish_gift_comlink_component_07.iff 0 1126.27 7.16043 1109.54 -0.0408745 0.0354367 0.685125 0.726414 systems.collections.consume_click collection.slotName|4|col_publish_com_link_component_01:publish_com_link_component_07|$| @@ -591,7 +590,6 @@ i i h i f f f f f f f s p -124994259 0 object/tangible/ground_spawning/area_spawner.iff 0 734.943 7.39358 1858 0.955494 0 -0.295012 0 systems.spawning.spawner_area fltMaxSpawnTime|2|200.000000|fltMinSpawnTime|2|180.000000|fltRadius|2|6.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_newbie_gunrunner_05|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_newbie_gunrunner_sentry|$| -118803310 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1174.94 4.56121 1484.43 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_patrol_10029562_4|registerWithController|0|1|$| -117774221 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1066.6 8.95239 1381 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_nikos_thugs_10021354_6|registerWithController|0|1|$| --117732858 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1470.97 4 1332.37 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -106832518 0 object/tangible/ground_spawning/area_spawner.iff 0 1635.8 5 1520.04 -0.65728 0 0.753646 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|2.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_rockmites|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_rockmites|$| -104803512 0 object/tangible/ground_spawning/area_spawner.iff 0 1053.49 10.0046 1215.65 0.548112 0 0.836405 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|6.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_newbie_scavenger_04|strSpawnerType|4|area|strSpawns|4|tatooine/scavenger|$| -91363171 0 object/tangible/furniture/tatooine/frn_tato_chair_cafe_style_01.iff 0 1222.61 5 1322.52 -0.609791 0 0.792563 0 occupied.limit|0|1|$| From 48c938ac6f664026fe631695900e0e4b572aafe9 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Thu, 27 Feb 2020 11:04:47 -0500 Subject: [PATCH 18/20] Fixed issues with Restuss and Galactic Information Brokers --- .../script/theme_park/restuss_event/stage_two_controller.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java index cf0e367dc..b6d0dcfdc 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java @@ -36,6 +36,7 @@ public class stage_two_controller extends script.base_script if(restussEvent != null && (restussEvent.equals("1") || restussEvent.equals("true"))){ LOG("events", "Restuss Event - Event is on."); String phaseVal = getConfigSetting("EventTeam", "restussPhase"); + doMessageTo("messageTo:broadcastMessage:10:beginEventNotification:0"); if(phaseVal != null && !phaseVal.equals("")){ int phase = Integer.parseInt(phaseVal); if(phase > 2) phase = 2; From 46061abe5b3638a10c87e8db5aed020a8b42e2bb Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Thu, 27 Feb 2020 14:02:32 -0500 Subject: [PATCH 19/20] Fixed mis-located mission terminals for the Emperors Retreat --- .../datatables/buildout/naboo/naboo_6_3_ws.tab | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab index 0ca29dda7..c272b8901 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab @@ -4,9 +4,9 @@ i i h i f f f f f f f s p 1418872 1418871 object/cell/cell.iff 1 0 0 0 1 1.401298E-45 0 0 $| 1418873 1418871 object/cell/cell.iff 2 0 0 0 1 2.802597E-45 0 0 $| 1418874 1418871 object/cell/cell.iff 3 0 0 0 1 4.203895E-45 0 0 $| -5775509 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 12.95271 0.2 -15.19417 0.0003987961 0 1 0 $| -5775511 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 3.501986 0.2 -17.76742 0.2815403 0 0.9595497 0 $| -5775513 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 22.29844 0.2 -17.65716 -0.2559252 0 0.9666967 0 $| +5775509 1418874 object/tangible/terminal/terminal_mission_imperial.iff 1 12.95271 0.2 -15.19417 0.0003987961 0 1 0 $| +5775511 1418874 object/tangible/terminal/terminal_mission_imperial.iff 2 3.501986 0.2 -17.76742 0.2815403 0 0.9595497 0 $| +5775513 1418874 object/tangible/terminal/terminal_mission_imperial.iff 3 22.29844 0.2 -17.65716 -0.2559252 0 0.9666967 0 $| 1418875 1418871 object/cell/cell.iff 4 0 0 0 1 5.605194E-45 0 0 $| 4295592 1418875 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 1 22.33858 0.2 -42.56847 0.38268 0 -0.92388 0 $| 1418876 1418871 object/cell/cell.iff 5 0 0 0 1 7.006492E-45 0 0 $| @@ -16,12 +16,12 @@ i i h i f f f f f f f s p 1418880 1418871 object/cell/cell.iff 9 0 0 0 1 1.261169E-44 0 0 $| 1418881 1418871 object/cell/cell.iff 10 0 0 0 1 1.401298E-44 0 0 $| 1418882 1418871 object/cell/cell.iff 11 0 0 0 1 1.541428E-44 0 0 $| -8865510 1418882 object/tangible/terminal/terminal_space.iff 11 -16.0263 0.200001 -33.2646 1 0 0 0 $| -8865511 1418882 object/tangible/terminal/terminal_space.iff 11 -13.1755 0.200001 -33.2581 1 0 0 0 $| -8865518 1418882 object/tangible/terminal/terminal_space.iff 11 -18.946 0.2 -33.2894 1 0 0 0 $| +8865510 1418882 object/tangible/terminal/terminal_space.iff 1 -16.0263 0.200001 -33.2646 1 0 0 0 $| +8865511 1418882 object/tangible/terminal/terminal_space.iff 2 -13.1755 0.200001 -33.2581 1 0 0 0 $| +8865518 1418882 object/tangible/terminal/terminal_space.iff 3 -18.946 0.2 -33.2894 1 0 0 0 $| 1418883 1418871 object/cell/cell.iff 12 0 0 0 1 1.681558E-44 0 0 $| 1418884 1418871 object/cell/cell.iff 13 0 0 0 1 1.821688E-44 0 0 $| -7825987 1418884 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 13 -44.5 0.2 -31.0 1 0 0 0 $| +7825987 1418884 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 1 -44.5 0.2 -31.0 1 0 0 0 $| 1418885 1418871 object/cell/cell.iff 14 0 0 0 1 1.961818E-44 0 0 $| 1418886 1418871 object/cell/cell.iff 15 0 0 0 1 2.101948E-44 0 0 $| 1418887 1418871 object/cell/cell.iff 16 0 0 0 1 2.242078E-44 0 0 $| From 9d09b89b5ca0ac5b908c16093537c918596bfa7c Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Wed, 4 Mar 2020 18:05:51 -0500 Subject: [PATCH 20/20] Fixed issue with Restuss Criers if starting Restuss in stage 3. --- .../game/script/theme_park/restuss_event/stage_two_crier.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java index faa0acdf2..cf3c5aca2 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java @@ -90,6 +90,7 @@ public class stage_two_crier extends script.base_script public int warningLoop(obj_id self, dictionary params) throws InterruptedException { obj_id herald = utils.getObjIdScriptVar(self, HERALD_ID); + if(!isValidId(herald) || !isValidId(self)) return SCRIPT_CONTINUE; chat.chat(herald, WARNING); messageTo(self, "warningLoop", null, 30.0f, false); return SCRIPT_CONTINUE;