From fbe804284379960b985fade41efe948c464443e1 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG <63141077+AconiteGodOfSWG@users.noreply.github.com> Date: Sat, 31 Oct 2020 23:05:36 -0400 Subject: [PATCH 1/4] Fix Flurry Changes --- .../script/systems/combat/combat_actions.java | 57 ++++++++++++++++--- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java index 204b4e6c3..08be04ee3 100755 --- a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java +++ b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java @@ -1888,91 +1888,134 @@ public class combat_actions extends script.systems.combat.combat_base { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_1", self, target, params, "", "")) { return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_1"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_flurry_2(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_2", self, target, params, "", "")) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_2"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_flurry_3(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_3", self, target, params, "", "")) { return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_3"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_flurry_4(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_4", self, target, params, "", "")) { return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_4"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_flurry_5(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_5", self, target, params, "", "")) { return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_5"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_flurry_6(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_6", self, target, params, "", "")) { return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_6"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_flurry_7(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException { if (!buff.isInStance(self)) { + sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } if (!combatStandardAction("fs_flurry_7", self, target, params, "", "")) { return SCRIPT_OVERRIDE; } - buff.removeBuff(self, "jedi_reflect_flurry"); + float baseCooldownTime = getBaseCooldownTime("fs_flurry_7"); + if (baseCooldownTime < 0) + { + return SCRIPT_OVERRIDE; + } + setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime); return SCRIPT_CONTINUE; } public int fs_dm_1(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException From 207d9852e15b31bc2f91d6a0afaeeca0e08cdf56 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Sat, 31 Oct 2020 23:12:13 -0400 Subject: [PATCH 2/4] Remove proc charge chance from FS Flurry --- sku.0/sys.server/compiled/game/datatables/proc/proc.tab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/datatables/proc/proc.tab b/sku.0/sys.server/compiled/game/datatables/proc/proc.tab index c8ba6e3dc..79c53915b 100755 --- a/sku.0/sys.server/compiled/game/datatables/proc/proc.tab +++ b/sku.0/sys.server/compiled/game/datatables/proc/proc.tab @@ -38,7 +38,7 @@ bh_armor_duelist_heal_3 100 expertise bounty hunter reactive heal bh_armor_duelist_heal_4 100 expertise bounty hunter reactive heal bh_armor_duelist_heal_5 100 expertise bounty hunter reactive heal expertise_fs_force_clarity_1_proc 5 Expertise to get a second attack -expertise_fs_flurry_charge_proc 5 Expertise to charge up a Flurry charge +expertise_fs_flurry_charge_proc 0 Expertise to charge up a Flurry charge- procChance set to 0 from 5 so it is effectively removed per GU 16.6 expertise_sm_ranged_shot_proc 0 Expertise to get a second attack expertise_sm_melee_proc 0 Expertise to get a second attack expertise_sm_melee_stun_proc 0 "sm_melee_stun,sm_melee_stun_recourse" Expertise to get a second attack that stuns From d19fd54f75d18517d23da5301de52272c9a89156 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG <63141077+AconiteGodOfSWG@users.noreply.github.com> Date: Sun, 1 Nov 2020 15:50:25 -0500 Subject: [PATCH 3/4] Fix misplaced system message in Flurry --- .../compiled/game/script/systems/combat/combat_actions.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java index 08be04ee3..0c68e9545 100755 --- a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java +++ b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java @@ -1912,7 +1912,6 @@ public class combat_actions extends script.systems.combat.combat_base } if (!combatStandardAction("fs_flurry_2", self, target, params, "", "")) { - sendSystemMessage(self, new string_id("spam", "fs_command_no_stance")); return SCRIPT_OVERRIDE; } float baseCooldownTime = getBaseCooldownTime("fs_flurry_2"); From ec121f578b8e8b8728299e24efd6dddad076f531 Mon Sep 17 00:00:00 2001 From: Erusman Date: Sun, 1 Nov 2020 18:17:35 -0800 Subject: [PATCH 4/4] Added Elite Harvesters to frog --- .../terminal/terminal_character_builder.java | 57 +++++++++++++++++-- 1 file changed, 51 insertions(+), 6 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 be7616c0f..ad17b66d3 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 @@ -48,7 +48,7 @@ public class terminal_character_builder extends script.base_script public static final String RLS_EFFECT = "appearance/pt_blackhole_01.prt"; public static final String RLS_SOUND = "sound/item_ding.snd"; public static final String[] CHARACTER_BUILDER_OPTIONS = { - "Development Testing", + "SWG Source Testing", "Weapons", "Armor", "Skills", @@ -976,6 +976,11 @@ public class terminal_character_builder extends script.base_script "Heavy Gas Harvester", "Heavy Chemical Harvester", "Heavy Moisture Vaporator", + "Elite Mineral Harvester", + "Elite Flora Harvester", + "Elite Gas Harvester", + "Elite Chemical Harvester", + "Elite Moisture Vaporator", "Fusion Reactor", "Corellia City Pack", "Naboo City Pack", @@ -4728,7 +4733,47 @@ public class terminal_character_builder extends script.base_script setObjVar(moisture, "player_structure.deed.currentExtractionRate", 13); } break; - case 14: + case 14: + mineral = createObject("object/tangible/deed/harvester_deed/ore_harvester_deed_elite.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Elite Mineral Harvester Issued."); + if (isIdValid(mineral)) { + setObjVar(mineral, "player_structure.deed.maxExtractionRate", 13); + setObjVar(mineral, "player_structure.deed.currentExtractionRate", 13); + } + break; + case 15: + flora = createObject("object/tangible/deed/harvester_deed/flora_harvester_deed_elite.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Elite Flora Harvester Issued."); + if (isIdValid(flora)) { + setObjVar(flora, "player_structure.deed.maxExtractionRate", 13); + setObjVar(flora, "player_structure.deed.currentExtractionRate", 13); + } + break; + case 16: + gas = createObject("object/tangible/deed/harvester_deed/gas_harvester_deed_elite.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Elite Gas Harvester Issued."); + if (isIdValid(gas)) { + setObjVar(gas, "player_structure.deed.maxExtractionRate", 13); + setObjVar(gas, "player_structure.deed.currentExtractionRate", 13); + } + break; + case 17: + chemical = createObject("object/tangible/deed/harvester_deed/liquid_harvester_deed_elite.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Elite Chemical Harvester Issued."); + if (isIdValid(chemical)) { + setObjVar(chemical, "player_structure.deed.maxExtractionRate", 13); + setObjVar(chemical, "player_structure.deed.currentExtractionRate", 13); + } + break; + case 18: + moisture = createObject("object/tangible/deed/harvester_deed/moisture_harvester_deed_elite.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Heavy Moisture Vaporator Issued."); + if (isIdValid(moisture)) { + setObjVar(moisture, "player_structure.deed.maxExtractionRate", 13); + setObjVar(moisture, "player_structure.deed.currentExtractionRate", 13); + } + break; + case 19: obj_id fusion = createObject("object/tangible/deed/generator_deed/power_generator_fusion_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "Fusion Reactor Issued."); if (isIdValid(fusion)) @@ -4737,7 +4782,7 @@ public class terminal_character_builder extends script.base_script setObjVar(fusion, "player_structure.deed.currentExtractionRate", 16); } break; - case 15: + case 20: createObject("object/tangible/deed/city_deed/cityhall_corellia_deed.iff", pInv, ""); createObject("object/tangible/deed/city_deed/cloning_corellia_deed.iff", pInv, ""); createObject("object/tangible/deed/city_deed/bank_corellia_deed.iff", pInv, ""); @@ -4747,7 +4792,7 @@ public class terminal_character_builder extends script.base_script createObject("object/tangible/deed/city_deed/garden_corellia_sml_01_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "Corellia City Pack Created"); break; - case 16: + case 21: createObject("object/tangible/deed/city_deed/cityhall_naboo_deed.iff", pInv, ""); createObject("object/tangible/deed/city_deed/cloning_naboo_deed.iff", pInv, ""); createObject("object/tangible/deed/city_deed/bank_naboo_deed.iff", pInv, ""); @@ -4757,7 +4802,7 @@ public class terminal_character_builder extends script.base_script createObject("object/tangible/deed/city_deed/garden_naboo_sml_01_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "Naboo City Pack Created"); break; - case 17: + case 22: createObject("object/tangible/deed/city_deed/cityhall_tatooine_deed.iff", pInv, ""); createObject("object/tangible/deed/city_deed/cloning_tatooine_deed.iff", pInv, ""); createObject("object/tangible/deed/city_deed/bank_tatooine_deed.iff", pInv, ""); @@ -4767,7 +4812,7 @@ 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: + case 23: static_item.createNewItemFunction("item_tcg_loot_reward_series2_diner", pInv); static_item.createNewItemFunction("item_tcg_loot_reward_series2_barn", pInv); static_item.createNewItemFunction("item_tcg_loot_reward_series3_sith_meditation_room_deed", pInv);