diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java index e5a890f49..c5d1acb28 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java @@ -1,6 +1,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSigil.SigilShield; +import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal.WarriorShield; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Bundle; @@ -14,10 +14,10 @@ public class Berserk extends Buff { } private State state = State.NORMAL; - private static final int EXHAUSTION_START = 40; + private static final int EXHAUSTION_START = 30; private int exhaustion; - private static final float LEVEL_RECOVER_START = 2f; + private static final float LEVEL_RECOVER_START = 3f; private float levelRecovery; private static final String STATE = "state"; @@ -78,7 +78,7 @@ public class Berserk extends Buff { public boolean berserking(){ if (target.HP == 0 && state == State.NORMAL){ - SigilShield sigil = target.buff(SigilShield.class); + WarriorShield sigil = target.buff(WarriorShield.class); if (sigil != null){ state = State.BERSERK; BuffIndicator.refreshHero(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index 849013b0a..e5fa6d7f3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; -import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSigil; +import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; @@ -109,7 +109,7 @@ public enum HeroClass { Dart darts = new Dart( 8 ); darts.identify().collect(); - new BrokenSigil().collect(); + new BrokenSeal().collect(); Dungeon.quickslot.setSlot(0, darts); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSigil.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java similarity index 88% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSigil.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java index ca85c9aab..ceec16cba 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSigil.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java @@ -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; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 6c67271e8..758970b78 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -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; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index bc36d4d6c..bc222f441 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -803,13 +803,13 @@ items.bomb.desc_burning=A fairly hefty black powder bomb. An explosion from this items.bomb$doublebomb.name=two bombs items.bomb$doublebomb.desc=A stack of two hefty black powder bombs, looks like you get one free! -items.brokensigil.name=Broken Sigil -items.brokensigil.ac_affix=AFFIX -items.brokensigil.prompt=Select an armor -items.brokensigil.unknown_armor=You must identify that armor first. -items.brokensigil.degraded_armor=That armor is in too poor a condition. -items.brokensigil.affix=You affix the sigil to your armor! -items.brokensigil.desc=A broken sigil from the warrior's past.\n\nMORE STUFF NEEDED HERE. +items.brokenseal.name=Broken Seal +items.brokenseal.ac_affix=AFFIX +items.brokenseal.prompt=Select an armor +items.brokenseal.unknown_armor=You must identify that armor first. +items.brokenseal.degraded_armor=That armor is in too poor a condition. +items.brokenseal.affix=You affix the sigil to your armor! +items.brokenseal.desc=A broken seal from the warrior's past.\n\nMORE STUFF NEEDED HERE. items.dewdrop.name=dewdrop items.dewdrop.value=%+dHP