projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-12 22:45:31 -04:00
Code Issues Projects Releases Wiki Activity

Combat takes account of stat and stat_modified

Browse Source 
stat = base leveling stat
stat_modified = what equipment/buffs give
This commit is contained in:
Treeku
2013-11-07 06:59:06 +00:00
parent ba8a627d31
commit ded54ab12b
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+25 -1
View File
@@ -960,7 +960,31 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
}
public int getLuck() {
return (getSkillModBase("luck") + getSkillModBase("luck_modified"));
}
public int getPrecision() {
return (getSkillModBase("precision") + getSkillModBase("precision_modified"));
}
public int getStrength() {
return (getSkillModBase("strength") + getSkillModBase("strength_modified"));
}
public int getConstitution() {
return (getSkillModBase("constitution") + getSkillModBase("constitution_modified"));
}
public int getStamina() {
return (getSkillModBase("stamina") + getSkillModBase("stamina_modified"));
}
public int getAgility() {
return (getSkillModBase("agility") + getSkillModBase("agility_modified"));
}
public int getHealth() {
synchronized(objectMutex) {
return health;
src/services/combat/CombatService.java
+16 -16
View File
@@ -322,7 +322,7 @@ public class CombatService implements INetworkDispatch {
int armorAbsorbed = (int) (damageBeforeArmor - damage);
if(mitigationType == HitType.BLOCK) {
float blockValue = (attacker.getSkillMod("strength_modified").getBase() + attacker.getSkillMod("combat_block_value").getBase()) / 2 + 25;
float blockValue = (attacker.getStrength() + attacker.getSkillMod("combat_block_value").getBase()) / 2 + 25;
damage -= blockValue;
}
@@ -438,7 +438,7 @@ public class CombatService implements INetworkDispatch {
if(hitType == HitType.STRIKETHROUGH) {
float stMaxValue = attacker.getSkillMod("combat_strikethrough_value").getBase() / 2 + attacker.getSkillMod("luck_modified").getBase() / 10;
float stMaxValue = attacker.getSkillMod("combat_strikethrough_value").getBase() / 2 + attacker.getLuck() / 10;
if(stMaxValue > 99)
stMaxValue = 99;
float stMinValue = stMaxValue / 2;
@@ -531,10 +531,10 @@ public class CombatService implements INetworkDispatch {
weaponDmg *= command.getPercentFromWeapon();
rawDamage += weaponDmg;
if(weapon.isMelee() && attacker.getSkillMod("strength_modified") != null) {
if(weapon.isMelee()) {
if(attacker.getSkillMod("strength_modified").getBase() > 0) {
rawDamage += ((attacker.getSkillMod("strength_modified").getBase() / 100) * 33);
if(attacker.getStrength() > 0) {
rawDamage += ((attacker.getStrength() / 100) * 33);
}
}
@@ -548,10 +548,10 @@ public class CombatService implements INetworkDispatch {
weaponDmg *= command.getPercentFromWeapon();
rawDamage += weaponDmg;
if(weapon.isMelee() && attacker.getSkillMod("strength_modified") != null) {
if(weapon.isMelee()) {
if(attacker.getSkillMod("strength_modified").getBase() > 0) {
rawDamage += ((attacker.getSkillMod("strength_modified").getBase() / 100) * 33);
if(attacker.getStrength() > 0) {
rawDamage += ((attacker.getStrength() / 100) * 33);
}
}
@@ -596,10 +596,10 @@ public class CombatService implements INetworkDispatch {
weaponDmg *= command.getPercentFromWeapon();
rawDamage += weaponDmg;
if(weapon.isMelee() && attacker.getSkillMod("strength_modified") != null) {
if(weapon.isMelee()) {
if(attacker.getSkillMod("strength_modified").getBase() > 0) {
rawDamage += ((attacker.getSkillMod("strength_modified").getBase() / 100) * 33);
if(attacker.getStrength() > 0) {
rawDamage += ((attacker.getStrength() / 100) * 33);
}
}
@@ -613,10 +613,10 @@ public class CombatService implements INetworkDispatch {
weaponDmg *= command.getPercentFromWeapon();
rawDamage += weaponDmg;
if(weapon.isMelee() && attacker.getSkillMod("strength_modified") != null) {
if(weapon.isMelee()) {
if(attacker.getSkillMod("strength_modified").getBase() > 0) {
rawDamage += ((attacker.getSkillMod("strength_modified").getBase() / 100) * 33);
if(attacker.getStrength() > 0) {
rawDamage += ((attacker.getStrength() / 100) * 33);
}
}
@@ -636,8 +636,8 @@ public class CombatService implements INetworkDispatch {
if(weapon.isRanged()) {
float missChance = 0.05f;
if(attacker.getSkillMod("strength_modified").getBase() > 0) {
float missNegation = (float) ((attacker.getSkillMod("strength_modified").getBase() / 100) * 0.1);
if(attacker.getStrength() > 0) {
float missNegation = (float) ((attacker.getStrength() / 100) * 0.1);
if(missNegation > 0.04f)
missNegation = 0.04f;
missChance -= missNegation;