konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.3.5: renamed broken sigil to broken seal

Browse Source
This commit is contained in:
Evan Debenham
2016-04-10 19:21:30 -04:00
parent 828a69f5b1
commit 6593165b96
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSigil.java → src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java
+6 -6
View File
@@ -14,7 +14,7 @@ import com.watabou.noosa.audio.Sample;
import java.util.ArrayList;
public class BrokenSigil extends Item {
public class BrokenSeal extends Item {
public static final String AC_AFFIX = "AFFIX";
@@ -54,21 +54,21 @@ public class BrokenSigil extends Item {
if (item != null && item instanceof Armor) {
Armor armor = (Armor)item;
if (!armor.levelKnown){
GLog.w(Messages.get(BrokenSigil.class, "unknown_armor"));
GLog.w(Messages.get(BrokenSeal.class, "unknown_armor"));
} else if (armor.cursed || armor.level() < 0){
GLog.w(Messages.get(BrokenSigil.class, "degraded_armor"));
GLog.w(Messages.get(BrokenSeal.class, "degraded_armor"));
} else {
GLog.p(Messages.get(BrokenSigil.class, "affix"));
GLog.p(Messages.get(BrokenSeal.class, "affix"));
Dungeon.hero.sprite.operate(Dungeon.hero.pos);
Sample.INSTANCE.play(Assets.SND_UNLOCK);
armor.affixSigil((BrokenSigil)curItem);
armor.affixSigil((BrokenSeal)curItem);
curItem.detach(Dungeon.hero.belongings.backpack);
}
}
}
};
public static class SigilShield extends Buff {
public static class WarriorShield extends Buff {
private Armor armor;
private float partialShield;
src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
+7 -7
View File
@@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSigil;
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Affection;
@@ -114,10 +114,10 @@ public class Armor extends EquipableItem {
public void execute(Hero hero, String action) {
if (action.equals(AC_DETACH) && sigil){
sigil = false;
BrokenSigil.SigilShield sigilBuff = hero.buff(BrokenSigil.SigilShield.class);
BrokenSeal.WarriorShield sigilBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sigilBuff != null) sigilBuff.setArmor(null);
BrokenSigil sigil = new BrokenSigil();
BrokenSeal sigil = new BrokenSeal();
if (level() > 0){
sigil.upgrade();
degrade();
@@ -163,17 +163,17 @@ public class Armor extends EquipableItem {
@Override
public void activate(Char ch) {
if (sigil) Buff.affect(ch, BrokenSigil.SigilShield.class).setArmor(this);
if (sigil) Buff.affect(ch, BrokenSeal.WarriorShield.class).setArmor(this);
}
public void affixSigil(BrokenSigil sigil){
public void affixSigil(BrokenSeal sigil){
this.sigil = true;
if (sigil.level() > 0){
//doesn't override existing glyphs, but doesn't create one either
upgrade(glyph != null);
}
if (isEquipped(Dungeon.hero)){
Buff.affect(Dungeon.hero, BrokenSigil.SigilShield.class).setArmor(this);
Buff.affect(Dungeon.hero, BrokenSeal.WarriorShield.class).setArmor(this);
}
}
@@ -189,7 +189,7 @@ public class Armor extends EquipableItem {
hero.belongings.armor = null;
((HeroSprite)hero.sprite).updateArmor();
BrokenSigil.SigilShield sigilBuff = hero.buff(BrokenSigil.SigilShield.class);
BrokenSeal.WarriorShield sigilBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sigilBuff != null) sigilBuff.setArmor(null);
return true;