|
|
@ -597,7 +597,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static void AssignDefenseValue(AbstractCharacter abstractCharacter){ |
|
|
|
public static void AssignDefenseValue(AbstractCharacter abstractCharacter) { |
|
|
|
ConcurrentHashMap<EquipSlotType, Item> equipped = abstractCharacter.charItemManager.getEquipped(); |
|
|
|
ConcurrentHashMap<EquipSlotType, Item> equipped = abstractCharacter.charItemManager.getEquipped(); |
|
|
|
if (abstractCharacter.effects != null && abstractCharacter.effects.containsKey("DeathShroud")) |
|
|
|
if (abstractCharacter.effects != null && abstractCharacter.effects.containsKey("DeathShroud")) |
|
|
|
abstractCharacter.defenseRating = (short) 0; |
|
|
|
abstractCharacter.defenseRating = (short) 0; |
|
|
@ -638,6 +638,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { |
|
|
|
abstractCharacter.defenseRating = (short) (defense + 0.5f); |
|
|
|
abstractCharacter.defenseRating = (short) (defense + 0.5f); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @param abstractCharacter |
|
|
|
* @param abstractCharacter |
|
|
|
* @ Calculates Atr (both hands) Defense, and Damage for pc |
|
|
|
* @ Calculates Atr (both hands) Defense, and Damage for pc |
|
|
@ -655,12 +656,12 @@ public abstract class AbstractCharacter extends AbstractWorldObject { |
|
|
|
ConcurrentHashMap<EquipSlotType, Item> equipped = abstractCharacter.charItemManager.getEquipped(); |
|
|
|
ConcurrentHashMap<EquipSlotType, Item> equipped = abstractCharacter.charItemManager.getEquipped(); |
|
|
|
AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.RHELD), true, equipped.get(EquipSlotType.RHELD)); |
|
|
|
AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.RHELD), true, equipped.get(EquipSlotType.RHELD)); |
|
|
|
AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.LHELD)); |
|
|
|
AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.LHELD)); |
|
|
|
if(abstractCharacter.getObjectType().equals(GameObjectType.Mob)){ |
|
|
|
if (abstractCharacter.getObjectType().equals(GameObjectType.Mob)) { |
|
|
|
Mob mob = (Mob) abstractCharacter; |
|
|
|
Mob mob = (Mob) abstractCharacter; |
|
|
|
abstractCharacter.minDamageHandOne += (int)mob.mobBase.getDamageMin(); |
|
|
|
abstractCharacter.minDamageHandOne += (int) mob.mobBase.getDamageMin(); |
|
|
|
abstractCharacter.minDamageHandTwo += (int)mob.mobBase.getDamageMin(); |
|
|
|
abstractCharacter.minDamageHandTwo += (int) mob.mobBase.getDamageMin(); |
|
|
|
abstractCharacter.maxDamageHandOne += (int)mob.mobBase.getDamageMax(); |
|
|
|
abstractCharacter.maxDamageHandOne += (int) mob.mobBase.getDamageMax(); |
|
|
|
abstractCharacter.maxDamageHandTwo += (int)mob.mobBase.getDamageMax(); |
|
|
|
abstractCharacter.maxDamageHandTwo += (int) mob.mobBase.getDamageMax(); |
|
|
|
abstractCharacter.atrHandOne += mob.mobBase.getAttackRating(); |
|
|
|
abstractCharacter.atrHandOne += mob.mobBase.getAttackRating(); |
|
|
|
abstractCharacter.atrHandTwo += mob.mobBase.getAttackRating(); |
|
|
|
abstractCharacter.atrHandTwo += mob.mobBase.getAttackRating(); |
|
|
|
abstractCharacter.defenseRating += mob.mobBase.getDefenseRating(); |
|
|
|
abstractCharacter.defenseRating += mob.mobBase.getDefenseRating(); |
|
|
@ -1025,12 +1026,12 @@ public abstract class AbstractCharacter extends AbstractWorldObject { |
|
|
|
//through SkillCalcJob. Designed to only run from one worker thread
|
|
|
|
//through SkillCalcJob. Designed to only run from one worker thread
|
|
|
|
public static void runSkillCalc(AbstractCharacter abstractCharacter) { |
|
|
|
public static void runSkillCalc(AbstractCharacter abstractCharacter) { |
|
|
|
|
|
|
|
|
|
|
|
//see if any new skills or powers granted
|
|
|
|
//see if any new skills or powers granted
|
|
|
|
CharacterSkill.calculateSkills(abstractCharacter); |
|
|
|
CharacterSkill.calculateSkills(abstractCharacter); |
|
|
|
// calculate granted Trains in powers.
|
|
|
|
// calculate granted Trains in powers.
|
|
|
|
CharacterPower.grantTrains(abstractCharacter); |
|
|
|
CharacterPower.grantTrains(abstractCharacter); |
|
|
|
//see if any new powers unlocked from previous check
|
|
|
|
//see if any new powers unlocked from previous check
|
|
|
|
CharacterPower.calculatePowers(abstractCharacter); |
|
|
|
CharacterPower.calculatePowers(abstractCharacter); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1147,6 +1148,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { |
|
|
|
public final short getUnusedStatPoints() { |
|
|
|
public final short getUnusedStatPoints() { |
|
|
|
return this.unusedStatPoints; |
|
|
|
return this.unusedStatPoints; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public String getName() { |
|
|
|
public String getName() { |
|
|
|
if (this.firstName.length() == 0 && this.lastName.length() == 0) { |
|
|
|
if (this.firstName.length() == 0 && this.lastName.length() == 0) { |
|
|
|