diff --git a/sku.0/sys.server/compiled/game/script/ai/ai.java b/sku.0/sys.server/compiled/game/script/ai/ai.java index fd8077138..6bde3da9d 100755 --- a/sku.0/sys.server/compiled/game/script/ai/ai.java +++ b/sku.0/sys.server/compiled/game/script/ai/ai.java @@ -1051,7 +1051,7 @@ public class ai extends script.base_script } int delayCount = 0; for (obj_id pk1 : pks) { - if (isIdValid(pk1) && (corpseLevel + 5 < getLevel(pk1) || utils.isFreeTrial(pk1))) { + if (isIdValid(pk1) && (corpseLevel + 5 < getLevel(pk1))) { doNotDropCard = true; } if (isIdValid(pk1) && scheduled_drop.hasCardDelay(pk1, sourceSystem)) { @@ -1071,7 +1071,7 @@ public class ai extends script.base_script } } if (isGod(pk) && hasObjVar(pk, "qa_tcg")) { - sendSystemMessageTestingOnly(pk, "QA TCG COMBAT. Do not drop card? " + doNotDropCard + " hasCardDelay? " + scheduled_drop.hasCardDelay(pk, sourceSystem) + " isTrial? " + utils.isFreeTrial(pk) + " bad level? " + (corpseLevel + 5 < getLevel(pk))); + sendSystemMessageTestingOnly(pk, "QA TCG COMBAT. Do not drop card? " + doNotDropCard + " hasCardDelay? " + scheduled_drop.hasCardDelay(pk, sourceSystem) + " bad level? " + (corpseLevel + 5 < getLevel(pk))); } } } diff --git a/sku.0/sys.server/compiled/game/script/base_class.java b/sku.0/sys.server/compiled/game/script/base_class.java index ab752e266..6e3d3346d 100755 --- a/sku.0/sys.server/compiled/game/script/base_class.java +++ b/sku.0/sys.server/compiled/game/script/base_class.java @@ -21717,9 +21717,8 @@ public class base_class return _getSubscriptionFeatureBits(getLongWithNull(player)); } /** - * Find out if this player is from a free trial account - * @param player The player (creature object) - * @return boolean, yes if it is a free trial, false otherwise + * @deprecated + * todo to be removed */ private static native boolean _isFreeTrialAccount(long player); public static boolean isFreeTrialAccount(obj_id player) diff --git a/sku.0/sys.server/compiled/game/script/conversation/community_tcg_photo_contest_painting_handout.java b/sku.0/sys.server/compiled/game/script/conversation/community_tcg_photo_contest_painting_handout.java index 64e0a5d44..9b370fa86 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/community_tcg_photo_contest_painting_handout.java +++ b/sku.0/sys.server/compiled/game/script/conversation/community_tcg_photo_contest_painting_handout.java @@ -34,10 +34,6 @@ public class community_tcg_photo_contest_painting_handout extends script.base_sc } public boolean community_tcg_photo_contest_painting_handout_condition_canReceivePaintings(obj_id player, obj_id npc) throws InterruptedException { - if (isFreeTrialAccount(player)) - { - return false; - } int myAge = getCurrentBirthDate() - getPlayerBirthDate(player); if (hasCompletedCollection(player, "player_received_tcg_gcw_photo_painting_2010_tracker") || myAge < 10) { @@ -80,10 +76,6 @@ public class community_tcg_photo_contest_painting_handout extends script.base_sc } public boolean community_tcg_photo_contest_painting_handout_condition_isTrialAccountPlayer(obj_id player, obj_id npc) throws InterruptedException { - if (isFreeTrialAccount(player)) - { - return true; - } return false; } public void community_tcg_photo_contest_painting_handout_action_grantPainting03(obj_id player, obj_id npc) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/conversation/storyteller_vendor.java b/sku.0/sys.server/compiled/game/script/conversation/storyteller_vendor.java index cd6d72358..5e67b655a 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/storyteller_vendor.java +++ b/sku.0/sys.server/compiled/game/script/conversation/storyteller_vendor.java @@ -18,10 +18,6 @@ public class storyteller_vendor extends script.base_script } public boolean storyteller_vendor_condition_checkFromToken(obj_id player, obj_id npc) throws InterruptedException { - if (isFreeTrialAccount(player)) - { - return false; - } if (hasObjVar(npc, "storytellerid")) { obj_id storytelledId = getObjIdObjVar(npc, "storytellerid"); diff --git a/sku.0/sys.server/compiled/game/script/library/group.java b/sku.0/sys.server/compiled/game/script/library/group.java index 0c273c9cc..89ae6ddd7 100755 --- a/sku.0/sys.server/compiled/game/script/library/group.java +++ b/sku.0/sys.server/compiled/game/script/library/group.java @@ -571,15 +571,6 @@ public class group extends script.base_script } public static boolean isDepositSafe(Vector members, int money) throws InterruptedException { - for (Object member : members) { - if (utils.isFreeTrial(((obj_id) member))) { - int math = getTotalMoney(((obj_id) member)); - int quickCheck = math + money; - if (quickCheck > 50000) { - return false; - } - } - } return true; } public static obj_id[] getSafeMoney(Vector members, int money) throws InterruptedException @@ -587,9 +578,7 @@ public class group extends script.base_script Vector returnArray = new Vector(); returnArray.setSize(0); for (Object member : members) { - if (!utils.isFreeTrial(((obj_id) member))) { - utils.addElement(returnArray, ((obj_id) member)); - } + utils.addElement(returnArray, ((obj_id) member)); } obj_id[] _returnArray = new obj_id[0]; if (returnArray != null) @@ -604,9 +593,7 @@ public class group extends script.base_script Vector returnArray = new Vector(); returnArray.setSize(0); for (Object member : members) { - if (utils.isFreeTrial(((obj_id) member))) { - utils.addElement(returnArray, ((obj_id) member)); - } + utils.addElement(returnArray, ((obj_id) member)); } obj_id[] _returnArray = new obj_id[0]; if (returnArray != null) @@ -618,24 +605,7 @@ public class group extends script.base_script } public static int getSafeDifference(obj_id members, int money) throws InterruptedException { - if (utils.isFreeTrial(members)) - { - int math = getTotalMoney(members); - int quickCheck = math + money; - int safe = 50000 - math; - if (quickCheck > 50000) - { - return safe; - } - else - { - return money; - } - } - else - { - return money; - } + return money; } public static boolean systemPayoutToGroup(String acct, obj_id player, int amt, String reason, String returnHandler, dictionary params) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/library/holiday.java b/sku.0/sys.server/compiled/game/script/library/holiday.java index 2d1fd89c4..d803f84ca 100755 --- a/sku.0/sys.server/compiled/game/script/library/holiday.java +++ b/sku.0/sys.server/compiled/game/script/library/holiday.java @@ -638,7 +638,7 @@ public class holiday extends script.base_script { return false; } - if (isPlayerConnected(player) && !isAwayFromKeyBoard(player) && !hasCompletedCollectionSlot(player, holiday.EMPIRE_DAY_CHAMPION_BADGE) && !hasCompletedCollectionSlot(player, holiday.REMEMBRANCE_DAY_CHAMPION_BADGE) && !isGod(player) && !isDead(player) && !ai_lib.isInCombat(player) && !isIncapacitated(player) && !utils.isFreeTrial(player) && isInWorldCell(player)) + if (isPlayerConnected(player) && !isAwayFromKeyBoard(player) && !hasCompletedCollectionSlot(player, holiday.EMPIRE_DAY_CHAMPION_BADGE) && !hasCompletedCollectionSlot(player, holiday.REMEMBRANCE_DAY_CHAMPION_BADGE) && !isGod(player) && !isDead(player) && !ai_lib.isInCombat(player) && !isIncapacitated(player) && isInWorldCell(player)) { return true; } diff --git a/sku.0/sys.server/compiled/game/script/library/npe.java b/sku.0/sys.server/compiled/game/script/library/npe.java index 0361b4b8a..a7f05a851 100755 --- a/sku.0/sys.server/compiled/game/script/library/npe.java +++ b/sku.0/sys.server/compiled/game/script/library/npe.java @@ -560,11 +560,6 @@ public class npe extends script.base_script { sendPlayerToTutorial(player); } - else if (isFreeTrialAccount(player)) - { - LIVE_LOG("npe", "Player(" + player + ") is a free trial player in an invalid space zone(" + scene + "), sending to tutorial start"); - sendPlayerToTutorial(player); - } else { return false; diff --git a/sku.0/sys.server/compiled/game/script/library/pclib.java b/sku.0/sys.server/compiled/game/script/library/pclib.java index 68781a382..1bbab18bb 100755 --- a/sku.0/sys.server/compiled/game/script/library/pclib.java +++ b/sku.0/sys.server/compiled/game/script/library/pclib.java @@ -289,10 +289,6 @@ public class pclib extends script.base_script return false; } CustomerServiceLog("Trade", " Tip -- Player: " + player + " " + getName(player) + " Target: " + target + " -- Transferring Cash! Amt: " + amt); - if (utils.isFreeTrial(player, target)) - { - doTipLogging(player, target, amt); - } boolean success = transferCashTo(player, target, amt, "handleTipSuccess", "handleTipFail", d); if (!success) { diff --git a/sku.0/sys.server/compiled/game/script/library/player_structure.java b/sku.0/sys.server/compiled/game/script/library/player_structure.java index 6280a61ba..7a66205d0 100755 --- a/sku.0/sys.server/compiled/game/script/library/player_structure.java +++ b/sku.0/sys.server/compiled/game/script/library/player_structure.java @@ -990,11 +990,6 @@ public class player_structure extends script.base_script } public static boolean canPlaceStructure(obj_id player, String template, location loc, obj_id deed) throws InterruptedException { - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id(STF_FILE, "no_trial_accounts")); - return false; - } int template_idx = getStructureTableIndex(template); LOG("LOG_CHANNEL", "player_structure::canPlaceStructure -- template_idx ->" + template_idx); if (template_idx == -1) @@ -1927,7 +1922,7 @@ public class player_structure extends script.base_script } public static boolean canPackBuilding(obj_id player, obj_id structure) throws InterruptedException { - return !utils.isFreeTrial(player) && !isCivic(structure) && !isHarvester(structure) && !isGenerator(structure) && isOwner(structure, player); + return !isCivic(structure) && !isHarvester(structure) && !isGenerator(structure) && isOwner(structure, player); } public static void packBuilding(obj_id player, obj_id structure) throws InterruptedException { @@ -5621,10 +5616,6 @@ public class player_structure extends script.base_script { return false; } - if (utils.isFreeTrial(player)) - { - return false; - } return isCommoditiesServerAvailable(); } public static boolean canPlayerPackAbandonedStructure(obj_id player, obj_id structure) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/library/storyteller.java b/sku.0/sys.server/compiled/game/script/library/storyteller.java index 2cd230a1f..6bcd88a1b 100755 --- a/sku.0/sys.server/compiled/game/script/library/storyteller.java +++ b/sku.0/sys.server/compiled/game/script/library/storyteller.java @@ -559,11 +559,6 @@ public class storyteller extends script.base_script } return true; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return false; - } obj_id myCell = here.cell; obj_id myContainer = getTopMostContainer(myCell); obj_id storytellerBeingAssisted = getStorytellerBeingAssisted(player); diff --git a/sku.0/sys.server/compiled/game/script/library/utils.java b/sku.0/sys.server/compiled/game/script/library/utils.java index 55e73b6ec..ffd397abe 100755 --- a/sku.0/sys.server/compiled/game/script/library/utils.java +++ b/sku.0/sys.server/compiled/game/script/library/utils.java @@ -5705,14 +5705,6 @@ public class utils extends script.base_script int timeCalled = utils.getIntScriptVar(player, toCheckFor); return timeCalled < 1 ? -1 : timeCalled + utils.getIntScriptVar(player, modifiedTime) - getGameTime(); } - public static boolean isFreeTrial(obj_id player) throws InterruptedException - { - return isFreeTrialAccount(player); - } - public static boolean isFreeTrial(obj_id player, obj_id target) throws InterruptedException - { - return isFreeTrialAccount(player); - } public static void notifyObject(obj_id objTarget, String strNotificationName, dictionary dctParams) throws InterruptedException { if (!isIdValid(objTarget)) diff --git a/sku.0/sys.server/compiled/game/script/library/xp.java b/sku.0/sys.server/compiled/game/script/library/xp.java index 643a1d6d7..76e074028 100755 --- a/sku.0/sys.server/compiled/game/script/library/xp.java +++ b/sku.0/sys.server/compiled/game/script/library/xp.java @@ -1390,19 +1390,6 @@ public class xp extends script.base_script } public static void displayXpFlyText(obj_id player, obj_id target, int amount) throws InterruptedException { - if (isFreeTrialAccount(player)) - { - int playerLevel = getLevel(player); - if (playerLevel >= TRIAL_LEVEL_CAP) - { - debugSpeakMsg(player, "I am a greater than or equal to level " + xp.TRIAL_LEVEL_CAP); - prose_package pp = new prose_package(); - prose.setDI(pp, xp.TRIAL_LEVEL_CAP); - prose.setStringId(pp, SID_FREE_TRIAL_LEVEL_CAP); - sendSystemMessageProse(player, pp); - return; - } - } if (amount == 0) { return; diff --git a/sku.0/sys.server/compiled/game/script/player/base/base_player.java b/sku.0/sys.server/compiled/game/script/player/base/base_player.java index a94033ed4..fd4d71ed0 100755 --- a/sku.0/sys.server/compiled/game/script/player/base/base_player.java +++ b/sku.0/sys.server/compiled/game/script/player/base/base_player.java @@ -3723,10 +3723,6 @@ public class base_player extends script.base_script d.put("targetName", targetName); CustomerServiceLog("Trade", " Tip -- Player: " + self + " " + getName(self) + " Target: " + target + " -- Transferring wire bank money to escrow account! Amt: " + amt); transferBankCreditsToNamedAccount(self, money.ACCT_TIP_ESCROW, amt, "handleTipSuccess", "handleTipFail", d); - if (utils.isFreeTrial(self, target)) - { - pclib.doTipLogging(self, target, amt); - } CustomerServiceLog("Trade", " Tip -- Player: " + self + " " + getName(self) + " Target: " + target + " -- Transferring wire bank fee to surcharge account! Amt: " + fee); transferBankCreditsToNamedAccount(self, money.ACCT_TIP_SURCHARGE, fee, "noHandler", "noHandler", d); utils.moneyOutMetric(self, money.ACCT_TIP_SURCHARGE, fee); @@ -9489,13 +9485,6 @@ public class base_player extends script.base_script return SCRIPT_CONTINUE; } int playerLevel = getLevel(self); - if (isFreeTrialAccount(self)) - { - if (playerLevel >= xp.TRIAL_LEVEL_CAP) - { - return SCRIPT_CONTINUE; - } - } String xp_type = params.getString("xp_type"); int amt = params.getInt("amt"); String fromCallback = params.getString("fromCallback"); diff --git a/sku.0/sys.server/compiled/game/script/player/player_building.java b/sku.0/sys.server/compiled/game/script/player/player_building.java index 82e261f02..bdee05a4b 100755 --- a/sku.0/sys.server/compiled/game/script/player/player_building.java +++ b/sku.0/sys.server/compiled/game/script/player/player_building.java @@ -220,11 +220,6 @@ public class player_building extends script.base_script } public int OnPermissionListModify(obj_id self, obj_id player, String name, String listName, String action) throws InterruptedException { - if (utils.isFreeTrial(player)) - { - sendSystemMessage(player, SID_TRIAL_NO_MODIFY); - return SCRIPT_CONTINUE; - } LOG("debug", "player_building::OnPermissionListModify"); obj_id structure = player_structure.getStructure(self); if ((structure == null) || (structure == obj_id.NULL_ID)) @@ -1169,10 +1164,6 @@ public class player_building extends script.base_script public int paWithdraw(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { obj_id structure = player_structure.getStructure(self); - if (utils.isFreeTrial(self)) - { - return SCRIPT_CONTINUE; - } if (!player_structure.isGuildHall(structure)) { LOG("LOG_CHANNEL", self + " ->You can only do that in a guild hall."); @@ -1351,14 +1342,6 @@ public class player_building extends script.base_script utils.removeScriptVarTree(self, "addPower"); } obj_id structure = player_structure.getStructure(self); - if (!player_structure.isOwner(structure, self)) - { - if (utils.isFreeTrial(self)) - { - sendSystemMessage(self, SID_TRIAL_STRUCTURE); - return SCRIPT_CONTINUE; - } - } if (!isIdValid(structure)) { LOG("LOG_CHANNEL", "You must be in a building, be near an installation, or have one targeted to do that."); @@ -1490,14 +1473,6 @@ public class player_building extends script.base_script public int assignDroid(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { obj_id structure = player_structure.getStructure(self); - if (!player_structure.isOwner(structure, self)) - { - if (utils.isFreeTrial(self)) - { - sendSystemMessage(self, SID_TRIAL_STRUCTURE); - return SCRIPT_CONTINUE; - } - } if (!isIdValid(structure)) { LOG("LOG_CHANNEL", self + " ->You must in a building or near an installation to use that command."); @@ -1729,11 +1704,6 @@ public class player_building extends script.base_script { LOG("LOG_CHANNEL", "player_building::setPermission-- params ->" + params + " target ->" + target); obj_id structure = player_structure.getStructure(self); - if (utils.isFreeTrial(self)) - { - sendSystemMessage(self, SID_TRIAL_NO_MODIFY); - return SCRIPT_CONTINUE; - } LOG("LOG_CHANNEL", "structure ->" + structure); if (!isIdValid(structure)) { @@ -2337,14 +2307,6 @@ public class player_building extends script.base_script return SCRIPT_CONTINUE; } LOG("house", "payMaintenance - structure = " + structure); - if (!player_structure.isOwner(structure, self)) - { - if (utils.isFreeTrial(self)) - { - sendSystemMessage(self, SID_TRIAL_STRUCTURE); - return SCRIPT_CONTINUE; - } - } if (player_structure.isCivic(structure)) { return SCRIPT_CONTINUE; @@ -2420,13 +2382,6 @@ public class player_building extends script.base_script { LOG("LOG_CHANNEL", "player_building::setPrivacy"); obj_id structure = player_structure.getStructure(self); - if (!player_structure.isOwner(structure, self)) - { - if (utils.isFreeTrial(self)) - { - return SCRIPT_CONTINUE; - } - } if (!isIdValid(structure)) { LOG("LOG_CHANNEL", "You must be in a building to do that."); @@ -2512,11 +2467,6 @@ public class player_building extends script.base_script public int declareResidence(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { obj_id structure = player_structure.getStructure(self); - if (utils.isFreeTrial(self)) - { - sendSystemMessage(self, SID_NO_DECLARE); - return SCRIPT_CONTINUE; - } if (!isIdValid(structure)) { LOG("LOG_CHANNEL", "You must be in a building to do that."); @@ -2742,11 +2692,6 @@ public class player_building extends script.base_script sendSystemMessage(self, player_structure.SID_SPECIAL_SIGN_NO_TRANSFER); return SCRIPT_CONTINUE; } - if (utils.isFreeTrial(target)) - { - sendSystemMessage(self, SID_NO_TRANSFER); - return SCRIPT_CONTINUE; - } if (player_structure.isBanned(structure, target)) { LOG("LOG_CHANNEL", "You cannot transfer ownership to a banned player"); @@ -4274,11 +4219,6 @@ public class player_building extends script.base_script removeVendorVars(player); return SCRIPT_CONTINUE; } - if (utils.isFreeTrial(player)) - { - removeVendorVars(player); - return SCRIPT_CONTINUE; - } blog("player_building.buildVendor: vendor data initial validation pass"); obj_id structure = player_structure.getStructure(player); obj_id inventory = getObjectInSlot(player, "inventory"); @@ -5396,10 +5336,6 @@ public class player_building extends script.base_script } public boolean canPlaceCivic(obj_id player, obj_id deed, location position, String template) throws InterruptedException { - if (utils.isFreeTrial(player)) - { - return false; - } int city_id = getCityAtLocation(position, 0); if (!cityExists(city_id)) { @@ -5419,10 +5355,6 @@ public class player_building extends script.base_script { return false; } - if (utils.isFreeTrial(player)) - { - return false; - } if (player_structure.isShuttleportTemplate(template)) { int travelCost = cityGetTravelCost(city_id); @@ -5525,12 +5457,6 @@ public class player_building extends script.base_script blog("player_building:validateVendorPlacement() - isCivic = true"); return false; } - if (utils.isFreeTrial(self)) - { - blog("player_building:validateVendorPlacement() - Player is free trial"); - sendSystemMessage(self, SID_NO_VENDOR); - return false; - } if (hasObjVar(self, "vendor_not_initialized")) { blog("player_building:validateVendorPlacement() - has vendor_not_initialized"); diff --git a/sku.0/sys.server/compiled/game/script/systems/beast/base_incubator.java b/sku.0/sys.server/compiled/game/script/systems/beast/base_incubator.java index 1f18681d1..b437c49aa 100755 --- a/sku.0/sys.server/compiled/game/script/systems/beast/base_incubator.java +++ b/sku.0/sys.server/compiled/game/script/systems/beast/base_incubator.java @@ -32,7 +32,6 @@ public class base_incubator extends script.base_script public static final string_id SID_REMOVE_EGG = new string_id("incubator", "remove_egg"); public static final string_id SID_ONLY_DNA_CAN_ADD = new string_id("incubator", "only_dna_can_add"); public static final string_id SID_STATION_HAS_DNA_ALREADY = new string_id("incubator", "station_has_dna_already"); - public static final string_id SID_NO_TRIAL_ACCOUNTS = new string_id("incubator", "no_trial_accounts"); public int OnInitialize(obj_id self) throws InterruptedException { if (utils.isInHouseCellSpace(self)) @@ -58,11 +57,6 @@ public class base_incubator extends script.base_script sendSystemMessage(player, SID_WHILE_DEAD); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, SID_NO_TRIAL_ACCOUNTS); - return SCRIPT_CONTINUE; - } if (incubator.hasActiveUser(station) && incubator.hasActiveIncubator(player)) { incubator.checkIncubatorForMismatch(station, player); @@ -118,11 +112,6 @@ public class base_incubator extends script.base_script sendSystemMessage(player, SID_WHILE_DEAD); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, SID_NO_TRIAL_ACCOUNTS); - return SCRIPT_CONTINUE; - } obj_id station = self; if (beast_lib.isBeastMaster(player) && utils.isInHouseCellSpace(station)) { diff --git a/sku.0/sys.server/compiled/game/script/systems/crafting/droid/modules/merchant_barker.java b/sku.0/sys.server/compiled/game/script/systems/crafting/droid/modules/merchant_barker.java index 3e2f9650a..a995fb4b3 100755 --- a/sku.0/sys.server/compiled/game/script/systems/crafting/droid/modules/merchant_barker.java +++ b/sku.0/sys.server/compiled/game/script/systems/crafting/droid/modules/merchant_barker.java @@ -18,8 +18,7 @@ public class merchant_barker extends script.base_script public static final String VAR_BARK_MESSAGE = "module_data.bark_message"; public static final String VAR_BARK_WAYPOINT_LOC = "module_data.bark_waypoint_loc"; public static final String VAR_BARK_WAYPOINT_NAME = "module_data.bark_waypoint_name"; - public static final string_id SID_NO_FREE_TRIAL = new string_id("base_player", "no_free_trial_barker"); - + public int OnAttach(obj_id self) throws InterruptedException { createTriggerVolume(pet.BARK_TRIGGER_VOLUME, pet.BARK_RANGE, true); @@ -117,11 +116,6 @@ public class merchant_barker extends script.base_script { if (item == menu_info_types.SERVER_MENU2) { - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, SID_NO_FREE_TRIAL); - return SCRIPT_CONTINUE; - } if (utils.hasScriptVar(self, SCRIPT_VAR_RECORDING_ON)) { sendSystemMessage(player, new string_id(STF_FILE, "recording_message_off")); @@ -135,11 +129,6 @@ public class merchant_barker extends script.base_script } if (item == menu_info_types.SERVER_MENU3) { - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, SID_NO_FREE_TRIAL); - return SCRIPT_CONTINUE; - } obj_id waypoints[] = getWaypointsInDatapad(player); if (waypoints != null && waypoints.length > 0) { @@ -164,11 +153,6 @@ public class merchant_barker extends script.base_script } if (item == menu_info_types.SERVER_MENU4) { - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, SID_NO_FREE_TRIAL); - return SCRIPT_CONTINUE; - } if (!utils.hasScriptVar(self, SCRIPT_VAR_BARKING_ON)) { if (!hasObjVar(self, VAR_BARK_MESSAGE)) diff --git a/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_base.java b/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_base.java index 2d477ebd6..059eb0b69 100755 --- a/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_base.java +++ b/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_base.java @@ -274,14 +274,9 @@ public class mission_base extends script.base_script return player; } for (Object target : targets) { - if (!utils.isFreeTrial(((obj_id) target)) && !hasScript(((obj_id) target), "ai.pet")) { + if (!hasScript(((obj_id) target), "ai.pet")) { return ((obj_id) target); } - if (utils.isFreeTrial(((obj_id) target))) { - if (group.getSafeDifference(((obj_id) target), money) == money) { - return ((obj_id) target); - } - } if (!hasScript(((obj_id) target), "ai.pet")) { if (group.getSafeDifference(((obj_id) target), money) > group.getSafeDifference(mostMoney, money)) { mostMoney = ((obj_id) target); diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.java index b657c333e..4f77a88d0 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.java @@ -73,11 +73,6 @@ public class blueprint extends script.base_script sendSystemMessage(player, new string_id("storyteller", "blueprint_not_while_swimming")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "blueprint_no_trial_accounts")); - return SCRIPT_CONTINUE; - } location yourLoc = getLocation(player); if (isIdValid(yourLoc.cell)) { @@ -254,11 +249,6 @@ public class blueprint extends script.base_script sendSystemMessage(player, new string_id("storyteller", "blueprint_not_while_swimming")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "blueprint_no_trial_accounts")); - return SCRIPT_CONTINUE; - } location yourLoc = getLocation(player); if (isIdValid(yourLoc.cell)) { diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.java index 649c1e315..ae6438df4 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.java @@ -28,11 +28,6 @@ public class blueprint_blank extends script.base_script sendSystemMessage(player, new string_id("storyteller", "blueprint_not_while_swimming")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "blueprint_no_trial_accounts")); - return SCRIPT_CONTINUE; - } location yourLoc = getLocation(player); if (isIdValid(yourLoc.cell)) { diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/destructible_prop_token.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/destructible_prop_token.java index f2b1e0041..989fcfb50 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/destructible_prop_token.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/destructible_prop_token.java @@ -29,11 +29,6 @@ public class destructible_prop_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_from_inventory_only")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } obj_id target = getStorytellerTokenTarget(player); if (item == menu_info_types.ITEM_USE) { diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/effect_token.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/effect_token.java index 81810d5eb..31c5a05c4 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/effect_token.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/effect_token.java @@ -46,11 +46,6 @@ public class effect_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_from_inventory_only")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } obj_id effectTarget = getStorytellerEffectTarget(player); if (item == menu_info_types.ITEM_USE) { @@ -75,11 +70,6 @@ public class effect_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_from_inventory_only")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } if (storyteller.hasReachedAreaSpawnLimit(player)) { sendSystemMessage(player, new string_id("storyteller", "reached_area_spawn_limit")); diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/jukebox_converter_prop_token.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/jukebox_converter_prop_token.java index d4a484ac3..fd98de3b7 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/jukebox_converter_prop_token.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/jukebox_converter_prop_token.java @@ -28,11 +28,6 @@ public class jukebox_converter_prop_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_from_inventory_only")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } obj_id target = getStorytellerTokenTarget(player); if (item == menu_info_types.ITEM_USE) { diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_difficulty_token.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_difficulty_token.java index f1e5e8d5a..4b8e3225a 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_difficulty_token.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_difficulty_token.java @@ -28,11 +28,6 @@ public class npc_difficulty_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_from_inventory_only")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } obj_id target = getStorytellerTokenTarget(player); if (item == menu_info_types.ITEM_USE) { diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.java index 823b3aee3..feb64cb1a 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.java @@ -67,11 +67,6 @@ public class npc_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_not_while_swimming")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } if (item == menu_info_types.ITEM_USE_OTHER) { String prompt = utils.packStringId(new string_id("storyteller", "npc_combat_level_prompt")); @@ -91,11 +86,6 @@ public class npc_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_not_while_swimming")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } if (storyteller.hasReachedAreaSpawnLimit(player)) { sendSystemMessage(player, new string_id("storyteller", "reached_area_spawn_limit")); diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/prop_token.java b/sku.0/sys.server/compiled/game/script/systems/storyteller/prop_token.java index ea16aee52..cc5aa52b9 100755 --- a/sku.0/sys.server/compiled/game/script/systems/storyteller/prop_token.java +++ b/sku.0/sys.server/compiled/game/script/systems/storyteller/prop_token.java @@ -53,11 +53,6 @@ public class prop_token extends script.base_script sendSystemMessage(player, new string_id("storyteller", "placement_not_while_swimming")); return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - sendSystemMessage(player, new string_id("storyteller", "placement_no_trial_accounts")); - return SCRIPT_CONTINUE; - } if (storyteller.hasReachedAreaSpawnLimit(player)) { sendSystemMessage(player, new string_id("storyteller", "reached_area_spawn_limit")); diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.java index a824a5870..62b5fb158 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_guild.java @@ -827,10 +827,6 @@ public class terminal_guild extends script.terminal.base.base_terminal sendSystemMessage(player, SID_ML_NOT_LOADED); return SCRIPT_CONTINUE; } - if (utils.isFreeTrial(player, member)) { - sendSystemMessage(player, SID_ML_TRIAL); - return SCRIPT_CONTINUE; - } utils.setScriptVar(self, "temp_new_leader", member); int pid = sui.msgbox(self, member, "@guild:make_leader_p", sui.YES_NO, "@guild:make_leader_t", sui.MSG_NORMAL, "handleAcceptLeadership"); guild.setWindowPid(self, pid); @@ -920,10 +916,6 @@ public class terminal_guild extends script.terminal.base.base_terminal { return; } - if (utils.isFreeTrial(player)) - { - return; - } if (guild.isCandidate(guildId, player)) { sendSystemMessage(player, SID_REGISTER_DUPE); diff --git a/sku.0/sys.server/compiled/game/script/test/ttyson_test.java b/sku.0/sys.server/compiled/game/script/test/ttyson_test.java index 177d85400..11cb16c0a 100755 --- a/sku.0/sys.server/compiled/game/script/test/ttyson_test.java +++ b/sku.0/sys.server/compiled/game/script/test/ttyson_test.java @@ -597,10 +597,6 @@ public class ttyson_test extends script.base.remote_object_requester { debugConsoleMsg(self, "isAbandoned = false"); } - if (utils.isFreeTrial(self)) - { - debugConsoleMsg(self, "isFreeTrial = true"); - } if (!isCommoditiesServerAvailable()) { debugConsoleMsg(self, "isCommoditiesServerAvailable = false"); diff --git a/sku.0/sys.server/compiled/game/script/theme_park/outbreak_prolog/publish_gift_prolog_quest.java b/sku.0/sys.server/compiled/game/script/theme_park/outbreak_prolog/publish_gift_prolog_quest.java index 0ec68cd79..f3acc9553 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/outbreak_prolog/publish_gift_prolog_quest.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/outbreak_prolog/publish_gift_prolog_quest.java @@ -29,10 +29,6 @@ public class publish_gift_prolog_quest extends script.base_script { return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - return SCRIPT_CONTINUE; - } if (isInTutorialArea(player)) { return SCRIPT_CONTINUE; @@ -46,10 +42,6 @@ public class publish_gift_prolog_quest extends script.base_script { return SCRIPT_CONTINUE; } - if (isFreeTrialAccount(player)) - { - return SCRIPT_CONTINUE; - } if (isInTutorialArea(player)) { return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/working/reecetest.java b/sku.0/sys.server/compiled/game/script/working/reecetest.java index 9445a9d0d..28755ea4d 100755 --- a/sku.0/sys.server/compiled/game/script/working/reecetest.java +++ b/sku.0/sys.server/compiled/game/script/working/reecetest.java @@ -334,27 +334,11 @@ public class reecetest extends script.base_script { int pBits = getSubscriptionFeatureBits(target); sendSystemMessageTestingOnly(self, "CHECKING ACCOUNT TYPE Got account bits. They came back as: " + pBits); - if ((utils.isFreeTrial(target))) - { - sendSystemMessageTestingOnly(self, "It would appear that this IS a free trial account, per results from utils.isFreeTrial"); - } - else - { - sendSystemMessageTestingOnly(self, "It would appear that this IS NOT a free trial account, per results from utils.isFreeTrial"); - } obj_id playerObject = getPlayerObject(target); if (playerObject != null) { pBits = getSubscriptionFeatureBits(playerObject); sendSystemMessageTestingOnly(self, "Running same checks on PLAYER ACCOUNT OBJECT. Got account bits came back as: " + pBits); - if ((utils.isFreeTrial(playerObject))) - { - sendSystemMessageTestingOnly(self, "testing PLAYER ACCOUNT OBJ, this IS a free trial account, per results from utils.isFreeTrial"); - } - else - { - sendSystemMessageTestingOnly(self, "testing PLAYER ACCOUNT OBJ, this IS NOT a free trial account, per results from utils.isFreeTrial"); - } } } }