From b48c860d94f388d48f3116a64092b73a36d55d8d Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 3 Jul 2016 18:45:01 -0400 Subject: [PATCH 1/3] Players can now launch into Ord Mantell Space from Tansarii Point Station --- .../compiled/game/script/library/npe.java | 17 +++++++++++++---- .../game/script/npe/ord_mantell_terminal.java | 11 +++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/npe.java b/sku.0/sys.server/compiled/game/script/library/npe.java index 2047b1869..ad190d94e 100755 --- a/sku.0/sys.server/compiled/game/script/library/npe.java +++ b/sku.0/sys.server/compiled/game/script/library/npe.java @@ -71,8 +71,10 @@ public class npe extends script.base_script location world_loc; String cell; location cell_loc; + LOG("npe", "Transfer perform engaged for %TU to " + station); switch (station) { case DUNGEON_SPACE_STATION + "*": + LOG("npe", "Transferring %TU to npe_space_station"); int instance_index = getBestStationInstanceIndex(player, stations); if (instance_index == -1 || instance_index >= stations.length) { return false; @@ -148,6 +150,7 @@ public class npe extends script.base_script } default: LIVE_LOG("npe", "Player is trying to perform a cluster wide transition, but is going to an unsupported station " + station + " should be " + DUNGEON_SPACE_STATION + "*, " + DUNGEON_ORD_SPACE_STATION + "*"); + LOG("npe", "%TU cannot be sent to " + station); return false; } } @@ -438,7 +441,7 @@ public class npe extends script.base_script attachScript(player, SCRIPT_PUBLIC_TRAVEL); utils.setScriptVar(player, SCRIPT_VAR_ORD_SPACE_DESTINATION, new_loc); getClusterWideData(DUNGEON_PUBLIC_MANAGER_NAME, DUNGEON_ORD_SPACE_STATION + "*", false, player); - return true; + return transferPlayerToOrdMantellSpace(player, new_loc); } public static boolean movePlayerFromOrdMantellSpaceToSharedStation(obj_id player) throws InterruptedException { @@ -461,7 +464,8 @@ public class npe extends script.base_script attachScript(player, SCRIPT_PUBLIC_TRAVEL); utils.setScriptVar(player, SCRIPT_VAR_FROM_ORD_SPACE, 1); getClusterWideData(DUNGEON_PUBLIC_MANAGER_NAME, DUNGEON_SPACE_STATION + "*", false, player); - return true; + + return movePlayerFromOrdMantellSpaceToSharedStation(player); } public static boolean movePlayerFromOrdMantellSpaceToOrdMantellDungeon(obj_id player) throws InterruptedException { @@ -471,11 +475,16 @@ public class npe extends script.base_script return true; } public static boolean movePlayerFromOrdMantellDungeonToOrdMantellSpace(obj_id player, location new_loc) throws InterruptedException + { + return transferPlayerToOrdMantellSpace(player, new_loc); + } + + private static boolean transferPlayerToOrdMantellSpace(obj_id player, location new_loc) throws InterruptedException { String scene = getStringObjVar(player, VAR_ORD_SCENE_NAME); if (scene == null || scene.equals("") || !scene.equals("space_ord_mantell")) { - LOG("npe", "movePlayerFromOrdMantellDungeonToOrdMantellSpace: empty scene id found: " + player); + LOG("npe", "transferPlayerToOrdMantellSpace: empty scene id found: " + player); scene = "space_ord_mantell"; } if (isAreaTooFullForTravel(scene, 0, 0)) @@ -483,7 +492,7 @@ public class npe extends script.base_script scene = getOpenOrdMantellSpaceZone(); if (scene == null || scene.equals("")) { - LIVE_LOG("npe", "movePlayerFromOrdMantellDungeonToOrdMantellSpace: player " + player + " can't be moved to ord mantell, all scenes are full"); + LIVE_LOG("npe", "transferPlayerToOrdMantellSpace: player " + player + " can't be moved to ord mantell, all scenes are full"); return false; } } diff --git a/sku.0/sys.server/compiled/game/script/npe/ord_mantell_terminal.java b/sku.0/sys.server/compiled/game/script/npe/ord_mantell_terminal.java index 26d937157..f5b73151b 100644 --- a/sku.0/sys.server/compiled/game/script/npe/ord_mantell_terminal.java +++ b/sku.0/sys.server/compiled/game/script/npe/ord_mantell_terminal.java @@ -44,12 +44,15 @@ public class ord_mantell_terminal extends script.base_script space_crafting.repairDamage(player, shipId[0], 1.0f); } if (checkGod(player)) - { return SCRIPT_CONTINUE; - } + location ordLoc = new location(200, 150, 600); - npe.movePlayerFromSharedStationToOrdMantellSpace(player, ordLoc); - groundquests.sendSignal(player, "accessedSpace"); + if (npe.movePlayerFromSharedStationToOrdMantellSpace(player, ordLoc)) { + // Only update quests if the player has successfully moved into OM space + groundquests.sendSignal(player, "accessedSpace"); + } else { + LOG("npe", "Could not move to OM space!"); + } } return SCRIPT_CONTINUE; } From 5bd873990c103c27394619efada65ec4fc2841c8 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 3 Jul 2016 18:52:47 -0400 Subject: [PATCH 2/3] Fixed debug speak messages being shown to all players --- sku.0/sys.server/compiled/game/script/base_class.java | 3 ++- sku.0/sys.server/compiled/game/script/library/npe.java | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/base_class.java b/sku.0/sys.server/compiled/game/script/base_class.java index 23a74bffb..6a3ef5189 100644 --- a/sku.0/sys.server/compiled/game/script/base_class.java +++ b/sku.0/sys.server/compiled/game/script/base_class.java @@ -1584,7 +1584,8 @@ public class base_class private static native void _debugSpeakMsg(long object, String msg); public static void debugSpeakMsg(obj_id object, String msg) { - _debugSpeakMsg(getLongWithNull(object), msg); + if (isGod(object)) + _debugSpeakMsg(getLongWithNull(object), msg); } /** diff --git a/sku.0/sys.server/compiled/game/script/library/npe.java b/sku.0/sys.server/compiled/game/script/library/npe.java index ad190d94e..c55d5d5c9 100755 --- a/sku.0/sys.server/compiled/game/script/library/npe.java +++ b/sku.0/sys.server/compiled/game/script/library/npe.java @@ -71,10 +71,8 @@ public class npe extends script.base_script location world_loc; String cell; location cell_loc; - LOG("npe", "Transfer perform engaged for %TU to " + station); switch (station) { case DUNGEON_SPACE_STATION + "*": - LOG("npe", "Transferring %TU to npe_space_station"); int instance_index = getBestStationInstanceIndex(player, stations); if (instance_index == -1 || instance_index >= stations.length) { return false; @@ -150,7 +148,6 @@ public class npe extends script.base_script } default: LIVE_LOG("npe", "Player is trying to perform a cluster wide transition, but is going to an unsupported station " + station + " should be " + DUNGEON_SPACE_STATION + "*, " + DUNGEON_ORD_SPACE_STATION + "*"); - LOG("npe", "%TU cannot be sent to " + station); return false; } } From bbc54f4aa9ab236c0abd96a8aed2d779d5064bc9 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Tue, 5 Jul 2016 11:55:33 -0400 Subject: [PATCH 3/3] Fixed Sarlacc Pit Debuff not being applied when approaching the Pit of Carkoon on Tatooine --- sku.0/sys.server/compiled/game/script/creature/sarlacc.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/creature/sarlacc.java b/sku.0/sys.server/compiled/game/script/creature/sarlacc.java index a3be4c4e7..c46f94a9c 100755 --- a/sku.0/sys.server/compiled/game/script/creature/sarlacc.java +++ b/sku.0/sys.server/compiled/game/script/creature/sarlacc.java @@ -1,6 +1,7 @@ package script.creature; import script.*; +import script.library.buff; import script.library.utils; public class sarlacc extends script.base_script @@ -55,6 +56,7 @@ public class sarlacc extends script.base_script if (getEnhancedSkillStatisticModifierUncapped(whoTriggeredMe, "resistance_disease") < 24) { sendSystemMessage(whoTriggeredMe, SID_SARLACC_DOT); + buff.applyBuff(whoTriggeredMe, "sarlaccSnare"); } } else if (volumeName.equals("sarlaccPreBreach")) @@ -90,6 +92,7 @@ public class sarlacc extends script.base_script } if (getEnhancedSkillStatisticModifierUncapped(content, "resistance_disease") < 24) { sendSystemMessage(content, SID_SARLACC_DOT); + buff.applyBuff(content, "sarlaccSnare"); } sendSystemMessage(content, SID_SARLACC_ERUPT); }