From 592335dff28e31b2e66d3d091d4d61b446736d71 Mon Sep 17 00:00:00 2001 From: Cekis Date: Tue, 5 Apr 2016 06:48:22 +0100 Subject: [PATCH] Audited emperors day java. --- .../event/emp_day/crash_site_requisition.java | 28 +++------------- .../empire_day_interior_spawn_npc.java | 10 ++---- .../empired_day_interior_spawn_npc.java | 14 ++------ .../factional_guard_self_destruct.java | 9 ++--- .../script/event/emp_day/firework_show.java | 25 ++++---------- .../script/event/emp_day/gating_prisoner.java | 11 ++----- .../script/event/emp_day/gating_solo.java | 21 ++++-------- .../script/event/emp_day/gating_vader.java | 25 +++++++------- .../give_multiple_items_to_supply_npc.java | 33 ++++--------------- .../event/emp_day/goodbye_path_destroy.java | 30 ++++++----------- .../event/emp_day/imperial_empty_sign.java | 24 ++------------ .../emp_day/imperial_recruitment_sign.java | 24 ++------------ .../player_sign_eventually_destroyed.java | 11 ++----- .../event/emp_day/rebel_empty_sign.java | 24 ++------------ .../event/emp_day/rebel_resistance_sign.java | 24 ++------------ .../rescue_faction_npc_trigger_volume.java | 24 ++++---------- 16 files changed, 75 insertions(+), 262 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/crash_site_requisition.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/empire_day_interior_spawn_npc.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/empired_day_interior_spawn_npc.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/factional_guard_self_destruct.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/firework_show.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/gating_prisoner.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/gating_solo.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/gating_vader.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/give_multiple_items_to_supply_npc.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/goodbye_path_destroy.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/imperial_empty_sign.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/imperial_recruitment_sign.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/player_sign_eventually_destroyed.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/rebel_empty_sign.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/rebel_resistance_sign.java mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/event/emp_day/rescue_faction_npc_trigger_volume.java diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/crash_site_requisition.java b/sku.0/sys.server/compiled/game/script/event/emp_day/crash_site_requisition.java old mode 100644 new mode 100755 index f4d1591f5..aecb7e48b --- a/sku.0/sys.server/compiled/game/script/event/emp_day/crash_site_requisition.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/crash_site_requisition.java @@ -1,24 +1,7 @@ package script.event.emp_day; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.buff; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.static_item; -import script.library.stealth; -import script.library.sui; -import script.library.trial; -import script.library.utils; +import script.library.*; public class crash_site_requisition extends script.base_script { @@ -101,11 +84,10 @@ public class crash_site_requisition extends script.base_script } public int handleObjectSwapTimer(obj_id self, dictionary params) throws InterruptedException { - if (params == null || params.equals("")) + if (params == null) { return SCRIPT_CONTINUE; } - int pid = params.getInt("id"); obj_id player = params.getObjId("player"); if (!isIdValid(player) || !exists(player)) { @@ -138,8 +120,8 @@ public class crash_site_requisition extends script.base_script { return SCRIPT_CONTINUE; } - int test_pid = getIntObjVar(player, sui.COUNTDOWNTIMER_SUI_VAR); - if (pid != test_pid) + int pid = params.getInt("id"); + if (pid != getIntObjVar(player, sui.COUNTDOWNTIMER_SUI_VAR)) { return SCRIPT_CONTINUE; } @@ -160,7 +142,7 @@ public class crash_site_requisition extends script.base_script { parentBuffName = holiday.BUFF_IMP_EMPIREDAY_RECRUITMENT_SF; } - if (parentBuffName == null || parentBuffName.equals("")) + if (parentBuffName.equals("")) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/empire_day_interior_spawn_npc.java b/sku.0/sys.server/compiled/game/script/event/emp_day/empire_day_interior_spawn_npc.java old mode 100644 new mode 100755 index 2fe6cea26..2bacaac99 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/empire_day_interior_spawn_npc.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/empire_day_interior_spawn_npc.java @@ -1,14 +1,8 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; import script.library.performance; +import script.obj_id; public class empire_day_interior_spawn_npc extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/empired_day_interior_spawn_npc.java b/sku.0/sys.server/compiled/game/script/event/emp_day/empired_day_interior_spawn_npc.java old mode 100644 new mode 100755 index 036bf148c..7a1da3220 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/empired_day_interior_spawn_npc.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/empired_day_interior_spawn_npc.java @@ -1,12 +1,7 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.dictionary; +import script.obj_id; public class empired_day_interior_spawn_npc extends script.base_script { @@ -25,10 +20,7 @@ public class empired_day_interior_spawn_npc extends script.base_script } public int removeConversationScripts(obj_id self, dictionary params) throws InterruptedException { - if (hasScript(self, "npc.faction_recruiter.recruiter_setup")) - { - detachScript(self, "npc.faction_recruiter.recruiter_setup"); - } + detachScript(self, "npc.faction_recruiter.recruiter_setup"); return SCRIPT_CONTINUE; } } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/factional_guard_self_destruct.java b/sku.0/sys.server/compiled/game/script/event/emp_day/factional_guard_self_destruct.java old mode 100644 new mode 100755 index 1fc2d6297..6f49af948 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/factional_guard_self_destruct.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/factional_guard_self_destruct.java @@ -1,12 +1,7 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; +import script.dictionary; +import script.obj_id; public class factional_guard_self_destruct extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/firework_show.java b/sku.0/sys.server/compiled/game/script/event/emp_day/firework_show.java old mode 100644 new mode 100755 index 637a4a32c..c92495a7f --- a/sku.0/sys.server/compiled/game/script/event/emp_day/firework_show.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/firework_show.java @@ -1,16 +1,11 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; +import script.library.create; import script.library.firework; import script.library.utils; -import script.library.create; +import script.obj_id; +import script.string_id; public class firework_show extends script.base_script { @@ -56,9 +51,8 @@ public class firework_show extends script.base_script obj_id[] objPlayers = getPlayerCreaturesInRange(self, 256.0f); if (objPlayers != null && objPlayers.length > 0) { - for (int i = 0; i < objPlayers.length; i++) - { - sendSystemMessage(objPlayers[i], new string_id("event/empire_day", "fireworks_broadcast")); + for (obj_id objPlayer : objPlayers) { + sendSystemMessage(objPlayer, new string_id("event/empire_day", "fireworks_broadcast")); } } messageTo(self, "startHugeFireworkDisplay", null, 10, false); @@ -75,12 +69,7 @@ public class firework_show extends script.base_script } public int launchRandomFirework(obj_id self, dictionary params) throws InterruptedException { - location here = getLocation(self); - location there = utils.getRandomLocationInRing(here, 0, 64); - int tableLength = dataTableGetNumRows(firework.TBL_FX); - int roll = rand(1, tableLength); - String template = dataTableGetString(firework.TBL_FX, roll, "template"); - obj_id effect = create.object(template, there); + obj_id effect = create.object(dataTableGetString(firework.TBL_FX, rand(1, dataTableGetNumRows(firework.TBL_FX)), "template"), utils.getRandomLocationInRing(getLocation(self), 0, 64)); if (isIdValid(effect)) { attachScript(effect, firework.SCRIPT_FIREWORK_CLEANUP); diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/gating_prisoner.java b/sku.0/sys.server/compiled/game/script/event/emp_day/gating_prisoner.java old mode 100644 new mode 100755 index a26272076..3e6026f43 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/gating_prisoner.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/gating_prisoner.java @@ -1,14 +1,7 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.groundquests; +import script.obj_id; +import script.string_id; public class gating_prisoner extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/gating_solo.java b/sku.0/sys.server/compiled/game/script/event/emp_day/gating_solo.java old mode 100644 new mode 100755 index 403ffa5e7..ceda53181 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/gating_solo.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/gating_solo.java @@ -1,15 +1,9 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.groundquests; import script.library.factions; +import script.library.groundquests; +import script.obj_id; +import script.string_id; public class gating_solo extends script.base_script { @@ -23,11 +17,10 @@ public class gating_solo extends script.base_script return SCRIPT_CONTINUE; } int questId = questGetQuestId("quest/emp_day_rebel"); - int task7 = groundquests.getTaskId(questId, "toSolo"); - int task8 = groundquests.getTaskId(questId, "empDayComplete"); - int factionHashCode = factions.pvpGetAlignedFaction(item); - String whichFaction = factions.getFactionNameByHashCode(factionHashCode); - if (questIsTaskActive(questId, task8, item) || questIsTaskActive(questId, task7, item) || questIsQuestComplete(questId, item)) + String whichFaction = factions.getFactionNameByHashCode(factions.pvpGetAlignedFaction(item)); + if (questIsTaskActive(questId, groundquests.getTaskId(questId, "empDayComplete"), item) || + questIsTaskActive(questId, groundquests.getTaskId(questId, "toSolo"), item) || + questIsQuestComplete(questId, item)) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/gating_vader.java b/sku.0/sys.server/compiled/game/script/event/emp_day/gating_vader.java old mode 100644 new mode 100755 index ab791b4ba..f29852d99 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/gating_vader.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/gating_vader.java @@ -1,17 +1,12 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.groundquests; -import script.library.factions; -import script.library.locations; +import script.dictionary; import script.library.create; +import script.library.factions; +import script.library.groundquests; +import script.location; +import script.obj_id; +import script.string_id; public class gating_vader extends script.base_script { @@ -31,10 +26,12 @@ public class gating_vader extends script.base_script outsideLoc.z += 15; for (int i = 0; i < 10; i++) { - obj_id outsideST = create.object(spawn, outsideLoc); + create.object(spawn, outsideLoc); } - obj_id atst1 = create.object("at_st", outsideLoc); - obj_id atst2 = create.object("at_st", outsideLoc); + // create AT-STs + create.object("at_st", outsideLoc); + create.object("at_st", outsideLoc); + obj_id room1Cell = getCellId(self, "room1"); obj_id room2Cell = getCellId(self, "room2"); obj_id room3Cell = getCellId(self, "room3"); diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/give_multiple_items_to_supply_npc.java b/sku.0/sys.server/compiled/game/script/event/emp_day/give_multiple_items_to_supply_npc.java old mode 100644 new mode 100755 index 9230e67d3..1f829db41 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/give_multiple_items_to_supply_npc.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/give_multiple_items_to_supply_npc.java @@ -1,19 +1,8 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.ai_lib; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.static_item; -import script.library.utils; +import script.library.*; +import script.obj_id; +import script.string_id; public class give_multiple_items_to_supply_npc extends script.base_script { @@ -90,25 +79,15 @@ public class give_multiple_items_to_supply_npc extends script.base_script return SCRIPT_CONTINUE; } int questCrc = groundquests.getQuestIdFromString(questName); - int taskId = groundquests.getTaskId(questCrc, questName); - questCompleteTask(questCrc, taskId, giver); + questCompleteTask(questCrc, groundquests.getTaskId(questCrc, questName), giver); if (!incrementCollection(self, giver, faction)) { blog("give_multiple_items_to_supply_npc.OnGiveItem: collection incr failed."); } return SCRIPT_OVERRIDE; } - public boolean isOpposingFaction(obj_id player, int npcFaction) throws InterruptedException - { - if (npcFaction == holiday.IMPERIAL_PLAYER && factions.isRebel(player)) - { - return true; - } - if (npcFaction == holiday.REBEL_PLAYER && factions.isImperial(player)) - { - return true; - } - return false; + public boolean isOpposingFaction(obj_id player, int npcFaction) throws InterruptedException { + return (npcFaction == holiday.IMPERIAL_PLAYER && factions.isRebel(player)) || (npcFaction == holiday.REBEL_PLAYER && factions.isImperial(player)); } public boolean isCrateItem(obj_id player, String itemName, int faction) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/goodbye_path_destroy.java b/sku.0/sys.server/compiled/game/script/event/emp_day/goodbye_path_destroy.java old mode 100644 new mode 100755 index 4d5f5ef28..6e24f53d0 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/goodbye_path_destroy.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/goodbye_path_destroy.java @@ -1,20 +1,12 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; import script.library.chat; -import script.library.create; import script.library.groundquests; -import script.library.holiday; import script.library.prose; -import script.library.stealth; -import script.library.utils; +import script.location; +import script.obj_id; +import script.string_id; public class goodbye_path_destroy extends script.base_script { @@ -77,8 +69,7 @@ public class goodbye_path_destroy extends script.base_script setObjVar(self, "saidGoodbye", true); return SCRIPT_CONTINUE; } - prose_package pp = prose.getPackage(new string_id("event/empire_day", "see_you_topside"), rescuer); - chat.publicChat(self, rescuer, null, null, pp); + chat.publicChat(self, rescuer, null, null, prose.getPackage(new string_id("event/empire_day", "see_you_topside"), rescuer)); setObjVar(self, "saidGoodbye", true); return SCRIPT_CONTINUE; } @@ -102,15 +93,14 @@ public class goodbye_path_destroy extends script.base_script return SCRIPT_CONTINUE; } obj_id point = obj_id.NULL_ID; - for (int i = 0; i < exitPoints.length; i++) - { - String var = getStringObjVar(exitPoints[i], "disguise_exit"); - if (var == null || !var.equals(mobDisguise)) - { + String var; + for (obj_id exitPoint : exitPoints) { + var = getStringObjVar(exitPoint, "disguise_exit"); + if (var == null || !var.equals(mobDisguise)) { blog("GOODBYE pathToExit - var: " + var + " mobDisguise: " + mobDisguise); continue; } - point = exitPoints[i]; + point = exitPoint; } if (!isValidId(point) || !exists(point)) { diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_empty_sign.java b/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_empty_sign.java old mode 100644 new mode 100755 index 4fab7544f..1d3eaaf71 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_empty_sign.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_empty_sign.java @@ -1,25 +1,7 @@ package script.event.emp_day; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.buff; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.pet_lib; -import script.library.static_item; -import script.library.stealth; -import script.library.sui; -import script.library.trial; -import script.library.utils; +import script.library.*; public class imperial_empty_sign extends script.base_script { @@ -115,7 +97,7 @@ public class imperial_empty_sign extends script.base_script } public int handleObjectSwapTimer(obj_id self, dictionary params) throws InterruptedException { - if (params == null || params.equals("")) + if (params == null) { return SCRIPT_CONTINUE; } @@ -179,7 +161,7 @@ public class imperial_empty_sign extends script.base_script { parentBuffName = holiday.BUFF_IMP_EMPIREDAY_RECRUITMENT_SF; } - if (parentBuffName == null || parentBuffName.equals("")) + if (parentBuffName.equals("")) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_recruitment_sign.java b/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_recruitment_sign.java old mode 100644 new mode 100755 index b54ecbecb..154bd8cb8 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_recruitment_sign.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/imperial_recruitment_sign.java @@ -1,25 +1,7 @@ package script.event.emp_day; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.buff; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.pet_lib; -import script.library.static_item; -import script.library.stealth; -import script.library.sui; -import script.library.trial; -import script.library.utils; +import script.library.*; public class imperial_recruitment_sign extends script.base_script { @@ -115,7 +97,7 @@ public class imperial_recruitment_sign extends script.base_script } public int handleObjectSwapTimer(obj_id self, dictionary params) throws InterruptedException { - if (params == null || params.equals("")) + if (params == null) { return SCRIPT_CONTINUE; } @@ -179,7 +161,7 @@ public class imperial_recruitment_sign extends script.base_script { parentBuffName = holiday.BUFF_REB_EMPIREDAY_VANDAL_SF; } - if (parentBuffName == null || parentBuffName.equals("")) + if (parentBuffName.equals("")) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/player_sign_eventually_destroyed.java b/sku.0/sys.server/compiled/game/script/event/emp_day/player_sign_eventually_destroyed.java old mode 100644 new mode 100755 index d5b9aa785..f1c3e6134 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/player_sign_eventually_destroyed.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/player_sign_eventually_destroyed.java @@ -1,15 +1,8 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - +import script.dictionary; import script.library.holiday; -import script.library.utils; +import script.obj_id; public class player_sign_eventually_destroyed extends script.base_script { diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_empty_sign.java b/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_empty_sign.java old mode 100644 new mode 100755 index 3af86678c..764c45550 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_empty_sign.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_empty_sign.java @@ -1,25 +1,7 @@ package script.event.emp_day; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.buff; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.pet_lib; -import script.library.static_item; -import script.library.stealth; -import script.library.sui; -import script.library.trial; -import script.library.utils; +import script.library.*; public class rebel_empty_sign extends script.base_script { @@ -111,7 +93,7 @@ public class rebel_empty_sign extends script.base_script } public int handleObjectSwapTimer(obj_id self, dictionary params) throws InterruptedException { - if (params == null || params.equals("")) + if (params == null) { return SCRIPT_CONTINUE; } @@ -175,7 +157,7 @@ public class rebel_empty_sign extends script.base_script { parentBuffName = holiday.BUFF_REB_EMPIREDAY_RESISTANCE_SF; } - if (parentBuffName == null || parentBuffName.equals("")) + if (parentBuffName.equals("")) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_resistance_sign.java b/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_resistance_sign.java old mode 100644 new mode 100755 index 63f9c0fb3..38549365a --- a/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_resistance_sign.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/rebel_resistance_sign.java @@ -1,25 +1,7 @@ package script.event.emp_day; import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.buff; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.pet_lib; -import script.library.static_item; -import script.library.stealth; -import script.library.sui; -import script.library.trial; -import script.library.utils; +import script.library.*; public class rebel_resistance_sign extends script.base_script { @@ -117,7 +99,7 @@ public class rebel_resistance_sign extends script.base_script } public int handleObjectSwapTimer(obj_id self, dictionary params) throws InterruptedException { - if (params == null || params.equals("")) + if (params == null) { return SCRIPT_CONTINUE; } @@ -181,7 +163,7 @@ public class rebel_resistance_sign extends script.base_script { parentBuffName = holiday.BUFF_IMP_EMPIREDAY_ANTIPROP_SF; } - if (parentBuffName == null || parentBuffName.equals("")) + if (parentBuffName.equals("")) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/emp_day/rescue_faction_npc_trigger_volume.java b/sku.0/sys.server/compiled/game/script/event/emp_day/rescue_faction_npc_trigger_volume.java old mode 100644 new mode 100755 index 921d62682..b74e94207 --- a/sku.0/sys.server/compiled/game/script/event/emp_day/rescue_faction_npc_trigger_volume.java +++ b/sku.0/sys.server/compiled/game/script/event/emp_day/rescue_faction_npc_trigger_volume.java @@ -1,21 +1,10 @@ package script.event.emp_day; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.chat; -import script.library.create; -import script.library.factions; -import script.library.groundquests; -import script.library.holiday; -import script.library.prose; -import script.library.stealth; -import script.library.utils; +import script.library.*; +import script.location; +import script.obj_id; +import script.prose_package; +import script.string_id; public class rescue_faction_npc_trigger_volume extends script.base_script { @@ -131,8 +120,7 @@ public class rescue_faction_npc_trigger_volume extends script.base_script pathTo(mob, playerLoc); } blog("saying something"); - prose_package pp = prose.getPackage(new string_id("event/empire_day", "rescue_me_breacher"), whoTriggeredMe); - chat.publicChat(mob, whoTriggeredMe, null, null, pp); + chat.publicChat(mob, whoTriggeredMe, null, null, prose.getPackage(new string_id("event/empire_day", "rescue_me_breacher"), whoTriggeredMe)); return SCRIPT_CONTINUE; } public int OnTriggerVolumeExited(obj_id self, String volumeName, obj_id whoTriggeredMe) throws InterruptedException