projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-28 23:15:53 -04:00
Code Issues Projects Releases Wiki Activity

Combat Commands now add buffs automatically to self and/or target

Browse Source
This commit is contained in:
Light2
2013-09-22 17:06:59 +02:00
parent 098b2d55f3
commit 7a4b985bc2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+6 -2
View File
@@ -160,6 +160,8 @@ public class CombatService implements INetworkDispatch {
}
core.buffService.addBuffToCreature(attacker, command.getBuffNameSelf());
}
private void doAreaCombat(CreatureObject attacker, TangibleObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {
@@ -292,7 +294,7 @@ public class CombatService implements INetworkDispatch {
if(mitigationType == HitType.GLANCE) {
damage *= 0.4f;
} else if(mitigationType == HitType.EVASION) {
} else if(mitigationType == HitType.EVASION && attacker.getSkillMod("combat_evasion_value") != null) {
float evasionValue = (attacker.getSkillMod("combat_evasion_value").getBase() / 4) / 100;
damage *= (1 - evasionValue);
@@ -313,6 +315,9 @@ public class CombatService implements INetworkDispatch {
applyDamage(attacker, target, (int) damage);
sendCombatPackets(attacker, target, weapon, command, actionCounter, damage, armorAbsorbed, hitType);
if(hitType != HitType.MISS && hitType != HitType.DODGE && hitType != HitType.PARRY)
core.buffService.addBuffToCreature(target, command.getBuffNameTarget());
if(FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py"))
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName(), "run", core, attacker, target, null);
@@ -647,7 +652,6 @@ public class CombatService implements INetworkDispatch {
return HitType.GLANCE;
}
return -1;