LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.1: adjusted ring of force, no longer works with thrown weapons

Browse Source
This commit is contained in:
Evan Debenham 2018-12-12 18:16:50 -05:00
parent bc5372a4ca
commit 1ace437283
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,8 @@ public class Hero extends Char {
int dmg;
if (wep != null) {
dmg = wep.damageRoll( this ) + RingOfForce.armedDamageBonus(this);
dmg = wep.damageRoll( this );
if (!(wep instanceof MissileWeapon)) dmg += RingOfForce.armedDamageBonus(this);
} else {
dmg = RingOfForce.damageRoll(this);
}

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

@ -81,9 +81,9 @@ public class RingOfForce extends Ring {
public String statsInfo() {
float tier = tier(Dungeon.hero.STR());
if (isIdentified()) {
return Messages.get(this, "stats", min(soloBonus(), tier), max(soloBonus(), tier));
return Messages.get(this, "stats", min(soloBonus(), tier), max(soloBonus(), tier), soloBonus());
} else {
return Messages.get(this, "typical_stats", min(1, tier), max(1, tier));
return Messages.get(this, "typical_stats", min(1, tier), max(1, tier), 1);
}
}

6
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -749,9 +749,9 @@ items.rings.ringofevasion.typical_stats=When worn, this ring will typically incr
items.rings.ringofevasion.desc=This ring quickens the wearer's reactions, making it harder to land blows on them. A cursed ring will instead make the user easier to strike.
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._
items.rings.ringofforce.typical_stats=When unarmed, at your current strength, typically this ring will deal _%1$d-%2$d damage._
items.rings.ringofforce.desc=This ring enhances the force of the wearer's 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.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.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.ringoffuror.name=ring of furor
items.rings.ringoffuror.stats=When worn, this ring will increase the speed of your attacks by _%s%%._