diff --git a/sku.0/sys.server/compiled/game/script/event/area_badge.java b/sku.0/sys.server/compiled/game/script/event/area_badge.java old mode 100644 new mode 100755 index 5c4a742ab..bdb62756b --- a/sku.0/sys.server/compiled/game/script/event/area_badge.java +++ b/sku.0/sys.server/compiled/game/script/event/area_badge.java @@ -1,15 +1,9 @@ package script.event; -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.utils; import script.library.badge; +import script.library.utils; +import script.obj_id; + import java.util.StringTokenizer; public class area_badge extends script.base_script @@ -17,7 +11,7 @@ public class area_badge extends script.base_script public area_badge() { } - public static final String[] HELP_TEXT = + private static final String[] HELP_TEXT = { "------------------------------------", "USAGE: \"areabadge \"", @@ -39,8 +33,7 @@ public class area_badge extends script.base_script } if (isGod(self)) { - int godLevel = getGodLevel(self); - if (godLevel < 5) + if (getGodLevel(self) < 5) { detachScript(self, "event.area_badge"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -57,10 +50,9 @@ public class area_badge extends script.base_script detachScript(self, "event.area_badge"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 5) + if (getGodLevel(self) < 5) { detachScript(self, "event.area_badge"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -77,15 +69,14 @@ public class area_badge extends script.base_script } if (isGod(self)) { - int godLevel = getGodLevel(self); - if (godLevel < 5) + if (getGodLevel(self) < 5) { detachScript(self, "event.area_badge"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); return SCRIPT_CONTINUE; } } - if (!isGod(self)) + else { detachScript(self, "event.area_badge"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); @@ -101,9 +92,8 @@ public class area_badge extends script.base_script String command = st.nextToken(); String badgeRangeStr = st.nextToken(); String badgeNumberStr = st.nextToken(); - int badgeRangeInt = utils.stringToInt(badgeRangeStr); badgeNumber = utils.stringToInt(badgeNumberStr); - badgeRange = (float)badgeRangeInt; + badgeRange = (float) utils.stringToInt(badgeRangeStr); if (badgeRange > 256 || badgeRange < 1) { sendSystemMessage(self, "Error: Specify a range between 1 and 256.", null); @@ -123,13 +113,10 @@ public class area_badge extends script.base_script obj_id[] objPlayers = getPlayerCreaturesInRange(self, badgeRange); if (objPlayers != null && objPlayers.length > 0) { - for (int i = 0; i < objPlayers.length; i++) - { - if (objPlayers[i] != self) - { - badge.grantBadge(objPlayers[i], badgeName); - String playerName = getName(objPlayers[i]); - sendSystemMessage(self, "Granting badge " + badgeNumber + " to player " + playerName, null); + for (obj_id objPlayer : objPlayers) { + if (objPlayer != self) { + badge.grantBadge(objPlayer, badgeName); + sendSystemMessage(self, "Granting badge " + badgeNumber + " to player " + getName(objPlayer), null); } } } @@ -138,15 +125,12 @@ public class area_badge extends script.base_script if ((toLower(strText)).equals("detach")) { detachScript(self, "event.area_badge"); - return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("help")) + else if ((toLower(strText)).equals("help")) { - for (int i = 0; i < HELP_TEXT.length; i++) - { - sendSystemMessage(self, HELP_TEXT[i], null); + for (String helpText : HELP_TEXT) { + sendSystemMessage(self, helpText, null); } - return SCRIPT_CONTINUE; } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/area_tefme.java b/sku.0/sys.server/compiled/game/script/event/area_tefme.java old mode 100644 new mode 100755 index da864d251..074cd491c --- a/sku.0/sys.server/compiled/game/script/event/area_tefme.java +++ b/sku.0/sys.server/compiled/game/script/event/area_tefme.java @@ -1,21 +1,14 @@ package script.event; -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.utils; +import script.obj_id; public class area_tefme extends script.base_script { public area_tefme() { } - public static final String[] HELP_TEXT = + private static final String[] HELP_TEXT = { "=========================================", "KEY WORDS (These are case sensitive): setStartPhrase, setEndPhrase, setAreaRange, setSingleMode, setAreaMode, showStats, detach.", @@ -25,7 +18,7 @@ public class area_tefme extends script.base_script "setSingleMode: Puts you in single target mode, meaning only your look-at target will get a TEF against you.", "setAreaMode: Puts you in area wide mode.", "showStats: Check what mode you are in and current variables.", - "detach: Detachs this script and clears objvars.", + "detach: Detaches this script and clears objvars.", "=========================================" }; public int OnAttach(obj_id self) throws InterruptedException @@ -42,10 +35,9 @@ public class area_tefme extends script.base_script removeObjVar(self, "event.tefme"); return SCRIPT_CONTINUE; } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.area_tefme"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -71,8 +63,7 @@ public class area_tefme extends script.base_script } if (isGod(self)) { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.area_tefme"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -80,7 +71,7 @@ public class area_tefme extends script.base_script return SCRIPT_CONTINUE; } } - if (!isGod(self)) + else { detachScript(self, "event.area_tefme"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); @@ -99,13 +90,10 @@ public class area_tefme extends script.base_script obj_id[] objPlayers = getPlayerCreaturesInRange(self, range); if (objPlayers != null && objPlayers.length > 0) { - for (int i = 0; i < objPlayers.length; i++) - { - if (objPlayers[i] != self) - { - pvpSetPersonalEnemyFlag(self, objPlayers[i]); - String playerName = getName(objPlayers[i]); - sendSystemMessage(self, playerName + " can now attack you!", null); + for (obj_id objPlayer : objPlayers) { + if (objPlayer != self) { + pvpSetPersonalEnemyFlag(self, objPlayer); + sendSystemMessage(self, getName(objPlayer) + " can now attack you!", null); } } } @@ -116,7 +104,7 @@ public class area_tefme extends script.base_script sendSystemMessage(self, "Clearing your TEFs. Note that you may still be able to attack some players for a period of time.", null); } } - if (mode == 1 && currentState == 0) + else if (mode == 1 && currentState == 0) { if (strText.equalsIgnoreCase(startPhrase)) { @@ -124,8 +112,7 @@ public class area_tefme extends script.base_script if (isIdValid(target) && target != self) { pvpSetPersonalEnemyFlag(self, target); - String playerName = getName(target); - sendSystemMessage(self, playerName + " can now attack you!", null); + sendSystemMessage(self, getName(target) + " can now attack you!", null); } } if (strText.equalsIgnoreCase(endPhrase)) @@ -134,7 +121,7 @@ public class area_tefme extends script.base_script sendSystemMessage(self, "Clearing your TEFs. Note that you may still be able to attack some players for a period of time.", null); } } - if (currentState == 1) + else if (currentState == 1) { if (strText.equalsIgnoreCase(endPhrase)) { @@ -146,7 +133,7 @@ public class area_tefme extends script.base_script sendSystemMessage(self, "You will TEF yourself when you say the following phrase: " + strText, null); return SCRIPT_CONTINUE; } - if (currentState == 2) + else if (currentState == 2) { if (strText.equalsIgnoreCase(startPhrase)) { @@ -158,10 +145,9 @@ public class area_tefme extends script.base_script sendSystemMessage(self, "You will attempt to lose your TEFs when you say the following phrase: " + strText, null); return SCRIPT_CONTINUE; } - if (currentState == 3) + else if (currentState == 3) { - String rangeStr = strText; - range = utils.stringToInt(rangeStr); + range = utils.stringToInt(strText); if (range < 1 || range > 256) { sendSystemMessage(self, "Range must be between 1 and 255. Please note that these are numbers. Try again.", null); @@ -172,7 +158,7 @@ public class area_tefme extends script.base_script sendSystemMessage(self, "Your TEF range is set to " + strText + "m.", null); return SCRIPT_CONTINUE; } - if (currentState > 3) + else if (currentState > 3) { setObjVar(self, "event.tefme.currentState", 0); sendSystemMessage(self, "Somehow currentState was above 3. Resetting it to 0.", null); @@ -188,33 +174,28 @@ public class area_tefme extends script.base_script { setObjVar(self, "event.tefme.currentState", 1); sendSystemMessage(self, "The next phrase you say will be set as the trigger to TEF yourself.", null); - return SCRIPT_CONTINUE; } - if (strText.equals("setEndPhrase")) + else if (strText.equals("setEndPhrase")) { setObjVar(self, "event.tefme.currentState", 2); sendSystemMessage(self, "The next phrase you say will be set as the trigger to attempt to remove your TEFs.", null); - return SCRIPT_CONTINUE; } - if (strText.equals("setAreaRange")) + else if (strText.equals("setAreaRange")) { setObjVar(self, "event.tefme.currentState", 3); sendSystemMessage(self, "Speak the range you wish to use for the AOE TEF.", null); - return SCRIPT_CONTINUE; } - if (strText.equals("setSingleMode")) + else if (strText.equals("setSingleMode")) { setObjVar(self, "event.tefme.mode", 1); sendSystemMessage(self, "Single TEF Mode active. Your look-at target will recieve a TEF for you when you speak the startPhrase.", null); - return SCRIPT_CONTINUE; } - if (strText.equals("setAreaMode")) + else if (strText.equals("setAreaMode")) { setObjVar(self, "event.tefme.mode", 0); sendSystemMessage(self, "Area Mode active. Everyone within " + range + "m will get a TEF against you when you speak the startPhrase.", null); - return SCRIPT_CONTINUE; } - if (strText.equals("showStats")) + else if (strText.equals("showStats")) { String currentModeStr = "Area Mode"; if (mode == 0) @@ -229,21 +210,17 @@ public class area_tefme extends script.base_script sendSystemMessage(self, "Your start phrase is: " + startPhrase, null); sendSystemMessage(self, "Your end phrase is: " + endPhrase, null); sendSystemMessage(self, "Your current AOE range is set to " + range + "m", null); - return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("detach")) + else if ((toLower(strText)).equals("detach")) { detachScript(self, "event.area_tefme"); removeObjVar(self, "event.tefme"); - return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("help")) + else if ((toLower(strText)).equals("help")) { - for (int i = 0; i < HELP_TEXT.length; i++) - { - sendSystemMessage(self, HELP_TEXT[i], null); + for (String helpText : HELP_TEXT) { + sendSystemMessage(self, helpText, null); } - return SCRIPT_CONTINUE; } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/boss_buff.java b/sku.0/sys.server/compiled/game/script/event/boss_buff.java old mode 100644 new mode 100755 index 9803e8082..9d724b430 --- a/sku.0/sys.server/compiled/game/script/event/boss_buff.java +++ b/sku.0/sys.server/compiled/game/script/event/boss_buff.java @@ -1,23 +1,14 @@ package script.event; -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.utils; -import script.library.healing; -import java.util.StringTokenizer; +import script.obj_id; public class boss_buff extends script.base_script { public boss_buff() { } - public static final String[] HELP_TEXT = + private static final String[] HELP_TEXT = { "=========================================", "USAGE:", @@ -44,10 +35,9 @@ public class boss_buff extends script.base_script sendSystemMessage(self, "You must be in God Mode for this script to take hold.", null); return SCRIPT_CONTINUE; } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.boss_buff"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -64,14 +54,12 @@ public class boss_buff extends script.base_script detachScript(self, "event.boss_buff"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.boss_buff"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); - return SCRIPT_CONTINUE; } } return SCRIPT_CONTINUE; @@ -84,15 +72,14 @@ public class boss_buff extends script.base_script } if (isGod(self)) { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.boss_buff"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); return SCRIPT_CONTINUE; } } - if (!isGod(self)) + else { detachScript(self, "event.boss_buff"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); @@ -105,7 +92,7 @@ public class boss_buff extends script.base_script { target = self; } - if ((toLower(strText)).startsWith("target")) + else if ((toLower(strText)).startsWith("target")) { target = getLookAtTarget(self); if (!isIdValid(target) || target == null) @@ -113,89 +100,50 @@ public class boss_buff extends script.base_script target = self; } } - int buffLevel = 1; - int buffTime = 10; - int secondBuffLevel = 1; - StringTokenizer st = new StringTokenizer(strText); - if (st.countTokens() < 2 || st.countTokens() > 4) - { - return SCRIPT_CONTINUE; - } - if (st.countTokens() == 2) - { - String command = st.nextToken(); - String buffLevelStr = st.nextToken(); - buffLevel = utils.stringToInt(buffLevelStr); - secondBuffLevel = buffLevel / 2; - buffTime = 10000; - } - if (st.countTokens() == 3) - { - String command = st.nextToken(); - String buffLevelStr = st.nextToken(); - String secondBuffLevelStr = st.nextToken(); - buffLevel = utils.stringToInt(buffLevelStr); - buffTime = 10000; - if ((toLower(secondBuffLevelStr)).equals("low")) - { - secondBuffLevel = buffLevel / 10; - if (secondBuffLevel > 10000) + int buffTime = 10000; + String secondBuffLevelStr; + String args[] = strText.split(" "); + int buffLevel = utils.stringToInt(args[1]); + int secondBuffLevel = buffLevel / 2; + secondBuffLevelStr = args[2]; + switch(args.length){ + case 4: + buffTime = utils.stringToInt(args[3]); + // don't break. + case 3: + if ((toLower(secondBuffLevelStr)).equals("low")) { - secondBuffLevel = 10000; + secondBuffLevel = buffLevel / 10; + if (secondBuffLevel > 10000) + { + secondBuffLevel = 10000; + } } - } - if ((toLower(secondBuffLevelStr)).equals("default")) - { - secondBuffLevel = buffLevel / 2; - } - if (!(toLower(secondBuffLevelStr)).equals("low") && !(toLower(secondBuffLevelStr)).equals("default")) - { - secondBuffLevel = utils.stringToInt(secondBuffLevelStr); - } - } - if (st.countTokens() == 4) - { - String command = st.nextToken(); - String buffLevelStr = st.nextToken(); - String secondBuffLevelStr = st.nextToken(); - String buffTimeStr = st.nextToken(); - buffLevel = utils.stringToInt(buffLevelStr); - buffTime = utils.stringToInt(buffTimeStr); - if ((toLower(secondBuffLevelStr)).equals("low")) - { - secondBuffLevel = buffLevel / 10; - if (secondBuffLevel > 10000) + else if (!(toLower(secondBuffLevelStr)).equals("default")) { - secondBuffLevel = 10000; + secondBuffLevel = utils.stringToInt(secondBuffLevelStr); } - } - if ((toLower(secondBuffLevelStr)).equals("default")) - { - secondBuffLevel = buffLevel / 2; - } - if (!(toLower(secondBuffLevelStr)).equals("low") && !(toLower(secondBuffLevelStr)).equals("default")) - { - secondBuffLevel = utils.stringToInt(secondBuffLevelStr); - } + // don't break. + case 2: + addAttribModifier(target, "medical_enhance_health", HEALTH, buffLevel, buffTime, 0.0f, 10.0f, true, false, true); + addAttribModifier(target, "medical_enhance_action", ACTION, buffLevel, buffTime, 0.0f, 10.0f, true, false, true); + addAttribModifier(target, "medical_enhance_constitution", CONSTITUTION, secondBuffLevel, buffTime, 0.0f, 10.0f, true, false, true); + addAttribModifier(target, "medical_enhance_stamina", STAMINA, secondBuffLevel, buffTime, 0.0f, 10.0f, true, false, true); + sendSystemMessage(self, "Primary stats: " + buffLevel + " -- Secondary stats: " + secondBuffLevel + " -- Duration: " + buffTime, null); + // don't break. + default: + return SCRIPT_CONTINUE; } - addAttribModifier(target, "medical_enhance_health", HEALTH, buffLevel, buffTime, 0.0f, 10.0f, true, false, true); - addAttribModifier(target, "medical_enhance_action", ACTION, buffLevel, buffTime, 0.0f, 10.0f, true, false, true); - addAttribModifier(target, "medical_enhance_constitution", CONSTITUTION, secondBuffLevel, buffTime, 0.0f, 10.0f, true, false, true); - addAttribModifier(target, "medical_enhance_stamina", STAMINA, secondBuffLevel, buffTime, 0.0f, 10.0f, true, false, true); - sendSystemMessage(self, "Primary stats: " + buffLevel + " -- Secondary stats: " + secondBuffLevel + " -- Duration: " + buffTime, null); } - if ((toLower(strText)).equals("detach")) + else if ((toLower(strText)).equals("detach")) { detachScript(self, "event.boss_buff"); - return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("help")) + else if ((toLower(strText)).equals("help")) { - for (int i = 0; i < HELP_TEXT.length; i++) - { - sendSystemMessage(self, HELP_TEXT[i], null); + for (String helpText : HELP_TEXT) { + sendSystemMessage(self, helpText, null); } - return SCRIPT_CONTINUE; } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/event_tool.java b/sku.0/sys.server/compiled/game/script/event/event_tool.java old mode 100644 new mode 100755 index 85a729aad..d66338ceb --- a/sku.0/sys.server/compiled/game/script/event/event_tool.java +++ b/sku.0/sys.server/compiled/game/script/event/event_tool.java @@ -1,31 +1,18 @@ package script.event; -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.*; +import script.location; +import script.obj_id; -import script.library.create; -import script.library.pclib; -import script.library.dot; -import script.library.combat; -import script.library.utils; import java.util.StringTokenizer; -import script.library.buff; -import script.library.badge; -import script.library.healing; -import script.library.pet_lib; -import script.library.weapons; public class event_tool extends script.base_script { public event_tool() { } - public static final String[] BADBUFFS = + private static final String[] BADBUFFS = { "movement", "delay_attack", @@ -41,197 +28,159 @@ public class event_tool extends script.base_script StringTokenizer st = new java.util.StringTokenizer(text); int tokens = st.countTokens(); String command = null; - if (st.hasMoreTokens()) - { + if (st.hasMoreTokens()) { command = st.nextToken(); - } - if (command.equals("grantCommunityBadge")) - { - dictionary dict = new dictionary(); - dict.put("communityRep", self); - String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); - if (st.hasMoreTokens()) - { + if (command.equals("grantCommunityBadge")) { + dictionary dict = new dictionary(); + dict.put("communityRep", self); + String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); + if (st.hasMoreTokens()) { + String playerName = ""; + String badgeName = ""; + if (st.hasMoreTokens()) { + playerName = st.nextToken(); + } + if (st.hasMoreTokens()) { + badgeName = st.nextToken(); + } + if (playerName == null || playerName.length() <= 0) { + sendSystemMessage(self, "You must supply a player name.", ""); + return SCRIPT_CONTINUE; + } + if (badgeName == null || badgeName.length() <= 0) { + sendSystemMessage(self, "You must supply a badge name.", ""); + return SCRIPT_CONTINUE; + } + String[] info = getCollectionSlotInfo(badgeName); + if ((info == null) || (info.length != COLLECTION_INFO_ARRAY_SIZE) || (info[COLLECTION_INFO_INDEX_BOOK] == null) || (!info[COLLECTION_INFO_INDEX_BOOK].equals(badge.BADGE_BOOK))) { + sendSystemMessage(self, "This is an invalid badge name.", ""); + return SCRIPT_CONTINUE; + } + String collectionName = info[COLLECTION_INFO_INDEX_COLLECTION]; + if (collectionName == null || collectionName.length() <= 0) { + sendSystemMessage(self, "Somehow this badge is missing a collection. Contact Development", ""); + return SCRIPT_CONTINUE; + } + if (!collectionName.equals("col_badge_accolades")) { + sendSystemMessage(self, "This badge is not a community badge.", ""); + sendSystemMessage(self, "Valid Community Badges are:", ""); + for (String allCommunityBadge : allCommunityBadges) { + sendSystemMessage(self, allCommunityBadge, ""); + } + return SCRIPT_CONTINUE; + } + obj_id player = getPlayerIdFromFirstName(playerName); + if (!isIdValid(player)) { + sendSystemMessage(self, "The name you supplied could not be found. Please check spelling.", ""); + return SCRIPT_CONTINUE; + } + dict.put("badgeName", badgeName); + messageTo(player, "handlerCommunityBadgeGrant", dict, 0, true); + CustomerServiceLog("EventPerk", "[EventTool] 'grantCommunityBadge' used by " + getPlayerName(self) + ":" + self + ". Awarding badge " + badgeName + " to " + getPlayerName(player) + ":" + player + " .", null); + sendSystemMessage(self, "Message sent to grant badge. Please wait for response. If you dont get one, the player is not online.", ""); + return SCRIPT_CONTINUE; + } else { + sendSystemMessage(self, "You need to specify a player name and what badge you want to grant.", ""); + sendSystemMessage(self, "Correct syntax is grantCommunityBadge .", ""); + sendSystemMessage(self, "Valid Community Badges are:", ""); + for (String allCommunityBadge : allCommunityBadges) { + sendSystemMessage(self, allCommunityBadge, ""); + } + } + return SCRIPT_CONTINUE; + } + if (command.equals("grantAllCommunityBadges")) { + dictionary dict = new dictionary(); + dict.put("communityRep", self); String playerName = ""; - String badgeName = ""; - if (st.hasMoreTokens()) - { + if (st.hasMoreTokens()) { playerName = st.nextToken(); + } else { + sendSystemMessage(self, "You need to specify a player name.", ""); + sendSystemMessage(self, "Correct syntax is grantAllCommunityBadges .", ""); + return SCRIPT_CONTINUE; } - if (st.hasMoreTokens()) - { - badgeName = st.nextToken(); - } - if (playerName == null || playerName.length() <= 0) - { + if (playerName == null || playerName.length() <= 0) { sendSystemMessage(self, "You must supply a player name.", ""); return SCRIPT_CONTINUE; } - if (badgeName == null || badgeName.length() <= 0) - { - sendSystemMessage(self, "You must supply a badge name.", ""); - return SCRIPT_CONTINUE; - } - String[] info = getCollectionSlotInfo(badgeName); - if ((info == null) || (info.length != COLLECTION_INFO_ARRAY_SIZE) || (info[COLLECTION_INFO_INDEX_BOOK] == null) || (!info[COLLECTION_INFO_INDEX_BOOK].equals(badge.BADGE_BOOK))) - { - sendSystemMessage(self, "This is an invalid badge name.", ""); - return SCRIPT_CONTINUE; - } - String collectionName = info[COLLECTION_INFO_INDEX_COLLECTION]; - if (collectionName == null || collectionName.length() <= 0) - { - sendSystemMessage(self, "Somehow this badge is missing a collection. Contact Development", ""); - return SCRIPT_CONTINUE; - } - if (!collectionName.equals("col_badge_accolades")) - { - sendSystemMessage(self, "This badge is not a community badge.", ""); - sendSystemMessage(self, "Valid Community Badges are:", ""); - for (int i = 0; i < allCommunityBadges.length; ++i) - { - sendSystemMessage(self, allCommunityBadges[i], ""); - } - return SCRIPT_CONTINUE; - } obj_id player = getPlayerIdFromFirstName(playerName); - if (!isIdValid(player)) - { + if (!isIdValid(player)) { sendSystemMessage(self, "The name you supplied could not be found. Please check spelling.", ""); return SCRIPT_CONTINUE; } - dict.put("badgeName", badgeName); - messageTo(player, "handlerCommunityBadgeGrant", dict, 0, true); - CustomerServiceLog("EventPerk", "[EventTool] 'grantCommunityBadge' used by " + getPlayerName(self) + ":" + self + ". Awarding badge " + badgeName + " to " + getPlayerName(player) + ":" + player + " .", null); - sendSystemMessage(self, "Message sent to grant badge. Please wait for response. If you dont get one, the player is not online.", ""); + String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); + for (String allCommunityBadge : allCommunityBadges) { + dict.put("badgeName", allCommunityBadge); + messageTo(player, "handlerCommunityBadgeGrant", dict, 0, true); + } + CustomerServiceLog("EventPerk", "[EventTool] 'grantAllCommunityBadges' used by " + getPlayerName(self) + ":" + self + ". Awarding all community badges to " + getPlayerName(player) + ":" + player + " .", null); + sendSystemMessage(self, "Messages sent to grant badges. Please wait for responses. If you dont get any, the player is not online.", ""); return SCRIPT_CONTINUE; } - else - { - sendSystemMessage(self, "You need to specify a player name and what badge you want to grant.", ""); - sendSystemMessage(self, "Correct syntax is grantCommunityBadge .", ""); - sendSystemMessage(self, "Valid Community Badges are:", ""); - for (int i = 0; i < allCommunityBadges.length; ++i) - { - sendSystemMessage(self, allCommunityBadges[i], ""); - } - } - return SCRIPT_CONTINUE; - } - if (command.equals("grantAllCommunityBadges")) - { - dictionary dict = new dictionary(); - dict.put("communityRep", self); - String playerName = ""; - if (st.hasMoreTokens()) - { - playerName = st.nextToken(); - } - else - { - sendSystemMessage(self, "You need to specify a player name.", ""); - sendSystemMessage(self, "Correct syntax is grantAllCommunityBadges .", ""); - return SCRIPT_CONTINUE; - } - if (playerName == null || playerName.length() <= 0) - { - sendSystemMessage(self, "You must supply a player name.", ""); - return SCRIPT_CONTINUE; - } - obj_id player = getPlayerIdFromFirstName(playerName); - if (!isIdValid(player)) - { - sendSystemMessage(self, "The name you supplied could not be found. Please check spelling.", ""); - return SCRIPT_CONTINUE; - } - String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); - for (int i = 0; i < allCommunityBadges.length; ++i) - { - dict.put("badgeName", allCommunityBadges[i]); - messageTo(player, "handlerCommunityBadgeGrant", dict, 0, true); - } - CustomerServiceLog("EventPerk", "[EventTool] 'grantAllCommunityBadges' used by " + getPlayerName(self) + ":" + self + ". Awarding all community badges to " + getPlayerName(player) + ":" + player + " .", null); - sendSystemMessage(self, "Messages sent to grant badges. Please wait for responses. If you dont get any, the player is not online.", ""); - return SCRIPT_CONTINUE; - } - if (command.equals("grantCommunityBadgeArea")) - { - dictionary dict = new dictionary(); - dict.put("communityRep", self); - if (st.hasMoreTokens()) - { - String badgeName = ""; - int range = 0; - if (st.hasMoreTokens()) - { - badgeName = st.nextToken(); - } - if (st.hasMoreTokens()) - { - range = utils.stringToInt(st.nextToken()); - } - if (badgeName == null || badgeName.length() <= 0) - { - sendSystemMessage(self, "You must supply a badge name.", ""); - return SCRIPT_CONTINUE; - } - if (range <= 0 || range > 156) - { - sendSystemMessage(self, "You supplied an invalid range.", ""); - sendSystemMessage(self, "Valid range is 1 to 156.", ""); - return SCRIPT_CONTINUE; - } - String[] info = getCollectionSlotInfo(badgeName); - if ((info == null) || (info.length != COLLECTION_INFO_ARRAY_SIZE) || (info[COLLECTION_INFO_INDEX_BOOK] == null) || (!info[COLLECTION_INFO_INDEX_BOOK].equals(badge.BADGE_BOOK))) - { - sendSystemMessage(self, "This is an invalid badge name.", ""); - return SCRIPT_CONTINUE; - } - String collectionName = info[COLLECTION_INFO_INDEX_COLLECTION]; - if (collectionName == null || collectionName.length() <= 0) - { - sendSystemMessage(self, "Somehow this badge is missing a collection. Contact Development", ""); - return SCRIPT_CONTINUE; - } - if (!collectionName.equals("col_badge_accolades")) - { - sendSystemMessage(self, "This badge is not a community badge.", ""); - sendSystemMessage(self, "Valid Community Badges are:", ""); - String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); - for (int i = 0; i < allCommunityBadges.length; ++i) - { - sendSystemMessage(self, allCommunityBadges[i], ""); + if (command.equals("grantCommunityBadgeArea")) { + dictionary dict = new dictionary(); + dict.put("communityRep", self); + if (st.hasMoreTokens()) { + String badgeName = ""; + int range = 0; + if (st.hasMoreTokens()) { + badgeName = st.nextToken(); } - return SCRIPT_CONTINUE; - } - int badgeCount = 0; - obj_id[] objPlayers = getPlayerCreaturesInRange(self, range); - if (objPlayers != null && objPlayers.length > 0) - { - for (int i = 0; i < objPlayers.length; i++) - { - if (objPlayers[i] != self) - { - dict.put("badgeName", badgeName); - messageTo(objPlayers[i], "handlerCommunityBadgeGrant", dict, 0, true); - sendSystemMessage(self, "Message sent to grant badge. Please wait for response. If you dont get one, the player is not online.", ""); - badgeCount++; + if (st.hasMoreTokens()) { + range = utils.stringToInt(st.nextToken()); + } + if (badgeName == null || badgeName.length() <= 0) { + sendSystemMessage(self, "You must supply a badge name.", ""); + return SCRIPT_CONTINUE; + } + if (range <= 0 || range > 156) { + sendSystemMessage(self, "You supplied an invalid range.", ""); + sendSystemMessage(self, "Valid range is 1 to 156.", ""); + return SCRIPT_CONTINUE; + } + String[] info = getCollectionSlotInfo(badgeName); + if ((info == null) || (info.length != COLLECTION_INFO_ARRAY_SIZE) || (info[COLLECTION_INFO_INDEX_BOOK] == null) || (!info[COLLECTION_INFO_INDEX_BOOK].equals(badge.BADGE_BOOK))) { + sendSystemMessage(self, "This is an invalid badge name.", ""); + return SCRIPT_CONTINUE; + } + String collectionName = info[COLLECTION_INFO_INDEX_COLLECTION]; + if (collectionName == null || collectionName.length() <= 0) { + sendSystemMessage(self, "Somehow this badge is missing a collection. Contact Development", ""); + return SCRIPT_CONTINUE; + } + if (!collectionName.equals("col_badge_accolades")) { + sendSystemMessage(self, "This badge is not a community badge.", ""); + sendSystemMessage(self, "Valid Community Badges are:", ""); + String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); + for (String allCommunityBadge : allCommunityBadges) { + sendSystemMessage(self, allCommunityBadge, ""); + } + return SCRIPT_CONTINUE; + } + int badgeCount = 0; + obj_id[] objPlayers = getPlayerCreaturesInRange(self, range); + if (objPlayers != null && objPlayers.length > 0) { + for (obj_id objPlayer : objPlayers) { + if (objPlayer != self) { + dict.put("badgeName", badgeName); + messageTo(objPlayer, "handlerCommunityBadgeGrant", dict, 0, true); + sendSystemMessage(self, "Message sent to grant badge. Please wait for response. If you dont get one, the player is not online.", ""); + badgeCount++; + } } } - } - sendSystemMessage(self, "A total of " + badgeCount + " badges were awarded.", null); - CustomerServiceLog("EventPerk", "[EventTool] 'grantCommunityBadgeArea' used by " + getPlayerName(self) + ":" + self + ". Awarding badge " + badgeName + " to " + badgeCount + " people.", null); - } - else - { - sendSystemMessage(self, "You need to specify a badge name and range of area you want to give the badge.", ""); - sendSystemMessage(self, "Correct syntax is grantCommunityBadge .", ""); - sendSystemMessage(self, "Valid Range is 1 to 156.", ""); - sendSystemMessage(self, "Valid Community Badges are:", ""); - String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); - for (int i = 0; i < allCommunityBadges.length; ++i) - { - sendSystemMessage(self, allCommunityBadges[i], ""); + sendSystemMessage(self, "A total of " + badgeCount + " badges were awarded.", null); + CustomerServiceLog("EventPerk", "[EventTool] 'grantCommunityBadgeArea' used by " + getPlayerName(self) + ":" + self + ". Awarding badge " + badgeName + " to " + badgeCount + " people.", null); + } else { + sendSystemMessage(self, "You need to specify a badge name and range of area you want to give the badge.", ""); + sendSystemMessage(self, "Correct syntax is grantCommunityBadge .", ""); + sendSystemMessage(self, "Valid Range is 1 to 156.", ""); + sendSystemMessage(self, "Valid Community Badges are:", ""); + String[] allCommunityBadges = getAllCollectionSlotsInCollection("col_badge_accolades"); + for (String allCommunityBadge : allCommunityBadges) { + sendSystemMessage(self, allCommunityBadge, ""); + } } } } @@ -243,9 +192,8 @@ public class event_tool extends script.base_script { return SCRIPT_CONTINUE; } - obj_id player = params.getObjId("player"); String badgeName = params.getString("badgeName"); - sendSystemMessage(self, getPlayerName(player) + " has received the badge " + badgeName + " that you sent them.", ""); + sendSystemMessage(self, getPlayerName(params.getObjId("player")) + " has received the badge " + badgeName + " that you sent them.", ""); return SCRIPT_CONTINUE; } public int eventVaderChoke(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -261,9 +209,7 @@ public class event_tool extends script.base_script dictionary eDict = new dictionary(); eDict.put("myTarget", myTarget); messageTo(self, "killTargetPlayer", eDict, 6, false); - String selfName = getName(self); - String targetName = getName(myTarget); - CustomerServiceLog("EventPerk", "[EventTool] /eventVaderChoke used by [" + selfName + ":" + self + "] on [" + targetName + ":" + myTarget, null); + CustomerServiceLog("EventPerk", "[EventTool] /eventVaderChoke used by [" + getName(self) + ":" + self + "] on [" + getName(myTarget) + ":" + myTarget, null); return SCRIPT_CONTINUE; } public int eventClearStates(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -274,16 +220,14 @@ public class event_tool extends script.base_script buff.removeAllBuffs(self); return SCRIPT_CONTINUE; } - int[] everyBuff = buff.getAllBuffs(self); - for (int i = 0; i < everyBuff.length; i++) - { - String buffParam = buff.getEffectParam(everyBuff[i], 1); - for (int j = 0; j < BADBUFFS.length; j++) - { - if (buffParam.equals(BADBUFFS[j])) - { - buff.removeBuff(self, everyBuff[i]); - sendSystemMessage(self, everyBuff[i] + " is EEeevil so it was removed.", null); + int[] allBuffs = buff.getAllBuffs(self); + String buffParam; + for (int thisBuff : allBuffs) { + buffParam = buff.getEffectParam(thisBuff, 1); + for (String badBuff : BADBUFFS) { + if (buffParam.equals(badBuff)) { + buff.removeBuff(self, thisBuff); + sendSystemMessage(self, thisBuff + " is EEeevil so it was removed.", null); } } } @@ -429,21 +373,16 @@ public class event_tool extends script.base_script obj_id[] thingsInRange = getPlayerCreaturesInRange(self, range); if (thingsInRange != null && thingsInRange.length > 0) { - for (int i = 0; i < thingsInRange.length; i++) - { - if (thingsInRange[i] != self) - { - if (numArgs == 2) - { - buff.applyBuff(thingsInRange[i], buffName); + for (obj_id aThingsInRange : thingsInRange) { + if (aThingsInRange != self) { + if (numArgs == 2) { + buff.applyBuff(aThingsInRange, buffName); } - if (numArgs == 3) - { - buff.applyBuff(thingsInRange[i], buffName, duration); + else if (numArgs == 3) { + buff.applyBuff(aThingsInRange, buffName, duration); } - if (numArgs == 4) - { - buff.applyBuff(thingsInRange[i], buffName, duration, value); + else if (numArgs == 4) { + buff.applyBuff(aThingsInRange, buffName, duration, value); } } } @@ -454,21 +393,16 @@ public class event_tool extends script.base_script obj_id[] thingsInRange = getNPCsInRange(self, range); if (thingsInRange != null && thingsInRange.length > 0) { - for (int i = 0; i < thingsInRange.length; i++) - { - if (thingsInRange[i] != self) - { - if (numArgs == 2) - { - buff.applyBuff(thingsInRange[i], buffName); + for (obj_id aThingsInRange : thingsInRange) { + if (aThingsInRange != self) { + if (numArgs == 2) { + buff.applyBuff(aThingsInRange, buffName); } - if (numArgs == 3) - { - buff.applyBuff(thingsInRange[i], buffName, duration); + if (numArgs == 3) { + buff.applyBuff(aThingsInRange, buffName, duration); } - if (numArgs == 4) - { - buff.applyBuff(thingsInRange[i], buffName, duration, value); + if (numArgs == 4) { + buff.applyBuff(aThingsInRange, buffName, duration, value); } } } @@ -479,21 +413,16 @@ public class event_tool extends script.base_script obj_id[] thingsInRange = getCreaturesInRange(self, range); if (thingsInRange != null && thingsInRange.length > 0) { - for (int i = 0; i < thingsInRange.length; i++) - { - if (thingsInRange[i] != self) - { - if (numArgs == 2) - { - buff.applyBuff(thingsInRange[i], buffName); + for (obj_id aThingsInRange : thingsInRange) { + if (aThingsInRange != self) { + if (numArgs == 2) { + buff.applyBuff(aThingsInRange, buffName); } - if (numArgs == 3) - { - buff.applyBuff(thingsInRange[i], buffName, duration); + if (numArgs == 3) { + buff.applyBuff(aThingsInRange, buffName, duration); } - if (numArgs == 4) - { - buff.applyBuff(thingsInRange[i], buffName, duration, value); + if (numArgs == 4) { + buff.applyBuff(aThingsInRange, buffName, duration, value); } } } @@ -528,13 +457,10 @@ public class event_tool extends script.base_script obj_id[] objPlayers = getPlayerCreaturesInRange(self, range); if (objPlayers != null && objPlayers.length > 0) { - for (int i = 0; i < objPlayers.length; i++) - { - if (objPlayers[i] != self) - { - pvpSetPersonalEnemyFlag(self, objPlayers[i]); - String playerName = getName(objPlayers[i]); - sendSystemMessage(self, playerName + " can now attack you!", null); + for (obj_id objPlayer : objPlayers) { + if (objPlayer != self) { + pvpSetPersonalEnemyFlag(self, objPlayer); + sendSystemMessage(self, getName(objPlayer) + " can now attack you!", null); } } } @@ -604,20 +530,16 @@ public class event_tool extends script.base_script obj_id[] objPlayers = getPlayerCreaturesInRange(self, range); if (objPlayers != null && objPlayers.length > 0) { - for (int i = 0; i < objPlayers.length; i++) - { - if (objPlayers[i] != self) - { - badge.grantBadge(objPlayers[i], badgeName); - String playerName = getName(objPlayers[i]); - sendSystemMessage(self, "Granting badge " + badgeNumber + " to player " + playerName, null); + for (obj_id objPlayer : objPlayers) { + if (objPlayer != self) { + badge.grantBadge(objPlayer, badgeName); + sendSystemMessage(self, "Granting badge " + badgeNumber + " to player " + getName(objPlayer), null); badgeCount++; } } } sendSystemMessage(self, "A total of " + badgeCount + " badges were awarded.", null); - String selfName = getName(self); - CustomerServiceLog("EventPerk", "[EventTool] /grantBadgeArea used by " + selfName + ":" + self + ". Awarding badge #" + badgeNumber + " to " + badgeCount + " people.", null); + CustomerServiceLog("EventPerk", "[EventTool] /grantBadgeArea used by " + getName(self) + ":" + self + ". Awarding badge #" + badgeNumber + " to " + badgeCount + " people.", null); return SCRIPT_CONTINUE; } public int maxForcePower(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -629,8 +551,7 @@ public class event_tool extends script.base_script return SCRIPT_CONTINUE; } setForcePower(self, maxForce); - String selfName = getName(self); - CustomerServiceLog("EventPerk", "[EventTool] /maxForcePower used by " + selfName + ":" + self, null); + CustomerServiceLog("EventPerk", "[EventTool] /maxForcePower used by " + getName(self) + ":" + self, null); return SCRIPT_CONTINUE; } public int eventDamage(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -656,9 +577,7 @@ public class event_tool extends script.base_script String damageStr = st.nextToken(); int damage = utils.stringToInt(damageStr) * -1; healing.healDamage(self, myTarget, HEALTH, damage); - String targetName = getName(myTarget); - String selfName = getName(self); - CustomerServiceLog("EventPerk", "[EventTool] /eventDamage used by " + selfName + ":" + self + " on target " + targetName + ":" + myTarget + " for " + damage + " damage.", null); + CustomerServiceLog("EventPerk", "[EventTool] /eventDamage used by " + getName(self) + ":" + self + " on target " + getName(myTarget) + ":" + myTarget + " for " + damage + " damage.", null); return SCRIPT_CONTINUE; } public int eventMoveToMe(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -680,10 +599,7 @@ public class event_tool extends script.base_script utils.setScriptVar(self, "eventTool.lastMoveLocation", here); utils.setScriptVar(self, "eventTool.lastMovedObject", myTarget); sendSystemMessage(self, "Moved object " + myTarget + " to your location. ", null); - location there = getLocation(self); - String selfName = getName(self); - String targetName = getName(myTarget); - CustomerServiceLog("EventPerk", "[EventTool] /eventMoveToMe used by " + selfName + ":" + self + " on target " + targetName + ":" + target + " from location " + here + " to location " + there, null); + CustomerServiceLog("EventPerk", "[EventTool] /eventMoveToMe used by " + getName(self) + ":" + self + " on target " + getName(myTarget) + ":" + target + " from location " + here + " to location " + getLocation(self), null); return SCRIPT_CONTINUE; } public int eventUndoMoveToMe(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -711,9 +627,7 @@ public class event_tool extends script.base_script utils.setScriptVar(self, "eventTool.lastMoveLocation", currentTargetLocation); utils.setScriptVar(self, "eventTool.lastMovedObject", lastTarget); sendSystemMessage(self, "Moved object " + lastTarget + " to " + lastLocation + ".", null); - String selfName = getName(self); - String targetName = getName(lastTarget); - CustomerServiceLog("EventPerk", "[EventTool] /eventUndoMoveToMe used by " + selfName + ":" + self + " on target " + targetName + ":" + lastTarget + " from location " + currentTargetLocation + " to location " + lastLocation, null); + CustomerServiceLog("EventPerk", "[EventTool] /eventUndoMoveToMe used by " + getName(self) + ":" + self + " on target " + getName(lastTarget) + ":" + lastTarget + " from location " + currentTargetLocation + " to location " + lastLocation, null); return SCRIPT_CONTINUE; } public int eventWeapon(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -741,10 +655,8 @@ public class event_tool extends script.base_script } setName(eventWeapon, "***INTERNAL USE ONLY WEAPON"); attachScript(eventWeapon, "event.no_rent"); - float creationTime = getGameTime(); - setObjVar(eventWeapon, "event.creationTime", creationTime); - String selfName = getName(self); - CustomerServiceLog("EventPerk", "[EventTool] /eventWeapon used by " + selfName + ":" + self + " to create " + weaponTemplate + " at " + powerMult + "% of maximum strength.", null); + setObjVar(eventWeapon, "event.creationTime", getGameTime()); + CustomerServiceLog("EventPerk", "[EventTool] /eventWeapon used by " + getName(self) + ":" + self + " to create " + weaponTemplate + " at " + powerMult + "% of maximum strength.", null); return SCRIPT_CONTINUE; } public int eventStorePet(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException @@ -756,9 +668,7 @@ public class event_tool extends script.base_script return SCRIPT_CONTINUE; } pet_lib.storePet(myTarget); - String targetName = getName(myTarget); - String selfName = getName(self); - CustomerServiceLog("EventPerk", "[EventTool] /eventStorePet used by " + selfName + ":" + self + " to store pet " + targetName + ":" + target, null); + CustomerServiceLog("EventPerk", "[EventTool] /eventStorePet used by " + getName(self) + ":" + self + " to store pet " + getName(myTarget) + ":" + target, null); return SCRIPT_CONTINUE; } public int killTargetPlayer(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/event/holiday_controller.java b/sku.0/sys.server/compiled/game/script/event/holiday_controller.java old mode 100644 new mode 100755 index 66641df82..85ad1449f --- a/sku.0/sys.server/compiled/game/script/event/holiday_controller.java +++ b/sku.0/sys.server/compiled/game/script/event/holiday_controller.java @@ -1,15 +1,9 @@ package script.event; -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.utils; +import script.dictionary; import script.library.holiday; +import script.library.utils; +import script.obj_id; public class holiday_controller extends script.base_script { @@ -88,13 +82,11 @@ public class holiday_controller extends script.base_script { names[idx] = "holiday_event"; attribs[idx] = "Empire Day Event Running = True"; - idx++; } else { names[idx] = "holiday_event"; attribs[idx] = "Empire Day Event Running = False"; - idx++; } return SCRIPT_CONTINUE; } @@ -104,101 +96,70 @@ public class holiday_controller extends script.base_script { return SCRIPT_CONTINUE; } - String halloweenString = getCurrentUniverseWideEvents(); - int halloween = halloweenString.indexOf("halloween"); + + String universeWideEvents = getCurrentUniverseWideEvents(); + int halloween = universeWideEvents.indexOf("halloween"); String halloweenRunning = getConfigSetting("GameServer", "halloween"); - if (text.equals("halloweenStart")) - { - startHolidayEvent(speaker, "halloween", halloweenRunning, halloween); - return SCRIPT_OVERRIDE; - } - if (text.equals("halloweenStop")) - { - stopHolidayEvent(speaker, "halloween", halloweenRunning, halloween); - return SCRIPT_OVERRIDE; - } - if (text.equals("halloweenStartForReals")) - { - startHolidayEventForReals(speaker, "halloween", halloweenRunning); - return SCRIPT_OVERRIDE; - } - if (text.equals("halloweenStopForReals")) - { - stopHolidayEventForReals(speaker, "halloween"); - return SCRIPT_OVERRIDE; - } - String lifedayString = getCurrentUniverseWideEvents(); - int lifeday = lifedayString.indexOf("lifeday"); + int lifeday = universeWideEvents.indexOf("lifeday"); String lifedayRunning = getConfigSetting("GameServer", "lifeday"); - if (text.equals("lifedayStart")) - { - startHolidayEvent(speaker, "lifeday", lifedayRunning, lifeday); - return SCRIPT_OVERRIDE; - } - if (text.equals("lifedayStop")) - { - stopHolidayEvent(speaker, "lifeday", lifedayRunning, lifeday); - return SCRIPT_OVERRIDE; - } - if (text.equals("lifedayStartForReals")) - { - startHolidayEventForReals(speaker, "lifeday", lifedayRunning); - return SCRIPT_OVERRIDE; - } - if (text.equals("lifedayStopForReals")) - { - stopHolidayEventForReals(speaker, "lifeday"); - return SCRIPT_OVERRIDE; - } - String lovedayString = getCurrentUniverseWideEvents(); - int loveday = lifedayString.indexOf("loveday"); + int loveday = universeWideEvents.indexOf("loveday"); String lovedayRunning = getConfigSetting("GameServer", "loveday"); - if (text.equals("lovedayStart")) - { - startHolidayEvent(speaker, "loveday", lovedayRunning, loveday); - return SCRIPT_OVERRIDE; - } - if (text.equals("lovedayStop")) - { - stopHolidayEvent(speaker, "loveday", lovedayRunning, loveday); - return SCRIPT_OVERRIDE; - } - if (text.equals("lovedayStartForReals")) - { - startHolidayEventForReals(speaker, "loveday", lovedayRunning); - return SCRIPT_OVERRIDE; - } - if (text.equals("lovedayStopForReals")) - { - stopHolidayEventForReals(speaker, "loveday"); - return SCRIPT_OVERRIDE; - } - String empiredayString = getCurrentUniverseWideEvents(); - int empireday = empiredayString.indexOf("empireday_ceremony"); + int empireday = universeWideEvents.indexOf("empireday_ceremony"); String empiredayRunning = getConfigSetting("GameServer", "empireday_ceremony"); - if (text.equals("empiredayStart")) - { - startHolidayEvent(speaker, "empireday_ceremony", empiredayRunning, empireday); - return SCRIPT_OVERRIDE; - } - if (text.equals("empiredayStop")) - { - stopHolidayEvent(speaker, "empireday_ceremony", empiredayRunning, empireday); - return SCRIPT_OVERRIDE; - } - if (text.equals("empiredayStartForReals")) - { - startHolidayEventForReals(speaker, "empireday_ceremony", empiredayRunning); - return SCRIPT_OVERRIDE; - } - if (text.equals("empiredayStopForReals")) - { - stopHolidayEventForReals(speaker, "empireday_ceremony"); - return SCRIPT_OVERRIDE; + + switch (text) { + case "halloweenStart": + startHolidayEvent(speaker, "halloween", halloweenRunning, halloween); + return SCRIPT_OVERRIDE; + case "halloweenStop": + stopHolidayEvent(speaker, "halloween", halloweenRunning, halloween); + return SCRIPT_OVERRIDE; + case "halloweenStartForReals": + startHolidayEventForReals(speaker, "halloween", halloweenRunning); + return SCRIPT_OVERRIDE; + case "halloweenStopForReals": + stopHolidayEventForReals(speaker, "halloween"); + return SCRIPT_OVERRIDE; + case "lifedayStart": + startHolidayEvent(speaker, "lifeday", lifedayRunning, lifeday); + return SCRIPT_OVERRIDE; + case "lifedayStop": + stopHolidayEvent(speaker, "lifeday", lifedayRunning, lifeday); + return SCRIPT_OVERRIDE; + case "lifedayStartForReals": + startHolidayEventForReals(speaker, "lifeday", lifedayRunning); + return SCRIPT_OVERRIDE; + case "lifedayStopForReals": + stopHolidayEventForReals(speaker, "lifeday"); + return SCRIPT_OVERRIDE; + case "lovedayStart": + startHolidayEvent(speaker, "loveday", lovedayRunning, loveday); + return SCRIPT_OVERRIDE; + case "lovedayStop": + stopHolidayEvent(speaker, "loveday", lovedayRunning, loveday); + return SCRIPT_OVERRIDE; + case "lovedayStartForReals": + startHolidayEventForReals(speaker, "loveday", lovedayRunning); + return SCRIPT_OVERRIDE; + case "lovedayStopForReals": + stopHolidayEventForReals(speaker, "loveday"); + return SCRIPT_OVERRIDE; + case "empiredayStart": + startHolidayEvent(speaker, "empireday_ceremony", empiredayRunning, empireday); + return SCRIPT_OVERRIDE; + case "empiredayStop": + stopHolidayEvent(speaker, "empireday_ceremony", empiredayRunning, empireday); + return SCRIPT_OVERRIDE; + case "empiredayStartForReals": + startHolidayEventForReals(speaker, "empireday_ceremony", empiredayRunning); + return SCRIPT_OVERRIDE; + case "empiredayStopForReals": + stopHolidayEventForReals(speaker, "empireday_ceremony"); + return SCRIPT_OVERRIDE; } return SCRIPT_CONTINUE; } - public void startHolidayEvent(obj_id speaker, String holidayName, String holidayRunning, int holidayStatus) throws InterruptedException + private void startHolidayEvent(obj_id speaker, String holidayName, String holidayRunning, int holidayStatus) throws InterruptedException { if (holidayRunning == null) { @@ -216,11 +177,9 @@ public class holiday_controller extends script.base_script sendSystemMessageTestingOnly(speaker, holidayName + " started."); startUniverseWideEvent(holidayName); } - return; } - return; } - public void startHolidayEventForReals(obj_id speaker, String holidayName, String holidayRunning) throws InterruptedException + private void startHolidayEventForReals(obj_id speaker, String holidayName, String holidayRunning) throws InterruptedException { if (holidayRunning == null) { @@ -231,37 +190,19 @@ public class holiday_controller extends script.base_script { sendSystemMessageTestingOnly(speaker, holidayName + " started."); startUniverseWideEvent(holidayName); - return; } - return; } - public void stopHolidayEvent(obj_id speaker, String holidayName, String holidayRunning, int holidayStatus) throws InterruptedException + private void stopHolidayEvent(obj_id speaker, String holidayName, String holidayRunning, int holidayStatus) throws InterruptedException { if (holidayRunning.equals("true") || holidayRunning.equals("1")) { sendSystemMessageTestingOnly(speaker, "Server config is marked as " + holidayName + " running. If you are sure that it should not be running anyway, say " + holidayName + "StopForReals"); - return; } - if (holidayRunning == null) - { - if (holidayStatus < 0) - { - sendSystemMessageTestingOnly(speaker, "Server says that " + holidayName + " is already stopped. If you are sure that it's not, say " + holidayName + "StartForReal"); - } - if (holidayStatus > -1) - { - sendSystemMessageTestingOnly(speaker, holidayName + " stopped."); - stopUniverseWideEvent(holidayName); - } - return; - } - return; } - public void stopHolidayEventForReals(obj_id speaker, String holidayName) throws InterruptedException + private void stopHolidayEventForReals(obj_id speaker, String holidayName) throws InterruptedException { sendSystemMessageTestingOnly(speaker, holidayName + " stopped."); stopUniverseWideEvent(holidayName); - return; } public int halloweenServerStart(obj_id self, dictionary params) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/event/honor_guard.java b/sku.0/sys.server/compiled/game/script/event/honor_guard.java old mode 100644 new mode 100755 index c051e8d90..614e1640f --- a/sku.0/sys.server/compiled/game/script/event/honor_guard.java +++ b/sku.0/sys.server/compiled/game/script/event/honor_guard.java @@ -1,18 +1,12 @@ package script.event; -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.create; -import script.library.utils; -import java.lang.Math; +import script.dictionary; import script.library.ai_lib; +import script.library.create; import script.library.sui; +import script.library.utils; +import script.location; +import script.obj_id; public class honor_guard extends script.base_script { @@ -80,11 +74,10 @@ public class honor_guard extends script.base_script } return SCRIPT_CONTINUE; } - public int showUI(obj_id self, obj_id player) throws InterruptedException + private int showUI(obj_id self, obj_id player) throws InterruptedException { int current = getIntObjVar(self, "event.honor_guard.setupStep"); - int pid = sui.inputbox(self, self, PROMPT_TEXT[current], TITLE[current], "handleUIdata", 255, false, ""); - return pid; + return sui.inputbox(self, self, PROMPT_TEXT[current], TITLE[current], "handleUIdata", 255, false, ""); } public int handleUIdata(obj_id self, dictionary params) throws InterruptedException { @@ -97,133 +90,113 @@ public class honor_guard extends script.base_script return SCRIPT_CONTINUE; } setObjVar(self, "event.honor_guard.lastData", text); - int current = getIntObjVar(self, "event.honor_guard.setupStep"); messageTo(self, "storeLastDataObjVar", null, 0, false); return SCRIPT_CONTINUE; } public int storeLastDataObjVar(obj_id self, dictionary params) throws InterruptedException { - int single = getIntObjVar(self, "event.honor_guard.single"); - int setupStep = getIntObjVar(self, "event.honor_guard.setupStep"); String lastDataStr = getStringObjVar(self, "event.honor_guard.lastData"); - if (lastDataStr.equals("setup")) - { - setObjVar(self, "event.honor_guard.setupStep", 1); - setObjVar(self, "event.honor_guard.single", 0); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("spawn")) - { - messageTo(self, "spawnHonorGuard", null, 0, false); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("data")) - { - String template = getStringObjVar(self, "event.honor_guard.template"); - int numPerLine = getIntObjVar(self, "event.honor_guard.numPerLine"); - int numRows = getIntObjVar(self, "event.honor_guard.numRows"); - float offset = getFloatObjVar(self, "event.honor_guard.offset"); - sendSystemMessage(self, "Current Template: " + template + ". Number per line: " + numPerLine + " . Number of Rows: " + numRows + " . Spacing: " + offset, null); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("quit")) - { - removeObjVar(self, "event.honor_guard"); - detachScript(self, "event.honor_guard"); - sendSystemMessage(self, "Many thank you for your playing.", null); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("singleSetup")) - { - setObjVar(self, "event.honor_guard.single", 1); - setObjVar(self, "event.honor_guard.setupStep", 1); - setObjVar(self, "event.honor_guard.numPerLine", 1); - setObjVar(self, "event.honor_guard.numRows", 1); - setObjVar(self, "event.honor_guard.offset", 1.0f); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (setupStep == 0) - { - sendSystemMessage(self, "Type \"quit\" to terminate the script, \"setup\" to start over, \"data\" to see current data or \"spawn\" to spawn the NPCs.", null); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (setupStep == 1) - { - setObjVar(self, "event.honor_guard.template", lastDataStr); - if (single == 0) - { - setObjVar(self, "event.honor_guard.setupStep", 2); - } - else - { - setObjVar(self, "event.honor_guard.setupStep", 5); - } - sendSystemMessage(self, "Template set as: " + lastDataStr, null); - } - if (setupStep == 2) - { - int lastDataInt = utils.stringToInt(lastDataStr); - if (lastDataInt <= 0) - { - sendSystemMessage(self, "You must enter a whole number greater then 0.", null); + switch (lastDataStr) { + case "setup": + setObjVar(self, "event.honor_guard.setupStep", 1); + setObjVar(self, "event.honor_guard.single", 0); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; - } - setObjVar(self, "event.honor_guard.setupStep", 3); - setObjVar(self, "event.honor_guard.numPerLine", lastDataInt); - sendSystemMessage(self, "Number of spawns per line set to: " + lastDataInt, null); - } - if (setupStep == 3) - { - int lastDataInt = utils.stringToInt(lastDataStr); - if (lastDataInt <= 0) - { - sendSystemMessage(self, "You must enter a whole number greater then 0.", null); + case "spawn": + messageTo(self, "spawnHonorGuard", null, 0, false); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; - } - setObjVar(self, "event.honor_guard.setupStep", 4); - setObjVar(self, "event.honor_guard.numRows", lastDataInt); - sendSystemMessage(self, "Number of rows set to: " + lastDataInt, null); - } - if (setupStep == 4) - { - float lastDataFloat = utils.stringToFloat(lastDataStr); - if (lastDataFloat <= 0) - { - sendSystemMessage(self, "You must enter a value greater then 0.", null); + case "data": + String template = getStringObjVar(self, "event.honor_guard.template"); + int numPerLine = getIntObjVar(self, "event.honor_guard.numPerLine"); + int numRows = getIntObjVar(self, "event.honor_guard.numRows"); + float offset = getFloatObjVar(self, "event.honor_guard.offset"); + sendSystemMessage(self, "Current Template: " + template + ". Number per line: " + numPerLine + " . Number of Rows: " + numRows + " . Spacing: " + offset, null); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; - } - setObjVar(self, "event.honor_guard.setupStep", 5); - setObjVar(self, "event.honor_guard.offset", lastDataFloat); - sendSystemMessage(self, "Spacing between NPCs set to: " + lastDataFloat, null); - } - if (setupStep == 5) - { - float lastDataFloat = utils.stringToFloat(lastDataStr); - if (lastDataFloat <= 0 || lastDataFloat > 864001) - { - sendSystemMessage(self, "You must enter a value more then 0 and at most 864000 (10 days).", null); + case "quit": + removeObjVar(self, "event.honor_guard"); + detachScript(self, "event.honor_guard"); + sendSystemMessage(self, "Many thank you for your playing.", null); + return SCRIPT_CONTINUE; + case "singleSetup": + setObjVar(self, "event.honor_guard.single", 1); + setObjVar(self, "event.honor_guard.setupStep", 1); + setObjVar(self, "event.honor_guard.numPerLine", 1); + setObjVar(self, "event.honor_guard.numRows", 1); + setObjVar(self, "event.honor_guard.offset", 1.0f); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; - } - setObjVar(self, "event.honor_guard.setupStep", 0); - setObjVar(self, "event.honor_guard.expirationTime", lastDataFloat); - sendSystemMessage(self, "Expiration time set to: " + lastDataFloat + " seconds.", null); } - if (setupStep == 6) - { - if (lastDataStr.equals("ok")) - { - setObjVar(self, "event.honor_guard.overRide", 1); + int setupStep = getIntObjVar(self, "event.honor_guard.setupStep"); + switch (setupStep) { + case 0: + sendSystemMessage(self, "Type \"quit\" to terminate the script, \"setup\" to start over, \"data\" to see current data or \"spawn\" to spawn the NPCs.", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + case 1: + setObjVar(self, "event.honor_guard.template", lastDataStr); + if (getIntObjVar(self, "event.honor_guard.single") == 0) { + setObjVar(self, "event.honor_guard.setupStep", 2); + } else { + setObjVar(self, "event.honor_guard.setupStep", 5); + } + sendSystemMessage(self, "Template set as: " + lastDataStr, null); + break; + case 2: { + int lastDataInt = utils.stringToInt(lastDataStr); + if (lastDataInt <= 0) { + sendSystemMessage(self, "You must enter a whole number greater then 0.", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + } + setObjVar(self, "event.honor_guard.setupStep", 3); + setObjVar(self, "event.honor_guard.numPerLine", lastDataInt); + sendSystemMessage(self, "Number of spawns per line set to: " + lastDataInt, null); + break; + } + case 3: { + int lastDataInt = utils.stringToInt(lastDataStr); + if (lastDataInt <= 0) { + sendSystemMessage(self, "You must enter a whole number greater then 0.", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + } setObjVar(self, "event.honor_guard.setupStep", 4); + setObjVar(self, "event.honor_guard.numRows", lastDataInt); + sendSystemMessage(self, "Number of rows set to: " + lastDataInt, null); + break; } + case 4: { + float lastDataFloat = utils.stringToFloat(lastDataStr); + if (lastDataFloat <= 0) { + sendSystemMessage(self, "You must enter a value greater then 0.", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + } + setObjVar(self, "event.honor_guard.setupStep", 5); + setObjVar(self, "event.honor_guard.offset", lastDataFloat); + sendSystemMessage(self, "Spacing between NPCs set to: " + lastDataFloat, null); + break; + } + case 5: { + float lastDataFloat = utils.stringToFloat(lastDataStr); + if (lastDataFloat <= 0 || lastDataFloat > 864001) { + sendSystemMessage(self, "You must enter a value more then 0 and at most 864000 (10 days).", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + } + setObjVar(self, "event.honor_guard.setupStep", 0); + setObjVar(self, "event.honor_guard.expirationTime", lastDataFloat); + sendSystemMessage(self, "Expiration time set to: " + lastDataFloat + " seconds.", null); + break; + } + case 6: + if (lastDataStr.equals("ok")) { + setObjVar(self, "event.honor_guard.overRide", 1); + setObjVar(self, "event.honor_guard.setupStep", 4); + } + break; } int numPerLine = getIntObjVar(self, "event.honor_guard.numPerLine"); int numRows = getIntObjVar(self, "event.honor_guard.numRows"); @@ -259,6 +232,7 @@ public class honor_guard extends script.base_script float yLoc = here.y; float zLoc = here.z; obj_id room = here.cell; + obj_id honorGuard; for (int i = 0; i < numPerLine; i++) { double xRowOffsetDbl = Math.sin(Math.toRadians(heading + 90)) * (i * offset); @@ -276,7 +250,7 @@ public class honor_guard extends script.base_script spawnPoint.y = yLoc; spawnPoint.z = zSpawn; spawnPoint.cell = room; - obj_id honorGuard = create.object(template, spawnPoint); + honorGuard = create.object(template, spawnPoint); persistObject(honorGuard); attachScript(honorGuard, "event.invasion.key_object"); setObjVar(honorGuard, "event.invasion.keyObject.expirationTime", expirationTime); diff --git a/sku.0/sys.server/compiled/game/script/event/no_rent.java b/sku.0/sys.server/compiled/game/script/event/no_rent.java old mode 100644 new mode 100755 index aaf55ee8b..60c53f63b --- a/sku.0/sys.server/compiled/game/script/event/no_rent.java +++ b/sku.0/sys.server/compiled/game/script/event/no_rent.java @@ -1,14 +1,7 @@ package script.event; -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.utils; +import script.menu_info; +import script.obj_id; public class no_rent extends script.base_script { @@ -41,6 +34,5 @@ public class no_rent extends script.base_script destroyObject(self); sendSystemMessage(player, "THE FOLLOWING ITEM HAS EXPIRED: " + myName, null); } - return; } } diff --git a/sku.0/sys.server/compiled/game/script/event/planet_event_handler.java b/sku.0/sys.server/compiled/game/script/event/planet_event_handler.java old mode 100644 new mode 100755 index 3210a68b6..372062717 --- a/sku.0/sys.server/compiled/game/script/event/planet_event_handler.java +++ b/sku.0/sys.server/compiled/game/script/event/planet_event_handler.java @@ -1,22 +1,15 @@ package script.event; -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 planet_event_handler extends script.base_script { public planet_event_handler() { } - public static final String EVENT_TIMESTAMP = "lifeday.time_stamp"; + private static final String EVENT_TIMESTAMP = "lifeday.time_stamp"; public int OnAttach(obj_id self) throws InterruptedException { CustomerServiceLog("holidayEvent", "planet_event_handler.OnAttach: trigger initialized."); @@ -26,7 +19,7 @@ public class planet_event_handler extends script.base_script CustomerServiceLog("holidayEvent", "planet_event_handler.OnAttach: Life Day oconfig found."); checkLifeDayData(self); } - else if (hasObjVar(self, "lifeday")) + else { removeObjVar(self, "lifeday"); } @@ -45,7 +38,7 @@ public class planet_event_handler extends script.base_script CustomerServiceLog("holidayEvent", "planet_event_handler.OnInitialize: Life Day oconfig found."); checkLifeDayData(self); } - else if (hasObjVar(self, "lifeday")) + else { removeObjVar(self, "lifeday"); } @@ -55,7 +48,7 @@ public class planet_event_handler extends script.base_script } return SCRIPT_CONTINUE; } - public void checkLifeDayData(obj_id self) throws InterruptedException + private void checkLifeDayData(obj_id self) throws InterruptedException { if (!hasObjVar(self, EVENT_TIMESTAMP)) { @@ -80,24 +73,17 @@ public class planet_event_handler extends script.base_script createDailyAlarmClock(self, "lifeDayDailyAlarm", null, 10, 0, 0); } } - public boolean newDay(obj_id self) throws InterruptedException + private boolean newDay(obj_id self) throws InterruptedException { if (hasObjVar(self, EVENT_TIMESTAMP)) { int now = getCalendarTime(); int then = getIntObjVar(self, EVENT_TIMESTAMP); - if (now > then) - { - return true; - } - else - { - return false; - } + return now > then; } return true; } - public void newTimeStamp(obj_id self) throws InterruptedException + private void newTimeStamp(obj_id self) throws InterruptedException { int now = getCalendarTime(); int secondsUntil = secondsUntilNextDailyTime(10, 0, 0); @@ -185,7 +171,7 @@ public class planet_event_handler extends script.base_script { checkLifeDayData(self); } - else if (hasObjVar(self, "lifeday")) + else { removeObjVar(self, "lifeday"); } @@ -227,7 +213,7 @@ public class planet_event_handler extends script.base_script messageTo(player, "scoreBoardCheck", newParams, 3.0f, false); return SCRIPT_CONTINUE; } - public boolean setupInitialEventScores(obj_id planet, String scoreObjVar, int modifier, boolean faction) throws InterruptedException + private boolean setupInitialEventScores(obj_id planet, String scoreObjVar, int modifier, boolean faction) throws InterruptedException { if (!isValidId(planet) || !exists(planet)) { @@ -241,12 +227,13 @@ public class planet_event_handler extends script.base_script { return false; } + String name; if (!faction) { for (int i = 1, score = modifier; i <= holiday.MAX_NUMBER_OF_PLANET_HIGH_SCORES; i++) { int randomPosition = rand(0, holiday.DEFAULT_HIGH_SCORE_LIST.length - 1); - String name = holiday.DEFAULT_HIGH_SCORE_LIST[randomPosition]; + name = holiday.DEFAULT_HIGH_SCORE_LIST[randomPosition]; setObjVar(planet, scoreObjVar + ".slot_" + i + holiday.PLANET_VAR_PLAYER_NAME, name); setObjVar(planet, scoreObjVar + ".slot_" + i + holiday.PLANET_VAR_PLAYER_SCORE, score); score--; @@ -257,7 +244,7 @@ public class planet_event_handler extends script.base_script for (int i = 1, score = modifier; i <= holiday.MAX_NUMBER_OF_PLANET_HIGH_SCORES; i++) { int randomPosition = rand(0, holiday.DEFAULT_HIGH_SCORE_LIST.length - 1); - String name = holiday.DEFAULT_HIGH_SCORE_LIST[randomPosition]; + name = holiday.DEFAULT_HIGH_SCORE_LIST[randomPosition]; setObjVar(planet, scoreObjVar + ".slot_" + i + holiday.PLANET_VAR_PLAYER_FACTION_REB + holiday.PLANET_VAR_PLAYER_NAME, name); setObjVar(planet, scoreObjVar + ".slot_" + i + holiday.PLANET_VAR_PLAYER_FACTION_REB + holiday.PLANET_VAR_PLAYER_SCORE, score); score--; @@ -265,7 +252,7 @@ public class planet_event_handler extends script.base_script for (int i = 1, score = modifier; i <= holiday.MAX_NUMBER_OF_PLANET_HIGH_SCORES; i++) { int randomPosition = rand(0, holiday.DEFAULT_HIGH_SCORE_LIST.length - 1); - String name = holiday.DEFAULT_HIGH_SCORE_LIST[randomPosition]; + name = holiday.DEFAULT_HIGH_SCORE_LIST[randomPosition]; setObjVar(planet, scoreObjVar + ".slot_" + i + holiday.PLANET_VAR_PLAYER_FACTION_IMP + holiday.PLANET_VAR_PLAYER_NAME, name); setObjVar(planet, scoreObjVar + ".slot_" + i + holiday.PLANET_VAR_PLAYER_FACTION_IMP + holiday.PLANET_VAR_PLAYER_SCORE, score); score--; @@ -273,7 +260,7 @@ public class planet_event_handler extends script.base_script } return true; } - public boolean checkForHolidayEventConfigs(obj_id planet) throws InterruptedException + private boolean checkForHolidayEventConfigs(obj_id planet) throws InterruptedException { if (!isValidId(planet) || !exists(planet)) { diff --git a/sku.0/sys.server/compiled/game/script/event/quick_weapon.java b/sku.0/sys.server/compiled/game/script/event/quick_weapon.java old mode 100644 new mode 100755 index 6c61ae7c6..d3a2d57d3 --- a/sku.0/sys.server/compiled/game/script/event/quick_weapon.java +++ b/sku.0/sys.server/compiled/game/script/event/quick_weapon.java @@ -1,15 +1,8 @@ package script.event; -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.create; import script.library.utils; +import script.obj_id; + import java.util.StringTokenizer; public class quick_weapon extends script.base_script @@ -17,8 +10,8 @@ public class quick_weapon extends script.base_script public quick_weapon() { } - public static final String WEAPON_LIST = "datatables/event/weapons.iff"; - public static final String[] HELP_TEXT = + private static final String WEAPON_LIST = "datatables/event/weapons.iff"; + private static final String[] HELP_TEXT = { "=========================================", "USAGE: weapon [Weapon Index Number] [MIN Damage] [MAX Damage] [SPEED]", @@ -26,7 +19,7 @@ public class quick_weapon extends script.base_script "Say \"detach\" to detach this script immediately.", "=========================================" }; - public static final String[] CATEGORIES = + private static final String[] CATEGORIES = { "2H Sword 0-15", "Polearm 28-44", @@ -49,10 +42,9 @@ public class quick_weapon extends script.base_script sendSystemMessage(self, "You must be in God Mode for this script to take hold.", null); return SCRIPT_CONTINUE; } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.quick_weapon"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -69,10 +61,9 @@ public class quick_weapon extends script.base_script detachScript(self, "event.quick_weapon"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.quick_weapon"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -89,15 +80,14 @@ public class quick_weapon extends script.base_script } if (isGod(self)) { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.quick_weapon"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); return SCRIPT_CONTINUE; } } - if (!isGod(self)) + else { detachScript(self, "event.quick_weapon"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); @@ -105,10 +95,10 @@ public class quick_weapon extends script.base_script } if ((toLower(strText)).startsWith("weapon")) { - int minDamage = 1; - int maxDamage = 10; - float weaponSpeed = 7.0f; - int weaponNum = 0; + int minDamage; + int maxDamage; + float weaponSpeed; + int weaponNum; String weaponType[] = dataTableGetStringColumn(WEAPON_LIST, 0); StringTokenizer st = new StringTokenizer(strText); if (st.countTokens() == 5) @@ -148,24 +138,22 @@ public class quick_weapon extends script.base_script return SCRIPT_CONTINUE; } } - if ((toLower(strText)).equals("detach")) + else if ((toLower(strText)).equals("detach")) { detachScript(self, "event.quick_weapon"); return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("help")) + else if ((toLower(strText)).equals("help")) { - for (int i = 0; i < HELP_TEXT.length; i++) - { - sendSystemMessage(self, HELP_TEXT[i], null); + for (String helpText : HELP_TEXT) { + sendSystemMessage(self, helpText, null); } return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("categories")) + else if ((toLower(strText)).equals("categories")) { - for (int i = 0; i < CATEGORIES.length; i++) - { - sendSystemMessage(self, CATEGORIES[i], null); + for (String category : CATEGORIES) { + sendSystemMessage(self, category, null); } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/shield_ring.java b/sku.0/sys.server/compiled/game/script/event/shield_ring.java old mode 100644 new mode 100755 index 310083b83..c35fab13d --- a/sku.0/sys.server/compiled/game/script/event/shield_ring.java +++ b/sku.0/sys.server/compiled/game/script/event/shield_ring.java @@ -1,22 +1,13 @@ package script.event; -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.utils; -import java.util.StringTokenizer; +import script.obj_id; public class shield_ring extends script.base_script { public shield_ring() { } - public static final String[] HELP_TEXT = + private static final String[] HELP_TEXT = { "=========================================", "USAGE: ShieldRing [Armor Effectiveness 1-100] (default effectiveness is 20)", @@ -38,10 +29,9 @@ public class shield_ring extends script.base_script sendSystemMessage(self, "You must be in God Mode for this script to take hold.", null); return SCRIPT_CONTINUE; } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.shield_ring"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -58,10 +48,9 @@ public class shield_ring extends script.base_script detachScript(self, "event.shield_ring"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); } - if (isGod(self)) + else { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.shield_ring"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); @@ -78,15 +67,14 @@ public class shield_ring extends script.base_script } if (isGod(self)) { - int godLevel = getGodLevel(self); - if (godLevel < 15) + if (getGodLevel(self) < 15) { detachScript(self, "event.shield_ring"); sendSystemMessage(self, "You do not have the appropriate access level to use this script.", null); return SCRIPT_CONTINUE; } } - if (!isGod(self)) + else { detachScript(self, "event.shield_ring"); sendSystemMessage(self, "You must be in God Mode to use this script.", null); @@ -96,16 +84,15 @@ public class shield_ring extends script.base_script { sendSystemMessage(self, "This command has been temporarily disabled. See S. Jakab or T. Blair", null); } - if ((toLower(strText)).equals("detach")) + else if ((toLower(strText)).equals("detach")) { detachScript(self, "event.shield_ring"); return SCRIPT_CONTINUE; } - if ((toLower(strText)).equals("help")) + else if ((toLower(strText)).equals("help")) { - for (int i = 0; i < HELP_TEXT.length; i++) - { - sendSystemMessage(self, HELP_TEXT[i], null); + for (String helpText : HELP_TEXT) { + sendSystemMessage(self, helpText, null); } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/event/shuttle.java b/sku.0/sys.server/compiled/game/script/event/shuttle.java old mode 100644 new mode 100755 index 2841bdbd7..e1b7fc42c --- a/sku.0/sys.server/compiled/game/script/event/shuttle.java +++ b/sku.0/sys.server/compiled/game/script/event/shuttle.java @@ -1,23 +1,18 @@ package script.event; -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.sui; import script.library.utils; +import script.location; +import script.obj_id; public class shuttle extends script.base_script { public shuttle() { } - public static final String[] PROMPT_TEXT = + private static final String[] PROMPT_TEXT = { "Enter \"setup\" to setup data, \"data\" to view current data, \"quit\" to end. After setup type \"f\" to have the shuttle do an automatic fly-by. Type \"m\" to spawn and manually control the shuttle then use \"land\" to make it land, \"leave\" to make it take off.", "Which of the following shuttles will spawn? Type \"lambda\", \"shuttle\", \"transport\" or \"theed transport\".", @@ -37,14 +32,14 @@ public class shuttle extends script.base_script "Number of NPCs", "UI Recovery Phrase" }; - public static final String[] SHUTTLE_TEMPLATE = + private static final String[] SHUTTLE_TEMPLATE = { "object/creature/npc/theme_park/lambda_shuttle.iff", "object/creature/npc/theme_park/player_shuttle.iff", "object/creature/npc/theme_park/player_transport.iff", "object/creature/npc/theme_park/player_transport_theed_hangar.iff" }; - public static final String[] SHUTTLE_NAME = + private static final String[] SHUTTLE_NAME = { "Lambda Shuttle", "Shuttle", @@ -88,20 +83,18 @@ public class shuttle extends script.base_script } return SCRIPT_CONTINUE; } - public int showUI(obj_id self, obj_id player) throws InterruptedException + private int showUI(obj_id self, obj_id player) throws InterruptedException { int current = getIntObjVar(self, "event.shuttle.setupStep"); - int pid = sui.inputbox(self, self, PROMPT_TEXT[current], TITLE[current], "handleUIdata", 255, false, ""); - return pid; + return sui.inputbox(self, self, PROMPT_TEXT[current], TITLE[current], "handleUIdata", 255, false, ""); } public int handleUIdata(obj_id self, dictionary params) throws InterruptedException { - String magicWord = getStringObjVar(self, "event.shuttle.magicWord"); - int current = getIntObjVar(self, "event.shuttle.setupStep"); int bp = sui.getIntButtonPressed(params); - String text = sui.getInputBoxText(params); if (bp == sui.BP_CANCEL) { + String magicWord = getStringObjVar(self, "event.shuttle.magicWord"); + int current = getIntObjVar(self, "event.shuttle.setupStep"); if (current == 0) { sendSystemMessage(self, "Your UI window was closed. To recover the window later for use say \"" + magicWord + "\". Please make note of this word.", null); @@ -113,6 +106,7 @@ public class shuttle extends script.base_script return SCRIPT_CONTINUE; } } + String text = sui.getInputBoxText(params); if (text == null || text.equals("")) { sendSystemMessage(self, "You entered a null or invalid value, please try again.", null); @@ -124,8 +118,6 @@ public class shuttle extends script.base_script } public int storeLastDataObjVar(obj_id self, dictionary params) throws InterruptedException { - int setupCompleted = getIntObjVar(self, "event.shuttle.setupCompleted"); - int setupStep = getIntObjVar(self, "event.shuttle.setupStep"); String lastDataStr = getStringObjVar(self, "event.shuttle.lastData"); if (lastDataStr.equals("setup")) { @@ -134,46 +126,41 @@ public class shuttle extends script.base_script messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } + int setupCompleted = getIntObjVar(self, "event.shuttle.setupCompleted"); if (setupCompleted == 1) { - if (lastDataStr.equals("m")) - { - messageTo(self, "spawnShuttle", null, 0, false); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("f")) - { - messageTo(self, "spawnShuttle", null, 0, false); - messageTo(self, "doFlyBy", null, 5, false); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("land")) - { - obj_id shuttle = getObjIdObjVar(self, "event.shuttle.shuttle"); - if (!isIdValid(shuttle)) - { - sendSystemMessage(self, "WARNING: Did not find a valid shuttle to message so nothing happened.", null); + switch (lastDataStr) { + case "m": + messageTo(self, "spawnShuttle", null, 0, false); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + case "f": + messageTo(self, "spawnShuttle", null, 0, false); + messageTo(self, "doFlyBy", null, 5, false); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + case "land": { + obj_id shuttle = getObjIdObjVar(self, "event.shuttle.shuttle"); + if (!isIdValid(shuttle)) { + sendSystemMessage(self, "WARNING: Did not find a valid shuttle to message so nothing happened.", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + } + messageTo(shuttle, "landShuttle", null, 1, false); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - messageTo(shuttle, "landShuttle", null, 1, false); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("leave")) - { - obj_id shuttle = getObjIdObjVar(self, "event.shuttle.shuttle"); - if (!isIdValid(shuttle)) - { - sendSystemMessage(self, "WARNING: Did not find a valid shuttle to message so nothing happened.", null); + case "leave": { + obj_id shuttle = getObjIdObjVar(self, "event.shuttle.shuttle"); + if (!isIdValid(shuttle)) { + sendSystemMessage(self, "WARNING: Did not find a valid shuttle to message so nothing happened.", null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + } + messageTo(shuttle, "takeOff", null, 1, false); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - messageTo(shuttle, "takeOff", null, 1, false); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; } } if (lastDataStr.equals("data")) @@ -181,63 +168,57 @@ public class shuttle extends script.base_script String template = getStringObjVar(self, "event.shuttle.template"); int shuttleType = getIntObjVar(self, "event.shuttle.shuttleType"); int numSpawns = getIntObjVar(self, "event.shuttle.numSpawns"); - float offset = getFloatObjVar(self, "event.shuttle.offset"); sendSystemMessage(self, "Shuttle: " + SHUTTLE_NAME[shuttleType] + ". Number of Spawns: " + numSpawns + " . Spawn Template: " + template + ".", null); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (lastDataStr.equals("quit")) + else if (lastDataStr.equals("quit")) { removeObjVar(self, "event.shuttle"); detachScript(self, "event.shuttle"); sendSystemMessage(self, "Many thank you for your playing.", null); return SCRIPT_CONTINUE; } + int setupStep = getIntObjVar(self, "event.shuttle.setupStep"); if (setupStep == 0) { sendSystemMessage(self, "Enter \"setup\" to setup data, \"data\" to view current data, \"quit\" to end. After setup type \"f\" to have the shuttle do an automatic fly-by. Type \"m\" to spawn and manually control the shuttle then use \"land\" to make it land, \"leave\" to make it take off.", null); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (setupStep == 1) + else if (setupStep == 1) { - if (lastDataStr.equals("lambda")) - { - setObjVar(self, "event.shuttle.shuttleType", 0); - setObjVar(self, "event.shuttle.setupStep", 2); - sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("shuttle")) - { - setObjVar(self, "event.shuttle.shuttleType", 1); - setObjVar(self, "event.shuttle.setupStep", 2); - sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("transport")) - { - setObjVar(self, "event.shuttle.shuttleType", 2); - setObjVar(self, "event.shuttle.setupStep", 2); - sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; - } - if (lastDataStr.equals("theed transport")) - { - setObjVar(self, "event.shuttle.shuttleType", 3); - setObjVar(self, "event.shuttle.setupStep", 2); - sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); - messageTo(self, "continueCollectingData", null, 1, false); - return SCRIPT_CONTINUE; + switch (lastDataStr) { + case "lambda": + setObjVar(self, "event.shuttle.shuttleType", 0); + setObjVar(self, "event.shuttle.setupStep", 2); + sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + case "shuttle": + setObjVar(self, "event.shuttle.shuttleType", 1); + setObjVar(self, "event.shuttle.setupStep", 2); + sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + case "transport": + setObjVar(self, "event.shuttle.shuttleType", 2); + setObjVar(self, "event.shuttle.setupStep", 2); + sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; + case "theed transport": + setObjVar(self, "event.shuttle.shuttleType", 3); + setObjVar(self, "event.shuttle.setupStep", 2); + sendSystemMessage(self, TITLE[setupStep] + ": " + lastDataStr, null); + messageTo(self, "continueCollectingData", null, 1, false); + return SCRIPT_CONTINUE; } sendSystemMessage(self, "You must type \"lambda\", \"shuttle\", \"transport\" or \"theed transport\". Try again.", null); messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (setupStep == 2) + else if (setupStep == 2) { if (lastDataStr.equals("here")) { @@ -254,7 +235,7 @@ public class shuttle extends script.base_script messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (setupStep == 3) + else if (setupStep == 3) { if (lastDataStr.equals("yes")) { @@ -275,7 +256,7 @@ public class shuttle extends script.base_script messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (setupStep == 4) + else if (setupStep == 4) { setObjVar(self, "event.shuttle.template", lastDataStr); setObjVar(self, "event.shuttle.setupStep", 5); @@ -283,7 +264,7 @@ public class shuttle extends script.base_script messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (setupStep == 5) + else if (setupStep == 5) { int lastDataInt = utils.stringToInt(lastDataStr); if (lastDataInt >= 0 && lastDataInt <= 10) @@ -298,7 +279,7 @@ public class shuttle extends script.base_script messageTo(self, "continueCollectingData", null, 1, false); return SCRIPT_CONTINUE; } - if (setupStep == 6) + else if (setupStep == 6) { setObjVar(self, "event.shuttle.magicWord", lastDataStr); setObjVar(self, "event.shuttle.setupStep", 0); @@ -318,7 +299,6 @@ public class shuttle extends script.base_script { int numSpawns = getIntObjVar(self, "event.shuttle.numSpawns"); location spawnPoint = getLocationObjVar(self, "event.shuttle.spawnPoint"); - float heading = getFloatObjVar(self, "event.shuttle.heading"); int shuttleType = getIntObjVar(self, "event.shuttle.shuttleType"); obj_id shuttle = create.object(SHUTTLE_TEMPLATE[shuttleType], spawnPoint); if (numSpawns > 0) @@ -330,6 +310,7 @@ public class shuttle extends script.base_script setObjVar(shuttle, "event.shuttle.owner", self); setObjVar(shuttle, "event.shuttle.numSpawns", numSpawns); setObjVar(shuttle, "event.shuttle.shuttleType", shuttleType); + float heading = getFloatObjVar(self, "event.shuttle.heading"); if (shuttleType < 3) { setYaw(shuttle, heading + 180); @@ -355,8 +336,7 @@ public class shuttle extends script.base_script } public int doFlyBy(obj_id self, dictionary params) throws InterruptedException { - obj_id shuttle = getObjIdObjVar(self, "event.shuttle.shuttle"); - messageTo(shuttle, "performFlyBy", null, 0, false); + messageTo(getObjIdObjVar(self, "event.shuttle.shuttle"), "performFlyBy", null, 0, false); return SCRIPT_CONTINUE; } public int getRidOfOwner(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/event/shuttle_control.java b/sku.0/sys.server/compiled/game/script/event/shuttle_control.java old mode 100644 new mode 100755 index 97830166b..6eae20b1a --- a/sku.0/sys.server/compiled/game/script/event/shuttle_control.java +++ b/sku.0/sys.server/compiled/game/script/event/shuttle_control.java @@ -1,22 +1,16 @@ package script.event; -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.obj_id; public class shuttle_control extends script.base_script { public shuttle_control() { } - public static final float DECAY_TIME = 60 * 60 * 8; - public static final float[] LANDING_TIME = + private static final float DECAY_TIME = 60 * 60 * 8; + private static final float[] LANDING_TIME = { 17, 22, @@ -49,8 +43,7 @@ public class shuttle_control extends script.base_script setPosture(self, POSTURE_PRONE); } messageTo(self, "dropOffNpcs", null, LANDING_TIME[shuttleType], false); - obj_id owner = getObjIdObjVar(self, "event.shuttle.owner"); - sendSystemMessage(owner, "SHUTTLE: I am landing.", null); + sendSystemMessage(getObjIdObjVar(self, "event.shuttle.owner"), "SHUTTLE: I am landing.", null); return SCRIPT_CONTINUE; } public int takeOff(obj_id self, dictionary params) throws InterruptedException @@ -67,8 +60,7 @@ public class shuttle_control extends script.base_script setPosture(self, POSTURE_UPRIGHT); } messageTo(self, "cleanUp", null, 20, false); - obj_id owner = getObjIdObjVar(self, "event.shuttle.owner"); - sendSystemMessage(owner, "SHUTTLE: I am taking off.", null); + sendSystemMessage(getObjIdObjVar(self, "event.shuttle.owner"), "SHUTTLE: I am taking off.", null); return SCRIPT_CONTINUE; } public int performFlyBy(obj_id self, dictionary params) throws InterruptedException @@ -86,8 +78,7 @@ public class shuttle_control extends script.base_script String template = getStringObjVar(self, "event.shuttle.template"); for (int i = 0; i < numSpawns; i++) { - location here = getLocation(self); - obj_id spawn = create.object(template, here); + create.object(template, getLocation(self)); } } return SCRIPT_CONTINUE; @@ -109,6 +100,5 @@ public class shuttle_control extends script.base_script { destroyObject(self); } - return; } }