diff --git a/sku.0/sys.server/compiled/game/script/event/emperorsday/emperor_statue.java b/sku.0/sys.server/compiled/game/script/event/emperorsday/emperor_statue.java old mode 100644 new mode 100755 index cf6e951ab..9f1d3519d --- a/sku.0/sys.server/compiled/game/script/event/emperorsday/emperor_statue.java +++ b/sku.0/sys.server/compiled/game/script/event/emperorsday/emperor_statue.java @@ -1,25 +1,9 @@ package script.event.emperorsday; 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.*; -import script.library.ai_lib; -import script.library.chat; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.firework; -import script.library.holiday; -import script.library.performance; -import script.library.prose; -import script.library.static_item; -import script.library.trial; -import script.library.utils; +import java.util.Vector; public class emperor_statue extends script.base_script { @@ -52,23 +36,13 @@ public class emperor_statue extends script.base_script public int OnInitialize(obj_id self) throws InterruptedException { CustomerServiceLog("holidayEvent", "emperor_statue.OnInitialize: Init."); - if (!utils.hasScriptVar(self, "musicObject")) - { - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_IMPERIAL_ATTACK, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); - } - else if (utils.hasScriptVar(self, "musicObject")) - { + if (utils.hasScriptVar(self, "musicObject")) { obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); - if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) - { + if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) { destroyObject(oldSoundObject); } - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_IMPERIAL_ATTACK, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); } + utils.setScriptVar(self, "musicObject", createObject(MUSIC_IMPERIAL_ATTACK, getLocation(self))); CustomerServiceLog("holidayEvent", "emperor_statue.OnInitialize: Preparing Parade."); messageTo(self, "prepareParade", null, 30.0f, false); return SCRIPT_CONTINUE; @@ -105,7 +79,6 @@ public class emperor_statue extends script.base_script { names[idx] = "empire_day_player_status"; attribs[idx] = statusString; - idx++; } return SCRIPT_CONTINUE; } @@ -160,11 +133,9 @@ public class emperor_statue extends script.base_script if (utils.hasScriptVar(self, "vader")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "vader"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "vader"); @@ -172,11 +143,9 @@ public class emperor_statue extends script.base_script if (utils.hasScriptVar(self, "dark_trooper")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "dark_trooper"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "dark_trooper"); @@ -189,88 +158,71 @@ public class emperor_statue extends script.base_script { return SCRIPT_CONTINUE; } - if (text.equals("getyaw")) - { - sendSystemMessage(speaker, "Statue Yaw: " + getYaw(self), ""); - return SCRIPT_OVERRIDE; - } - else if (text.equals("createlambda")) - { - sendSystemMessage(speaker, "Creating Shuttle", ""); - createLambdaDropship(self, getLocation(speaker)); - return SCRIPT_OVERRIDE; - } - else if (text.equals("startParade")) - { - obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); - if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) - { - destroyObject(oldSoundObject); - } - sendSystemMessage(speaker, "Manually starting parade", ""); - messageTo(self, "prepareParade", null, 10.0f, false); - return SCRIPT_OVERRIDE; - } - else if (text.equals("removeParade")) - { - obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); - if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) - { - destroyObject(oldSoundObject); - } - sendSystemMessage(speaker, "Manually destroying parade", ""); - messageTo(self, "destroyParade", null, 10.0f, false); - return SCRIPT_OVERRIDE; - } - else if (text.equals("correctLocation")) - { - location yodaLoc = new location(-5495.0f, 6.0f, 4407.3f); - setLocation(self, yodaLoc); - location actualLocation = getLocation(self); - sendSystemMessage(speaker, "Fountain location is " + actualLocation, ""); - return SCRIPT_OVERRIDE; - } - else if (text.equals("removeMyBadges") || text.equals("removeBadges")) - { - if (hasCompletedCollectionSlot(speaker, holiday.EMPIRE_DAY_CHAMPION_BADGE)) - { - sendSystemMessage(speaker, "Removed Imperial Badge", ""); - if (modifyCollectionSlotValue(speaker, holiday.EMPIRE_DAY_CHAMPION_BADGE, -1)) - { - sendSystemMessage(speaker, holiday.SID_REM_EMP_DAY_BADGE); + switch (text) { + case "getyaw": + sendSystemMessage(speaker, "Statue Yaw: " + getYaw(self), ""); + return SCRIPT_OVERRIDE; + case "createlambda": + sendSystemMessage(speaker, "Creating Shuttle", ""); + createLambdaDropship(self, getLocation(speaker)); + return SCRIPT_OVERRIDE; + case "startParade": { + obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); + if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) { + destroyObject(oldSoundObject); } + sendSystemMessage(speaker, "Manually starting parade", ""); + messageTo(self, "prepareParade", null, 10.0f, false); + return SCRIPT_OVERRIDE; } - if (hasCompletedCollectionSlot(speaker, holiday.REMEMBRANCE_DAY_CHAMPION_BADGE)) - { - sendSystemMessage(speaker, "Removed Rebel Badge", ""); - if (modifyCollectionSlotValue(speaker, holiday.REMEMBRANCE_DAY_CHAMPION_BADGE, -1)) - { - sendSystemMessage(speaker, holiday.SID_REM_REM_DAY_BADGE); + case "removeParade": { + obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); + if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) { + destroyObject(oldSoundObject); } + sendSystemMessage(speaker, "Manually destroying parade", ""); + messageTo(self, "destroyParade", null, 10.0f, false); + return SCRIPT_OVERRIDE; } - } - else if (text.equals("removeRewardFlag") || text.equals("removeRewards") || text.equals("removeReward")) - { - removeObjVar(speaker, holiday.currentYearObjVar()); - sendSystemMessage(speaker, holiday.SID_REMOVED_REWARD_FLAG); + case "correctLocation": + setLocation(self, new location(-5495.0f, 6.0f, 4407.3f)); + sendSystemMessage(speaker, "Fountain location is " + getLocation(self), ""); + return SCRIPT_OVERRIDE; + case "removeMyBadges": + case "removeBadges": + if (hasCompletedCollectionSlot(speaker, holiday.EMPIRE_DAY_CHAMPION_BADGE)) { + sendSystemMessage(speaker, "Removed Imperial Badge", ""); + if (modifyCollectionSlotValue(speaker, holiday.EMPIRE_DAY_CHAMPION_BADGE, -1)) { + sendSystemMessage(speaker, holiday.SID_REM_EMP_DAY_BADGE); + } + } + if (hasCompletedCollectionSlot(speaker, holiday.REMEMBRANCE_DAY_CHAMPION_BADGE)) { + sendSystemMessage(speaker, "Removed Rebel Badge", ""); + if (modifyCollectionSlotValue(speaker, holiday.REMEMBRANCE_DAY_CHAMPION_BADGE, -1)) { + sendSystemMessage(speaker, holiday.SID_REM_REM_DAY_BADGE); + } + } + break; + case "removeRewardFlag": + case "removeRewards": + case "removeReward": + removeObjVar(speaker, holiday.currentYearObjVar()); + sendSystemMessage(speaker, holiday.SID_REMOVED_REWARD_FLAG); + break; } return SCRIPT_CONTINUE; } public int npcTypeList(obj_id self, dictionary params) throws InterruptedException { String npcType = params.getString("type"); - obj_id npc = params.getObjId("npcObjId"); Vector npcs = new Vector(); npcs.setSize(0); if (utils.hasScriptVar(self, npcType)) { npcs = utils.getResizeableObjIdArrayScriptVar(self, npcType); } - utils.addElement(npcs, npc); + utils.addElement(npcs, params.getObjId("npcObjId")); utils.setScriptVar(self, npcType, npcs); - if (npcType.equals("vader")) - { - } return SCRIPT_CONTINUE; } public int prepareParade(obj_id self, dictionary params) throws InterruptedException @@ -306,25 +258,16 @@ public class emperor_statue extends script.base_script if (!utils.hasScriptVar(self, "musicObject")) { CustomerServiceLog("holidayEvent", "emperor_statue.parade: Creating new music object."); - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_IMPERIAL_MARCH, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); } - else if (utils.hasScriptVar(self, "musicObject")) + else { CustomerServiceLog("holidayEvent", "emperor_statue.parade: Getting existing music object."); - obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); - if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) - { - destroyObject(oldSoundObject); - } - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_IMPERIAL_MARCH, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); + destroyObject(utils.getObjIdScriptVar(self, "musicObject")); } + utils.setScriptVar(self, "musicObject", createObject(MUSIC_IMPERIAL_MARCH, getLocation(self))); + CustomerServiceLog("holidayEvent", "emperor_statue.parade: Getting shuttle waypoint data in preparation for shuttle landing."); obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "shuttlePathingLastPoint", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - obj_id exitPoint = holiday.getEmpireDayWaypointObjectObjId(self, "shuttlePathingMidPoint", holiday.OBJECT_NEAR_CHECK_RANGE_250M); location spawnLoc = getLocation(spawnPoint); boolean lambdaCreation = createLambdaDropship(self, spawnLoc); CustomerServiceLog("holidayEvent", "emperor_statue.parade: Shuttle spawnPoint: " + spawnPoint); @@ -339,7 +282,7 @@ public class emperor_statue extends script.base_script if (isValidId(lambda) && exists(lambda)) { CustomerServiceLog("holidayEvent", "emperor_statue.parade: Sending Message to move to new point in X seconds"); - setObjVar(lambda, "exitpoint", exitPoint); + setObjVar(lambda, "exitpoint", holiday.getEmpireDayWaypointObjectObjId(self, "shuttlePathingMidPoint", holiday.OBJECT_NEAR_CHECK_RANGE_250M)); messageTo(self, "shuttleAdjust", null, 5, false); } CustomerServiceLog("holidayEvent", "emperor_statue.parade: Sending Message to NPCS to spawn in 25 seconds"); @@ -355,20 +298,15 @@ public class emperor_statue extends script.base_script if (isValidId(lambda) && exists(lambda)) { setMovementPercent(lambda, 18); - obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "shuttleLanding", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location loc = getLocation(spawnPoint); - pathTo(lambda, loc); + pathTo(lambda, getLocation(holiday.getEmpireDayWaypointObjectObjId(self, "shuttleLanding", holiday.OBJECT_NEAR_CHECK_RANGE_100M))); } return SCRIPT_CONTINUE; } public int spawnDarkTroopers1(obj_id self, dictionary params) throws InterruptedException { - int squadSize = 4; - int formation = ai_lib.FORMATION_COLUMN; obj_id[] squad = new obj_id[4]; - obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark1", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location spawnLoc = getLocation(spawnPoint); - location tempLoc = (location)spawnLoc.clone(); + location spawnLoc = getLocation(holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark1", holiday.OBJECT_NEAR_CHECK_RANGE_100M)); + location tempLoc = (location) spawnLoc.clone(); for (int i = 0; i < squad.length; i++) { tempLoc.z = spawnLoc.z + i * 2; @@ -385,11 +323,8 @@ public class emperor_statue extends script.base_script } public int spawnDarkTroopers2(obj_id self, dictionary params) throws InterruptedException { - int squadSize = 4; - int formation = ai_lib.FORMATION_COLUMN; obj_id[] squad = new obj_id[4]; - obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark2", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location spawnLoc = getLocation(spawnPoint); + location spawnLoc = getLocation(holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark2", holiday.OBJECT_NEAR_CHECK_RANGE_100M)); location tempLoc = (location)spawnLoc.clone(); for (int i = 0; i < squad.length; i++) { @@ -407,9 +342,7 @@ public class emperor_statue extends script.base_script } public int spawnVader(obj_id self, dictionary params) throws InterruptedException { - obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnVader", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location spawnLoc = getLocation(spawnPoint); - obj_id vader = create.object("imperial_emperorsday_darth_vader", spawnLoc); + obj_id vader = create.object("imperial_emperorsday_darth_vader", getLocation(holiday.getEmpireDayWaypointObjectObjId(self, "spawnVader", holiday.OBJECT_NEAR_CHECK_RANGE_100M))); setYaw(vader, 0.0f); if (isIdValid(vader)) { @@ -429,50 +362,46 @@ public class emperor_statue extends script.base_script squad1.setSize(0); Vector squad2 = new Vector(); squad2.setSize(0); - for (int i = 0; i < objects.length; i++) - { - if (isIdValid(objects[i])) - { - if (hasObjVar(objects[i], "darkTroopers1")) - { - utils.addElement(squad1, objects[i]); + obj_id pathPoint; + for (obj_id object : objects) { + if (isIdValid(object)) { + if (hasObjVar(object, "darkTroopers1")) { + utils.addElement(squad1, object); } - if (hasObjVar(objects[i], "darkTroopers2")) - { - utils.addElement(squad2, objects[i]); + if (hasObjVar(object, "darkTroopers2")) { + utils.addElement(squad2, object); } - if (hasObjVar(objects[i], "vader")) - { - obj_id pathPoint = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "vader_path"); - if (isIdValid(pathPoint) && exists(pathPoint)) - { - location pathLoc = getLocation(pathPoint); - pathTo(objects[i], pathLoc); + if (hasObjVar(object, "vader")) { + pathPoint = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "vader_path"); + if (isIdValid(pathPoint) && exists(pathPoint)) { + pathTo(object, getLocation(pathPoint)); } } } } if (squad1.size() == squad2.size()) { + location pathLoc; + location tempLoc; for (int i = 0; i < squad1.size(); i++) { if (isIdValid(((obj_id)squad1.get(i))) && isIdValid(((obj_id)squad2.get(i)))) { - obj_id pathPoint1 = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "darktrooper_path_right"); - if (isIdValid(pathPoint1) && exists(pathPoint1)) + pathPoint = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "darktrooper_path_right"); + if (isIdValid(pathPoint) && exists(pathPoint)) { - location pathLoc1 = getLocation(pathPoint1); - location tempLoc1 = (location)pathLoc1.clone(); - tempLoc1.z = pathLoc1.z - i * 2; - pathTo(((obj_id)squad1.get(i)), tempLoc1); + pathLoc = getLocation(pathPoint); + tempLoc = (location) pathLoc.clone(); + tempLoc.z = pathLoc.z - i * 2; + pathTo(((obj_id)squad1.get(i)), tempLoc); } - obj_id pathPoint2 = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "darktrooper_path_left"); - if (isIdValid(pathPoint2) && exists(pathPoint2)) + pathPoint = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "darktrooper_path_left"); + if (isIdValid(pathPoint) && exists(pathPoint)) { - location pathLoc2 = getLocation(pathPoint2); - location tempLoc2 = (location)pathLoc2.clone(); - tempLoc2.z = pathLoc2.z - i * 2; - pathTo(((obj_id)squad2.get(i)), tempLoc2); + pathLoc = getLocation(pathPoint); + tempLoc = (location) pathLoc.clone(); + tempLoc.z = pathLoc.z - i * 2; + pathTo(((obj_id)squad2.get(i)), tempLoc); } } } @@ -482,7 +411,6 @@ public class emperor_statue extends script.base_script public int launchRandomTieFighterFlyBy(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: messageHandler initialized."); - int num = rand(1, 4); obj_id cauldronRight = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "cauldron_right"); obj_id cauldronLeft = getObjIdObjVar(self, holiday.SPAWNER_PREFIX_OBJVAR + "cauldron_left"); if (!isValidId(cauldronRight) && !exists(cauldronRight) && !isValidId(cauldronRight) && !exists(cauldronRight)) @@ -490,28 +418,24 @@ public class emperor_statue extends script.base_script return SCRIPT_CONTINUE; } CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: random number received, firing something."); - switch (num) + switch (rand(1, 4)) { case 1: - CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 1."); - playTieFighterPair(self, cauldronLeft); - break; + CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 1."); + playTieFighterPair(self, cauldronLeft); + break; case 2: - CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 2."); - playTieFighterGroup(self, cauldronLeft); - break; + CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 2."); + playTieFighterGroup(self, cauldronLeft); + break; case 3: - CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 3."); - playTieFighterPair(self, cauldronRight); - break; + CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 3."); + playTieFighterPair(self, cauldronRight); + break; case 4: - CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 4."); - playTieFighterGroup(self, cauldronRight); - break; - default: - CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 5."); - playTieFighterGroup(self, cauldronRight); - break; + CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomTieFighterFlyBy: case 4."); + playTieFighterGroup(self, cauldronRight); + break; } return SCRIPT_CONTINUE; } @@ -521,7 +445,6 @@ public class emperor_statue extends script.base_script location statue = getLocation(self); location here = (location)statue.clone(); here.z = statue.z + 20; - location there = utils.getRandomLocationInRing(here, 0, 10); int tableLength = dataTableGetNumRows(firework.TBL_FX); Vector nonFactionalTemplates = new Vector(); nonFactionalTemplates.setSize(0); @@ -532,13 +455,14 @@ public class emperor_statue extends script.base_script utils.addElement(nonFactionalTemplates, dataTableGetString(firework.TBL_FX, i, "template")); } } - if (nonFactionalTemplates == null || nonFactionalTemplates.size() <= 0) + if (nonFactionalTemplates.size() <= 0) { return SCRIPT_CONTINUE; } CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomFirework: We are selecting a random firework out of a list of " + nonFactionalTemplates.size()); int roll = rand(0, nonFactionalTemplates.size() - 1); String template = ((String)nonFactionalTemplates.get(roll)); + location there = utils.getRandomLocationInRing(here, 0, 10); obj_id effect = create.object(template, there); if (isIdValid(effect)) { @@ -565,11 +489,9 @@ public class emperor_statue extends script.base_script if (utils.hasScriptVar(self, "stormtrooper_squadleader")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "stormtrooper_squadleader"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - doAnimationAction(((obj_id)npc.get(i)), "salute2"); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + doAnimationAction(((obj_id) aNpc), "salute2"); } } } @@ -591,17 +513,13 @@ public class emperor_statue extends script.base_script if (utils.hasScriptVar(self, "dark_trooper")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "dark_trooper"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - if (hasObjVar(((obj_id)npc.get(i)), "darkTroopers1")) - { - setYaw(((obj_id)npc.get(i)), -180.0f); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + if (hasObjVar(((obj_id) aNpc), "darkTroopers1")) { + setYaw(((obj_id) aNpc), -180.0f); } - if (hasObjVar(((obj_id)npc.get(i)), "darkTroopers2")) - { - setYaw(((obj_id)npc.get(i)), -180.0f); + if (hasObjVar(((obj_id) aNpc), "darkTroopers2")) { + setYaw(((obj_id) aNpc), -180.0f); } } } @@ -610,48 +528,43 @@ public class emperor_statue extends script.base_script } public int finalMarch(obj_id self, dictionary params) throws InterruptedException { - location loc = getLocation(self); - obj_id[] objects = getObjectsInRange(loc, holiday.OBJECT_NEAR_CHECK_RANGE_100M); + obj_id[] objects = getObjectsInRange(getLocation(self), holiday.OBJECT_NEAR_CHECK_RANGE_100M); Vector squad1 = new Vector(); squad1.setSize(0); Vector squad2 = new Vector(); squad2.setSize(0); - for (int i = 0; i < objects.length; i++) - { - if (isIdValid(objects[i])) - { - if (hasObjVar(objects[i], "darkTroopers1")) - { - utils.addElement(squad1, objects[i]); + for (obj_id object : objects) { + if (isIdValid(object)) { + if (hasObjVar(object, "darkTroopers1")) { + utils.addElement(squad1, object); } - if (hasObjVar(objects[i], "darkTroopers2")) - { - utils.addElement(squad2, objects[i]); + if (hasObjVar(object, "darkTroopers2")) { + utils.addElement(squad2, object); } - if (hasObjVar(objects[i], "vader")) - { - obj_id pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnVader", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location pathLoc = getLocation(pathPoint); - pathTo(objects[i], pathLoc); + if (hasObjVar(object, "vader")) { + pathTo(object, getLocation(holiday.getEmpireDayWaypointObjectObjId(self, "spawnVader", holiday.OBJECT_NEAR_CHECK_RANGE_100M))); } } } if (squad1.size() == squad2.size()) { + obj_id pathPoint; + location pathLoc; + location tempLoc; for (int i = 0; i < squad1.size(); i++) { if (isIdValid(((obj_id)squad1.get(i))) && isIdValid(((obj_id)squad2.get(i)))) { - obj_id pathPoint1 = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark1", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location pathLoc1 = getLocation(pathPoint1); - location tempLoc1 = (location)pathLoc1.clone(); - tempLoc1.z = pathLoc1.z + i * 2; - pathTo(((obj_id)squad1.get(i)), tempLoc1); - obj_id pathPoint2 = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark2", holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location pathLoc2 = getLocation(pathPoint2); - location tempLoc2 = (location)pathLoc2.clone(); - tempLoc2.z = pathLoc2.z + i * 2; - pathTo(((obj_id)squad2.get(i)), tempLoc2); + pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark1", holiday.OBJECT_NEAR_CHECK_RANGE_100M); + pathLoc = getLocation(pathPoint); + tempLoc = (location) pathLoc.clone(); + tempLoc.z = pathLoc.z + i * 2; + pathTo(((obj_id)squad1.get(i)), tempLoc); + pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark2", holiday.OBJECT_NEAR_CHECK_RANGE_100M); + pathLoc = getLocation(pathPoint); + tempLoc = (location) pathLoc.clone(); + tempLoc.z = pathLoc.z + i * 2; + pathTo(((obj_id)squad2.get(i)), tempLoc); } } } @@ -687,11 +600,9 @@ public class emperor_statue extends script.base_script { CustomerServiceLog("holidayEvent", "emperor_statue.destroyParade: Destroying all parade NPCs that are vader."); Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "vader"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(vader) && exists(vader)) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(vader) && exists(vader)) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "vader"); @@ -701,11 +612,9 @@ public class emperor_statue extends script.base_script { CustomerServiceLog("holidayEvent", "emperor_statue.destroyParade: Destroying all parade NPCs that are dark troppers."); Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "dark_trooper"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "dark_trooper"); @@ -719,23 +628,13 @@ public class emperor_statue extends script.base_script } public int normalMusic(obj_id self, dictionary params) throws InterruptedException { - if (!utils.hasScriptVar(self, "musicObject")) - { - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_IMPERIAL_ATTACK, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); - } - else if (utils.hasScriptVar(self, "musicObject")) - { + if (utils.hasScriptVar(self, "musicObject")) { obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); - if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) - { + if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) { destroyObject(oldSoundObject); } - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_IMPERIAL_ATTACK, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); } + utils.setScriptVar(self, "musicObject", createObject(MUSIC_IMPERIAL_ATTACK, getLocation(self))); return SCRIPT_CONTINUE; } public int startConversation(obj_id self, dictionary params) throws InterruptedException @@ -743,11 +642,9 @@ public class emperor_statue extends script.base_script if (utils.hasScriptVar(self, "stormtrooper_squadleader")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "stormtrooper_squadleader"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - doAnimationAction(((obj_id)npc.get(i)), "salute2"); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + doAnimationAction(((obj_id) aNpc), "salute2"); } } } @@ -765,18 +662,14 @@ public class emperor_statue extends script.base_script Vector squad2 = new Vector(); squad2.setSize(0); Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "dark_trooper"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - setYaw(((obj_id)npc.get(i)), 0.0f); - if (hasObjVar(((obj_id)npc.get(i)), "darkTroopers1")) - { - utils.addElement(squad1, ((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + setYaw(((obj_id) aNpc), 0.0f); + if (hasObjVar(((obj_id) aNpc), "darkTroopers1")) { + utils.addElement(squad1, aNpc); } - if (hasObjVar(((obj_id)npc.get(i)), "darkTroopers2")) - { - utils.addElement(squad2, ((obj_id)npc.get(i))); + if (hasObjVar(((obj_id) aNpc), "darkTroopers2")) { + utils.addElement(squad2, aNpc); } } } @@ -873,18 +766,15 @@ public class emperor_statue extends script.base_script } Vector imperialPlayers = new Vector(); imperialPlayers.setSize(0); - for (int z = 0; z < playersInRange.length; z++) - { - if (!isIdValid(playersInRange[z]) || !exists(playersInRange[z])) - { + for (obj_id aPlayersInRange : playersInRange) { + if (!isIdValid(aPlayersInRange) || !exists(aPlayersInRange)) { continue; } - if (holiday.isEmpireDayPlayerEligible(playersInRange[z], holiday.IMPERIAL_PLAYER)) - { - utils.addElement(imperialPlayers, playersInRange[z]); + if (holiday.isEmpireDayPlayerEligible(aPlayersInRange, holiday.IMPERIAL_PLAYER)) { + utils.addElement(imperialPlayers, aPlayersInRange); } } - if (imperialPlayers == null || imperialPlayers.size() <= 0) + if (imperialPlayers.size() <= 0) { CustomerServiceLog("holidayEvent", "emperor_statue.darth6: There were players in the area but none that were eligible. Vader is leaving."); chat.chat(vader, DARTH_6_ALT); @@ -941,7 +831,7 @@ public class emperor_statue extends script.base_script utils.setScriptVar(listOfWinners[i], "emperorsDayBadge", 1); setObjVar(vader, "readyForBadge.winner_" + (i + 1), listOfWinners[i]); } - if (winnerList == null || winnerList.equals("")) + if (winnerList.equals("")) { CustomerServiceLog("holidayEvent", "yoda_fountain.leia6: The player names to be called somehow got corrupted. Sending Leia to falcon."); chat.chat(vader, DARTH_6_ALT); @@ -964,7 +854,7 @@ public class emperor_statue extends script.base_script public int vendor3(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "emperor_statue.vendor3: messageHandler Initialized."); - if (params == null || params.equals("")) + if (params == null) { CustomerServiceLog("holidayEvent", "emperor_statue.vendor3: There were no params passed to the vendor3 message handler."); return SCRIPT_CONTINUE; @@ -1011,7 +901,7 @@ public class emperor_statue extends script.base_script public int waitingHalf(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "emperor_statue.waitingHalf: messageHandler Initialized."); - if (params == null || params.equals("")) + if (params == null) { CustomerServiceLog("holidayEvent", "emperor_statue.waitingHalf: There were no params passed to the vendor3 message handler."); return SCRIPT_CONTINUE; @@ -1073,7 +963,7 @@ public class emperor_statue extends script.base_script String waitingOnList = ""; if (miaList.size() == 1) { - CustomerServiceLog("holidayEvent", "emperor_statue.waitingHalf: The list length for MIA players is only one player: " + ((obj_id)miaList.get(0))); + CustomerServiceLog("holidayEvent", "emperor_statue.waitingHalf: The list length for MIA players is only one player: " + miaList.get(0)); waitingOnList = getFirstName(((obj_id)miaList.get(0))); } else @@ -1118,7 +1008,7 @@ public class emperor_statue extends script.base_script public int waitingDone(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "emperor_statue.waitingDone: messageHandler Initialized."); - if (params == null || params.equals("")) + if (params == null) { CustomerServiceLog("holidayEvent", "emperor_statue.waitingDone: There were no params passed to the vendor3 message handler."); return SCRIPT_CONTINUE; @@ -1171,9 +1061,10 @@ public class emperor_statue extends script.base_script { Vector lastestMiaList = new Vector(); lastestMiaList.setSize(0); + obj_var playerPlace; for (int i = 0; i < latestMiaListLen; i++) { - obj_var playerPlace = allMissingPlayers.getObjVar(i); + playerPlace = allMissingPlayers.getObjVar(i); utils.addElement(lastestMiaList, playerPlace.getObjIdData()); } if (lastestMiaList.size() <= 0) @@ -1186,7 +1077,7 @@ public class emperor_statue extends script.base_script String waitingOnList = ""; if (lastestMiaList.size() == 1) { - CustomerServiceLog("holidayEvent", "emperor_statue.waitingDone: The list length for MIA players is only one player: " + ((obj_id)lastestMiaList.get(0))); + CustomerServiceLog("holidayEvent", "emperor_statue.waitingDone: The list length for MIA players is only one player: " + lastestMiaList.get(0)); waitingOnList = getFirstName(((obj_id)lastestMiaList.get(0))); } else @@ -1227,11 +1118,9 @@ public class emperor_statue extends script.base_script } prose.setTO(pp, waitingOnList); chat.chat(vader, oldMiaList[0], pp); - for (int i = 0; i < oldMiaList.length; i++) - { - if (isIdValid(oldMiaList[i]) && exists(oldMiaList[i])) - { - utils.removeScriptVar(oldMiaList[i], "emperorsDayBadge"); + for (obj_id anOldMiaList : oldMiaList) { + if (isIdValid(anOldMiaList) && exists(anOldMiaList)) { + utils.removeScriptVar(anOldMiaList, "emperorsDayBadge"); } } } diff --git a/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc.java b/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc.java old mode 100644 new mode 100755 index 1dd25f7bc..3dca64dfc --- a/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc.java +++ b/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc.java @@ -1,23 +1,7 @@ package script.event.emperorsday; 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.anims; -import script.library.chat; -import script.library.colors; -import script.library.factions; -import script.library.holiday; -import script.library.pclib; -import script.library.prose; -import script.library.stealth; -import script.library.utils; +import script.library.*; public class imperial_npc extends script.base_script { @@ -99,10 +83,8 @@ public class imperial_npc extends script.base_script return SCRIPT_CONTINUE; } boolean playerReward = false; - for (int i = 0; i < listOfWinners.length; i++) - { - if (player != listOfWinners[i]) - { + for (obj_id winner : listOfWinners) { + if (player != winner) { continue; } playerReward = true; @@ -152,21 +134,20 @@ public class imperial_npc extends script.base_script { switch (holiday.getEmoteBeligerence(emotein)) { - case 2: - break; case 1: - doAnimationAction(self, "shake_head_no"); - utils.removeScriptVar(emoteSayer, "emperorsDayBadge"); - factions.addFactionStanding(emoteSayer, factions.FACTION_IMPERIAL, -250); - prose_package pp = prose.getPackage(holiday.DARTH_BADGE_2); - prose.setTT(pp, emoteSayer); - chat.chat(self, emoteSayer, pp); - forceChokePlayer(self, emoteSayer); - break; + doAnimationAction(self, "shake_head_no"); + utils.removeScriptVar(emoteSayer, "emperorsDayBadge"); + factions.addFactionStanding(emoteSayer, factions.FACTION_IMPERIAL, -250); + prose_package pp = prose.getPackage(holiday.DARTH_BADGE_2); + prose.setTT(pp, emoteSayer); + chat.chat(self, emoteSayer, pp); + forceChokePlayer(self, emoteSayer); + break; case 0: - break; + case 2: + break; default: - break; + break; } } } diff --git a/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc_corpse.java b/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc_corpse.java old mode 100644 new mode 100755 index 126051171..1c69a7948 --- a/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc_corpse.java +++ b/sku.0/sys.server/compiled/game/script/event/emperorsday/imperial_npc_corpse.java @@ -1,13 +1,6 @@ package script.event.emperorsday; 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; diff --git a/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc.java b/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc.java old mode 100644 new mode 100755 index cce417f04..68ba2b42f --- a/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc.java +++ b/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc.java @@ -1,23 +1,7 @@ package script.event.emperorsday; 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.anims; -import script.library.chat; -import script.library.colors; -import script.library.factions; -import script.library.holiday; -import script.library.pclib; -import script.library.prose; -import script.library.stealth; -import script.library.utils; +import script.library.*; public class rebel_npc extends script.base_script { @@ -174,10 +158,8 @@ public class rebel_npc extends script.base_script return SCRIPT_CONTINUE; } boolean playerReward = false; - for (int i = 0; i < listOfWinners.length; i++) - { - if (player != listOfWinners[i]) - { + for (obj_id listOfWinner : listOfWinners) { + if (player != listOfWinner) { continue; } playerReward = true; @@ -233,23 +215,22 @@ public class rebel_npc extends script.base_script { switch (holiday.getEmoteBeligerence(emotein)) { + case 0: case 2: break; case 1: - doAnimationAction(self, "shake_head_no"); - utils.removeScriptVar(emoteSayer, "emperorsDayBadge"); - factions.addFactionStanding(emoteSayer, factions.FACTION_REBEL, -250); - prose_package pp = prose.getPackage(holiday.LEIA_BADGE_2); - prose.setTT(pp, emoteSayer); - chat.chat(self, emoteSayer, pp); - dictionary params = new dictionary(); - params.put("rudePlayer", emoteSayer); - messageTo(masterObject, "hanAngry", params, 2.0f, false); - break; - case 0: - break; + doAnimationAction(self, "shake_head_no"); + utils.removeScriptVar(emoteSayer, "emperorsDayBadge"); + factions.addFactionStanding(emoteSayer, factions.FACTION_REBEL, -250); + prose_package pp = prose.getPackage(holiday.LEIA_BADGE_2); + prose.setTT(pp, emoteSayer); + chat.chat(self, emoteSayer, pp); + dictionary params = new dictionary(); + params.put("rudePlayer", emoteSayer); + messageTo(masterObject, "hanAngry", params, 2.0f, false); + break; default: - break; + break; } } } diff --git a/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc_corpse.java b/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc_corpse.java old mode 100644 new mode 100755 index 5ec34a392..31443cffa --- a/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc_corpse.java +++ b/sku.0/sys.server/compiled/game/script/event/emperorsday/rebel_npc_corpse.java @@ -1,13 +1,6 @@ package script.event.emperorsday; 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; diff --git a/sku.0/sys.server/compiled/game/script/event/emperorsday/yoda_fountain.java b/sku.0/sys.server/compiled/game/script/event/emperorsday/yoda_fountain.java old mode 100644 new mode 100755 index 6bf3b6d63..ad79da7d3 --- a/sku.0/sys.server/compiled/game/script/event/emperorsday/yoda_fountain.java +++ b/sku.0/sys.server/compiled/game/script/event/emperorsday/yoda_fountain.java @@ -1,25 +1,9 @@ package script.event.emperorsday; 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.*; -import script.library.ai_lib; -import script.library.chat; -import script.library.collection; -import script.library.create; -import script.library.factions; -import script.library.firework; -import script.library.holiday; -import script.library.performance; -import script.library.prose; -import script.library.static_item; -import script.library.trial; -import script.library.utils; +import java.util.Vector; public class yoda_fountain extends script.base_script { @@ -58,23 +42,17 @@ public class yoda_fountain extends script.base_script public int OnInitialize(obj_id self) throws InterruptedException { CustomerServiceLog("holidayEvent", "yoda_fountain.OnInitialize: Fountain is initializing."); - if (!utils.hasScriptVar(self, "musicObject")) - { - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_HAN_LEIA, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); - } - else if (utils.hasScriptVar(self, "musicObject")) + + if (utils.hasScriptVar(self, "musicObject")) { obj_id oldSoundObject = utils.getObjIdScriptVar(self, "musicObject"); if ((isIdValid(oldSoundObject)) && exists(oldSoundObject)) { destroyObject(oldSoundObject); } - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_HAN_LEIA, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); } + utils.setScriptVar(self, "musicObject", createObject(MUSIC_HAN_LEIA, getLocation(self))); + CustomerServiceLog("holidayEvent", "yoda_fountain.OnInitialize: Preparing Parade."); messageTo(self, "prepareParade", null, 30.0f, false); return SCRIPT_CONTINUE; @@ -107,11 +85,9 @@ public class yoda_fountain extends script.base_script idx++; } String statusString = holiday.getEmpireDayEligibility(player, holiday.REBEL_PLAYER); - if (statusString != null || !statusString.equals("")) - { + if (statusString != null && !statusString.equals("")) { names[idx] = "remembrance_day_player_status"; attribs[idx] = statusString; - idx++; } return SCRIPT_CONTINUE; } @@ -172,11 +148,9 @@ public class yoda_fountain extends script.base_script if (utils.hasScriptVar(self, "leia")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "leia"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "leia"); @@ -184,11 +158,9 @@ public class yoda_fountain extends script.base_script if (utils.hasScriptVar(self, "solo")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "solo"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "solo"); @@ -196,11 +168,9 @@ public class yoda_fountain extends script.base_script if (utils.hasScriptVar(self, "chewbacca")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "chewbacca"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - destroyObject(((obj_id)npc.get(i))); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + destroyObject(((obj_id) aNpc)); } } utils.removeScriptVar(self, "chewbacca"); @@ -290,16 +260,13 @@ public class yoda_fountain extends script.base_script } location loc = getLocation(self); obj_id[] objects = getObjectsInRange(loc, holiday.OBJECT_NEAR_CHECK_RANGE_100M); - for (int i = 0; i < objects.length; i++) - { - if (isIdValid(objects[i])) - { - if (hasObjVar(objects[i], "soldier")) - { - int soldierNumber = getIntObjVar(objects[i], "soldier"); - obj_id pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "pathsoldier" + soldierNumber, holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location pathLoc = getLocation(pathPoint); - pathTo(objects[i], pathLoc); + obj_id pathPoint; + for (obj_id object : objects) { + if (isIdValid(object)) { + if (hasObjVar(object, "soldier")) { + int soldierNumber = getIntObjVar(object, "soldier"); + pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "pathsoldier" + soldierNumber, holiday.OBJECT_NEAR_CHECK_RANGE_100M); + pathTo(object, getLocation(pathPoint)); } } } @@ -323,9 +290,7 @@ public class yoda_fountain extends script.base_script if (!utils.hasScriptVar(self, "musicObject")) { CustomerServiceLog("holidayEvent", "yoda_fountain.parade: Creating new music object."); - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_BATTLE_HEROES, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); + utils.setScriptVar(self, "musicObject", createObject(MUSIC_BATTLE_HEROES, getLocation(self))); } else if (utils.hasScriptVar(self, "musicObject")) { @@ -335,9 +300,7 @@ public class yoda_fountain extends script.base_script { destroyObject(oldSoundObject); } - location soundLoc = getLocation(self); - obj_id soundObject = createObject(MUSIC_BATTLE_HEROES, soundLoc); - utils.setScriptVar(self, "musicObject", soundObject); + utils.setScriptVar(self, "musicObject", createObject(MUSIC_BATTLE_HEROES, getLocation(self))); } CustomerServiceLog("holidayEvent", "yoda_fountain.parade: Getting Falcon waypoint data in preparation for shuttle landing."); obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "shuttleLanding", holiday.OBJECT_NEAR_CHECK_RANGE_100M); @@ -508,15 +471,12 @@ public class yoda_fountain extends script.base_script if (utils.hasScriptVar(self, "soldier")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "soldier"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - if (isValidId(getObjectInSlot(((obj_id)npc.get(i)), "hold_r"))) - { + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + if (isValidId(getObjectInSlot(((obj_id) aNpc), "hold_r"))) { continue; } - doAnimationAction(((obj_id)npc.get(i)), "salute1"); + doAnimationAction(((obj_id) aNpc), "salute1"); } } } @@ -617,18 +577,15 @@ public class yoda_fountain extends script.base_script } Vector rebelPlayers = new Vector(); rebelPlayers.setSize(0); - for (int z = 0; z < playersInRange.length; z++) - { - if (!isIdValid(playersInRange[z]) || !exists(playersInRange[z])) - { + for (obj_id aPlayersInRange : playersInRange) { + if (!isIdValid(aPlayersInRange) || !exists(aPlayersInRange)) { continue; } - if (holiday.isEmpireDayPlayerEligible(playersInRange[z], holiday.REBEL_PLAYER)) - { - utils.addElement(rebelPlayers, playersInRange[z]); + if (holiday.isEmpireDayPlayerEligible(aPlayersInRange, holiday.REBEL_PLAYER)) { + utils.addElement(rebelPlayers, aPlayersInRange); } } - if (rebelPlayers == null || rebelPlayers.size() <= 0) + if (rebelPlayers.size() <= 0) { CustomerServiceLog("holidayEvent", "yoda_fountain.leia6: There were players in the area but none that were eligible. Leia is leaving."); chat.chat(leia, LEIA_6_ALT); @@ -685,7 +642,7 @@ public class yoda_fountain extends script.base_script utils.setScriptVar(listOfWinners[i], "emperorsDayBadge", 1); setObjVar(leia, "readyForBadge.winner_" + (i + 1), listOfWinners[i]); } - if (winnerList == null || winnerList.equals("")) + if (winnerList.equals("")) { CustomerServiceLog("holidayEvent", "yoda_fountain.leia6: The player names to be called somehow got corrupted. Sending Leia to falcon."); chat.chat(leia, LEIA_6_ALT); @@ -738,11 +695,9 @@ public class yoda_fountain extends script.base_script if (utils.hasScriptVar(self, "soldier")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "soldier"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - doAnimationAction(((obj_id)npc.get(i)), "celebrate"); + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + doAnimationAction(((obj_id) aNpc), "celebrate"); } } } @@ -751,7 +706,7 @@ public class yoda_fountain extends script.base_script public int vendor3(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "yoda_fountain.vendor3: messageHandler Initialized."); - if (params == null || params.equals("")) + if (params == null) { CustomerServiceLog("holidayEvent", "yoda_fountain.vendor3: There were no params passed to the vendor3 message handler."); return SCRIPT_CONTINUE; @@ -799,7 +754,7 @@ public class yoda_fountain extends script.base_script public int waitingHalf(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "yoda_fountain.waitingHalf: messageHandler Initialized."); - if (params == null || params.equals("")) + if (params == null) { CustomerServiceLog("holidayEvent", "yoda_fountain.waitingHalf: There were no params passed to the vendor3 message handler."); return SCRIPT_CONTINUE; @@ -866,12 +821,12 @@ public class yoda_fountain extends script.base_script String waitingOnList = ""; if (miaList.size() == 1) { - CustomerServiceLog("holidayEvent", "yoda_fountain.waitingHalf: The list length for MIA players is only one player: " + ((obj_id)miaList.get(0))); + CustomerServiceLog("holidayEvent", "yoda_fountain.waitingHalf: The list length for MIA players is only one player: " + miaList.get(0)); waitingOnList = getFirstName(((obj_id)miaList.get(0))); } else { - CustomerServiceLog("holidayEvent", "yoda_fountain.waitingHalf: The list length for MIA players is: " + ((obj_id)miaList.get(0))); + CustomerServiceLog("holidayEvent", "yoda_fountain.waitingHalf: The list length for MIA players is: " + miaList.get(0)); for (int i = 0; i < miaList.size(); i++) { if (i == 0) @@ -915,7 +870,7 @@ public class yoda_fountain extends script.base_script public int waitingDone(obj_id self, dictionary params) throws InterruptedException { CustomerServiceLog("holidayEvent", "yoda_fountain.waitingDone: messageHandler Initialized."); - if (params == null || params.equals("")) + if (params == null) { CustomerServiceLog("holidayEvent", "yoda_fountain.waitingDone: There were no params passed to the vendor3 message handler."); return SCRIPT_CONTINUE; @@ -984,7 +939,7 @@ public class yoda_fountain extends script.base_script String waitingOnList = ""; if (lastestMiaList.size() == 1) { - CustomerServiceLog("holidayEvent", "emperor_statue.waitingDone: The list length for MIA players is only one player: " + ((obj_id)lastestMiaList.get(0))); + CustomerServiceLog("holidayEvent", "emperor_statue.waitingDone: The list length for MIA players is only one player: " + lastestMiaList.get(0)); waitingOnList = getFirstName(((obj_id)lastestMiaList.get(0))); } else @@ -1025,11 +980,9 @@ public class yoda_fountain extends script.base_script } prose.setTO(pp, waitingOnList); chat.chat(leia, oldMiaList[0], pp); - for (int i = 0; i < oldMiaList.length; i++) - { - if (isIdValid(oldMiaList[i]) && exists(oldMiaList[i])) - { - utils.removeScriptVar(oldMiaList[i], "emperorsDayBadge"); + for (obj_id miaItem : oldMiaList) { + if (isIdValid(miaItem) && exists(miaItem)) { + utils.removeScriptVar(miaItem, "emperorsDayBadge"); } } } @@ -1065,7 +1018,7 @@ public class yoda_fountain extends script.base_script utils.addElement(nonFactionalTemplates, dataTableGetString(firework.TBL_FX, i, "template")); } } - if (nonFactionalTemplates == null || nonFactionalTemplates.size() <= 0) + if (nonFactionalTemplates.size() <= 0) { return SCRIPT_CONTINUE; } @@ -1097,15 +1050,12 @@ public class yoda_fountain extends script.base_script if (utils.hasScriptVar(self, "soldier")) { Vector npc = utils.getResizeableObjIdArrayScriptVar(self, "soldier"); - for (int i = 0; i < npc.size(); i++) - { - if (isIdValid(((obj_id)npc.get(i))) && exists(((obj_id)npc.get(i)))) - { - if (isValidId(getObjectInSlot(((obj_id)npc.get(i)), "hold_r"))) - { + for (Object aNpc : npc) { + if (isIdValid(((obj_id) aNpc)) && exists(((obj_id) aNpc))) { + if (isValidId(getObjectInSlot(((obj_id) aNpc), "hold_r"))) { continue; } - doAnimationAction(((obj_id)npc.get(i)), "salute1"); + doAnimationAction(((obj_id) aNpc), "salute1"); } } } @@ -1192,16 +1142,13 @@ public class yoda_fountain extends script.base_script } location loc = getLocation(self); obj_id[] objects = getObjectsInRange(loc, holiday.OBJECT_NEAR_CHECK_RANGE_100M); - for (int i = 0; i < objects.length; i++) - { - if (isIdValid(objects[i])) - { - if (hasObjVar(objects[i], "soldier")) - { - int soldierNumber = getIntObjVar(objects[i], "soldier"); - obj_id pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnsoldier" + soldierNumber, holiday.OBJECT_NEAR_CHECK_RANGE_100M); - location pathLoc = getLocation(pathPoint); - pathTo(objects[i], pathLoc); + obj_id pathPoint; + for (obj_id object : objects) { + if (isIdValid(object)) { + if (hasObjVar(object, "soldier")) { + int soldierNumber = getIntObjVar(object, "soldier"); + pathPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnsoldier" + soldierNumber, holiday.OBJECT_NEAR_CHECK_RANGE_100M); + pathTo(object, getLocation(pathPoint)); } } } @@ -1247,37 +1194,37 @@ public class yoda_fountain extends script.base_script switch (num) { case 1: - break; + break; case 2: - playRebelFlyBy02(self, right); - break; + playRebelFlyBy(self, right, 2); + break; case 3: - playRebelFlyBy03(self, left); - break; + playRebelFlyBy(self, left, 3); + break; case 4: - playRebelFlyBy04(self, right); - break; + playRebelFlyBy(self, right, 4); + break; case 5: - playRebelFlyBy01(self, right); - break; + playRebelFlyBy(self, right, 1); + break; case 6: - playRebelFlyBy02(self, left); - break; + playRebelFlyBy(self, left, 2); + break; case 7: - playRebelFlyBy03(self, right); - break; + playRebelFlyBy(self, right, 3); + break; case 8: - playRebelFlyBy04(self, left); - break; + playRebelFlyBy(self, left, 4); + break; default: - playRebelFlyBy01(self, left); - break; + playRebelFlyBy(self, left, 1); + break; } return SCRIPT_CONTINUE; } - public boolean playRebelFlyBy01(obj_id self, obj_id playOnObject) throws InterruptedException + public boolean playRebelFlyBy(obj_id self, obj_id playOnObject, int sequence) throws InterruptedException { - CustomerServiceLog("holidayEvent", "yoda_fountain.playTieFighterGroup: Function initialized."); + CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy: Function initialized."); if (!isValidId(self) || !exists(self)) { return false; @@ -1286,58 +1233,23 @@ public class yoda_fountain extends script.base_script { return false; } - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy01: playing."); + CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy" + sequence + ": playing."); location here = getLocation(playOnObject); - playClientEffectLoc(getPlayerCreaturesInRange(here, 200.0f), holiday.REBEL_FLYBY_PARTICLE_01, here, 1.0f); + playClientEffectLoc(getPlayerCreaturesInRange(here, 200.0f), getFlyBy(sequence), here, 1.0f); return true; } - public boolean playRebelFlyBy02(obj_id self, obj_id playOnObject) throws InterruptedException - { - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy02: Function initialized."); - if (!isValidId(self) || !exists(self)) - { - return false; + private String getFlyBy(int sequence){ + switch(sequence){ + case 1: + return holiday.REBEL_FLYBY_PARTICLE_01; + case 2: + return holiday.REBEL_FLYBY_PARTICLE_02; + case 3: + return holiday.REBEL_FLYBY_PARTICLE_03; + case 4: + return holiday.REBEL_FLYBY_PARTICLE_04; } - if (!isValidId(playOnObject) || !exists(playOnObject)) - { - return false; - } - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy02: playing."); - location here = getLocation(playOnObject); - playClientEffectLoc(getPlayerCreaturesInRange(here, 200.0f), holiday.REBEL_FLYBY_PARTICLE_02, here, 1.0f); - return true; - } - public boolean playRebelFlyBy03(obj_id self, obj_id playOnObject) throws InterruptedException - { - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy03: Function initialized."); - if (!isValidId(self) || !exists(self)) - { - return false; - } - if (!isValidId(playOnObject) || !exists(playOnObject)) - { - return false; - } - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy03: playing."); - location here = getLocation(playOnObject); - playClientEffectLoc(getPlayerCreaturesInRange(here, 200.0f), holiday.REBEL_FLYBY_PARTICLE_03, here, 1.0f); - return true; - } - public boolean playRebelFlyBy04(obj_id self, obj_id playOnObject) throws InterruptedException - { - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy04: Function initialized."); - if (!isValidId(self) || !exists(self)) - { - return false; - } - if (!isValidId(playOnObject) || !exists(playOnObject)) - { - return false; - } - CustomerServiceLog("holidayEvent", "yoda_fountain.playRebelFlyBy04: playing."); - location here = getLocation(playOnObject); - playClientEffectLoc(getPlayerCreaturesInRange(here, 200.0f), holiday.REBEL_FLYBY_PARTICLE_04, here, 1.0f); - return true; + return holiday.REBEL_FLYBY_PARTICLE_01; } public boolean createFalconDropship(obj_id fountain, location loc) throws InterruptedException {