BadBird
/
BattleBane
forked from MagicBane/Server
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
Browse Source

mob work

lakebane-questing
FatBoy-DOTC 10 months ago
parent
d0efd08a84
commit
537512ed5d
3 changed files with 95 additions and 217 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/engine/devcmd/cmds/InfoCmd.java
  2. 204
      src/engine/objects/Mob.java
  3. 2
      src/engine/powers/poweractions/ApplyEffectPowerAction.java

4
src/engine/devcmd/cmds/InfoCmd.java
Unescape View File

@ -500,8 +500,8 @@ public class InfoCmd extends AbstractDevCmd {
output += "Damage: " + targetMob.mobBase.getDamageMin() + " - " + targetMob.mobBase.getDamageMax() + newline; output += "Damage: " + targetMob.mobBase.getDamageMin() + " - " + targetMob.mobBase.getDamageMax() + newline;
output += "ATR: " + targetMob.mobBase.getAttackRating() + newline; output += "ATR: " + targetMob.mobBase.getAttackRating() + newline;
output += "DEF: " + targetMob.mobBase.getDefenseRating() + newline; output += "DEF: " + targetMob.defenseRating + newline;
output += "RANGE: " + targetMob.mobBase.getAttackRange() + newline; output += "RANGE: " + targetMob.getRange() + newline;
output += "Effects:" + newline; output += "Effects:" + newline;
for(MobBaseEffects mbe : targetMob.mobBase.mobbaseEffects){ for(MobBaseEffects mbe : targetMob.mobBase.mobbaseEffects){
EffectsBase eb = PowersManager.getEffectByToken(mbe.getToken()); EffectsBase eb = PowersManager.getEffectByToken(mbe.getToken());

204
src/engine/objects/Mob.java
Unescape View File

@ -1638,7 +1638,7 @@ public class Mob extends AbstractIntelligenceAgent {
this.defenseRating = defense; this.defenseRating = defense;
this.atrHandOne = atr; this.atrHandOne = atr;
return; return;
} }else {
if (this.charItemManager == null || this.equip == null) { if (this.charItemManager == null || this.equip == null) {
Logger.error("Player " + currentID + " missing skills or equipment"); Logger.error("Player " + currentID + " missing skills or equipment");
defaultAtrAndDamage(true); defaultAtrAndDamage(true);
@ -1685,7 +1685,7 @@ public class Mob extends AbstractIntelligenceAgent {
// TODO add error log here // TODO add error log here
if (this.bonuses != null) { if (this.bonuses != null) {
defense = GetDefense((int)defense, this); defense = GetDefense((int) defense, this);
} else } else
Logger.error("Error: missing bonuses"); Logger.error("Error: missing bonuses");
@ -1697,7 +1697,7 @@ public class Mob extends AbstractIntelligenceAgent {
this.defenseRating = (short) this.mobBase.getDefense(); this.defenseRating = (short) this.mobBase.getDefense();
} }
// calculate defense for equipment // calculate defense for equipment
}
if(this.isDropper || Mob.discDroppers.contains(this)){ if(this.isDropper || Mob.discDroppers.contains(this)){
this.defenseRating *= 2; this.defenseRating *= 2;
this.atrHandOne *= 2; this.atrHandOne *= 2;
@ -1842,168 +1842,46 @@ public class Mob extends AbstractIntelligenceAgent {
private void calculateAtrDamageForWeapon(MobEquipment weapon, boolean mainHand) { private void calculateAtrDamageForWeapon(MobEquipment weapon, boolean mainHand) {
int baseStrength = 0; if(mainHand){
int min = (int)this.mobBase.getDamageMin();
float skillPercentage, masteryPercentage; int max = (int)this.mobBase.getDamageMax();
float mastDam; int atr = this.mobBase.getAtr();
if(this.bonuses != null){
// make sure weapon exists min *= 1 + this.bonuses.getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
max *= 1 + this.bonuses.getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
boolean noWeapon = false; atr *= 1 + this.bonuses.getFloatPercentAll(ModType.OCV,SourceType.None);
ItemBase wb = null; atr += this.bonuses.getFloat(ModType.OCV,SourceType.None);
}
if (weapon == null) this.minDamageHandOne = min;
noWeapon = true; this.maxDamageHandOne = max;
this.atrHandOne = atr;
else { if(weapon == null){
ItemBase ib = weapon.getItemBase();
if (ib == null)
noWeapon = true;
else if (ib.getType().equals(ItemType.WEAPON) == false) {
defaultAtrAndDamage(mainHand);
return;
} else
wb = ib;
}
float min, max;
float speed;
boolean strBased = false;
// get skill percentages and min and max damage for weapons
if (noWeapon) {
if (mainHand)
this.rangeHandOne = this.mobBase.getAttackRange(); this.rangeHandOne = this.mobBase.getAttackRange();
else this.speedHandTwo = 20.0f;
this.rangeHandTwo = -1; // set to do not attack }else{
this.rangeHandOne = weapon.getItemBase().getRange();
skillPercentage = getModifiedAmount(this.skills.get("Unarmed Combat")); this.speedHandTwo = weapon.getItemBase().getSpeed();
masteryPercentage = getModifiedAmount(this.skills.get("Unarmed Combat Mastery")); }
}else{
if (masteryPercentage == 0f) int min = (int)this.mobBase.getDamageMin();
mastDam = CharacterSkill.getQuickMastery(this, "Unarmed Combat Mastery"); int max = (int)this.mobBase.getDamageMax();
else int atr = this.mobBase.getAtr();
mastDam = masteryPercentage; if(this.bonuses != null){
min *= 1 + this.bonuses.getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
// TODO Correct these max *= 1 + this.bonuses.getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
min = this.mobBase.getMinDmg(); atr *= 1 + this.bonuses.getFloatPercentAll(ModType.OCV,SourceType.None);
max = this.mobBase.getMaxDmg(); atr += this.bonuses.getFloat(ModType.OCV,SourceType.None);
} else { }
this.minDamageHandTwo = min;
if (mainHand) this.maxDamageHandTwo = max;
this.rangeHandOne = weapon.getItemBase().getRange() * (1 + (baseStrength / 600.0f)); this.atrHandTwo = atr;
else if(weapon == null){
this.rangeHandTwo = weapon.getItemBase().getRange() * (1 + (baseStrength / 600.0f)); this.rangeHandTwo = this.mobBase.getAttackRange();
this.speedHandTwo = 20.0f;
skillPercentage = getModifiedAmount(this.skills.get(wb.getSkillRequired())); }else{
masteryPercentage = getModifiedAmount(this.skills.get(wb.getMastery())); this.rangeHandTwo = weapon.getItemBase().getRange();
this.speedHandTwo = weapon.getItemBase().getSpeed();
if (masteryPercentage == 0f)
mastDam = 0f;
else
mastDam = masteryPercentage;
min = wb.getMinDamage();
max = wb.getMaxDamage();
strBased = wb.isStrBased();
} }
// calculate atr
float atr = this.mobBase.getAttackRating();
if (this.statStrCurrent > this.statDexCurrent)
atr += statStrCurrent * .5;
else
atr += statDexCurrent * .5;
// add in any bonuses to atr
if (this.bonuses != null) {
atr += this.bonuses.getFloat(ModType.OCV, SourceType.None);
// Finally use any multipliers. DO THIS LAST!
float pos_Bonus = 1 + this.bonuses.getFloatPercentPositive(ModType.OCV, SourceType.None);
atr *= pos_Bonus;
//and negative percent modifiers
//TODO DO DEBUFFS AFTER?? wILL TEst when finished
float neg_Bonus = this.bonuses.getFloatPercentNegative(ModType.OCV, SourceType.None);
atr *= (1 + neg_Bonus);
}
atr = (atr < 1) ? 1 : atr;
// set atr
if (mainHand)
this.atrHandOne = (short) (atr + 0.5f);
else
this.atrHandTwo = (short) (atr + 0.5f);
//calculate speed
if (wb != null)
speed = wb.getSpeed();
else
speed = 20f; //unarmed attack speed
if (this.bonuses != null && this.bonuses.getFloat(ModType.AttackDelay, SourceType.None) != 0f) //add effects speed bonus
speed *= (1 + this.bonuses.getFloatPercentAll(ModType.AttackDelay, SourceType.None));
if (speed < 10)
speed = 10;
//add min/max damage bonuses for weapon **REMOVED
//if duel wielding, cut damage by 30%
// calculate damage
float minDamage;
float maxDamage;
float pri = (strBased) ? (float) this.statStrCurrent : (float) this.statDexCurrent;
float sec = (strBased) ? (float) this.statDexCurrent : (float) this.statStrCurrent;
minDamage = (float) (min * ((0.0315f * Math.pow(pri, 0.75f)) + (0.042f * Math.pow(sec, 0.75f)) + (0.01f * ((int) skillPercentage + (int) mastDam))));
maxDamage = (float) (max * ((0.0785f * Math.pow(pri, 0.75f)) + (0.016f * Math.pow(sec, 0.75f)) + (0.0075f * ((int) skillPercentage + (int) mastDam))));
minDamage = (float) ((int) (minDamage + 0.5f)); //round to nearest decimal
maxDamage = (float) ((int) (maxDamage + 0.5f)); //round to nearest decimal
//add Base damage last.
float minDamageMod = this.mobBase.getDamageMin();
float maxDamageMod = this.mobBase.getDamageMax();
minDamage += minDamageMod;
maxDamage += maxDamageMod;
// add in any bonuses to damage
if (this.bonuses != null) {
// Add any base bonuses
minDamage += this.bonuses.getFloat(ModType.MinDamage, SourceType.None);
maxDamage += this.bonuses.getFloat(ModType.MaxDamage, SourceType.None);
// Finally use any multipliers. DO THIS LAST!
minDamage *= (1 + this.bonuses.getFloatPercentAll(ModType.MinDamage, SourceType.None));
maxDamage *= (1 + this.bonuses.getFloatPercentAll(ModType.MaxDamage, SourceType.None));
}
// set damages
if (mainHand) {
this.minDamageHandOne = (short) minDamage;
this.maxDamageHandOne = (short) maxDamage;
this.speedHandOne = 30;
} else {
this.minDamageHandTwo = (short) minDamage;
this.maxDamageHandTwo = (short) maxDamage;
this.speedHandTwo = 30;
} }
} }

2
src/engine/powers/poweractions/ApplyEffectPowerAction.java
Unescape View File

@ -130,7 +130,7 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
((Mob) awo).setCombatTarget(source); ((Mob) awo).setCombatTarget(source);
ChatSystemMsg msg = ChatManager.CombatInfo(source, awo); ChatSystemMsg msg = ChatManager.CombatInfo(source, awo);
DispatchMessage.sendToAllInRange(source, msg); DispatchMessage.sendToAllInRange(source, msg);
((Mob)awo).refresh(); //((Mob)awo).refresh();
} }
} }
if (awo != null && awo.getObjectType() == GameObjectType.Mob) { if (awo != null && awo.getObjectType() == GameObjectType.Mob) {

Write Preview
Loading…
Cancel
Save