From ed4fd97e1c35b0901c54bcda4d078bf9cadabaff Mon Sep 17 00:00:00 2001 From: Zukero Date: Fri, 11 Aug 2017 13:10:01 +0200 Subject: [PATCH 1/2] Cleaner formula for previous dual-wield fix. --- .../com/gpl/rpg/AndorsTrail/controller/SkillController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java index beba1ef9c..b7845b2ef 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java @@ -331,9 +331,7 @@ public final class SkillController { } else if (skillLevelFightStyle == 1) { percent = SkillCollection.DUALWIELD_EFFICIENCY_LEVEL1; //Take into account the case where the worst weapon AP-wise is in the off-hand. - playerTraits.attackCost = Math.max( - attackCostMainHand + getPercentage(attackCostOffHand, SkillCollection.DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT, 0), - attackCostOffHand + getPercentage(attackCostMainHand, SkillCollection.DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT, 0)); + playerTraits.attackCost = Math.max(attackCostMainHand, attackCostOffHand) + getPercentage( Math.min(attackCostMainHand, attackCostOffHand), SkillCollection.DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT, 0); playerTraits.criticalMultiplier = Math.max(mainHandItem.effects_equip.stats.setCriticalMultiplier, getPercentage(offHandItem.effects_equip.stats.setCriticalMultiplier, SkillCollection.DUALWIELD_EFFICIENCY_LEVEL1, 0)); } else { percent = SkillCollection.DUALWIELD_EFFICIENCY_LEVEL0; From 101d722ae6cb2e9f09974d381844ee62f7673889 Mon Sep 17 00:00:00 2001 From: Carceris Magister Date: Wed, 16 Aug 2017 17:54:09 -0400 Subject: [PATCH 2/2] Fixed dangling reference in Mikhail's conversation list. --- AndorsTrail/res/values/loadresources.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml index 72b8bbfc7..f08a8ddaa 100644 --- a/AndorsTrail/res/values/loadresources.xml +++ b/AndorsTrail/res/values/loadresources.xml @@ -81,6 +81,7 @@ @raw/conversationlist_mikhail + @raw/conversationlist_mikhail_foodpoison @raw/conversationlist_crossglen @raw/conversationlist_crossglen_gruil @raw/conversationlist_crossglen_leonid