|
|
|
@ -555,7 +555,6 @@ public enum CombatManager {
@@ -555,7 +555,6 @@ public enum CombatManager {
|
|
|
|
|
|
|
|
|
|
if (target == null) |
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
|
PlayerCharacter pc = (PlayerCharacter) ac; |
|
|
|
|
pc.combatStats.calculateATR(true); |
|
|
|
@ -672,13 +671,13 @@ public enum CombatManager {
@@ -672,13 +671,13 @@ public enum CombatManager {
|
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
AbstractCharacter tar = (AbstractCharacter) target; |
|
|
|
|
handleRetaliate(tar, ac); //Handle target attacking back if in combat and has no other target
|
|
|
|
|
if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
|
((PlayerCharacter)tar).combatStats.calculateDefense(); |
|
|
|
|
defense = ((PlayerCharacter)tar).combatStats.defense; |
|
|
|
|
}else { |
|
|
|
|
defense = tar.getDefenseRating(); |
|
|
|
|
} |
|
|
|
|
handleRetaliate(tar, ac); //Handle target attacking back if in combat and has no other target
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
errorTrack = 4; |
|
|
|
|