OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'rebalancing' into nut_test_brimhaven

Browse Source 
# Conflicts:
#	AndorsTrail/res/raw/itemlist_v069_questitems.json
This commit is contained in:
Gonk
2020-03-29 15:47:21 +02:00
parent 723816dd1d 18b9a86416
commit 2e0198d902
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
View File

@@ -92,8 +92,9 @@ public final class AbilityModifierInfoView extends LinearLayout {
abilitymodifierinfo_change_attack_damage.setVisibility(View.VISIBLE);
}
if (traits.setNonWeaponDamageModifier > 0 && traits.setNonWeaponDamageModifier != 100) {
abilitymodifierinfo_set_damage_modifier.setText(res.getString(R.string.iteminfo_effect_set_damage_modifier, traits.setNonWeaponDamageModifier));
if (isWeapon) {
final int nonWeaponDamageModifier = traits.setNonWeaponDamageModifier > 0 ? traits.setNonWeaponDamageModifier : 100;
abilitymodifierinfo_set_damage_modifier.setText(res.getString(R.string.iteminfo_effect_set_damage_modifier, nonWeaponDamageModifier));
abilitymodifierinfo_set_damage_modifier.setVisibility(View.VISIBLE);
}
}