Project reformat
This commit is contained in:
@@ -216,6 +216,7 @@ public class dbItemHandler extends dbHandlerBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Item GET_ITEM(final int itemUUID) {
|
public Item GET_ITEM(final int itemUUID) {
|
||||||
|
|
||||||
Item item;
|
Item item;
|
||||||
|
|||||||
@@ -11,7 +11,10 @@ package engine.db.handlers;
|
|||||||
|
|
||||||
import engine.Enum;
|
import engine.Enum;
|
||||||
import engine.gameManager.DbManager;
|
import engine.gameManager.DbManager;
|
||||||
import engine.objects.*;
|
import engine.objects.AbstractWorldObject;
|
||||||
|
import engine.objects.Heraldry;
|
||||||
|
import engine.objects.PlayerCharacter;
|
||||||
|
import engine.objects.PlayerFriends;
|
||||||
import engine.server.MBServerStatics;
|
import engine.server.MBServerStatics;
|
||||||
import org.pmw.tinylog.Logger;
|
import org.pmw.tinylog.Logger;
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ public enum CombatManager {
|
|||||||
//calculate hit chance based off ATR and DEF
|
//calculate hit chance based off ATR and DEF
|
||||||
|
|
||||||
int hitChance;
|
int hitChance;
|
||||||
if(def == 0)
|
if (def == 0)
|
||||||
def = 1;
|
def = 1;
|
||||||
float dif = atr / def;
|
float dif = atr / def;
|
||||||
|
|
||||||
@@ -152,7 +152,7 @@ public enum CombatManager {
|
|||||||
hitChance = 100;
|
hitChance = 100;
|
||||||
|
|
||||||
int passiveAnim = getSwingAnimation(null, null, slot.equals(Enum.EquipSlotType.RHELD));
|
int passiveAnim = getSwingAnimation(null, null, slot.equals(Enum.EquipSlotType.RHELD));
|
||||||
if(attacker.charItemManager.getEquipped().get(slot) != null){
|
if (attacker.charItemManager.getEquipped().get(slot) != null) {
|
||||||
passiveAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template, null, true);
|
passiveAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -290,9 +290,9 @@ public enum CombatManager {
|
|||||||
else
|
else
|
||||||
((Building) target).setCurrentHitPoints(target.getCurrentHitpoints() - damage);
|
((Building) target).setCurrentHitPoints(target.getCurrentHitpoints() - damage);
|
||||||
|
|
||||||
int attackAnim = getSwingAnimation(null,null,slot.equals(Enum.EquipSlotType.RHELD));
|
int attackAnim = getSwingAnimation(null, null, slot.equals(Enum.EquipSlotType.RHELD));
|
||||||
if (attacker.charItemManager.getEquipped().get(slot) != null) {
|
if (attacker.charItemManager.getEquipped().get(slot) != null) {
|
||||||
attackAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template,null,slot.equals(Enum.EquipSlotType.RHELD));
|
attackAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template, null, slot.equals(Enum.EquipSlotType.RHELD));
|
||||||
}
|
}
|
||||||
TargetedActionMsg cmm = new TargetedActionMsg(attacker, target, (float) damage, attackAnim);
|
TargetedActionMsg cmm = new TargetedActionMsg(attacker, target, (float) damage, attackAnim);
|
||||||
DispatchMessage.sendToAllInRange(target, cmm);
|
DispatchMessage.sendToAllInRange(target, cmm);
|
||||||
|
|||||||
@@ -351,9 +351,9 @@ public enum NPCManager {
|
|||||||
int strength = guard.getStatStrCurrent();
|
int strength = guard.getStatStrCurrent();
|
||||||
int baseAtr = guard.mobBase.getAttackRating();
|
int baseAtr = guard.mobBase.getAttackRating();
|
||||||
if (guard.charItemManager.equipped.get(Enum.EquipSlotType.RHELD) != null)
|
if (guard.charItemManager.equipped.get(Enum.EquipSlotType.RHELD) != null)
|
||||||
guard.atrHandOne = baseAtr + (int) ((strength * 0.5f) + ((int)guard.charItemManager.equipped.get(Enum.EquipSlotType.RHELD).template.item_skill_required.values().toArray()[0] * 4) + ((int)guard.charItemManager.equipped.get(Enum.EquipSlotType.RHELD).template.item_skill_required.values().toArray()[0] * 3));
|
guard.atrHandOne = baseAtr + (int) ((strength * 0.5f) + ((int) guard.charItemManager.equipped.get(Enum.EquipSlotType.RHELD).template.item_skill_required.values().toArray()[0] * 4) + ((int) guard.charItemManager.equipped.get(Enum.EquipSlotType.RHELD).template.item_skill_required.values().toArray()[0] * 3));
|
||||||
else if (guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD) != null && !ItemTemplate.isShield(guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD).template))
|
else if (guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD) != null && !ItemTemplate.isShield(guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD).template))
|
||||||
guard.atrHandTwo = baseAtr + (int) ((strength * 0.5f) + ((int)guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD).template.item_skill_required.values().toArray()[0] * 4) + ((int)guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD).template.item_skill_required.values().toArray()[0] * 3));
|
guard.atrHandTwo = baseAtr + (int) ((strength * 0.5f) + ((int) guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD).template.item_skill_required.values().toArray()[0] * 4) + ((int) guard.charItemManager.equipped.get(Enum.EquipSlotType.LHELD).template.item_skill_required.values().toArray()[0] * 3));
|
||||||
else
|
else
|
||||||
guard.atrHandOne = baseAtr;
|
guard.atrHandOne = baseAtr;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ public class MobAI {
|
|||||||
if (mob.isMoving() && mob.getRange() > 20)
|
if (mob.isMoving() && mob.getRange() > 20)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CombatManager.combatCycle(mob,mob.combatTarget);
|
CombatManager.combatCycle(mob, mob.combatTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (target.getPet() != null)
|
if (target.getPet() != null)
|
||||||
@@ -149,7 +149,7 @@ public class MobAI {
|
|||||||
MovementManager.sendRWSSMsg(mob);
|
MovementManager.sendRWSSMsg(mob);
|
||||||
|
|
||||||
|
|
||||||
CombatManager.combatCycle(mob, target);
|
CombatManager.combatCycle(mob, target);
|
||||||
|
|
||||||
if (mob.isSiege()) {
|
if (mob.isSiege()) {
|
||||||
PowerProjectileMsg ppm = new PowerProjectileMsg(mob, target);
|
PowerProjectileMsg ppm = new PowerProjectileMsg(mob, target);
|
||||||
@@ -172,7 +172,7 @@ public class MobAI {
|
|||||||
//no weapons, default mob attack speed 3 seconds.
|
//no weapons, default mob attack speed 3 seconds.
|
||||||
|
|
||||||
|
|
||||||
CombatManager.combatCycle(mob, target);
|
CombatManager.combatCycle(mob, target);
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
|
Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
|
||||||
|
|||||||
@@ -12,7 +12,10 @@ import engine.net.client.msg.ArcLoginNotifyMsg;
|
|||||||
import engine.net.client.msg.ClientNetMsg;
|
import engine.net.client.msg.ClientNetMsg;
|
||||||
import engine.net.client.msg.HotzoneChangeMsg;
|
import engine.net.client.msg.HotzoneChangeMsg;
|
||||||
import engine.net.client.msg.PetMsg;
|
import engine.net.client.msg.PetMsg;
|
||||||
import engine.objects.*;
|
import engine.objects.Account;
|
||||||
|
import engine.objects.Guild;
|
||||||
|
import engine.objects.PlayerCharacter;
|
||||||
|
import engine.objects.PlayerFriends;
|
||||||
import engine.server.MBServerStatics;
|
import engine.server.MBServerStatics;
|
||||||
import engine.session.Session;
|
import engine.session.Session;
|
||||||
import org.pmw.tinylog.Logger;
|
import org.pmw.tinylog.Logger;
|
||||||
|
|||||||
@@ -14,7 +14,10 @@ import engine.gameManager.SessionManager;
|
|||||||
import engine.net.*;
|
import engine.net.*;
|
||||||
import engine.net.client.ClientConnection;
|
import engine.net.client.ClientConnection;
|
||||||
import engine.net.client.Protocol;
|
import engine.net.client.Protocol;
|
||||||
import engine.objects.*;
|
import engine.objects.Guild;
|
||||||
|
import engine.objects.GuildStatusController;
|
||||||
|
import engine.objects.PlayerCharacter;
|
||||||
|
import engine.objects.PromotionClass;
|
||||||
import engine.server.MBServerStatics;
|
import engine.server.MBServerStatics;
|
||||||
import org.pmw.tinylog.Logger;
|
import org.pmw.tinylog.Logger;
|
||||||
|
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -484,7 +484,7 @@ public class CharacterSkill extends AbstractGameObject {
|
|||||||
if (absChar == null && absChar.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) == false)
|
if (absChar == null && absChar.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) == false)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
PlayerCharacter pc = (PlayerCharacter)absChar;
|
PlayerCharacter pc = (PlayerCharacter) absChar;
|
||||||
|
|
||||||
ConcurrentHashMap<String, CharacterSkill> skills = pc.getSkills();
|
ConcurrentHashMap<String, CharacterSkill> skills = pc.getSkills();
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public class ItemTemplate {
|
|||||||
|
|
||||||
// Global template lookup
|
// Global template lookup
|
||||||
public static HashMap<Integer, ItemTemplate> templates = new HashMap<>();
|
public static HashMap<Integer, ItemTemplate> templates = new HashMap<>();
|
||||||
|
|
||||||
public int template_id;
|
public int template_id;
|
||||||
|
|
||||||
// Template Properties
|
// Template Properties
|
||||||
|
|||||||
@@ -1069,7 +1069,7 @@ public class NPC extends AbstractCharacter {
|
|||||||
for (Integer itemID : fullItemList) {
|
for (Integer itemID : fullItemList) {
|
||||||
itemTemplate = ItemTemplate.templates.get(itemID);
|
itemTemplate = ItemTemplate.templates.get(itemID);
|
||||||
|
|
||||||
if(itemTemplate.item_skill_required.values().iterator().hasNext())
|
if (itemTemplate.item_skill_required.values().iterator().hasNext())
|
||||||
skillRequired = itemTemplate.item_skill_required.values().iterator().next();
|
skillRequired = itemTemplate.item_skill_required.values().iterator().next();
|
||||||
|
|
||||||
boolean exclude = skillRequired == 0 && ItemTemplate.templates.get(itemID).item_type.equals(ItemType.WEAPON);
|
boolean exclude = skillRequired == 0 && ItemTemplate.templates.get(itemID).item_type.equals(ItemType.WEAPON);
|
||||||
|
|||||||
Reference in New Issue
Block a user