projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/services/SimulationService.java
This commit is contained in:
Light2
2013-12-08 18:21:50 +01:00
parent 93195f7d5f 4e78f9064e
commit f2200711cf
117 changed files with 2388 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+14 -2
View File
@@ -405,11 +405,21 @@ public class CombatService implements INetworkDispatch {
private void sendHealPackets(CreatureObject attacker, CreatureObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {
float cooldown = 0;
CombatAction combatAction = new CombatAction(CRC.StringtoCRC(command.getDefaultAnimations()[0]), attacker.getObjectID(), weapon.getObjectID(), target.getObjectID(), command.getCommandCRC());
ObjControllerMessage objController = new ObjControllerMessage(0x1B, combatAction);
attacker.notifyObserversInRange(objController, true, 125);
StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), command.getCooldown());
cooldown = command.getCooldown();
System.out.println(cooldown);
if(attacker.getSkillMod("expertise_cooldown_line_of_heal") != null)
cooldown -= attacker.getSkillMod("expertise_cooldown_line_of_heal").getBase();
if(attacker.getSkillMod("expertise_cooldown_line_sh") != null)
cooldown -= ((attacker.getSkillMod("expertise_cooldown_line_sh").getBase())/10);
StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), cooldown);
ObjControllerMessage objController2 = new ObjControllerMessage(0x0B, startTask);
attacker.getClient().getSession().write(objController2.serialize());
@@ -887,8 +897,10 @@ public class CombatService implements INetworkDispatch {
healPotency += healer.getSkillMod("expertise_healing_line_sm_heal").getBase();
if(healer.getSkillMod("expertise_healing_line_sp_heal") != null)
healPotency += healer.getSkillMod("expertise_healing_line_sp_heal").getBase();
if(healer.getSkillMod("expertise_stance_healing_line_fs_heal") != null)
healPotency += healer.getSkillMod("expertise_stance_healing_line_fs_heal").getBase();
if(healPotency > 0)
healAmount += (healAmount * (healPotency / 100));
healAmount += ((healAmount * healPotency) / 100);
if(target.getSkillMod("expertise_healing_reduction") != null)
healAmount *= (1 - target.getSkillMod("expertise_healing_reduction").getBase() / 100);