From 255c98b1482749ad89afaed97445a0bb204b015a Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 10 Sep 2014 15:50:28 -0400
Subject: [PATCH] V0.2.0: renamed Ring of Power to Ring of Magic

---
 .../shatteredpixeldungeon/items/Generator.java       |  2 +-
 .../shatteredpixeldungeon/items/rings/Ring.java      |  2 +-
 .../rings/{RingOfPower.java => RingOfMagic.java}     | 12 ++++++------
 .../shatteredpixeldungeon/items/wands/Wand.java      |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/com/shatteredpixel/shatteredpixeldungeon/items/rings/{RingOfPower.java => RingOfMagic.java} (78%)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
index 000c1bed4..46c85aaf3 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
@@ -165,7 +165,7 @@ public class Generator {
 			//RingOfMending.class,
 			//RingOfDetection.class,
 			//RingOfShadows.class,
-			RingOfPower.class,
+			RingOfMagic.class,
 			//RingOfHerbalism.class,
 			RingOfAccuracy.class,
 			RingOfEvasion.class,
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
index 99819d370..f45bc11d7 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
@@ -46,7 +46,7 @@ public class Ring extends KindofMisc {
 		//RingOfMending.class,
 		//RingOfDetection.class,
 		//RingOfShadows.class,
-		RingOfPower.class,
+		RingOfMagic.class,
 		//RingOfHerbalism.class,
 		RingOfAccuracy.class,
 		RingOfEvasion.class,
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfPower.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java
similarity index 78%
rename from src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfPower.java
rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java
index 8cd881022..572983ed7 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfPower.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java
@@ -17,25 +17,25 @@
  */
 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
 	protected RingBuff buff( ) {
-		return new Power();
+		return new Magic();
 	}
 	
 	@Override
 	public String desc() {
 		return isKnown() ?
-			"Your wands will become more powerful in the energy field " +
-			"that radiates from this ring. Degraded rings of power will instead weaken your wands." :
+			"Your wands will become more powerful in the arcane field " +
+			"that radiates from this ring. Degraded rings of magic will instead weaken your wands." :
 			super.desc();
 	}
 	
-	public class Power extends RingBuff {
+	public class Magic extends RingBuff {
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
index 808736902..45a864354 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
@@ -34,7 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler;
 import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
 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.scenes.CellSelector;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
@@ -210,8 +210,8 @@ public abstract class Wand extends KindOfWeapon {
 	
 	public int level() {
 		if (charger != null) {
-			Power power = charger.target.buff( Power.class );
-			return power == null ? level : Math.max( level + power.level, 0 ); 
+			Magic magic = charger.target.buff( Magic.class );
+			return magic == null ? level : Math.max( level + magic.level, 0 );
 		} else {
 			return level;
 		}