From 2394d6210a604e074048f5efbe38eea4e60a5326 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Sun, 15 Aug 2021 05:42:30 -0400 Subject: [PATCH] Deprecate Feature Bits & Subscription Bits --- .../compiled/game/script/base_class.java | 11 ++- .../game/script/beta/featuretest.java | 11 --- .../game/script/conversation/boba_fett.java | 4 +- .../script/conversation/c_ddroid_valance.java | 2 +- .../game/script/conversation/c_sink_imp.java | 2 +- .../game/script/conversation/c_sink_reb.java | 2 +- .../corellia_imperial_trainer_1.java | 2 +- ...ellia_privateer_retired_corsec_beggar.java | 2 +- .../corellia_privateer_trainer.java | 2 +- .../corellia_rebel_trainer_1.java | 2 +- .../ep3_clone_relics_clone_trooper_mort.java | 2 +- .../ep3_clone_relics_hunter_qakkee.java | 4 +- .../ep3_clone_relics_queen_kylantha.java | 4 +- .../ep3_kachirho_varactyl_egg.java | 6 +- .../generic_newbie_pilot_info_01.java | 2 +- ...ic_newbie_pilot_info_emperors_retreat.java | 2 +- .../generic_newbie_pilot_info_gia_pei.java | 2 +- ...neric_newbie_pilot_info_jabbas_palace.java | 2 +- .../generic_newbie_pilot_info_khroz.java | 2 +- .../conversation/greeter_bestine_bookie.java | 2 +- .../greeter_bestine_imperial_officer.java | 2 +- .../greeter_dantooine_brother_imperial.java | 2 +- .../greeter_dantooine_brother_neutral.java | 2 +- .../greeter_dantooine_brother_rebel.java | 2 +- .../greeter_dantooine_imperial_officer.java | 2 +- .../greeter_dantooine_imperial_pilot.java | 2 +- .../greeter_dantooine_old_pilot.java | 2 +- .../greeter_kadaara_imperial_officer.java | 2 +- .../greeter_kadaara_mistress.java | 2 +- .../greeter_kor_vella_bodyguard.java | 2 +- .../greeter_kor_vella_imperial_officer.java | 2 +- .../conversation/greeter_kor_vella_pilot.java | 2 +- .../greeter_moenia_undercover_rebel.java | 2 +- .../greeter_mos_eisley_smuggler_fat.java | 2 +- .../greeter_mos_eisley_smuggler_nervous.java | 2 +- .../greeter_mos_eisley_smuggler_skinny.java | 2 +- .../greeter_mos_espa_hutt_recruiter.java | 2 +- .../greeter_mos_espa_valarian_recruiter.java | 2 +- .../greeter_mos_espa_young_pilot.java | 2 +- .../greeter_theed_freighter_captain.java | 2 +- .../greeter_theed_protocol_droid.java | 2 +- .../greeter_tyrena_disgraced_corsec.java | 2 +- .../greeter_tyrena_load_lifter.java | 2 +- .../greeter_tyrena_pilot_friend.java | 2 +- .../script/conversation/imperial_broker.java | 2 +- .../conversation/imperial_master_trooper.java | 2 +- .../naboo_imperial_trainer_1.java | 2 +- .../naboo_privateer_trainer_1.java | 2 +- .../naboo_rebel_tier1_kiizete.java | 2 +- .../conversation/naboo_rebel_trainer_1.java | 2 +- .../script/conversation/privateer_broker.java | 2 +- .../script/conversation/rebel_broker.java | 2 +- .../conversation/rebel_master_trooper.java | 2 +- .../conversation/story_loot_bestine.java | 2 +- .../conversation/story_loot_coronet.java | 2 +- .../conversation/story_loot_eisley.java | 2 +- .../script/conversation/story_loot_espa.java | 2 +- .../conversation/story_loot_kaadara.java | 2 +- .../conversation/story_loot_moenia.java | 2 +- .../script/conversation/story_loot_talus.java | 2 +- .../script/conversation/story_loot_theed.java | 2 +- .../conversation/story_loot_tyrena.java | 2 +- .../tatooine_imperial_trainer_1.java | 2 +- .../tatooine_knives_fencing_valarian.java | 4 +- .../tatooine_privateer_trainer_1.java | 2 +- .../tatooine_rebel_trainer_1.java | 2 +- .../tutorial_imperial_broker.java | 2 +- .../yavin_fallenstar_pt_1_osae.java | 2 +- .../script/cybernetic/cybernetic_item.java | 15 ---- .../game/script/item/goggles/menu.java | 4 - .../game/script/item/goggles/reset.java | 49 +++++------ .../compiled/game/script/library/dump.java | 61 -------------- .../game/script/library/features.java | 83 +------------------ .../compiled/game/script/library/qa.java | 61 -------------- .../game/script/library/space_quest.java | 5 -- .../game/script/library/space_transition.java | 26 ++---- .../compiled/game/script/library/travel.java | 32 ------- .../script/library/veteran_deprecated.java | 36 -------- .../script/npc/skillteacher/skillteacher.java | 17 ---- .../npe/han_solo_experience_player.java | 5 +- .../game/script/player/base/base_player.java | 63 +++++--------- ...oot_ep3_clone_relics_jedi_starfighter.java | 4 - .../loot_ep3_clone_relics_nym_starmap.java | 4 - .../space/combat/combat_ship_player.java | 28 +------ .../script/space/terminal/terminal_space.java | 32 +------ .../space_mining/mining_asteroid_chunk.java | 4 - .../space_mining/mining_asteroid_dynamic.java | 4 - .../space_mining/mining_asteroid_static.java | 2 +- .../terminal/terminal_kashyyyk_content.java | 10 +-- .../game/script/test/dwhite_test.java | 57 ------------- .../theme_park/new_player/helper_droid.java | 40 ++------- .../theme_park/newbie_tutorial/newbie.java | 10 +-- .../newbie_tutorial/newbie_skipped.java | 5 +- .../newbie_tutorial/tutorial_base.java | 33 -------- .../game/script/working/reecetest.java | 34 -------- 95 files changed, 142 insertions(+), 748 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/base_class.java b/sku.0/sys.server/compiled/game/script/base_class.java index 6e3d3346d..b937ce59a 100755 --- a/sku.0/sys.server/compiled/game/script/base_class.java +++ b/sku.0/sys.server/compiled/game/script/base_class.java @@ -21696,10 +21696,10 @@ public class base_class { return _getAccountNumLots(getLongWithNull(player)); } + /** - * Find out what game features this player has purchased - * @param player The player (creature object) - * @return A 32bit bit-vector indicating the game features this player has purchased. + * @deprecated + * todo to be removed */ private static native int _getGameFeatureBits(long player); public static int getGameFeatureBits(obj_id player) @@ -21707,9 +21707,8 @@ public class base_class return _getGameFeatureBits(getLongWithNull(player)); } /** - * Find out what subscription features this player has purchased - * @param player The player (creature object) - * @return A 32bit bit-vector indicating the subscription features this player has purchased. + * @deprecated + * todo to be removed */ private static native int _getSubscriptionFeatureBits(long player); public static int getSubscriptionFeatureBits(obj_id player) diff --git a/sku.0/sys.server/compiled/game/script/beta/featuretest.java b/sku.0/sys.server/compiled/game/script/beta/featuretest.java index 18d1b682d..1312a0477 100755 --- a/sku.0/sys.server/compiled/game/script/beta/featuretest.java +++ b/sku.0/sys.server/compiled/game/script/beta/featuretest.java @@ -9,23 +9,12 @@ public class featuretest extends script.base_script public featuretest() { } - public static final int SWG_BASE_GAME = 0x00000001; - public static final int SWG_COLLECTORS_GAME = 0x00000002; public int OnAttach(obj_id self) throws InterruptedException { - debugSpeakMsg(self, "feature test script attached"); return SCRIPT_CONTINUE; } public int OnSpeaking(obj_id self, String text) throws InterruptedException { - if (text.equals("featuretest")) - { - sendSystemMessageTestingOnly(self, "getGameFeatures(): " + getGameFeatureBits(self)); - sendSystemMessageTestingOnly(self, "getSubFeatures(): " + getSubscriptionFeatureBits(self)); - sendSystemMessageTestingOnly(self, "utils.checkBit( SWG_BASE_GAME ): " + utils.checkBit(getGameFeatureBits(self), SWG_COLLECTORS_GAME)); - sendSystemMessageTestingOnly(self, "utils.checkBit( SWG_COLLECTORS_GAME ): " + utils.checkBit(getGameFeatureBits(self), SWG_COLLECTORS_GAME)); - sendSystemMessageTestingOnly(self, "isCollectorEdition" + features.isCollectorEdition(self)); - } return SCRIPT_CONTINUE; } } diff --git a/sku.0/sys.server/compiled/game/script/conversation/boba_fett.java b/sku.0/sys.server/compiled/game/script/conversation/boba_fett.java index ce80f4ad9..32af38b37 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/boba_fett.java +++ b/sku.0/sys.server/compiled/game/script/conversation/boba_fett.java @@ -89,11 +89,11 @@ public class boba_fett extends script.base_script } public boolean boba_fett_condition_isGm(obj_id player, obj_id npc) throws InterruptedException { - return (hasObjVar(player, "gm")); + return isGod(player); } public boolean boba_fett_condition_hasEp3(obj_id player, obj_id npc) throws InterruptedException { - return features.hasEpisode3Expansion(player); + return true; } public boolean boba_fett_condition_hasCompletetedQuestFive(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/c_ddroid_valance.java b/sku.0/sys.server/compiled/game/script/conversation/c_ddroid_valance.java index f1583961c..2e27926f5 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/c_ddroid_valance.java +++ b/sku.0/sys.server/compiled/game/script/conversation/c_ddroid_valance.java @@ -15,7 +15,7 @@ public class c_ddroid_valance extends script.base_script } public boolean c_ddroid_valance_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean c_ddroid_valance_condition_playeronquest1(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/c_sink_imp.java b/sku.0/sys.server/compiled/game/script/conversation/c_sink_imp.java index 3b8d885a8..b7571ca0f 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/c_sink_imp.java +++ b/sku.0/sys.server/compiled/game/script/conversation/c_sink_imp.java @@ -83,7 +83,7 @@ public class c_sink_imp extends script.base_script } public boolean c_sink_imp_condition_hasJTL(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean c_sink_imp_condition_spaceWon(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/c_sink_reb.java b/sku.0/sys.server/compiled/game/script/conversation/c_sink_reb.java index 983bd0643..d315dd04e 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/c_sink_reb.java +++ b/sku.0/sys.server/compiled/game/script/conversation/c_sink_reb.java @@ -85,7 +85,7 @@ public class c_sink_reb extends script.base_script } public boolean c_sink_reb_condition_hasJTL(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean c_sink_reb_condition_spaceWon(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/corellia_imperial_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/corellia_imperial_trainer_1.java index d9b6e0107..837ae08a4 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/corellia_imperial_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/corellia_imperial_trainer_1.java @@ -369,7 +369,7 @@ public class corellia_imperial_trainer_1 extends script.base_script } public boolean corellia_imperial_trainer_1_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean corellia_imperial_trainer_1_condition_hasNoviceSkillBox(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_retired_corsec_beggar.java b/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_retired_corsec_beggar.java index 891212d5e..5674e450a 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_retired_corsec_beggar.java +++ b/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_retired_corsec_beggar.java @@ -164,7 +164,7 @@ public class corellia_privateer_retired_corsec_beggar extends script.base_script } public boolean corellia_privateer_retired_corsec_beggar_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean corellia_privateer_retired_corsec_beggar_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_trainer.java b/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_trainer.java index 9fa8470c2..6295d026d 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_trainer.java +++ b/sku.0/sys.server/compiled/game/script/conversation/corellia_privateer_trainer.java @@ -162,7 +162,7 @@ public class corellia_privateer_trainer extends script.base_script } public boolean corellia_privateer_trainer_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean corellia_privateer_trainer_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/corellia_rebel_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/corellia_rebel_trainer_1.java index 674c6ccf0..be45254aa 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/corellia_rebel_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/corellia_rebel_trainer_1.java @@ -161,7 +161,7 @@ public class corellia_rebel_trainer_1 extends script.base_script } public boolean corellia_rebel_trainer_1_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean corellia_rebel_trainer_1_condition_has_GRADUATED_goto_LOK(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_clone_trooper_mort.java b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_clone_trooper_mort.java index f594ac3aa..ccbcd2f89 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_clone_trooper_mort.java +++ b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_clone_trooper_mort.java @@ -78,7 +78,7 @@ public class ep3_clone_relics_clone_trooper_mort extends script.base_script } public boolean ep3_clone_relics_clone_trooper_mort_condition_hasEp3(obj_id player, obj_id npc) throws InterruptedException { - return features.hasEpisode3Expansion(player); + return true; } public void ep3_clone_relics_clone_trooper_mort_action_giveQuest1(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.java b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.java index c0c31ff86..a1ffd3a73 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.java +++ b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_hunter_qakkee.java @@ -71,11 +71,11 @@ public class ep3_clone_relics_hunter_qakkee extends script.base_script } public boolean ep3_clone_relics_hunter_qakkee_condition_isGm(obj_id player, obj_id npc) throws InterruptedException { - return (hasObjVar(player, "gm")); + return isGod(player); } public boolean ep3_clone_relics_hunter_qakkee_condition_hasEp3(obj_id player, obj_id npc) throws InterruptedException { - return features.hasEpisode3Expansion(player); + return true; } public void ep3_clone_relics_hunter_qakkee_action_removeQuestOne(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_queen_kylantha.java b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_queen_kylantha.java index b5559a76e..ee384d44c 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_queen_kylantha.java +++ b/sku.0/sys.server/compiled/game/script/conversation/ep3_clone_relics_queen_kylantha.java @@ -64,11 +64,11 @@ public class ep3_clone_relics_queen_kylantha extends script.base_script } public boolean ep3_clone_relics_queen_kylantha_condition_isGm(obj_id player, obj_id npc) throws InterruptedException { - return (hasObjVar(player, "gm")); + return isGod(player); } public boolean ep3_clone_relics_queen_kylantha_condition_hasEp3(obj_id player, obj_id npc) throws InterruptedException { - return features.hasEpisode3Expansion(player); + return true; } public boolean ep3_clone_relics_queen_kylantha_condition_failedQuestTwo(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/ep3_kachirho_varactyl_egg.java b/sku.0/sys.server/compiled/game/script/conversation/ep3_kachirho_varactyl_egg.java index a420b4bef..285a5d1d0 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/ep3_kachirho_varactyl_egg.java +++ b/sku.0/sys.server/compiled/game/script/conversation/ep3_kachirho_varactyl_egg.java @@ -27,11 +27,7 @@ public class ep3_kachirho_varactyl_egg extends script.base_script } public boolean ep3_kachirho_varactyl_egg_condition_isPreOrder(obj_id player, obj_id npc) throws InterruptedException { - if (features.hasEpisode3PreOrderDigitalDownload(player) && hasSkill(player, "outdoors_creaturehandler_master")) - { - return true; - } - return false; + return true; } public void ep3_kachirho_varactyl_egg_action_grantMission(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_01.java b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_01.java index 9a6930126..dd60cb056 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_01.java +++ b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_01.java @@ -31,7 +31,7 @@ public class generic_newbie_pilot_info_01 extends script.base_script } public boolean generic_newbie_pilot_info_01_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean generic_newbie_pilot_info_01_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_emperors_retreat.java b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_emperors_retreat.java index 8582295b9..0f09ef61d 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_emperors_retreat.java +++ b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_emperors_retreat.java @@ -46,7 +46,7 @@ public class generic_newbie_pilot_info_emperors_retreat extends script.base_scri } public boolean generic_newbie_pilot_info_emperors_retreat_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean generic_newbie_pilot_info_emperors_retreat_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_gia_pei.java b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_gia_pei.java index b075bb98b..3acb0805c 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_gia_pei.java +++ b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_gia_pei.java @@ -31,7 +31,7 @@ public class generic_newbie_pilot_info_gia_pei extends script.base_script } public boolean generic_newbie_pilot_info_gia_pei_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean generic_newbie_pilot_info_gia_pei_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_jabbas_palace.java b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_jabbas_palace.java index 4753c559b..c263a3f53 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_jabbas_palace.java +++ b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_jabbas_palace.java @@ -98,7 +98,7 @@ public class generic_newbie_pilot_info_jabbas_palace extends script.base_script } public boolean generic_newbie_pilot_info_jabbas_palace_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean generic_newbie_pilot_info_jabbas_palace_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_khroz.java b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_khroz.java index 63e4d0a05..3026e9bee 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_khroz.java +++ b/sku.0/sys.server/compiled/game/script/conversation/generic_newbie_pilot_info_khroz.java @@ -31,7 +31,7 @@ public class generic_newbie_pilot_info_khroz extends script.base_script } public boolean generic_newbie_pilot_info_khroz_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean generic_newbie_pilot_info_khroz_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_bookie.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_bookie.java index d97bf2e24..d28318664 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_bookie.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_bookie.java @@ -18,7 +18,7 @@ public class greeter_bestine_bookie extends script.base_script } public boolean greeter_bestine_bookie_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public int greeter_bestine_bookie_handleBranch1(obj_id player, obj_id npc, string_id response) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_imperial_officer.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_imperial_officer.java index ea70b023b..8c6199259 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_imperial_officer.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_bestine_imperial_officer.java @@ -31,7 +31,7 @@ public class greeter_bestine_imperial_officer extends script.base_script } public boolean greeter_bestine_imperial_officer_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_bestine_imperial_officer_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_imperial.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_imperial.java index 58786eda2..e4b8bdf35 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_imperial.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_imperial.java @@ -27,7 +27,7 @@ public class greeter_dantooine_brother_imperial extends script.base_script } public boolean greeter_dantooine_brother_imperial_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_dantooine_brother_imperial_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_neutral.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_neutral.java index 18a3fe26f..36a23afd9 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_neutral.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_neutral.java @@ -19,7 +19,7 @@ public class greeter_dantooine_brother_neutral extends script.base_script } public boolean greeter_dantooine_brother_neutral_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_dantooine_brother_neutral_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_rebel.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_rebel.java index c86683489..5d3df5f06 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_rebel.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_brother_rebel.java @@ -35,7 +35,7 @@ public class greeter_dantooine_brother_rebel extends script.base_script } public boolean greeter_dantooine_brother_rebel_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_dantooine_brother_rebel_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_officer.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_officer.java index be5e0d7c7..a3ed73b95 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_officer.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_officer.java @@ -31,7 +31,7 @@ public class greeter_dantooine_imperial_officer extends script.base_script } public boolean greeter_dantooine_imperial_officer_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_dantooine_imperial_officer_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_pilot.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_pilot.java index 2fd828771..dcdd3abc5 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_pilot.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_imperial_pilot.java @@ -31,7 +31,7 @@ public class greeter_dantooine_imperial_pilot extends script.base_script } public boolean greeter_dantooine_imperial_pilot_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_dantooine_imperial_pilot_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_old_pilot.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_old_pilot.java index bda5401ee..e14205bd5 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_old_pilot.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_dantooine_old_pilot.java @@ -31,7 +31,7 @@ public class greeter_dantooine_old_pilot extends script.base_script } public boolean greeter_dantooine_old_pilot_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_dantooine_old_pilot_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_imperial_officer.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_imperial_officer.java index 7faf0f9d0..ccdbb259b 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_imperial_officer.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_imperial_officer.java @@ -31,7 +31,7 @@ public class greeter_kadaara_imperial_officer extends script.base_script } public boolean greeter_kadaara_imperial_officer_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_kadaara_imperial_officer_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_mistress.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_mistress.java index 89bef8804..60d172f06 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_mistress.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_kadaara_mistress.java @@ -31,7 +31,7 @@ public class greeter_kadaara_mistress extends script.base_script } public boolean greeter_kadaara_mistress_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_kadaara_mistress_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_bodyguard.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_bodyguard.java index dc0b071b2..7da2525eb 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_bodyguard.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_bodyguard.java @@ -31,7 +31,7 @@ public class greeter_kor_vella_bodyguard extends script.base_script } public boolean greeter_kor_vella_bodyguard_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_kor_vella_bodyguard_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_imperial_officer.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_imperial_officer.java index e9b837af3..b2f2372fa 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_imperial_officer.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_imperial_officer.java @@ -31,7 +31,7 @@ public class greeter_kor_vella_imperial_officer extends script.base_script } public boolean greeter_kor_vella_imperial_officer_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_kor_vella_imperial_officer_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_pilot.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_pilot.java index 266901106..7b48ce25e 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_pilot.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_kor_vella_pilot.java @@ -31,7 +31,7 @@ public class greeter_kor_vella_pilot extends script.base_script } public boolean greeter_kor_vella_pilot_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_kor_vella_pilot_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_moenia_undercover_rebel.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_moenia_undercover_rebel.java index 6422cc4f3..7286a7b3d 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_moenia_undercover_rebel.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_moenia_undercover_rebel.java @@ -43,7 +43,7 @@ public class greeter_moenia_undercover_rebel extends script.base_script } public boolean greeter_moenia_undercover_rebel_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_moenia_undercover_rebel_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_fat.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_fat.java index e91a4d21f..d188e2b44 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_fat.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_fat.java @@ -31,7 +31,7 @@ public class greeter_mos_eisley_smuggler_fat extends script.base_script } public boolean greeter_mos_eisley_smuggler_fat_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_mos_eisley_smuggler_fat_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_nervous.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_nervous.java index 52e99702c..63ef63cd5 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_nervous.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_nervous.java @@ -31,7 +31,7 @@ public class greeter_mos_eisley_smuggler_nervous extends script.base_script } public boolean greeter_mos_eisley_smuggler_nervous_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_mos_eisley_smuggler_nervous_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_skinny.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_skinny.java index b0ae4264e..73c6d4ede 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_skinny.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_eisley_smuggler_skinny.java @@ -31,7 +31,7 @@ public class greeter_mos_eisley_smuggler_skinny extends script.base_script } public boolean greeter_mos_eisley_smuggler_skinny_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_mos_eisley_smuggler_skinny_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_hutt_recruiter.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_hutt_recruiter.java index 2ba33e459..5649503b3 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_hutt_recruiter.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_hutt_recruiter.java @@ -31,7 +31,7 @@ public class greeter_mos_espa_hutt_recruiter extends script.base_script } public boolean greeter_mos_espa_hutt_recruiter_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_mos_espa_hutt_recruiter_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_valarian_recruiter.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_valarian_recruiter.java index 1d30bbb3b..e84142fb3 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_valarian_recruiter.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_valarian_recruiter.java @@ -31,7 +31,7 @@ public class greeter_mos_espa_valarian_recruiter extends script.base_script } public boolean greeter_mos_espa_valarian_recruiter_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_mos_espa_valarian_recruiter_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_young_pilot.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_young_pilot.java index 790854c41..54fc7f36d 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_young_pilot.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_mos_espa_young_pilot.java @@ -31,7 +31,7 @@ public class greeter_mos_espa_young_pilot extends script.base_script } public boolean greeter_mos_espa_young_pilot_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_mos_espa_young_pilot_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_freighter_captain.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_freighter_captain.java index 764632fba..f57629746 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_freighter_captain.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_freighter_captain.java @@ -51,7 +51,7 @@ public class greeter_theed_freighter_captain extends script.base_script } public boolean greeter_theed_freighter_captain_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_theed_freighter_captain_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_protocol_droid.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_protocol_droid.java index c0570842a..9b046b24d 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_protocol_droid.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_theed_protocol_droid.java @@ -51,7 +51,7 @@ public class greeter_theed_protocol_droid extends script.base_script } public boolean greeter_theed_protocol_droid_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_theed_protocol_droid_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_disgraced_corsec.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_disgraced_corsec.java index e61771e5b..9e9d80bef 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_disgraced_corsec.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_disgraced_corsec.java @@ -31,7 +31,7 @@ public class greeter_tyrena_disgraced_corsec extends script.base_script } public boolean greeter_tyrena_disgraced_corsec_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_tyrena_disgraced_corsec_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_load_lifter.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_load_lifter.java index 3f2356ff8..28ff7abe2 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_load_lifter.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_load_lifter.java @@ -31,7 +31,7 @@ public class greeter_tyrena_load_lifter extends script.base_script } public boolean greeter_tyrena_load_lifter_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_tyrena_load_lifter_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_pilot_friend.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_pilot_friend.java index 22c023671..f38d505bb 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_pilot_friend.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_tyrena_pilot_friend.java @@ -35,7 +35,7 @@ public class greeter_tyrena_pilot_friend extends script.base_script } public boolean greeter_tyrena_pilot_friend_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean greeter_tyrena_pilot_friend_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/imperial_broker.java b/sku.0/sys.server/compiled/game/script/conversation/imperial_broker.java index 57401a7e4..dc0dceedb 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/imperial_broker.java +++ b/sku.0/sys.server/compiled/game/script/conversation/imperial_broker.java @@ -79,7 +79,7 @@ public class imperial_broker extends script.base_script } public boolean imperial_broker_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public void imperial_broker_action_addCorelliaImpWaypoint(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/imperial_master_trooper.java b/sku.0/sys.server/compiled/game/script/conversation/imperial_master_trooper.java index 6efff46b6..b7193c531 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/imperial_master_trooper.java +++ b/sku.0/sys.server/compiled/game/script/conversation/imperial_master_trooper.java @@ -31,7 +31,7 @@ public class imperial_master_trooper extends script.base_script } public boolean imperial_master_trooper_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean imperial_master_trooper_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/naboo_imperial_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/naboo_imperial_trainer_1.java index 9c1b5391d..9d0b5863d 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/naboo_imperial_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/naboo_imperial_trainer_1.java @@ -326,7 +326,7 @@ public class naboo_imperial_trainer_1 extends script.base_script } public boolean naboo_imperial_trainer_1_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public void naboo_imperial_trainer_1_action_grantMission1(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/naboo_privateer_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/naboo_privateer_trainer_1.java index 046d61180..bcc6005cb 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/naboo_privateer_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/naboo_privateer_trainer_1.java @@ -146,7 +146,7 @@ public class naboo_privateer_trainer_1 extends script.base_script } public boolean naboo_privateer_trainer_1_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean naboo_privateer_trainer_1_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_tier1_kiizete.java b/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_tier1_kiizete.java index ec938854d..d68937030 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_tier1_kiizete.java +++ b/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_tier1_kiizete.java @@ -35,7 +35,7 @@ public class naboo_rebel_tier1_kiizete extends script.base_script } public boolean naboo_rebel_tier1_kiizete_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean naboo_rebel_tier1_kiizete_condition_hasVeryFirstQuest(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_trainer_1.java index 2fa477869..4af880120 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/naboo_rebel_trainer_1.java @@ -137,7 +137,7 @@ public class naboo_rebel_trainer_1 extends script.base_script } public boolean naboo_rebel_trainer_1_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean naboo_rebel_trainer_1_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/privateer_broker.java b/sku.0/sys.server/compiled/game/script/conversation/privateer_broker.java index 888338b1d..f57595aaa 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/privateer_broker.java +++ b/sku.0/sys.server/compiled/game/script/conversation/privateer_broker.java @@ -23,7 +23,7 @@ public class privateer_broker extends script.base_script } public boolean privateer_broker_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public void privateer_broker_action_addImperialBrokerWaypoint(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/rebel_broker.java b/sku.0/sys.server/compiled/game/script/conversation/rebel_broker.java index bc525fedb..4bef4519c 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/rebel_broker.java +++ b/sku.0/sys.server/compiled/game/script/conversation/rebel_broker.java @@ -39,7 +39,7 @@ public class rebel_broker extends script.base_script } public boolean rebel_broker_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public void rebel_broker_action_brushedOffImp(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/rebel_master_trooper.java b/sku.0/sys.server/compiled/game/script/conversation/rebel_master_trooper.java index 0d16877ed..41359f374 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/rebel_master_trooper.java +++ b/sku.0/sys.server/compiled/game/script/conversation/rebel_master_trooper.java @@ -31,7 +31,7 @@ public class rebel_master_trooper extends script.base_script } public boolean rebel_master_trooper_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean rebel_master_trooper_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_bestine.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_bestine.java index 66be58792..84acc214a 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_bestine.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_bestine.java @@ -123,7 +123,7 @@ public class story_loot_bestine extends script.base_script } public boolean story_loot_bestine_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_bestine_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_coronet.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_coronet.java index 0f2743739..604f03259 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_coronet.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_coronet.java @@ -123,7 +123,7 @@ public class story_loot_coronet extends script.base_script } public boolean story_loot_coronet_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_coronet_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_eisley.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_eisley.java index 555b62489..cdc14fb34 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_eisley.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_eisley.java @@ -123,7 +123,7 @@ public class story_loot_eisley extends script.base_script } public boolean story_loot_eisley_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_eisley_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_espa.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_espa.java index 2f535dd11..d59027a42 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_espa.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_espa.java @@ -123,7 +123,7 @@ public class story_loot_espa extends script.base_script } public boolean story_loot_espa_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_espa_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_kaadara.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_kaadara.java index 99693ff39..8a71f65eb 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_kaadara.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_kaadara.java @@ -123,7 +123,7 @@ public class story_loot_kaadara extends script.base_script } public boolean story_loot_kaadara_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_kaadara_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_moenia.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_moenia.java index 09a0052f4..42e24cb24 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_moenia.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_moenia.java @@ -123,7 +123,7 @@ public class story_loot_moenia extends script.base_script } public boolean story_loot_moenia_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_moenia_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_talus.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_talus.java index a9bc6c2ee..02eda8857 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_talus.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_talus.java @@ -123,7 +123,7 @@ public class story_loot_talus extends script.base_script } public boolean story_loot_talus_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_talus_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_theed.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_theed.java index 9fbb2c2fd..acd630bd7 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_theed.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_theed.java @@ -123,7 +123,7 @@ public class story_loot_theed extends script.base_script } public boolean story_loot_theed_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_theed_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/story_loot_tyrena.java b/sku.0/sys.server/compiled/game/script/conversation/story_loot_tyrena.java index 9e8d8685f..5c7f3867e 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/story_loot_tyrena.java +++ b/sku.0/sys.server/compiled/game/script/conversation/story_loot_tyrena.java @@ -123,7 +123,7 @@ public class story_loot_tyrena extends script.base_script } public boolean story_loot_tyrena_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public boolean story_loot_tyrena_condition_checkRem(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/tatooine_imperial_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/tatooine_imperial_trainer_1.java index 43d652066..17f2b297c 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/tatooine_imperial_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/tatooine_imperial_trainer_1.java @@ -330,7 +330,7 @@ public class tatooine_imperial_trainer_1 extends script.base_script } public boolean tatooine_imperial_trainer_1_condition_hasSpaceExp(obj_id player, obj_id npc) throws InterruptedException { - return features.isSpaceEdition(player); + return true; } public void tatooine_imperial_trainer_1_action_grantMission1(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/tatooine_knives_fencing_valarian.java b/sku.0/sys.server/compiled/game/script/conversation/tatooine_knives_fencing_valarian.java index 269d052b9..17c5d62cc 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/tatooine_knives_fencing_valarian.java +++ b/sku.0/sys.server/compiled/game/script/conversation/tatooine_knives_fencing_valarian.java @@ -28,7 +28,7 @@ public class tatooine_knives_fencing_valarian extends script.base_script { int questId1 = questGetQuestId("quest/tatooine_knives_fencing"); int questId2 = questGetQuestId("quest/tatooine_knives_fencing_pt_2"); - boolean OnTask = (questIsQuestComplete(questId1, player)) && !((features.isSpaceEdition(player))) || ((questIsQuestComplete(questId1, player)) && (questIsQuestComplete(questId2, player))); + boolean OnTask = questIsQuestComplete(questId1, player) || ((questIsQuestComplete(questId1, player)) && (questIsQuestComplete(questId2, player))); return OnTask; } public boolean tatooine_knives_fencing_valarian_condition_completeTandP(obj_id player, obj_id npc) throws InterruptedException @@ -42,7 +42,7 @@ public class tatooine_knives_fencing_valarian extends script.base_script public boolean tatooine_knives_fencing_valarian_condition_physcoHasJTL(obj_id player, obj_id npc) throws InterruptedException { int questId1 = questGetQuestId("quest/tatooine_knives_fencing"); - boolean onTask = questIsQuestComplete(questId1, player) && features.isSpaceEdition(player); + boolean onTask = questIsQuestComplete(questId1, player); return onTask; } public boolean tatooine_knives_fencing_valarian_condition_onPhysco(obj_id player, obj_id npc) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/conversation/tatooine_privateer_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/tatooine_privateer_trainer_1.java index 12d2a7844..e6e8ebeb5 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/tatooine_privateer_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/tatooine_privateer_trainer_1.java @@ -146,7 +146,7 @@ public class tatooine_privateer_trainer_1 extends script.base_script } public boolean tatooine_privateer_trainer_1_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean tatooine_privateer_trainer_1_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/tatooine_rebel_trainer_1.java b/sku.0/sys.server/compiled/game/script/conversation/tatooine_rebel_trainer_1.java index eb0081529..bc1ea089e 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/tatooine_rebel_trainer_1.java +++ b/sku.0/sys.server/compiled/game/script/conversation/tatooine_rebel_trainer_1.java @@ -137,7 +137,7 @@ public class tatooine_rebel_trainer_1 extends script.base_script } public boolean tatooine_rebel_trainer_1_condition_hasSpaceExpansion(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public boolean tatooine_rebel_trainer_1_condition_hasSpaceShip(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/tutorial_imperial_broker.java b/sku.0/sys.server/compiled/game/script/conversation/tutorial_imperial_broker.java index e98ffdb85..5c14d5562 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/tutorial_imperial_broker.java +++ b/sku.0/sys.server/compiled/game/script/conversation/tutorial_imperial_broker.java @@ -79,7 +79,7 @@ public class tutorial_imperial_broker extends script.base_script } public boolean tutorial_imperial_broker_condition_hasSpace(obj_id player, obj_id npc) throws InterruptedException { - return (features.isSpaceEdition(player)); + return true; } public void tutorial_imperial_broker_action_addCorelliaImpWaypoint(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/yavin_fallenstar_pt_1_osae.java b/sku.0/sys.server/compiled/game/script/conversation/yavin_fallenstar_pt_1_osae.java index 1ef95ecaf..afd7f3500 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/yavin_fallenstar_pt_1_osae.java +++ b/sku.0/sys.server/compiled/game/script/conversation/yavin_fallenstar_pt_1_osae.java @@ -83,7 +83,7 @@ public class yavin_fallenstar_pt_1_osae extends script.base_script { int questId1 = questGetQuestId("quest/yavin_fallenstar_pt1"); int questId2 = questGetQuestId("quest/yavin_fallenstar_pt2"); - boolean OnTask = (questIsQuestComplete(questId1, player)) && (questIsQuestComplete(questId2, player)) && (features.isSpaceEdition(player)); + boolean OnTask = (questIsQuestComplete(questId1, player)) && (questIsQuestComplete(questId2, player)); return OnTask; } public boolean yavin_fallenstar_pt_1_osae_condition_onQuest(obj_id player, obj_id npc) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java b/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java index adcde8c25..caba253a5 100755 --- a/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java +++ b/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java @@ -53,21 +53,6 @@ public class cybernetic_item extends script.base_script { return SCRIPT_CONTINUE; } - else - { - String templateName = getTemplateName(self); - if (!templateName.contains("s01")) - { - if (!features.hasEpisode3Expansion(destContainer)) - { - if (!templateName.equals("object/tangible/wearables/cybernetic/s04/cybernetic_s04_arm_r.iff")) - { - sendSystemMessage(destContainer, SID_REQUIRE_EP3); - return SCRIPT_OVERRIDE; - } - } - } - } if (!isPlayer(transferer)) { cybernetic.applyCyberneticMods(destContainer, self); diff --git a/sku.0/sys.server/compiled/game/script/item/goggles/menu.java b/sku.0/sys.server/compiled/game/script/item/goggles/menu.java index 202c7962c..6d227ef12 100755 --- a/sku.0/sys.server/compiled/game/script/item/goggles/menu.java +++ b/sku.0/sys.server/compiled/game/script/item/goggles/menu.java @@ -186,10 +186,6 @@ public class menu extends script.base_script { validGoggles = false; } - if (!features.isCollectorEdition(owner)) - { - validGoggles = false; - } else { obj_id container = getContainedBy(self); diff --git a/sku.0/sys.server/compiled/game/script/item/goggles/reset.java b/sku.0/sys.server/compiled/game/script/item/goggles/reset.java index e4099d394..d7d9aa6a7 100755 --- a/sku.0/sys.server/compiled/game/script/item/goggles/reset.java +++ b/sku.0/sys.server/compiled/game/script/item/goggles/reset.java @@ -25,40 +25,33 @@ public class reset extends script.base_script public int createNewGoggles(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { boolean createFailed = false; - if (features.isCollectorEdition(self) || features.isJPCollectorEdition(self)) + if (rand(0, 1) == 0) { - if (features.isCollectorEdition(self)) - { - obj_id[] allItems = utils.getAllItemsInBankAndInventory(self); - obj_id inventory = getObjectInSlot(self, "inventory"); - for (String collectorEditionItem : COLLECTOR_EDITION_ITEMS) { - if (checkItems(allItems, collectorEditionItem)) { - continue; - } - obj_id newItem = createObject(collectorEditionItem, inventory, ""); - if (!isIdValid(newItem)) { - createFailed = true; - } + obj_id[] allItems = utils.getAllItemsInBankAndInventory(self); + obj_id inventory = getObjectInSlot(self, "inventory"); + for (String collectorEditionItem : COLLECTOR_EDITION_ITEMS) { + if (checkItems(allItems, collectorEditionItem)) { + continue; } - } - if (features.isJPCollectorEdition(self)) - { - obj_id[] allItems = utils.getAllItemsInBankAndInventory(self); - obj_id inventory = getObjectInSlot(self, "inventory"); - for (String jpCollectorEditionItem : JP_COLLECTOR_EDITION_ITEMS) { - if (checkItems(allItems, jpCollectorEditionItem)) { - continue; - } - obj_id newItem = createObject(jpCollectorEditionItem, inventory, ""); - if (!isIdValid(newItem)) { - createFailed = true; - } + obj_id newItem = createObject(collectorEditionItem, inventory, ""); + if (!isIdValid(newItem)) { + createFailed = true; } } } - else + else { - sendSystemMessage(self, new string_id("error_message", "create_goggle_non_se")); + obj_id[] allItems = utils.getAllItemsInBankAndInventory(self); + obj_id inventory = getObjectInSlot(self, "inventory"); + for (String jpCollectorEditionItem : JP_COLLECTOR_EDITION_ITEMS) { + if (checkItems(allItems, jpCollectorEditionItem)) { + continue; + } + obj_id newItem = createObject(jpCollectorEditionItem, inventory, ""); + if (!isIdValid(newItem)){ + createFailed = true; + } + } } if (createFailed) { diff --git a/sku.0/sys.server/compiled/game/script/library/dump.java b/sku.0/sys.server/compiled/game/script/library/dump.java index 37e520a19..1f94cdec8 100755 --- a/sku.0/sys.server/compiled/game/script/library/dump.java +++ b/sku.0/sys.server/compiled/game/script/library/dump.java @@ -1007,67 +1007,6 @@ public class dump extends script.base_script { strTest += "none\n\r"; } - strTest += "\r\nGAME SUBSCRIPTION FEATURES:\r\n"; - boolean boolHasCollectorEdition = features.hasCollectorEdition(objTarget); - boolean boolhasSpaceExpansion = features.hasSpaceExpansion(objTarget); - boolean boolhasSpaceExpansionPromotion = features.hasSpaceExpansionPromotion(objTarget); - boolean boolhasJapaneseCollectorEdition = features.hasJapaneseCollectorEdition(objTarget); - boolean boolhasEpisode3Expansion = features.hasEpisode3Expansion(objTarget); - boolean boolhasEpisode3PreOrderDigitalDownload = features.hasEpisode3PreOrderDigitalDownload(objTarget); - boolean boolhasEpisode3ExpansionRetail = features.hasEpisode3ExpansionRetail(objTarget); - boolean boolhasTrialsOfObiwanExpansionRetail = features.hasTrialsOfObiwanExpansionRetail(objTarget); - boolean boolhasTrialsOfObiwanExpansionPreorder = features.hasTrialsOfObiwanExpansionPreorder(objTarget); - boolean boolhasTrialsOfObiwanExpansion = features.hasTrialsOfObiwanExpansion(objTarget); - boolean boolhasMustafarExpansionRetail = features.hasMustafarExpansionRetail(objTarget); - boolean boolhasFreeTrial = features.hasFreeTrial(objTarget); - if (boolHasCollectorEdition) - { - strTest += "\t\t\tCollector's Edition\r\n"; - } - if (boolhasSpaceExpansion) - { - strTest += "\t\t\tJTL SpaceExpansion\r\n"; - } - if (boolhasSpaceExpansionPromotion) - { - strTest += "\t\t\tJTL Space Expansion Promotion\r\n"; - } - if (boolhasJapaneseCollectorEdition) - { - strTest += "\t\t\tJapanese Collector's Edition:\r\n"; - } - if (boolhasEpisode3Expansion) - { - strTest += "\t\t\tEpisode 3 Expansion\r\n"; - } - if (boolhasEpisode3PreOrderDigitalDownload) - { - strTest += "\t\t\tEpisode 3 Expansion Preorder\r\n"; - } - if (boolhasEpisode3ExpansionRetail) - { - strTest += "\t\t\tEpisode 3 Expansion Retail\r\n"; - } - if (boolhasTrialsOfObiwanExpansionRetail) - { - strTest += "\t\t\tTrials of Obiwan Expansion Retail\r\n"; - } - if (boolhasTrialsOfObiwanExpansionPreorder) - { - strTest += "\t\t\tTrials of Obiwan Expansion Preorder\r\n"; - } - if (boolhasTrialsOfObiwanExpansion) - { - strTest += "\t\t\tTrials of Obiwan Expansion\r\n"; - } - if (boolhasMustafarExpansionRetail) - { - strTest += "\t\t\tMustafar Expansion Retail\r\n"; - } - if (boolhasFreeTrial) - { - strTest += "\t\t\tFree Trial\r\n"; - } } if (space_utils.isShip(objTarget)) { diff --git a/sku.0/sys.server/compiled/game/script/library/features.java b/sku.0/sys.server/compiled/game/script/library/features.java index cf04c3e65..578b1ac09 100755 --- a/sku.0/sys.server/compiled/game/script/library/features.java +++ b/sku.0/sys.server/compiled/game/script/library/features.java @@ -7,88 +7,9 @@ public class features extends script.base_script public features() { } - public static final int GAME_BASE = 0x0001; - public static final int GAME_COLLECTORS_EDITION = 0x0002; - public static final int GAME_SPACE_EXPANSION_BETA = 0x0004; - public static final int GAME_SPACE_EXPANSION_PRE_ORDER = 0x0008; - public static final int GAME_SPACE_EXPANSION_RETAIL = 0x0010; - public static final int GAME_SWG_RETAIL = 0x0020; - public static final int GAME_SPACE_EXPANSION_PROMOTION = 0x0040; - public static final int GAME_JAPANESE_RETAIL = 0x0080; - public static final int GAME_JAPANESE_COLLECTORS = 0x0100; - public static final int GAME_EPISODE3_EXPANSION_RETAIL = 0x0200; - public static final int GAME_EPISODE3_PREORDER_DIGITAL_DOWNLOAD = 0x0800; - public static final int GAME_TRIALS_OF_OBIWAN_PREORDER = 0x4000; - public static final int GAME_TRIALS_OF_OBIWAN_RETAIL = 0x8000; - public static final int SUBSCRIPTION_BASE = 0x1; - public static final int SUBSCRIPTION_FREE_TRIAL = 0x2; - public static final int SUBSCRIPTION_COMBAT_BALANCE_ACCESS = 0x4; - public static boolean hasCollectorEdition(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_COLLECTORS_EDITION) != 0; - } - public static boolean hasSpaceExpansion(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_SPACE_EXPANSION_RETAIL) != 0; - } - public static boolean hasSpaceExpansionPromotion(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_SPACE_EXPANSION_PROMOTION) != 0; - } - public static boolean hasJapaneseCollectorEdition(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_JAPANESE_COLLECTORS) != 0; - } - public static boolean hasEpisode3Expansion(obj_id player) throws InterruptedException - { - return (hasEpisode3PreOrderDigitalDownload(player) || hasEpisode3ExpansionRetail(player)); - } - public static boolean hasEpisode3PreOrderDigitalDownload(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_EPISODE3_PREORDER_DIGITAL_DOWNLOAD) != 0; - } - public static boolean hasEpisode3ExpansionRetail(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_EPISODE3_EXPANSION_RETAIL) != 0; - } - public static boolean hasTrialsOfObiwanExpansionRetail(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_TRIALS_OF_OBIWAN_RETAIL) != 0; - } - public static boolean hasTrialsOfObiwanExpansionPreorder(obj_id player) throws InterruptedException - { - return (getGameFeatureBits(player) & GAME_TRIALS_OF_OBIWAN_PREORDER) != 0; - } - public static boolean hasTrialsOfObiwanExpansion(obj_id player) throws InterruptedException - { - return hasTrialsOfObiwanExpansionRetail(player) || hasTrialsOfObiwanExpansionPreorder(player); - } - public static boolean hasMustafarExpansionRetail(obj_id player) throws InterruptedException - { - return hasTrialsOfObiwanExpansion(player); - } - public static boolean hasFreeTrial(obj_id player) throws InterruptedException - { - return (getSubscriptionFeatureBits(player) & SUBSCRIPTION_FREE_TRIAL) != 0; - } - public static boolean hasCombatBalanceAccess(obj_id player) throws InterruptedException - { - return (getSubscriptionFeatureBits(player) & SUBSCRIPTION_COMBAT_BALANCE_ACCESS) != 0; - } - public static boolean isCollectorEdition(obj_id player) throws InterruptedException - { - return hasCollectorEdition(player); - } + public static boolean isSpaceEdition(obj_id player) throws InterruptedException { - return hasSpaceExpansion(player); - } - public static boolean isJPCollectorEdition(obj_id player) throws InterruptedException - { - return hasJapaneseCollectorEdition(player); - } - public static boolean isDecemberRegistration(obj_id player) throws InterruptedException - { - return hasSpaceExpansionPromotion(player); + return true; } } diff --git a/sku.0/sys.server/compiled/game/script/library/qa.java b/sku.0/sys.server/compiled/game/script/library/qa.java index 6df3e2c0e..eb1c46b5a 100755 --- a/sku.0/sys.server/compiled/game/script/library/qa.java +++ b/sku.0/sys.server/compiled/game/script/library/qa.java @@ -867,67 +867,6 @@ public class qa extends script.base_script { strTest += "none\n\r"; } - strTest += "\r\nGAME SUBSCRIPTION FEATURES:\r\n"; - boolean boolHasCollectorEdition = features.hasCollectorEdition(objTarget); - boolean boolhasSpaceExpansion = features.hasSpaceExpansion(objTarget); - boolean boolhasSpaceExpansionPromotion = features.hasSpaceExpansionPromotion(objTarget); - boolean boolhasJapaneseCollectorEdition = features.hasJapaneseCollectorEdition(objTarget); - boolean boolhasEpisode3Expansion = features.hasEpisode3Expansion(objTarget); - boolean boolhasEpisode3PreOrderDigitalDownload = features.hasEpisode3PreOrderDigitalDownload(objTarget); - boolean boolhasEpisode3ExpansionRetail = features.hasEpisode3ExpansionRetail(objTarget); - boolean boolhasTrialsOfObiwanExpansionRetail = features.hasTrialsOfObiwanExpansionRetail(objTarget); - boolean boolhasTrialsOfObiwanExpansionPreorder = features.hasTrialsOfObiwanExpansionPreorder(objTarget); - boolean boolhasTrialsOfObiwanExpansion = features.hasTrialsOfObiwanExpansion(objTarget); - boolean boolhasMustafarExpansionRetail = features.hasMustafarExpansionRetail(objTarget); - boolean boolhasFreeTrial = features.hasFreeTrial(objTarget); - if (boolHasCollectorEdition) - { - strTest += "\t\t\tCollector's Edition\r\n"; - } - if (boolhasSpaceExpansion) - { - strTest += "\t\t\tJTL SpaceExpansion\r\n"; - } - if (boolhasSpaceExpansionPromotion) - { - strTest += "\t\t\tJTL Space Expansion Promotion\r\n"; - } - if (boolhasJapaneseCollectorEdition) - { - strTest += "\t\t\tJapanese Collector's Edition:\r\n"; - } - if (boolhasEpisode3Expansion) - { - strTest += "\t\t\tEpisode 3 Expansion\r\n"; - } - if (boolhasEpisode3PreOrderDigitalDownload) - { - strTest += "\t\t\tEpisode 3 Expansion Preorder\r\n"; - } - if (boolhasEpisode3ExpansionRetail) - { - strTest += "\t\t\tEpisode 3 Expansion Retail\r\n"; - } - if (boolhasTrialsOfObiwanExpansionRetail) - { - strTest += "\t\t\tTrials of Obiwan Expansion Retail\r\n"; - } - if (boolhasTrialsOfObiwanExpansionPreorder) - { - strTest += "\t\t\tTrials of Obiwan Expansion Preorder\r\n"; - } - if (boolhasTrialsOfObiwanExpansion) - { - strTest += "\t\t\tTrials of Obiwan Expansion\r\n"; - } - if (boolhasMustafarExpansionRetail) - { - strTest += "\t\t\tMustafar Expansion Retail\r\n"; - } - if (boolhasFreeTrial) - { - strTest += "\t\t\tFree Trial\r\n"; - } } if (space_utils.isShip(objTarget)) { diff --git a/sku.0/sys.server/compiled/game/script/library/space_quest.java b/sku.0/sys.server/compiled/game/script/library/space_quest.java index 25af49a55..990f2650a 100755 --- a/sku.0/sys.server/compiled/game/script/library/space_quest.java +++ b/sku.0/sys.server/compiled/game/script/library/space_quest.java @@ -171,11 +171,6 @@ public class space_quest extends script.base_script { return false; } - if (!features.isSpaceEdition(player)) - { - sendSystemMessage(player, SID_REQUIRES_JTL); - return false; - } if (hasQuest(player, questType, questName)) { return false; diff --git a/sku.0/sys.server/compiled/game/script/library/space_transition.java b/sku.0/sys.server/compiled/game/script/library/space_transition.java index f2b7f7d00..e02abf05a 100755 --- a/sku.0/sys.server/compiled/game/script/library/space_transition.java +++ b/sku.0/sys.server/compiled/game/script/library/space_transition.java @@ -368,21 +368,12 @@ public class space_transition extends script.base_script } public static boolean isPlayerBelowShipLimit(obj_id player) throws InterruptedException { - int count = countShipControlDevicesForPlayer(player); - int limit = SHIP_LIMIT_MAX; - if (features.hasEpisode3Expansion(player)) - { - limit = SHIP_LIMIT_EXPANSION; - } + final int count = countShipControlDevicesForPlayer(player); if (count < 0) { return false; } - if (count >= limit) - { - return false; - } - return true; + return count < SHIP_LIMIT_EXPANSION; } public static obj_id findPilotSlotObjectForShip(obj_id pilot, obj_id ship) throws InterruptedException { @@ -1156,15 +1147,10 @@ public class space_transition extends script.base_script location playerLoc = getLocation(player); for (obj_id passenger : passengers) { if (passenger != player) { - if (features.isSpaceEdition(passenger)) { - startIndex = space_transition.getNextStartIndex(shipStartLocations, startIndex); - if (startIndex <= shipStartLocations.size()) { - passengersToWarp = utils.addElement(passengersToWarp, passenger); - passengerStartIndexes = utils.addElement(passengerStartIndexes, startIndex); - } - } else { - string_id strSpam = new string_id("space/space_interaction", "no_space_expansion"); - sendSystemMessage(passenger, strSpam); + startIndex = space_transition.getNextStartIndex(shipStartLocations, startIndex); + if (startIndex <= shipStartLocations.size()) { + passengersToWarp = utils.addElement(passengersToWarp, passenger); + passengerStartIndexes = utils.addElement(passengerStartIndexes, startIndex); } } } diff --git a/sku.0/sys.server/compiled/game/script/library/travel.java b/sku.0/sys.server/compiled/game/script/library/travel.java index 51c4ce5af..ecb6a0b84 100755 --- a/sku.0/sys.server/compiled/game/script/library/travel.java +++ b/sku.0/sys.server/compiled/game/script/library/travel.java @@ -869,22 +869,6 @@ public class travel extends script.base_script sui.msgbox(player, new string_id("travel", "purchase_pending")); return false; } - if (planet2.equals("mustafar")) - { - if (!features.hasMustafarExpansionRetail(player)) - { - sendSystemMessage(player, SID_MUSTAFAR_UNAUTHORIZED); - return false; - } - } - else if (planet2.equals("kashyyyk_main")) - { - if (!features.hasEpisode3Expansion(player)) - { - sendSystemMessage(player, SID_KASHYYYK_UNAUTHORIZED); - return false; - } - } else if (planet1.equals(planet2)) { if (point1.equals(point2)) @@ -1165,22 +1149,6 @@ public class travel extends script.base_script { return false; } - if (planet.equals("mustafar")) - { - if (!features.hasMustafarExpansionRetail(player)) - { - sendSystemMessage(player, SID_MUSTAFAR_UNAUTHORIZED); - return false; - } - } - else if (planet.equals("kashyyyk_main")) - { - if (!features.hasEpisode3Expansion(player)) - { - sendSystemMessage(player, SID_KASHYYYK_UNAUTHORIZED); - return false; - } - } } location loc = getPlanetTravelPointLocation(planet, point); LOG("LOG_CHANNEL", "travel::movePlayerToDestination -- location ->" + loc); diff --git a/sku.0/sys.server/compiled/game/script/library/veteran_deprecated.java b/sku.0/sys.server/compiled/game/script/library/veteran_deprecated.java index 7586a5344..8927d9030 100755 --- a/sku.0/sys.server/compiled/game/script/library/veteran_deprecated.java +++ b/sku.0/sys.server/compiled/game/script/library/veteran_deprecated.java @@ -479,42 +479,6 @@ public class veteran_deprecated extends script.base_script } } } - int requiredBit = dataTableGetInt(REWARDS_DATATABLE, index, REWARDS_COLUMN_REQUIREDGAMEFEATUREBITANY); - if (requiredBit > 0) - { - int game_bits = getGameFeatureBits(player); - if ((game_bits & requiredBit) == 0) - { - return CAN_GET_REWARD_FAIL_INADEQUATE_SUBSCRIPTION; - } - } - requiredBit = dataTableGetInt(REWARDS_DATATABLE, index, REWARDS_COLUMN_REQUIREDGAMEFEATUREBITALL); - if (requiredBit > 0) - { - int game_bits = getGameFeatureBits(player); - if ((game_bits & requiredBit) != requiredBit) - { - return CAN_GET_REWARD_FAIL_INADEQUATE_SUBSCRIPTION; - } - } - requiredBit = dataTableGetInt(REWARDS_DATATABLE, index, REWARDS_COLUMN_REQUIREDSUBSCRIPTIONFEATUREBITANY); - if (requiredBit > 0) - { - int sub_bits = getSubscriptionFeatureBits(player); - if ((sub_bits & requiredBit) == 0) - { - return CAN_GET_REWARD_FAIL_INADEQUATE_SUBSCRIPTION; - } - } - requiredBit = dataTableGetInt(REWARDS_DATATABLE, index, REWARDS_COLUMN_REQUIREDSUBSCRIPTIONFEATUREBITALL); - if (requiredBit > 0) - { - int sub_bits = getSubscriptionFeatureBits(player); - if ((sub_bits & requiredBit) != requiredBit) - { - return CAN_GET_REWARD_FAIL_INADEQUATE_SUBSCRIPTION; - } - } int rewardMilestone = dataTableGetInt(REWARDS_DATATABLE, index, REWARDS_COLUMN_MILESTONE); if (rewardMilestone > milestone) { diff --git a/sku.0/sys.server/compiled/game/script/npc/skillteacher/skillteacher.java b/sku.0/sys.server/compiled/game/script/npc/skillteacher/skillteacher.java index ade37c29d..c56068b21 100755 --- a/sku.0/sys.server/compiled/game/script/npc/skillteacher/skillteacher.java +++ b/sku.0/sys.server/compiled/game/script/npc/skillteacher/skillteacher.java @@ -144,13 +144,6 @@ public class skillteacher extends script.base_script { trainerType = getStringObjVar(self, "trainer"); } - if (trainerType.equals("trainer_shipwright") && !features.isSpaceEdition(speaker)) - { - doAnimationAction(self, "thumbs_down"); - sendSystemMessage(speaker, new string_id("skill_teacher", "requires_jtl")); - chat.publicChat(self, speaker, new string_id("skill_teacher", "too_complicated")); - return SCRIPT_CONTINUE; - } faceTo(self, speaker); if (!checkSkillStatus(self, speaker)) { @@ -191,16 +184,6 @@ public class skillteacher extends script.base_script public int OnNpcConversationResponse(obj_id self, String convoName, obj_id speaker, string_id sid_response) throws InterruptedException { String trainerType = getStringObjVar(self, "trainer"); - if (trainerType != null) - { - if (trainerType.equals("trainer_shipwright") && !features.isSpaceEdition(speaker)) - { - doAnimationAction(self, "thumbs_down"); - sendSystemMessage(speaker, new string_id("skill_teacher", "requires_jtl")); - chat.publicChat(self, speaker, new string_id("skill_teacher", "too_complicated")); - return SCRIPT_CONTINUE; - } - } if (!convoName.equals(CONVONAME) && !convoName.equals(JEDI_TRAINER)) { return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/npe/han_solo_experience_player.java b/sku.0/sys.server/compiled/game/script/npe/han_solo_experience_player.java index 09ed8f80b..ed5e598b8 100755 --- a/sku.0/sys.server/compiled/game/script/npe/han_solo_experience_player.java +++ b/sku.0/sys.server/compiled/game/script/npe/han_solo_experience_player.java @@ -51,9 +51,6 @@ public class han_solo_experience_player extends script.base_script } public void checkJtLStatus(obj_id self) throws InterruptedException { - if (features.isSpaceEdition(self)) - { - setObjVar(self, "jtlNewbie", 4); - } + setObjVar(self, "jtlNewbie", 4); } } 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 fd4d71ed0..660d520d0 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 @@ -587,14 +587,7 @@ public class base_player extends script.base_script buff.removeGroupBuffEffect(self, buffList); } } - if (features.isSpaceEdition(self)) - { - grantCommand(self, SPACE_CERTIFICATION); - } - else - { - revokeCommand(self, SPACE_CERTIFICATION); - } + grantCommand(self, SPACE_CERTIFICATION); removeObjVar(self, pclib.VAR_SAFE_LOGOUT); recalculateLevel(self); removeObjVar(self, "clickRespec"); @@ -760,7 +753,7 @@ public class base_player extends script.base_script { setObjVar(self, "bounty.decayTime", currentTime); } - else + else { int bounty = getIntObjVar(self, "bounty.amount"); if (currentTime - lastDecayTime > 604800) @@ -9748,45 +9741,35 @@ public class base_player extends script.base_script } public int cmdFlashSpeeder(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { - if (!VETERAN_REWARDS_ENABLED) { + if (!VETERAN_REWARDS_ENABLED) + { return SCRIPT_CONTINUE; } - int sub_bits = getGameFeatureBits(self); - if (hasObjVar(self, "flash_speeder.eligible")) + if (!hasObjVar(self, "flash_speeder.granted")) { - sub_bits = getIntObjVar(self, "flash_speeder.eligible"); - } - if (features.isSpaceEdition(self) && utils.checkBit(sub_bits, 3) || features.isJPCollectorEdition(self)) - { - if (!hasObjVar(self, "flash_speeder.granted")) + obj_id inv = getObjectInSlot(self, "inventory"); + int free_space = getVolumeFree(inv); + if (free_space < 1) { - obj_id inv = getObjectInSlot(self, "inventory"); - int free_space = getVolumeFree(inv); - if (free_space < 1) - { - sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_no_inv_space")); - return SCRIPT_CONTINUE; - } - if (veteran_deprecated.checkFlashSpeederReward(self)) - { - sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_granted")); - } - else - { - sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_grant_failed")); - } + sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_no_inv_space")); + return SCRIPT_CONTINUE; } - else + if (veteran_deprecated.checkFlashSpeederReward(self)) { - sui.msgbox(self, self, "@" + veteran_deprecated.VETERAN_STRING_TABLE + ":flash_speeder_replace_prompt", sui.YES_NO, "msgFlashSpeederConfirmed"); + sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_granted")); + } + else + { + sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_grant_failed")); } } - else + else { - sendSystemMessage(self, new string_id(veteran_deprecated.VETERAN_STRING_TABLE, "flash_speeder_not_eligible")); + sui.msgbox(self, self, "@" + veteran_deprecated.VETERAN_STRING_TABLE + ":flash_speeder_replace_prompt", sui.YES_NO, "msgFlashSpeederConfirmed"); } return SCRIPT_CONTINUE; } + public int msgFlashSpeederConfirmed(obj_id self, dictionary params) throws InterruptedException { String button = params.getString("buttonPressed"); @@ -10190,14 +10173,6 @@ public class base_player extends script.base_script } public boolean allowedBySpaceExpansion(obj_id self, String skillName) throws InterruptedException { - if (skillName.startsWith("pilot_") || skillName.startsWith("crafting_shipwright_")) - { - if (!features.isSpaceEdition(self)) - { - sendSystemMessage(self, new string_id("skl_use", "need_space_expansion")); - return false; - } - } return true; } public int gmForceCommand(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_jedi_starfighter.java b/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_jedi_starfighter.java index 22c303ac5..ea257c8dc 100755 --- a/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_jedi_starfighter.java +++ b/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_jedi_starfighter.java @@ -18,10 +18,6 @@ public class loot_ep3_clone_relics_jedi_starfighter extends script.base_script } public int OnAboutToOpenContainer(obj_id self, obj_id who) throws InterruptedException { - if (!features.hasEpisode3Expansion(who)) - { - return SCRIPT_OVERRIDE; - } return SCRIPT_CONTINUE; } public int OnObjectMenuSelect(obj_id self, obj_id player, int item) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_nym_starmap.java b/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_nym_starmap.java index 519149262..60b1b3497 100755 --- a/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_nym_starmap.java +++ b/sku.0/sys.server/compiled/game/script/quest/ep3/loot_ep3_clone_relics_nym_starmap.java @@ -19,10 +19,6 @@ public class loot_ep3_clone_relics_nym_starmap extends script.base_script } public int OnAboutToOpenContainer(obj_id self, obj_id who) throws InterruptedException { - if (!features.hasEpisode3Expansion(who)) - { - return SCRIPT_OVERRIDE; - } return SCRIPT_CONTINUE; } public int OnObjectMenuSelect(obj_id self, obj_id player, int item) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java index 9245218d4..56ad4f18f 100755 --- a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java +++ b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java @@ -61,7 +61,7 @@ public class combat_ship_player extends script.base_script } public void newPlayerCheck(obj_id self) throws InterruptedException { - if (!hasObjVar(self, "jtlNewbie") && features.isSpaceEdition(self)) + if (!hasObjVar(self, "jtlNewbie")) { if (!hasScript(self, "theme_park.newbie_tutorial.jtl_newbie")) { @@ -592,32 +592,6 @@ public class combat_ship_player extends script.base_script if(sceneName == null || sceneName.equals("")){ LOG("space","WARNING: Unable to get hyperspace scene name from hyperspacePoint (" + hyperspacePoint + "). Self (" + self + ":" + getName(self) + "), Target(" + target + ":" + getName(target) + ")."); } - if (!isGod(self)) - { - if (sceneName != null && sceneName.equals("space_kashyyyk")) - { - if (!features.hasEpisode3Expansion(self)) - { - string_id strSpam = new string_id("space/space_interaction", "no_ep3"); - sendSystemMessage(self, strSpam); - return SCRIPT_CONTINUE; - } - Vector passengers = space_transition.getContainedPlayers(objShip); - for (Object passenger1 : passengers) { - obj_id passenger = (obj_id) passenger1; - if (!features.hasEpisode3Expansion(passenger)) { - string_id strSpam = new string_id("space/space_interaction", "no_ep3_passengers"); - sendSystemMessage(self, strSpam); - return SCRIPT_CONTINUE; - } - } - } - } - else - { - string_id strSpam = new string_id("space/space_interaction", "godmode_bypassing_ep3_check"); - sendSystemMessage(self, strSpam); - } if (utils.hasScriptVar(objShip, "intHyperspacing")) { string_id strSpam = new string_id("space/space_interaction", "hyperspace_in_progress"); diff --git a/sku.0/sys.server/compiled/game/script/space/terminal/terminal_space.java b/sku.0/sys.server/compiled/game/script/space/terminal/terminal_space.java index 095bc8951..d27ebc1d2 100755 --- a/sku.0/sys.server/compiled/game/script/space/terminal/terminal_space.java +++ b/sku.0/sys.server/compiled/game/script/space/terminal/terminal_space.java @@ -63,17 +63,6 @@ public class terminal_space extends script.terminal.base.base_terminal { return SCRIPT_CONTINUE; } - if (!features.isSpaceEdition(player)) - { - LOG("space", "NO EXPANSION"); - string_id strSpam = new string_id("space/space_interaction", "no_space_expansion"); - sendSystemMessage(player, strSpam); - if (!isGod(player)) - { - LOG("space", "NO EXPANSION - RETURNING"); - return SCRIPT_CONTINUE; - } - } if (ai_lib.isInCombat(player)) { sendSystemMessage(player, SID_NOT_IN_COMBAT); @@ -207,14 +196,6 @@ public class terminal_space extends script.terminal.base.base_terminal sendSystemMessage(player, SID_MUSTAFAR); return; }*/ - if (planet.equals("kashyyyk_main")) - { - if (!features.hasEpisode3Expansion(player)) - { - sendSystemMessage(player, travel.SID_KASHYYYK_UNAUTHORIZED); - return; - } - } if (space_utils.isBasicShip(ship)) { location locTest = getLocation(player); @@ -285,15 +266,10 @@ public class terminal_space extends script.terminal.base.base_terminal { for (obj_id obj_id : membersApprovedByShipOwner) { if (obj_id != player && exists(obj_id) && getLocation(obj_id).cell == playerLoc.cell) { - if (features.isSpaceEdition(obj_id)) { - startIndex = space_transition.getNextStartIndex(shipStartLocations, startIndex); - if (startIndex <= shipStartLocations.size()) { - groupMembersToWarp = utils.addElement(groupMembersToWarp, obj_id); - groupMemberStartIndex = utils.addElement(groupMemberStartIndex, startIndex); - } - } else { - string_id strSpam = new string_id("space/space_interaction", "no_space_expansion"); - sendSystemMessage(obj_id, strSpam); + startIndex = space_transition.getNextStartIndex(shipStartLocations, startIndex); + if (startIndex <= shipStartLocations.size()) { + groupMembersToWarp = utils.addElement(groupMembersToWarp, obj_id); + groupMemberStartIndex = utils.addElement(groupMemberStartIndex, startIndex); } } } diff --git a/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_chunk.java b/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_chunk.java index 3a6cae394..7d11c00e9 100755 --- a/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_chunk.java +++ b/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_chunk.java @@ -69,10 +69,6 @@ public class mining_asteroid_chunk extends script.base_script public int OnShipWasHit(obj_id self, obj_id attacker, int weaponIndex, boolean isMissile, int missileType, int chassisSlot, boolean isPlayerAutoTurret, float hitLocationX_o, float hitLocationY_o, float hitLocationZ_o) throws InterruptedException { obj_id attackingPilot = space_utils.getPilotForRealsies(attacker); - if (!features.hasEpisode3Expansion(attackingPilot)) - { - return SCRIPT_CONTINUE; - } LOG("space_mining", "OnShipWasHit " + self + ", " + attacker + ", " + weaponIndex); int intWeaponSlot = weaponIndex + ship_chassis_slot_type.SCST_weapon_0; location attackingLocation = getLocation(attacker); diff --git a/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_dynamic.java b/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_dynamic.java index b5d664ff3..46bab7375 100755 --- a/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_dynamic.java +++ b/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_dynamic.java @@ -31,10 +31,6 @@ public class mining_asteroid_dynamic extends script.base_script public int OnShipWasHit(obj_id self, obj_id attacker, int weaponIndex, boolean isMissile, int missileType, int chassisSlot, boolean isPlayerAutoTurret, float hitLocationX_o, float hitLocationY_o, float hitLocationZ_o) throws InterruptedException { obj_id attackingPilot = space_utils.getPilotForRealsies(attacker); - if (!features.hasEpisode3Expansion(attackingPilot)) - { - return SCRIPT_CONTINUE; - } String strAsteroidTable = "datatables/space_mining/mining_asteroids.iff"; String strAsteroidType = getStringObjVar(self, "strAsteroidType"); int intWeaponSlot = weaponIndex + ship_chassis_slot_type.SCST_weapon_0; diff --git a/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_static.java b/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_static.java index 7765bd942..47742f8ea 100755 --- a/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_static.java +++ b/sku.0/sys.server/compiled/game/script/space_mining/mining_asteroid_static.java @@ -28,7 +28,7 @@ public class mining_asteroid_static extends script.base_script int intDangerLevel = getIntObjVar(self, "intDangerLevel"); int intDangerPct = getIntObjVar(self, "intDangerPct"); obj_id attackingPilot = space_utils.getPilotForRealsies(attacker); - if (!isIdValid(attackingPilot) || !features.hasEpisode3Expansion(attackingPilot)) + if (!isIdValid(attackingPilot)) { return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_kashyyyk_content.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_kashyyyk_content.java index 2ec126d0a..317ae02f5 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_kashyyyk_content.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_kashyyyk_content.java @@ -684,15 +684,7 @@ public class terminal_kashyyyk_content extends script.base_script { if (item == menu_info_types.ITEM_USE) { - boolean enabled = features.hasEpisode3Expansion(player); - if (enabled == true) - { - startCharacterBuilder(player); - } - else - { - sendSystemMessageTestingOnly(player, "You must be enabled for Rage Of The Wookiees to use this"); - } + startCharacterBuilder(player); } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/test/dwhite_test.java b/sku.0/sys.server/compiled/game/script/test/dwhite_test.java index dbcc4177b..b95591530 100755 --- a/sku.0/sys.server/compiled/game/script/test/dwhite_test.java +++ b/sku.0/sys.server/compiled/game/script/test/dwhite_test.java @@ -189,63 +189,6 @@ public class dwhite_test extends script.base_script obj_id resId = getResourceTypeByName(resource); sendSystemMessageTestingOnly(self, "[test] " + resource + " = " + resId); } - if (text.startsWith("testGoggles")) - { - java.util.StringTokenizer st = new java.util.StringTokenizer(text); - String arg = st.nextToken(); - String oidString = st.nextToken(); - Long temp = Long.parseLong(oidString); - obj_id goggle = obj_id.getObjId(temp.longValue()); - boolean validGoggles = true; - obj_id owner = getOwner(goggle); - LOG("seGoggles", "Owner = " + owner); - if (!isIdValid(owner)) - { - validGoggles = false; - } - else - { - obj_id inv = utils.getInventoryContainer(owner); - obj_id bank = utils.getPlayerBank(owner); - obj_id eyes = getObjectInSlot(owner, "eyes"); - LOG("seGoggles", "Inv = " + inv); - LOG("seGoggles", "Bank = " + bank); - LOG("seGoggles", "Eyes = " + eyes); - if (!isIdValid(inv) || !isIdValid(bank)) - { - validGoggles = false; - } - if (!features.isCollectorEdition(owner)) - { - validGoggles = false; - } - else - { - obj_id container = getContainedBy(goggle); - LOG("seGoggles", "Container = " + container); - if (container == owner) - { - if (goggle != eyes) - { - validGoggles = false; - } - } - else if (!(container == inv || container == bank)) - { - validGoggles = false; - } - } - } - if (!validGoggles) - { - if (isIdValid(owner)) - { - sendSystemMessage(owner, new string_id("error_message", "destroy_goggle")); - } - destroyObject(goggle); - return SCRIPT_CONTINUE; - } - } if (text.startsWith("saberStats")) { java.util.StringTokenizer st = new java.util.StringTokenizer(text); diff --git a/sku.0/sys.server/compiled/game/script/theme_park/new_player/helper_droid.java b/sku.0/sys.server/compiled/game/script/theme_park/new_player/helper_droid.java index bb1cf27af..8cd0f7726 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/new_player/helper_droid.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/new_player/helper_droid.java @@ -81,10 +81,7 @@ public class helper_droid extends script.base_script { return SCRIPT_CONTINUE; } - if (features.isSpaceEdition(master)) - { - int menuSpace = mi.addRootMenu(menu_info_types.SERVER_MENU10, SID_SPACE_MENU); - } + int menuSpace = mi.addRootMenu(menu_info_types.SERVER_MENU10, SID_SPACE_MENU); if (hasObjVar(master, BRAWLER_QUEST_OBJVAR) || hasObjVar(master, MARKSMAN_QUEST_OBJVAR) || hasObjVar(master, SCOUT_QUEST_OBJVAR) || hasObjVar(master, ARTISAN_QUEST_OBJVAR) || hasObjVar(master, ENTERTAINER_QUEST_OBJVAR) || hasObjVar(master, MEDIC_QUEST_OBJVAR)) { int menuOption = mi.addRootMenu(menu_info_types.SERVER_ITEM_OPTIONS, SID_QUEST_MENU); @@ -145,19 +142,10 @@ public class helper_droid extends script.base_script } if (item == menu_info_types.SERVER_MENU10) { - if (features.isSpaceEdition(player)) - { - String custLogMsg = "New Player Quests: %TU used the helper droid radial menu for space info."; - CustomerServiceLog(NEW_PLAYER_LOG, custLogMsg, player); - messageTo(master, "handleSpaceIntroBegin", null, 1, false); - return SCRIPT_CONTINUE; - } - else - { - String custLogMsg = "New Player Quests: %TU tried to use the helper droid radial menu for space info, but does not have the space edition of the game."; - CustomerServiceLog(NEW_PLAYER_LOG, custLogMsg, player); - return SCRIPT_CONTINUE; - } + String custLogMsg = "New Player Quests: %TU used the helper droid radial menu for space info."; + CustomerServiceLog(NEW_PLAYER_LOG, custLogMsg, player); + messageTo(master, "handleSpaceIntroBegin", null, 1, false); + return SCRIPT_CONTINUE; } if (item == menu_info_types.SERVER_MENU7) { @@ -350,21 +338,9 @@ public class helper_droid extends script.base_script { if (utils.hasScriptVar(master, "new_player.firstEverDroid")) { - if (features.isSpaceEdition(master)) - { - String custLogMsg = "New Player Quests: %TU is receiving a new helper droid and being prompted about space."; - CustomerServiceLog(NEW_PLAYER_LOG, custLogMsg, master); - messageTo(master, "handleSpaceIntroBegin", null, 1, false); - } - else - { - int msgNum = utils.getIntScriptVar(self, "msgNum"); - string_id greetingBegin = new string_id("new_player", "droid_greeting_begin_0" + msgNum); - string_id greetingEnd = new string_id("new_player", "droid_greeting_end"); - String textMsgStr = utils.packStringId(greetingBegin) + " \\#pcontrast1 " + masterName + " \\#., " + utils.packStringId(greetingEnd); - utils.removeScriptVar(master, "new_player.firstEverDroid"); - twoButtonSui(master, master, "handleNewProfessionGreetingResponse", droidName, textMsgStr, okButton, cancelButton); - } + String custLogMsg = "New Player Quests: %TU is receiving a new helper droid and being prompted about space."; + CustomerServiceLog(NEW_PLAYER_LOG, custLogMsg, master); + messageTo(master, "handleSpaceIntroBegin", null, 1, false); } else { diff --git a/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie.java b/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie.java index aaad8e283..756f5e61d 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie.java @@ -14,10 +14,7 @@ public class newbie extends script.theme_park.newbie_tutorial.tutorial_base public static final String questNewbieHall01 = "c_newbie_hall_01"; public int OnAttach(obj_id self) throws InterruptedException { - if (features.isSpaceEdition(self)) - { - setObjVar(self, "jtlNewbie", 4); - } + setObjVar(self, "jtlNewbie", 4); obj_id bldg = getTopMostContainer(self); setObjVar(bldg, NEWBIE_PLAYER, self); newbieTutorialRequest(self, "clientReady"); @@ -29,10 +26,7 @@ public class newbie extends script.theme_park.newbie_tutorial.tutorial_base } public int OnInitialize(obj_id self) throws InterruptedException { - if (features.isSpaceEdition(self)) - { - setObjVar(self, "jtlNewbie", 4); - } + setObjVar(self, "jtlNewbie", 4); location loc = getLocation(self); String area = loc.area; if (area.equals("tutorial")) diff --git a/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie_skipped.java b/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie_skipped.java index 8d7fd355b..8b0552e9c 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie_skipped.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/newbie_skipped.java @@ -14,10 +14,7 @@ public class newbie_skipped extends script.theme_park.newbie_tutorial.tutorial_b } public int OnAttach(obj_id self) throws InterruptedException { - if (features.isSpaceEdition(self)) - { - setObjVar(self, "jtlNewbie", 4); - } + setObjVar(self, "jtlNewbie", 4); deleteInventory(self); fillbank(self); grantNewbieStartingMoney(self); diff --git a/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/tutorial_base.java b/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/tutorial_base.java index 594db7bcc..0ebcd8a3c 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/tutorial_base.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/newbie_tutorial/tutorial_base.java @@ -758,39 +758,6 @@ public class tutorial_base extends script.base_script body = new string_id("newbie_tutorial/newbie_mail", "welcome_body"); } utils.sendMail(subject, body, player, "system"); - obj_id playerInv = utils.getInventoryContainer(player); - if (features.isCollectorEdition(player)) - { - subject = new string_id("newbie_tutorial/newbie_mail", "collector_subject"); - body = new string_id("newbie_tutorial/newbie_mail", "collector_body"); - utils.sendMail(subject, body, player, "system"); - for (String collectorEditionItem : COLLECTOR_EDITION_ITEMS) { - obj_id newItem = createObject(collectorEditionItem, playerInv, ""); - if (!isIdValid(newItem)) { - LOG("newbie", "WARNING: PLAYER " + player + " did not receive his collector's edition item: " + collectorEditionItem); - } else { - setObjVar(newItem, "notrade", true); - } - } - } - else if (features.isJPCollectorEdition(player)) - { - subject = new string_id("newbie_tutorial/newbie_mail", "collector_subject"); - body = new string_id("newbie_tutorial/newbie_mail", "collector_body"); - utils.sendMail(subject, body, player, "system"); - for (int i = 0; i < JP_COLLECTOR_EDITION_ITEMS.length; i++) - { - obj_id newItem = createObject(JP_COLLECTOR_EDITION_ITEMS[i], playerInv, ""); - if (!isIdValid(newItem)) - { - LOG("newbie", "WARNING: PLAYER " + player + " did not receive his collector's edition item: " + COLLECTOR_EDITION_ITEMS[i]); - } - else - { - setObjVar(newItem, "notrade", true); - } - } - } } public void deleteInventory(obj_id player) throws InterruptedException { 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 28755ea4d..da6535630 100755 --- a/sku.0/sys.server/compiled/game/script/working/reecetest.java +++ b/sku.0/sys.server/compiled/game/script/working/reecetest.java @@ -223,25 +223,6 @@ public class reecetest extends script.base_script sendSystemMessageTestingOnly(self, "found location #" + i + " and it was at: " + spawnLoc); } } - if (strText.equals("expansion")) - { - if (features.hasTrialsOfObiwanExpansion(self)) - { - sendSystemMessageTestingOnly(self, " YEE HAW! GOT MUSTAFAR"); - } - else - { - sendSystemMessageTestingOnly(self, "No mustafar expansion detected"); - } - if (features.hasEpisode3PreOrderDigitalDownload(self)) - { - sendSystemMessageTestingOnly(self, " YEE HAW! EP3 Preorder"); - } - else - { - sendSystemMessageTestingOnly(self, "No EP3 pre-order expansion detected"); - } - } if (strText.equals("petcount")) { obj_id target = getLookAtTarget(self); @@ -327,21 +308,6 @@ public class reecetest extends script.base_script messageTo(target, "handleCountdown", d, 10.0f, false); } } - if (strText.equals("accountCheck")) - { - obj_id target = getLookAtTarget(self); - if (target != null) - { - int pBits = getSubscriptionFeatureBits(target); - sendSystemMessageTestingOnly(self, "CHECKING ACCOUNT TYPE Got account bits. They came back as: " + pBits); - 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 (strText.equals("reloadtest")) { obj_id ship = space_transition.getContainingShip(self);