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 7ac975298..204b4e6c3 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 @@ -1890,11 +1890,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_1", self, target, params, "", "")) { return SCRIPT_OVERRIDE; @@ -1908,11 +1903,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_2", self, target, params, "", "")) { return SCRIPT_OVERRIDE; @@ -1926,11 +1916,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_3", self, target, params, "", "")) { return SCRIPT_OVERRIDE; @@ -1944,11 +1929,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_4", self, target, params, "", "")) { return SCRIPT_OVERRIDE; @@ -1962,11 +1942,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_5", self, target, params, "", "")) { return SCRIPT_OVERRIDE; @@ -1980,11 +1955,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_6", self, target, params, "", "")) { return SCRIPT_OVERRIDE; @@ -1998,11 +1968,6 @@ public class combat_actions extends script.systems.combat.combat_base { return SCRIPT_OVERRIDE; } - if (!buff.hasBuff(self, "jedi_reflect_flurry")) - { - sendSystemMessage(self, new string_id("spam", "fs_flurry_not_charged")); - return SCRIPT_OVERRIDE; - } if (!combatStandardAction("fs_flurry_7", self, target, params, "", "")) { return SCRIPT_OVERRIDE; diff --git a/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab b/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab index 149881a01..25120ad80 100755 --- a/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab +++ b/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab @@ -166,13 +166,13 @@ fs_buff_def_1_3 commandClicky normal fs_buff_def_1_3 failSpecialAttack 1 fs_bu fs_buff_def_1_4 commandClicky normal fs_buff_def_1_4 failSpecialAttack 1 fs_buff_def_1_4 1 0 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 other optional 2 combat_ranged 0 combat 1 ALL fs_buff_stance 0 0.25 10 1 fs_buff_def_1_5 commandClicky normal fs_buff_def_1_5 failSpecialAttack 1 fs_buff_def_1_5 1 0 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 other optional 2 combat_ranged 0 combat 1 ALL fs_buff_stance 0 0.25 10 1 fs_buff_def_1_6 commandClicky normal fs_buff_def_1_6 failSpecialAttack 1 fs_buff_def_1_6 1 0 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 other optional 2 combat_ranged 0 combat 1 ALL fs_buff_stance 0 0.25 10 1 -fs_flurry_1 commandClicky normal fs_flurry_1 failSpecialAttack 1 fs_flurry_1 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 10 1 -fs_flurry_2 commandClicky normal fs_flurry_2 failSpecialAttack 1 fs_flurry_2 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 8 1 -fs_flurry_3 commandClicky normal fs_flurry_3 failSpecialAttack 1 fs_flurry_3 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 8 1 -fs_flurry_4 commandClicky normal fs_flurry_4 failSpecialAttack 1 fs_flurry_4 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 8 1 -fs_flurry_5 commandClicky normal fs_flurry_5 failSpecialAttack 1 fs_flurry_5 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 8 1 -fs_flurry_6 commandClicky normal fs_flurry_6 failSpecialAttack 1 fs_flurry_6 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 8 1 -fs_flurry_7 commandClicky normal fs_flurry_7 failSpecialAttack 1 fs_flurry_7 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 4 1 +fs_flurry_1 commandClicky normal fs_flurry_1 failSpecialAttack 1 fs_flurry_1 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 +fs_flurry_2 commandClicky normal fs_flurry_2 failSpecialAttack 1 fs_flurry_2 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 +fs_flurry_3 commandClicky normal fs_flurry_3 failSpecialAttack 1 fs_flurry_3 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 +fs_flurry_4 commandClicky normal fs_flurry_4 failSpecialAttack 1 fs_flurry_4 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 +fs_flurry_5 commandClicky normal fs_flurry_5 failSpecialAttack 1 fs_flurry_5 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 +fs_flurry_6 commandClicky normal fs_flurry_6 failSpecialAttack 1 fs_flurry_6 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 +fs_flurry_7 commandClicky normal fs_flurry_7 failSpecialAttack 1 fs_flurry_7 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_flurry 0 0.25 12 1 fs_dm_1 commandClicky normal fs_dm_1 failSpecialAttack 1 fs_dm_1 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_dm 0 0.25 3 1 fs_dm_2 commandClicky normal fs_dm_2 failSpecialAttack 1 fs_dm_2 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_dm 0 0.25 3 1 fs_dm_3 commandClicky normal fs_dm_3 failSpecialAttack 1 fs_dm_3 1 0 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 1 1 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 enemy required 2 combat_ranged 0 combat 1 MELEE,ALL_LIGHTSABERS HEAVY fs_dm 0 0.25 3 1