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

v0.3.0: renamed wand of firebolt to wand of fireblast

Browse Source
This commit is contained in:
Evan Debenham 2015-05-07 01:21:00 -04:00
parent 9b280400c6
commit 3e083fc299
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
View File

@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Chill;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; 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.items.weapon.enchantments.Fire;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ElementalSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ElementalSprite;
@ -102,7 +102,7 @@ public class Elemental extends Mob {
static { static {
IMMUNITIES.add( Burning.class ); IMMUNITIES.add( Burning.class );
IMMUNITIES.add( Fire.class ); IMMUNITIES.add( Fire.class );
IMMUNITIES.add( WandOfFirebolt.class ); IMMUNITIES.add( WandOfFireblast.class );
} }
@Override @Override

5
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
View File

@ -35,7 +35,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; 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.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust; import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; 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.WandOfAvalanche;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; 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.WandOfLightning;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPoison; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPoison;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth;
@ -239,7 +238,7 @@ public class Wandmaker extends NPC {
wand1 = new WandOfDisintegration(); wand1 = new WandOfDisintegration();
break; break;
case 2: case 2:
wand1 = new WandOfFirebolt(); wand1 = new WandOfFireblast();
break; break;
case 3: case 3:
wand1 = new WandOfLightning(); wand1 = new WandOfLightning();

2
src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
View File

@ -118,7 +118,7 @@ public class Generator {
Category.WAND.classes = new Class<?>[]{ Category.WAND.classes = new Class<?>[]{
WandOfTeleportation.class, WandOfTeleportation.class,
WandOfSlowness.class, WandOfSlowness.class,
WandOfFirebolt.class, WandOfFireblast.class,
WandOfRegrowth.class, WandOfRegrowth.class,
WandOfPoison.class, WandOfPoison.class,
WandOfBlink.class, WandOfBlink.class,

5
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java → src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java
View File

@ -37,11 +37,10 @@ import com.watabou.utils.Random;
import java.util.HashSet; import java.util.HashSet;
//TODO: rename to fireblast public class WandOfFireblast extends Wand {
public class WandOfFirebolt extends Wand {
{ {
name = "Wand of Firebolt"; name = "Wand of Fireblast";
image = ItemSpriteSheet.WAND_FIREBOLT; image = ItemSpriteSheet.WAND_FIREBOLT;
collisionProperties = Ballistica.STOP_TERRAIN; collisionProperties = Ballistica.STOP_TERRAIN;