swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

Fix Flurry Changes

Browse Source
This commit is contained in:
AconiteGodOfSWG
2020-10-31 23:05:36 -04:00
committed by GitHub
parent fff9d8e2f0
commit fbe8042843
1 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java
View File

@@ -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