swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-04 04:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from AconiteGodOfSWG/master

Browse Source 
Convert Flurry to Regular Attack
This commit is contained in:
Cekis
2020-10-31 08:14:09 -07:00
committed by GitHub
parent b678858944 611a735979
commit e3a2837ea3
2 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java
-35
View File
@@ -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;
sku.0/sys.shared/compiled/game/datatables/command/command_table.tab
+7 -7
View File
@@ -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