From 39a78603c6dbdb4d088e357a3ba8ca86dee7cdf7 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 01:00:46 +0100 Subject: [PATCH 01/18] adding stuff to the Frog / Terminal Character Builder / Adding Options for all disabled Stuff / Adding Stella Specific Submenu --- .../terminal/terminal_character_builder.java | 130 +++++++++++++++--- 1 file changed, 111 insertions(+), 19 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java old mode 100644 new mode 100755 index e725a590c..963095dad --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -42,6 +42,7 @@ import script.library.stealth; import script.library.sui; import script.library.utils; import script.library.weapons; +import script.library.performance; public class terminal_character_builder extends script.base_script { @@ -81,6 +82,7 @@ public class terminal_character_builder extends script.base_script public static final string_id PROSE_GRANT_SKILL_FAIL = new string_id("skill_teacher", "skill_terminal_grant_fail"); public static final String[] CHARACTER_BUILDER_OPTIONS = { + "StellaTesting", "Weapons", "Armor Sets", "Roadmap Skill Builder", @@ -869,6 +871,10 @@ public class terminal_character_builder extends script.base_script "Master Crafted EE3 Schematic", "Master Crafted DC-15 Schematic", "Vet 30k Resource Deed" + }; + public static final String[] STELLA_OPTIONS = + { + "Spec-Ops Pack", }; public static final String[] MEDICINE_OPTIONS = { @@ -1583,7 +1589,19 @@ public class terminal_character_builder extends script.base_script } switch (idx) { - case 0: + case 0: + if (isGod(player) || checkConfigSetting("StellaEnabled")) + { + handleStellaOption(player); + } + else + { + sendSystemMessageTestingOnly(player, "This Option is Currently Disabled."); + return SCRIPT_CONTINUE; + } + break; + + case 1: if (isGod(player) || checkConfigSetting("weaponsEnabled")) { handleWeaponOption(player); @@ -1594,7 +1612,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 1: + case 2: if (isGod(player) || checkConfigSetting("armorEnabled")) { handleArmorOption(player); @@ -1605,7 +1623,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 2: + case 3: if (isGod(player) || checkConfigSetting("skillsEnabled")) { handleRoadmapSkills(player); @@ -1616,7 +1634,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 3: + case 4: if (isGod(player) || checkConfigSetting("resourcesEnabled")) { handleResourceOption(player); @@ -1627,7 +1645,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 4: + case 5: if (isGod(player) || checkConfigSetting("creditsEnabled")) { handleCreditOption(player); @@ -1638,7 +1656,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 5: + case 6: if (isGod(player) || checkConfigSetting("factionEnabled")) { handleFactionOption(player); @@ -1649,10 +1667,10 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 6: + case 7: handleVehicleOption(player); break; - case 7: + case 8: if (isGod(player) || checkConfigSetting("shipsEnabled")) { handleShipMenuSelect(player); @@ -1663,7 +1681,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 8: + case 9: if (isGod(player) || checkConfigSetting("craftingEnabled")) { handleCraftingOption(player); @@ -1674,7 +1692,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 9: + case 10: if (isGod(player) || checkConfigSetting("deedsEnabled")) { handleDeedOption(player); @@ -1685,7 +1703,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 10: + case 11: if (isGod(player) || checkConfigSetting("pahallEnabled")) { handlePAOption(player); @@ -1696,7 +1714,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 11: + case 12: if (isGod(player) || checkConfigSetting("miscitemEnabled")) { handleMiscOption(player); @@ -1707,7 +1725,7 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 12: + case 13: if (isGod(player) || checkConfigSetting("jediEnabled")) { handleJediOption(player); @@ -1718,8 +1736,8 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 13: - if (isGod(player)) + case 14: + if (isGod(player) || checkConfigSetting("BestResourceEnabled")) { handleBestResourceOption(player); } @@ -1729,8 +1747,8 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 14: - if (isGod(player)) + case 15: + if (isGod(player) || checkConfigSetting("HeroicFlagEnabled")) { flagAllHeroicInstances(player); } @@ -1740,8 +1758,8 @@ public class terminal_character_builder extends script.base_script return SCRIPT_CONTINUE; } break; - case 15: - if (isGod(player)) + case 16: + if (isGod(player) || checkConfigSetting("DraftSchematicsEnabled")) { handleDraftSchematicsOption(player); } @@ -6371,6 +6389,80 @@ public class terminal_character_builder extends script.base_script } refreshMenu(player, "Select the desired armor option", "Character Builder Terminal", HEROIC_JEWELRY_LIST, "handleHeroicJewelrySelect", false); return SCRIPT_CONTINUE; + } + public void handleStellaOption(obj_id player) throws InterruptedException + { + refreshMenu(player, "Select the desired thingie", "Character Builder Terminal", STELLA_OPTIONS, "handleStellaOptions", false); + } + public int handleStellaOptions(obj_id self, dictionary params) throws InterruptedException + { + if ((params == null) || (params.isEmpty())) + { + return SCRIPT_CONTINUE; + } + obj_id player = sui.getPlayerId(params); + obj_id pInv = utils.getInventoryContainer(player); + int btn = sui.getIntButtonPressed(params); + int idx = sui.getListboxSelectedRow(params); + if (btn == sui.BP_REVERT) + { + handleMiscOption(player); + return SCRIPT_CONTINUE; + } + if (btn == sui.BP_CANCEL) + { + cleanScriptVars(player); + closeOldWindow(player); + return SCRIPT_CONTINUE; + } + if (idx == -1 || idx > STELLA_OPTIONS.length) + { + cleanScriptVars(player); + return SCRIPT_CONTINUE; + } + if (!isIdValid(player)) + { + sendSystemMessageTestingOnly(player, "The system is unable to complete the transaction."); + cleanScriptVars(player); + return SCRIPT_OVERRIDE; + } + if (!isIdValid(pInv)) + { + sendSystemMessageTestingOnly(player, "The system is unable to complete the transaction."); + cleanScriptVars(player); + return SCRIPT_OVERRIDE; + } + if (getVolumeFree(pInv) <= 0) + { + sendSystemMessageTestingOnly(player, "Your Inventory is Full, please make room and try again."); + cleanScriptVars(player); + return SCRIPT_OVERRIDE; + } + + switch (idx) + { + case 0: + createObject("object/tangible/wearables/backpack/backpack_s06.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Spec-Ops Pack Issued."); + break; + case 1: + buff.applyBuff((player), "me_buff_health_2", 7200); + buff.applyBuff((player), "me_buff_action_3", 7200); + buff.applyBuff((player), "me_buff_strength_3", 7200); + buff.applyBuff((player), "me_buff_agility_3", 7200); + buff.applyBuff((player), "me_buff_precision_3", 7200); + buff.applyBuff((player), "me_buff_melee_gb_1", 7200); + buff.applyBuff((player), "me_buff_ranged_gb_1", 7200); + buff.applyBuff((player), "of_buff_def_9", 7200); + buff.applyBuff((player), "of_tactical_drop_6", 7200); + buff.applyBuff((player), "of_buff_def_9", 7200); + break; + default: + cleanScriptVars(player); + return SCRIPT_CONTINUE; + } + refreshMenu(player, "Select the desired option", "Character Builder Terminal", MISC_OPTIONS, "handleMiscSelect", false); + return SCRIPT_CONTINUE; } public void handleMiscOption(obj_id player) throws InterruptedException { From c15f52c494199891f6980214fd08f1643ca4533c Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 01:11:02 +0100 Subject: [PATCH 02/18] more changes --- .../game/script/terminal/terminal_character_builder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 963095dad..d0d1079c2 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -875,6 +875,7 @@ public class terminal_character_builder extends script.base_script public static final String[] STELLA_OPTIONS = { "Spec-Ops Pack", + "Buff me", }; public static final String[] MEDICINE_OPTIONS = { From eccb00b9a4f7afda5610f3d95a33b29568ef4872 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 01:33:41 +0100 Subject: [PATCH 03/18] adding entertainer buff, not really working, only showing a symbol ... might be enough as placebo for now :D --- .../terminal/terminal_character_builder.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index d0d1079c2..38a77edbe 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -1517,6 +1517,20 @@ public class terminal_character_builder extends script.base_script public static final String[] CRAFTING_SUIT = { "Blix's Ultra Crafting Suit" + }; + public static final String[] buffComponentKeys = + { + "kinetic", + "energy", + "action_cost_reduction", + "dodge" + }; + public static final int[] buffComponentValues = + { + 15, + 15, + 1, + 2 }; public boolean checkConfigSetting(String configString) throws InterruptedException { @@ -6447,6 +6461,14 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "Spec-Ops Pack Issued."); break; case 1: + obj_id bufferId = player; + float currentBuffTime = performance.inspireGetMaxDuration(player); + buff.applyBuff(player, "buildabuff_inspiration", 3600); + utils.setScriptVar(player, "performance.buildabuff.buffComponentKeys", buffComponentKeys); + utils.setScriptVar(player, "performance.buildabuff.buffComponentValues", buffComponentValues); + utils.setScriptVar(player, "performance.buildabuff.bufferId", bufferId); + + buff.applyBuff((player), "me_buff_health_2", 7200); buff.applyBuff((player), "me_buff_action_3", 7200); buff.applyBuff((player), "me_buff_strength_3", 7200); From 2720238cfe7435bcf1a7601bdd0a402f8e8a9892 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 01:54:52 +0100 Subject: [PATCH 04/18] more buffs, removed god restrictions for vehicles --- .../terminal/terminal_character_builder.java | 65 ++++++++----------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 38a77edbe..562b8acc1 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -2639,41 +2639,20 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "XP38 Landspeeder Deed Issued."); break; case 6: - if (isGod(player)) - { - createObject("object/tangible/deed/vehicle_deed/barc_speeder_deed.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "Barc Speeder Deed Issued."); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the BARC Speeder!"); - } + createObject("object/tangible/deed/vehicle_deed/barc_speeder_deed.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Barc Speeder Deed Issued."); break; case 7: - if (isGod(player)) - { - createObject("object/tangible/deed/vehicle_deed/landspeeder_av21_deed.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "AV21 Deed Issued."); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the AV21 Speeder!"); - } + createObject("object/tangible/deed/vehicle_deed/landspeeder_av21_deed.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "AV21 Deed Issued."); break; case 8: createObject("object/tangible/deed/vehicle_deed/landspeeder_x31_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "X31 Deed Issued."); break; case 9: - if (isGod(player)) - { - createObject("object/tangible/deed/vehicle_deed/speederbike_flash_deed.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "Flash Speeder Deed Issued."); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the Flash Speeder!"); - } + createObject("object/tangible/deed/vehicle_deed/speederbike_flash_deed.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Flash Speeder Deed Issued."); break; default: cleanScriptVars(player); @@ -6463,22 +6442,32 @@ public class terminal_character_builder extends script.base_script case 1: obj_id bufferId = player; float currentBuffTime = performance.inspireGetMaxDuration(player); - buff.applyBuff(player, "buildabuff_inspiration", 3600); + buff.applyBuff(player, "buildabuff_inspiration", 14400); utils.setScriptVar(player, "performance.buildabuff.buffComponentKeys", buffComponentKeys); utils.setScriptVar(player, "performance.buildabuff.buffComponentValues", buffComponentValues); utils.setScriptVar(player, "performance.buildabuff.bufferId", bufferId); - buff.applyBuff((player), "me_buff_health_2", 7200); - buff.applyBuff((player), "me_buff_action_3", 7200); - buff.applyBuff((player), "me_buff_strength_3", 7200); - buff.applyBuff((player), "me_buff_agility_3", 7200); - buff.applyBuff((player), "me_buff_precision_3", 7200); - buff.applyBuff((player), "me_buff_melee_gb_1", 7200); - buff.applyBuff((player), "me_buff_ranged_gb_1", 7200); - buff.applyBuff((player), "of_buff_def_9", 7200); - buff.applyBuff((player), "of_tactical_drop_6", 7200); - buff.applyBuff((player), "of_buff_def_9", 7200); + buff.applyBuff((player), "me_buff_health_2", 14400); + buff.applyBuff((player), "me_buff_action_3", 14400); + buff.applyBuff((player), "me_buff_strength_3", 14400); + buff.applyBuff((player), "me_buff_agility_3", 14400); + buff.applyBuff((player), "me_buff_precision_3", 14400); + buff.applyBuff((player), "me_buff_melee_gb_1", 14400); + buff.applyBuff((player), "me_buff_ranged_gb_1", 14400); + buff.applyBuff((player), "of_buff_def_9", 14400); + buff.applyBuff((player), "of_tactical_drop_6", 14400); + buff.applyBuff((player), "of_focus_fire_6", 14400); + buff.applyBuff((player), "aurilian_crystal_large", 14400); + buff.applyBuff((player), "sm_smuggled", 14400); + buff.applyBuff((player), "forceCrystalHealth", 14400); + buff.applyBuff((player), "forceCrystalForce", 14400); + buff.applyBuff((player), "muon_gold", 14400); + buff.applyBuff((player), "sm_smuggled", 14400); + buff.applyBuff((player), "event_ewok_drink", 14400); + buff.applyBuff((player), "event_ewok_berry", 14400); + buff.applyBuff((player), "vr_familiar_defense_8", 14400); + buff.applyBuff((player), "drink_flameout", 14400); break; default: cleanScriptVars(player); From 46401de0f72f0620ecf37391caf4a1ebad30c5bd Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 02:04:40 +0100 Subject: [PATCH 05/18] adding elder jedi robes to jedi selection --- .../terminal/terminal_character_builder.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 562b8acc1..2f8afcbd4 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -961,6 +961,8 @@ public class terminal_character_builder extends script.base_script "(80)Dark Jedi Knight Robe", "(80)Jedi Master Cloak Brown", "(80)Jedi Master Cloak Black", + "(80)Elder Jedi Arbiter Robe", + "(80)Elder Jedi Oppressor Robe", "Reset Jedi Statue Slots for Master Jedi Cloaks Collection" }; public static final String ARMOR_SET_PREFIX = "object/tangible/wearables/armor/"; @@ -8483,7 +8485,21 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "Jedi Master Cloak Issued!"); } break; - case 9: + case 9: + + { + static_item.createNewItemFunction("item_jedi_robe_light_04_04", pInv); + sendSystemMessageTestingOnly(player, "Elder Jedi Arbiter Robe Issued!"); + } + break; + case 10: + + { + static_item.createNewItemFunction("item_jedi_robe_dark_04_04", pInv); + sendSystemMessageTestingOnly(player, "Elder Jedi Oppressor Robe Issued!"); + } + break; + case 11: { if (hasCompletedCollectionSlot(player, "jedi_robe_01_07")) From cffb05e5818d9a02cb528e67b685c3e32117dcc3 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 02:10:23 +0100 Subject: [PATCH 06/18] making the back button proper --- .../game/script/terminal/terminal_character_builder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 2f8afcbd4..75147bd27 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -6402,7 +6402,7 @@ public class terminal_character_builder extends script.base_script int idx = sui.getListboxSelectedRow(params); if (btn == sui.BP_REVERT) { - handleMiscOption(player); + refreshMenu(player, "Select the desired character option", "Character Builder Terminal", CHARACTER_BUILDER_OPTIONS, "handleOptionSelect", true); return SCRIPT_CONTINUE; } if (btn == sui.BP_CANCEL) @@ -6475,7 +6475,7 @@ public class terminal_character_builder extends script.base_script cleanScriptVars(player); return SCRIPT_CONTINUE; } - refreshMenu(player, "Select the desired option", "Character Builder Terminal", MISC_OPTIONS, "handleMiscSelect", false); + refreshMenu(player, "Select the desired option", "Character Builder Terminal", STELLA_OPTIONS, "handleStellaOptions", false); return SCRIPT_CONTINUE; } public void handleMiscOption(obj_id player) throws InterruptedException From e8e85eb364cd8090c97ad949401498f2fe4df696 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 02:54:25 +0100 Subject: [PATCH 07/18] adding tcg-houses, commited to swgmasters by gaigu --- .../terminal/terminal_character_builder.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 75147bd27..f5a94bde1 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -526,7 +526,8 @@ public class terminal_character_builder extends script.base_script "Fusion Reactor", "Corellia City Pack", "Naboo City Pack", - "Tatooine City Pack" + "Tatooine City Pack", + "TCG Houses" }; public static final String[] CRAFTING_OPTIONS = { @@ -4161,6 +4162,19 @@ public class terminal_character_builder extends script.base_script createObject("object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "Tatooine City Pack Created"); break; + case 18: + createObject("object/tangible/tcg/series1/structure_deed_diner.iff", pInv, ""); + createObject("object/tangible/tcg/series3/structure_deed_sith_meditation_room_deed.iff", pInv, ""); + createObject("object/tangible/tcg/series3/structure_deed_jedi_meditation_room_deed.iff", pInv, ""); + createObject("object/tangible/tcg/series4/structure_deed_relaxation_pool.iff", pInv, ""); + createObject("object/tangible/tcg/series5/structure_deed_player_house_hangar.iff", pInv, ""); + createObject("object/tangible/tcg/series5/structure_deed_player_house_atat.iff", pInv, ""); + createObject("object/tangible/tcg/series6/structure_deed_emperors_spire.iff", pInv, ""); + createObject("object/tangible/tcg/series6/structure_deed_rebel_spire.iff", pInv, ""); + createObject("object/tangible/tcg/series7/structure_deed_commando_bunker.iff", pInv, ""); + createObject("object/tangible/tcg/series7/structure_deed_vip_bunker.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "TCG House Pack Created"); + break; default: cleanScriptVars(player); return SCRIPT_CONTINUE; From 3d3f20e6d82c101a5a4d91bbcad71d25fb8c04d6 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 03:06:22 +0100 Subject: [PATCH 08/18] adding more stuff to the frog from swgmasters gaigu and noobs --- .../terminal/terminal_character_builder.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index f5a94bde1..61ca417d6 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -871,7 +871,11 @@ public class terminal_character_builder extends script.base_script "Seeker Droid", "Master Crafted EE3 Schematic", "Master Crafted DC-15 Schematic", - "Vet 30k Resource Deed" + "Vet 30k Resource Deed", + "Biological Focus Crystal", + "Synapse Focus Crystal", + "Mustafarian Injector", + "Naboo Signaling Unit", }; public static final String[] STELLA_OPTIONS = { @@ -6657,6 +6661,22 @@ public class terminal_character_builder extends script.base_script case 10: createObject("object/tangible/veteran_reward/resource.iff", pInv, ""); sendSystemMessageTestingOnly(player, "Resource Kit Issued"); + break; + case 11: + createObject("object/tangible/item/quest/force_sensitive/fs_crystal_health.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Biological Focus Crystal Issued"); + break; + case 12: + createObject("object/tangible/item/quest/force_sensitive/fs_crystal_force.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Synapse Focus Crystal Issued"); + break; + case 13: + createObject("object/tangible/loot/mustafar/old_republic_tech_02.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Mustafarian Injector Issued"); + break; + case 14: + createObject("object/tangible/tcg/series5/consumable_signal_unit.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Naboo Signaling Unit Issued"); default: cleanScriptVars(player); return SCRIPT_CONTINUE; From 57ad68cdce9937127fc33f0c3299eca35d628f8f Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 03:13:05 +0100 Subject: [PATCH 09/18] this is the proper way to spawn items --- .../script/terminal/terminal_character_builder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 61ca417d6..93dd9eaf9 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -6663,19 +6663,19 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "Resource Kit Issued"); break; case 11: - createObject("object/tangible/item/quest/force_sensitive/fs_crystal_health.iff", pInv, ""); + static_item.createNewItemFunction("item_force_crystal_04_01", pInv); sendSystemMessageTestingOnly(player, "Biological Focus Crystal Issued"); break; case 12: - createObject("object/tangible/item/quest/force_sensitive/fs_crystal_force.iff", pInv, ""); + static_item.createNewItemFunction("item_force_crystal_04_02", pInv); sendSystemMessageTestingOnly(player, "Synapse Focus Crystal Issued"); break; case 13: - createObject("object/tangible/loot/mustafar/old_republic_tech_02.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "Mustafarian Injector Issued"); + static_item.createNewItemFunction("item_tow_proc_generic_03_01", pInv); + sendSystemMessageTestingOnly(player, "Mustafarian Injector Issued"); break; case 14: - createObject("object/tangible/tcg/series5/consumable_signal_unit.iff", pInv, ""); + static_item.createNewItemFunction("item_tcg_loot_reward_series5_signal_unit", pInv); sendSystemMessageTestingOnly(player, "Naboo Signaling Unit Issued"); default: cleanScriptVars(player); From 7dd0a53fe7c25d5d0825387407f9bd20c700bd8a Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 03:25:39 +0100 Subject: [PATCH 10/18] this is more proper on the previous commit, too --- .../terminal/terminal_character_builder.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 93dd9eaf9..392db0345 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -4167,16 +4167,16 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "Tatooine City Pack Created"); break; case 18: - createObject("object/tangible/tcg/series1/structure_deed_diner.iff", pInv, ""); - createObject("object/tangible/tcg/series3/structure_deed_sith_meditation_room_deed.iff", pInv, ""); - createObject("object/tangible/tcg/series3/structure_deed_jedi_meditation_room_deed.iff", pInv, ""); - createObject("object/tangible/tcg/series4/structure_deed_relaxation_pool.iff", pInv, ""); - createObject("object/tangible/tcg/series5/structure_deed_player_house_hangar.iff", pInv, ""); - createObject("object/tangible/tcg/series5/structure_deed_player_house_atat.iff", pInv, ""); - createObject("object/tangible/tcg/series6/structure_deed_emperors_spire.iff", pInv, ""); - createObject("object/tangible/tcg/series6/structure_deed_rebel_spire.iff", pInv, ""); - createObject("object/tangible/tcg/series7/structure_deed_commando_bunker.iff", pInv, ""); - createObject("object/tangible/tcg/series7/structure_deed_vip_bunker.iff", pInv, ""); + static_item.createNewItemFunction("item_tcg_loot_reward_series1_diner", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series3_sith_meditation_room_deed", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series3_jedi_meditation_room_deed", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series4_relaxation_pool_deed_02_01", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series5_player_house_hangar", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series5_player_house_atat", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series6_deed_emperor_spire", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series6_deed_rebel_spire", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series7_deed_commando_bunker", pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series7_deed_vip_bunker", pInv); sendSystemMessageTestingOnly(player, "TCG House Pack Created"); break; default: From 47438fcd1d7f87d8d5f2a39489ec597473b5d57a Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 15:31:49 +0100 Subject: [PATCH 11/18] removing god restriction for draftschematic function --- .../game/script/terminal/terminal_character_builder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 392db0345..a0cb05812 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -9206,7 +9206,7 @@ public class terminal_character_builder extends script.base_script cleanScriptVars(player); return SCRIPT_CONTINUE; } - if (!isIdValid(player) || !isGod(player)) + if (!isIdValid(player)) { sendSystemMessageTestingOnly(player, "The system is unable to complete the transaction."); cleanScriptVars(player); From 2f9a8ba00c5f1b1f9e9e67a2497535142a66b120 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 15:41:54 +0100 Subject: [PATCH 12/18] removing more god restriction stuff from draft schematics .. --- .../game/script/terminal/terminal_character_builder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index a0cb05812..a25040e54 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -9245,7 +9245,7 @@ public class terminal_character_builder extends script.base_script { return SCRIPT_CONTINUE; } - if (!isIdValid(player) || !isGod(player)) + if (!isIdValid(player)) { sendSystemMessageTestingOnly(player, "The system is unable to complete the transaction."); return SCRIPT_OVERRIDE; @@ -9279,7 +9279,7 @@ public class terminal_character_builder extends script.base_script closeOldWindow(player); return SCRIPT_CONTINUE; } - if (!isIdValid(player) || !isGod(player)) + if (!isIdValid(player)) { sendSystemMessageTestingOnly(player, "The system is unable to complete the transaction."); cleanScriptVars(player); From b763bcfd2d18dd0bd5c962b9a5d58966921a559b Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 15:44:05 +0100 Subject: [PATCH 13/18] removing god restriction for bm egg options --- .../game/script/terminal/terminal_character_builder.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index a25040e54..8e4df165c 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -2522,14 +2522,7 @@ public class terminal_character_builder extends script.base_script } break; case 2: - if (!isGod(player)) - { - refreshMenu(player, prompt, title, BEAST_OPTIONS_FOR_PLAYERS, "handleBeastSelect", false); - } - else - { - refreshMenu(player, prompt, title, BEAST_OPTIONS, "handleBeastSelect", false); - } + refreshMenu(player, prompt, title, BEAST_OPTIONS, "handleBeastSelect", false); break; case 3: obj_id beast = beast_lib.getBeastOnPlayer(player); From 5e3d96a3bde038caaab9d9e7f78fbda6f227da87 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 15:48:08 +0100 Subject: [PATCH 14/18] removing god restrictions for some jedi stuff --- .../terminal/terminal_character_builder.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 8e4df165c..c2f021844 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -8144,15 +8144,8 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "Color Crystals Issued!"); break; case 1: - if (isGod(player)) - { static_item.createNewItemFunction("item_tow_lava_crystal_06_01", pInv); sendSystemMessageTestingOnly(player, "Lava Crystal Issued!"); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the Lava Crystal!"); - } break; case 2: for (int i = 0; i < 4; i++) @@ -8162,18 +8155,11 @@ public class terminal_character_builder extends script.base_script sendSystemMessageTestingOnly(player, "Power Crystals Issued!"); break; case 3: - if (isGod(player)) - { for (int i = 0; i < 4; i++) { static_item.createNewItemFunction("item_krayt_pearl_04_20", pInv); } sendSystemMessageTestingOnly(player, "Ancient Krayt Pearls Issued!"); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the Ancient Krayt Pearls Issued!"); - } break; default: cleanScriptVars(player); From 8906f840026bc5d3440f08e9b07e12f5c070e71c Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 15:52:08 +0100 Subject: [PATCH 15/18] damn double checks everywhere ... --- .../game/script/terminal/terminal_character_builder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index c2f021844..715c1db63 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -2747,7 +2747,7 @@ public class terminal_character_builder extends script.base_script closeOldWindow(player); return SCRIPT_CONTINUE; } - String[] beasts = (!isGod(player) ? BEAST_OPTIONS_FOR_PLAYERS : BEAST_OPTIONS); + String[] beasts = BEAST_OPTIONS; if (idx == -1 || idx > beasts.length) { cleanScriptVars(player); From 873c7c5aad85a7df9c2fe7399f7f5d4d0bcfa871 Mon Sep 17 00:00:00 2001 From: Groot Date: Thu, 26 May 2016 19:02:52 +0100 Subject: [PATCH 16/18] adding officer healing stims (highest version) to the frog --- .../game/script/terminal/terminal_character_builder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java index 715c1db63..9109bcbce 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.java @@ -881,6 +881,7 @@ public class terminal_character_builder extends script.base_script { "Spec-Ops Pack", "Buff me", + "Healing Stims" }; public static final String[] MEDICINE_OPTIONS = { @@ -6482,6 +6483,10 @@ public class terminal_character_builder extends script.base_script buff.applyBuff((player), "vr_familiar_defense_8", 14400); buff.applyBuff((player), "drink_flameout", 14400); break; + case 2: + // createObject("object/tangible/medicine/instant_stimpack/stimpack_generic_e.iff", pInv, ""); + static_item.createNewItemFunction("item_off_temp_stimpack_02_06", pInv); + break; default: cleanScriptVars(player); return SCRIPT_CONTINUE; From 7947267d5008f83bf5aa252fe6acb4b15248f45e Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 26 May 2016 19:33:39 +0000 Subject: [PATCH 17/18] fix the terminals that weren't usable --- .../tangible/npe/shared_npe_tutorial_door_terminal.tpf | 2 -- .../quest/shared_frn_all_security_terminal_wall_01.tpf | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sku.0/sys.shared/compiled/game/object/tangible/npe/shared_npe_tutorial_door_terminal.tpf b/sku.0/sys.shared/compiled/game/object/tangible/npe/shared_npe_tutorial_door_terminal.tpf index 18ec7c919..686f0e134 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/npe/shared_npe_tutorial_door_terminal.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/npe/shared_npe_tutorial_door_terminal.tpf @@ -12,8 +12,6 @@ detailedDescription = "npe_hangar_1" "door_terminal" containerType = CT_none -appearanceFilename = "appearance/frn_all_data_terminal_wall_s3.apt" - portalLayoutFilename = "" gameObjectType = GOT_lair diff --git a/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf b/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf index b47f77dd9..1dab034aa 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf @@ -6,11 +6,8 @@ @class object_template 5 - objectName = "frn_n" "frn_payroll_terminal" detailedDescription = "frn_d" "frn_payroll_terminal" -appearanceFilename = "appearance/frn_all_data_terminal_wall_s1.apt" - -portalLayoutFilename = "" \ No newline at end of file +portalLayoutFilename = "" From 297b3b1b4b281fe40b9a02249f930bab78d33742 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 26 May 2016 19:39:14 +0000 Subject: [PATCH 18/18] fix another one --- .../quest/shared_frn_all_security_terminal_wall_01.tpf | 2 -- .../game/object/tangible/quest/shared_legacy_head_shuttle.tpf | 4 ---- 2 files changed, 6 deletions(-) diff --git a/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf b/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf index 1dab034aa..bb915f057 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_frn_all_security_terminal_wall_01.tpf @@ -9,5 +9,3 @@ objectName = "frn_n" "frn_payroll_terminal" detailedDescription = "frn_d" "frn_payroll_terminal" - -portalLayoutFilename = "" diff --git a/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_legacy_head_shuttle.tpf b/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_legacy_head_shuttle.tpf index 6fb89ebdf..190465d3a 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_legacy_head_shuttle.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/quest/shared_legacy_head_shuttle.tpf @@ -7,10 +7,6 @@ @class object_template 5 - - objectName = "item_n" "legacy_head_shuttle" detailedDescription = "item_d" "legacy_head_shuttle" - -appearanceFilename = "appearance/thm_kash_shuttle_mesh.apt"