V0.2.0: renamed Ring of Power to Ring of Magic

This commit is contained in:
Evan Debenham 2014-09-10 15:50:28 -04:00
parent 4ded3553b8
commit 255c98b148
4 changed files with 11 additions and 11 deletions

View File

@ -165,7 +165,7 @@ public class Generator {
//RingOfMending.class, //RingOfMending.class,
//RingOfDetection.class, //RingOfDetection.class,
//RingOfShadows.class, //RingOfShadows.class,
RingOfPower.class, RingOfMagic.class,
//RingOfHerbalism.class, //RingOfHerbalism.class,
RingOfAccuracy.class, RingOfAccuracy.class,
RingOfEvasion.class, RingOfEvasion.class,

View File

@ -46,7 +46,7 @@ public class Ring extends KindofMisc {
//RingOfMending.class, //RingOfMending.class,
//RingOfDetection.class, //RingOfDetection.class,
//RingOfShadows.class, //RingOfShadows.class,
RingOfPower.class, RingOfMagic.class,
//RingOfHerbalism.class, //RingOfHerbalism.class,
RingOfAccuracy.class, RingOfAccuracy.class,
RingOfEvasion.class, RingOfEvasion.class,

View File

@ -17,25 +17,25 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items.rings; package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfPower extends Ring { public class RingOfMagic extends Ring {
{ {
name = "Ring of Power"; name = "Ring of Magic";
} }
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Power(); return new Magic();
} }
@Override @Override
public String desc() { public String desc() {
return isKnown() ? return isKnown() ?
"Your wands will become more powerful in the energy field " + "Your wands will become more powerful in the arcane field " +
"that radiates from this ring. Degraded rings of power will instead weaken your wands." : "that radiates from this ring. Degraded rings of magic will instead weaken your wands." :
super.desc(); super.desc();
} }
public class Power extends RingBuff { public class Magic extends RingBuff {
} }
} }

View File

@ -34,7 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler; import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler;
import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfPower.Power; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfMagic.Magic;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
@ -210,8 +210,8 @@ public abstract class Wand extends KindOfWeapon {
public int level() { public int level() {
if (charger != null) { if (charger != null) {
Power power = charger.target.buff( Power.class ); Magic magic = charger.target.buff( Magic.class );
return power == null ? level : Math.max( level + power.level, 0 ); return magic == null ? level : Math.max( level + magic.level, 0 );
} else { } else {
return level; return level;
} }