konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed inconsistencies in text for brawler's stance charge use

Browse Source
This commit is contained in:
Evan Debenham
2023-01-28 12:48:17 -05:00
committed by Evan Debenham
parent e591debc6e
commit 03b3ab6eda
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/assets/messages/items/items.properties
View File

@@ -901,7 +901,7 @@ items.rings.ringofforce.name=ring of force
items.rings.ringofforce.stats=When unarmed, at your current strength, this ring will deal _%1$d-%2$d damage._ With a weapon equipped, this ring will increase damage by _%3$d._
items.rings.ringofforce.typical_stats=When unarmed, at your current strength, typically this ring will deal _%1$d-%2$d damage._ With a weapon equipped, typically this ring will increase damage by _%3$d._
items.rings.ringofforce.ability_name=brawler's stance
items.rings.ringofforce.ability_desc=The Duelist can adopt a _brawler's stance_ with a ring of force. While in this stance the Duelist's regular attacks will use her ring of force even with a weapon equipped. The ring will also inherit the weapon's enchantment and augmentation. Each regular attack in this stance consumes 1/3 of a weapon charge.
items.rings.ringofforce.ability_desc=The Duelist can adopt a _brawler's stance_ with a ring of force. While in this stance the Duelist's regular attacks will use her ring of force even with a weapon equipped. The ring will also inherit the weapon's enchantment and augmentation. Each regular attack in this stance consumes 1/4 of a weapon charge.
items.rings.ringofforce.desc=This ring enhances the force of the wearer's melee blows. This extra power is fairly weak when wielding weapons, but an unarmed attack will be made much stronger. A cursed ring will instead weaken the wearer's blows.
items.rings.ringofforce$brawlersstance.name=brawler's stance
items.rings.ringofforce$brawlersstance.desc=While in this stance the Duelist's regular attacks will use an equipped ring of force even when she has a weapon equipped. The attack will still use the weapon's augmentation and enchantment however.\n\nEach regular attack in this stance consumes 1/4 of a weapon charge. You currently have enough charge for %d attacks.\n\nThis stance can be toggled on or off by using a ring of force.

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@@ -1967,7 +1967,7 @@ public class Hero extends Char {
RingOfForce.BrawlersStance brawlStance = buff(RingOfForce.BrawlersStance.class);
if (brawlStance != null && brawlStance.hitsLeft() > 0){
MeleeWeapon.Charger charger = Buff.affect(this, MeleeWeapon.Charger.class);
charger.partialCharge -= 0.25f;
charger.partialCharge -= RingOfForce.BrawlersStance.HIT_CHARGE_USE;
while (charger.partialCharge < 0) {
charger.charges--;
charger.partialCharge++;

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java
View File

@@ -155,7 +155,8 @@ public class RingOfForce extends Ring {
} else if (!isEquipped(hero)) {
GLog.w(Messages.get(MeleeWeapon.class, "ability_need_equip"));
} else if ((Buff.affect(hero, MeleeWeapon.Charger.class).charges + Buff.affect(hero, MeleeWeapon.Charger.class).partialCharge) < 0.333f){
} else if ((Buff.affect(hero, MeleeWeapon.Charger.class).charges + Buff.affect(hero, MeleeWeapon.Charger.class).partialCharge)
< BrawlersStance.HIT_CHARGE_USE){
GLog.w(Messages.get(MeleeWeapon.class, "ability_no_charge"));
} else {