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

v0.4.0: renamed glyph of bounce

Browse Source
This commit is contained in:
Evan Debenham 2016-06-03 22:07:08 -04:00
parent b8712493c0
commit 47389c9cb7
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -142,6 +142,9 @@ public class ShatteredPixelDungeon extends Game {
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Chilling.class,
"com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Slow" );
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Repulsion.class,
"com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Bounce" );
}

8
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
View File

@ -31,12 +31,12 @@ import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Affection;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.AntiEntropy;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Bounce;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Displacement;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Entanglement;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Metabolism;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Multiplicity;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Potential;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Repulsion;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Stench;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Viscosity;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@ -391,7 +391,7 @@ public class Armor extends EquipableItem {
public static abstract class Glyph implements Bundlable {
private static final Class<?>[] glyphs = new Class<?>[]{
Bounce.class, Affection.class, AntiEntropy.class, Multiplicity.class,
Repulsion.class, Affection.class, AntiEntropy.class, Multiplicity.class,
Potential.class, Metabolism.class, Stench.class, Viscosity.class,
Displacement.class, Entanglement.class };
@ -415,9 +415,7 @@ public class Armor extends EquipableItem {
public void storeInBundle( Bundle bundle ) {
}
public ItemSprite.Glowing glowing() {
return ItemSprite.Glowing.WHITE;
}
public abstract ItemSprite.Glowing glowing();
public boolean checkOwner( Char owner ) {
if (!owner.isAlive() && owner instanceof Hero) {

9
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java → src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Repulsion.java
View File

@ -28,9 +28,12 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.watabou.utils.Random;
public class Bounce extends Glyph {
public class Repulsion extends Glyph {
private static ItemSprite.Glowing WHITE = new ItemSprite.Glowing( 0xFFFFFF );
@Override
public int proc( Armor armor, Char attacker, Char defender, int damage) {
@ -67,4 +70,8 @@ public class Bounce extends Glyph {
return damage;
}
@Override
public ItemSprite.Glowing glowing() {
return WHITE;
}
}

4
src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -3,8 +3,6 @@ items.armor.glyphs.affection.name=%s of affection
items.armor.glyphs.antientropy.name=%s of anti-entropy
items.armor.glyphs.bounce.name=%s of bounce
items.armor.glyphs.displacement.name=%s of displacement
items.armor.glyphs.entanglement.name=%s of entanglement
@ -17,6 +15,8 @@ items.armor.glyphs.multiplicity.rankings_desc=Killed by: glyph of multiplicity
items.armor.glyphs.potential.name=%s of potential
items.armor.glyphs.potential.rankings_desc=Killed by: glyph of potential
items.armor.glyphs.repulsion.name=%s of repulsion
items.armor.glyphs.stench.name=%s of stench
items.armor.glyphs.viscosity.name=%s of viscosity