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

v0.3.5: fixed various naming and string errors

Browse Source
This commit is contained in:
Evan Debenham 2016-04-21 19:19:01 -04:00
parent bf04f7d8d1
commit 01f957f70f
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,11 @@ public class Berserk extends Buff {
public boolean berserking(){
if (target.HP == 0 && state == State.NORMAL){
WarriorShield sigil = target.buff(WarriorShield.class);
if (sigil != null){
WarriorShield shield = target.buff(WarriorShield.class);
if (shield != null){
state = State.BERSERK;
BuffIndicator.refreshHero();
target.SHLD = sigil.maxShield() * 5;
target.SHLD = shield.maxShield() * 5;
SpellSprite.show(target, SpellSprite.BERSERK);
Sample.INSTANCE.play( Assets.SND_CHALLENGE );

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

@ -24,7 +24,7 @@ public class BrokenSeal extends Item {
public static final String AC_INFO = "INFO_WINDOW";
{
image = ItemSpriteSheet.SIGIL;
image = ItemSpriteSheet.SEAL;
cursedKnown = levelKnown = true;
unique = true;

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

@ -117,18 +117,18 @@ public class Armor extends EquipableItem {
if (action.equals(AC_DETACH) && seal){
seal = false;
BrokenSeal.WarriorShield sigilBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sigilBuff != null) sigilBuff.setArmor(null);
BrokenSeal.WarriorShield sealBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sealBuff != null) sealBuff.setArmor(null);
BrokenSeal sigil = new BrokenSeal();
BrokenSeal seal = new BrokenSeal();
if (level() > 0){
sigil.upgrade();
seal.upgrade();
degrade();
}
GLog.i( Messages.get(Armor.class, "detach_sigil") );
GLog.i( Messages.get(Armor.class, "detach_seal") );
hero.sprite.operate(hero.pos);
if (!sigil.collect()){
Dungeon.level.drop(sigil, hero.pos);
if (!seal.collect()){
Dungeon.level.drop(seal, hero.pos);
}
}
}
@ -190,8 +190,8 @@ public class Armor extends EquipableItem {
hero.belongings.armor = null;
((HeroSprite)hero.sprite).updateArmor();
BrokenSeal.WarriorShield sigilBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sigilBuff != null) sigilBuff.setArmor(null);
BrokenSeal.WarriorShield sealBuff = hero.buff(BrokenSeal.WarriorShield.class);
if (sealBuff != null) sealBuff.setArmor(null);
return true;

8
src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
View File

@ -76,7 +76,7 @@ actors.buffs.chill.desc=Not quite frozen, but still much too cold.\n\nChilled ta
actors.buffs.combo.name=Combo
actors.buffs.combo.combo=%d hit combo!
actors.butts.combo.bad_target=You must target an enemy in attack range.
actors.buffs.combo.bad_target=You must target an enemy in attack range.
actors.buffs.combo.clobber_prompt=Select a target to Clobber\nStuns and knocks back
actors.buffs.combo.clobber_desc=_Clobber_ is currently available. This attack _knocks an enemy back and stuns them,_ but deals reduced damage. It's excellent for buying a little time during a fight.
actors.buffs.combo.cleave_prompt=Select a target to Cleave\nIf it kills, preserves combo
@ -219,9 +219,9 @@ actors.hero.hero.pain_resist=The pain helps you resist the urge to sleep.
actors.hero.hero.revive=The ankh explodes with life-giving energy!
actors.hero.heroclass.warrior=warrior
actors.hero.heroclass.warrior_perk1=The Warrior starts with a broken sigil which he can affix to armor.
actors.hero.heroclass.warrior_perk2=The Warrior will slowly generate a shield while he is wearing armor with the sigil affixed.
actors.hero.heroclass.warrior_perk3=The sigil can be moved between armor, carrying a single upgrade with it.
actors.hero.heroclass.warrior_perk1=The Warrior starts with a broken seal which he can affix to armor.
actors.hero.heroclass.warrior_perk2=The Warrior will slowly generate a shield while he is wearing armor with the seal affixed.
actors.hero.heroclass.warrior_perk3=The seal can be moved between armor, carrying a single upgrade with it.
actors.hero.heroclass.warrior_perk4=Any piece of food restores some health when eaten.
actors.hero.heroclass.warrior_perk5=Potions of Healing are identified from the beginning.

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

@ -30,7 +30,7 @@ items.armor.glyphs.viscosity$defereddamage.desc=While your armor's glyph has pro
###armor
items.armor.armor.ac_detach=DETACH
items.armor.armor.detach_sigil=You detach the sigil from your armor.
items.armor.armor.detach_seal=You detach the seal from your armor.
items.armor.armor.equip_cursed=The armor constricts around you painfully.
items.armor.armor.identify=you are now familiar enough with your %s to identify it. It is %s.
items.armor.armor.incompatible=Interaction of different types of magic has erased the glyph on this armor!
@ -809,9 +809,9 @@ 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 wax seal, affixed to armor as a smybol of valor. All the markings on the seal have worn off with age and it is broken in half down the middle.\n\nA memento from his home, the seal helps the warrior persevere. While wearing the seal the warrior will slowly generate shielding ontop of his health based on the quality of his armor.\n\nThe seal can be _affixed to armor,_ and moved between armors. It can carry a single upgrade with it.
items.brokenseal.degraded_armor=The condition of this armor is too poor.
items.brokenseal.affix=You affix the seal to your armor!
items.brokenseal.desc=A wax seal, affixed to armor as a symbol of valor. All the markings on the seal have worn off with age and it is broken in half down the middle.\n\nA memento from his home, the seal helps the warrior persevere. While wearing the seal the warrior will slowly generate shielding on top of his health based on the quality of his armor.\n\nThe seal can be _affixed to armor,_ and moved between armors. It can carry a single upgrade with it.
items.dewdrop.name=dewdrop
items.dewdrop.value=%+dHP

2
src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -70,7 +70,7 @@ public class ItemSpriteSheet {
public static final int BOMB = ROW2+5;
public static final int HONEYPOT = ROW2+6;
public static final int SHATTPOT = ROW2+7;
public static final int SIGIL = ROW2+8;
public static final int SEAL = ROW2+8;
// Keys
public static final int IRON_KEY = ROW2+9;
public static final int GOLDEN_KEY = ROW2+10;