From 3e083fc2996627f98fb26c2ae2ee233faef8e57a Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 7 May 2015 01:21:00 -0400
Subject: [PATCH] v0.3.0: renamed wand of firebolt to wand of fireblast

---
 .../shatteredpixeldungeon/actors/mobs/Elemental.java         | 4 ++--
 .../shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java    | 5 ++---
 .../shatteredpixeldungeon/items/Generator.java               | 2 +-
 .../wands/{WandOfFirebolt.java => WandOfFireblast.java}      | 5 ++---
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename src/com/shatteredpixel/shatteredpixeldungeon/items/wands/{WandOfFirebolt.java => WandOfFireblast.java} (98%)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
index befec4c1d..ea38cba89 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
@@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Chill;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame;
-import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFirebolt;
+import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Fire;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ElementalSprite;
@@ -102,7 +102,7 @@ public class Elemental extends Mob {
 	static {
 		IMMUNITIES.add( Burning.class );
 		IMMUNITIES.add( Fire.class );
-		IMMUNITIES.add( WandOfFirebolt.class );
+		IMMUNITIES.add( WandOfFireblast.class );
 	}
 	
 	@Override
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
index a7c294cf4..21ee75923 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
@@ -35,7 +35,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
-import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
 import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
@@ -43,7 +42,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAmok;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAvalanche;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration;
-import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFirebolt;
+import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLightning;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPoison;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth;
@@ -239,7 +238,7 @@ public class Wandmaker extends NPC {
 					wand1 = new WandOfDisintegration();
 					break;
 				case 2:
-					wand1 = new WandOfFirebolt();
+					wand1 = new WandOfFireblast();
 					break;
 				case 3:
 					wand1 = new WandOfLightning();
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
index ca8fd656d..d02ea4e9a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
@@ -118,7 +118,7 @@ public class Generator {
 		Category.WAND.classes = new Class<?>[]{ 
 			WandOfTeleportation.class, 
 			WandOfSlowness.class,
-			WandOfFirebolt.class,
+			WandOfFireblast.class,
 			WandOfRegrowth.class,
 			WandOfPoison.class,
 			WandOfBlink.class,
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java
similarity index 98%
rename from src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java
rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java
index 4692c21af..ccfcd8494 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java
@@ -37,11 +37,10 @@ import com.watabou.utils.Random;
 
 import java.util.HashSet;
 
-//TODO: rename to fireblast
-public class WandOfFirebolt extends Wand {
+public class WandOfFireblast extends Wand {
 
 	{
-		name = "Wand of Firebolt";
+		name = "Wand of Fireblast";
 		image = ItemSpriteSheet.WAND_FIREBOLT;
 
 		collisionProperties = Ballistica.STOP_TERRAIN;