From 0c376442bb76abfcdc351fcbdbf9da4c64dade14 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sun, 24 Jun 2012 09:51:25 +0200 Subject: [PATCH] Armor proficiencies should not affect items with negative stats. --- .../gpl/rpg/AndorsTrail/controller/SkillController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java index 6223c0015..9106d6ddf 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java @@ -232,13 +232,13 @@ public final class SkillController { int skill = getProficiencySkillForItemCategory(itemType.category); if (skill == SkillCollection.SKILL_ARMOR_PROFICIENCY_LIGHT) { if (skillLevelLightArmor > 0) { - playerTraits.blockChance += FloatMath.floor(itemType.effects_equip.combatProficiency.blockChance * 30 * skillLevelLightArmor / 100.0f); + playerTraits.blockChance += getPercentage(itemType.effects_equip.combatProficiency.blockChance, 30 * skillLevelLightArmor); } } else if (skill == SkillCollection.SKILL_ARMOR_PROFICIENCY_HEAVY) { if (skillLevelHeavyArmor > 0) { - playerTraits.blockChance += FloatMath.floor(itemType.effects_equip.combatProficiency.blockChance * 10 * skillLevelHeavyArmor / 100.0f); - player.actorTraits.moveCost -= FloatMath.floor(itemType.effects_equip.moveCostPenalty * 25 * skillLevelHeavyArmor / 100.0f); - playerTraits.attackCost -= FloatMath.floor(itemType.effects_equip.combatProficiency.attackCost * 25 * skillLevelHeavyArmor / 100.0f); + playerTraits.blockChance += getPercentage(itemType.effects_equip.combatProficiency.blockChance, 10 * skillLevelHeavyArmor); + player.actorTraits.moveCost -= getPercentage(itemType.effects_equip.moveCostPenalty, 25 * skillLevelHeavyArmor); + playerTraits.attackCost -= getPercentage(itemType.effects_equip.combatProficiency.attackCost, 25 * skillLevelHeavyArmor); } } }