MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Project reformat

Browse Source
This commit is contained in:
MagicBot
2024-04-01 17:00:14 -04:00
parent 3df1da364c
commit ee030a690a
11 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+14 -12
View File
@@ -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();
if (abstractCharacter.effects != null && abstractCharacter.effects.containsKey("DeathShroud"))
abstractCharacter.defenseRating = (short) 0;
@@ -638,6 +638,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
abstractCharacter.defenseRating = (short) (defense + 0.5f);
}
}
/**
* @param abstractCharacter
* @ 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();
AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.RHELD), true, equipped.get(EquipSlotType.RHELD));
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;
abstractCharacter.minDamageHandOne += (int)mob.mobBase.getDamageMin();
abstractCharacter.minDamageHandTwo += (int)mob.mobBase.getDamageMin();
abstractCharacter.maxDamageHandOne += (int)mob.mobBase.getDamageMax();
abstractCharacter.maxDamageHandTwo += (int)mob.mobBase.getDamageMax();
abstractCharacter.minDamageHandOne += (int) mob.mobBase.getDamageMin();
abstractCharacter.minDamageHandTwo += (int) mob.mobBase.getDamageMin();
abstractCharacter.maxDamageHandOne += (int) mob.mobBase.getDamageMax();
abstractCharacter.maxDamageHandTwo += (int) mob.mobBase.getDamageMax();
abstractCharacter.atrHandOne += mob.mobBase.getAttackRating();
abstractCharacter.atrHandTwo += mob.mobBase.getAttackRating();
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
public static void runSkillCalc(AbstractCharacter abstractCharacter) {
//see if any new skills or powers granted
CharacterSkill.calculateSkills(abstractCharacter);
// calculate granted Trains in powers.
CharacterPower.grantTrains(abstractCharacter);
//see if any new powers unlocked from previous check
CharacterPower.calculatePowers(abstractCharacter);
//see if any new skills or powers granted
CharacterSkill.calculateSkills(abstractCharacter);
// calculate granted Trains in powers.
CharacterPower.grantTrains(abstractCharacter);
//see if any new powers unlocked from previous check
CharacterPower.calculatePowers(abstractCharacter);
}
@@ -1147,6 +1148,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
public final short getUnusedStatPoints() {
return this.unusedStatPoints;
}
@Override
public String getName() {
if (this.firstName.length() == 0 && this.lastName.length() == 0) {