LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
View File

@ -1,6 +1,6 @@
package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; 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.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
@ -14,10 +14,10 @@ public class Berserk extends Buff {
} }
private State state = State.NORMAL; private State state = State.NORMAL;
private static final int EXHAUSTION_START = 40; private static final int EXHAUSTION_START = 30;
private int exhaustion; private int exhaustion;
private static final float LEVEL_RECOVER_START = 2f; private static final float LEVEL_RECOVER_START = 3f;
private float levelRecovery; private float levelRecovery;
private static final String STATE = "state"; private static final String STATE = "state";
@ -78,7 +78,7 @@ public class Berserk extends Buff {
public boolean berserking(){ public boolean berserking(){
if (target.HP == 0 && state == State.NORMAL){ if (target.HP == 0 && state == State.NORMAL){
SigilShield sigil = target.buff(SigilShield.class); WarriorShield sigil = target.buff(WarriorShield.class);
if (sigil != null){ if (sigil != null){
state = State.BERSERK; state = State.BERSERK;
BuffIndicator.refreshHero(); BuffIndicator.refreshHero();

4
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
View File

@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; 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.armor.ClothArmor;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows;
import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; import com.shatteredpixel.shatteredpixeldungeon.items.food.Food;
@ -109,7 +109,7 @@ public enum HeroClass {
Dart darts = new Dart( 8 ); Dart darts = new Dart( 8 );
darts.identify().collect(); darts.identify().collect();
new BrokenSigil().collect(); new BrokenSeal().collect();
Dungeon.quickslot.setSlot(0, darts); Dungeon.quickslot.setSlot(0, darts);

12
src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSigil.java → src/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java
View File

@ -14,7 +14,7 @@ import com.watabou.noosa.audio.Sample;
import java.util.ArrayList; import java.util.ArrayList;
public class BrokenSigil extends Item { public class BrokenSeal extends Item {
public static final String AC_AFFIX = "AFFIX"; public static final String AC_AFFIX = "AFFIX";
@ -54,21 +54,21 @@ public class BrokenSigil extends Item {
if (item != null && item instanceof Armor) { if (item != null && item instanceof Armor) {
Armor armor = (Armor)item; Armor armor = (Armor)item;
if (!armor.levelKnown){ 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){ } else if (armor.cursed || armor.level() < 0){
GLog.w(Messages.get(BrokenSigil.class, "degraded_armor")); GLog.w(Messages.get(BrokenSeal.class, "degraded_armor"));
} else { } else {
GLog.p(Messages.get(BrokenSigil.class, "affix")); GLog.p(Messages.get(BrokenSeal.class, "affix"));
Dungeon.hero.sprite.operate(Dungeon.hero.pos); Dungeon.hero.sprite.operate(Dungeon.hero.pos);
Sample.INSTANCE.play(Assets.SND_UNLOCK); Sample.INSTANCE.play(Assets.SND_UNLOCK);
armor.affixSigil((BrokenSigil)curItem); armor.affixSigil((BrokenSeal)curItem);
curItem.detach(Dungeon.hero.belongings.backpack); curItem.detach(Dungeon.hero.belongings.backpack);
} }
} }
} }
}; };
public static class SigilShield extends Buff { public static class WarriorShield extends Buff {
private Armor armor; private Armor armor;
private float partialShield; private float partialShield;

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

@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; 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.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Affection; import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Affection;
@ -114,10 +114,10 @@ public class Armor extends EquipableItem {
public void execute(Hero hero, String action) { public void execute(Hero hero, String action) {
if (action.equals(AC_DETACH) && sigil){ if (action.equals(AC_DETACH) && sigil){
sigil = false; sigil = false;
BrokenSigil.SigilShield sigilBuff = hero.buff(BrokenSigil.SigilShield.class); BrokenSeal.WarriorShield sigilBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sigilBuff != null) sigilBuff.setArmor(null); if (sigilBuff != null) sigilBuff.setArmor(null);
BrokenSigil sigil = new BrokenSigil(); BrokenSeal sigil = new BrokenSeal();
if (level() > 0){ if (level() > 0){
sigil.upgrade(); sigil.upgrade();
degrade(); degrade();
@ -163,17 +163,17 @@ public class Armor extends EquipableItem {
@Override @Override
public void activate(Char ch) { 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; this.sigil = true;
if (sigil.level() > 0){ if (sigil.level() > 0){
//doesn't override existing glyphs, but doesn't create one either //doesn't override existing glyphs, but doesn't create one either
upgrade(glyph != null); upgrade(glyph != null);
} }
if (isEquipped(Dungeon.hero)){ 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; hero.belongings.armor = null;
((HeroSprite)hero.sprite).updateArmor(); ((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); if (sigilBuff != null) sigilBuff.setArmor(null);
return true; return true;

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

@ -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.name=two bombs
items.bomb$doublebomb.desc=A stack of two hefty black powder bombs, looks like you get one free! items.bomb$doublebomb.desc=A stack of two hefty black powder bombs, looks like you get one free!
items.brokensigil.name=Broken Sigil items.brokenseal.name=Broken Seal
items.brokensigil.ac_affix=AFFIX items.brokenseal.ac_affix=AFFIX
items.brokensigil.prompt=Select an armor items.brokenseal.prompt=Select an armor
items.brokensigil.unknown_armor=You must identify that armor first. items.brokenseal.unknown_armor=You must identify that armor first.
items.brokensigil.degraded_armor=That armor is in too poor a condition. items.brokenseal.degraded_armor=That armor is in too poor a condition.
items.brokensigil.affix=You affix the sigil to your armor! items.brokenseal.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.desc=A broken seal from the warrior's past.\n\nMORE STUFF NEEDED HERE.
items.dewdrop.name=dewdrop items.dewdrop.name=dewdrop
items.dewdrop.value=%+dHP items.dewdrop.value=%+dHP