v0.3.5: bugfixes

This commit is contained in:
Evan Debenham 2016-04-19 20:47:35 -04:00
parent e03d523cd1
commit d8d54a4f3f
3 changed files with 11 additions and 4 deletions

View File

@ -217,7 +217,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
dmg = Math.round(dmg*2.5f); dmg = Math.round(dmg*2.5f);
break; break;
case FURY: case FURY:
dmg = Math.round(dmg*.4f); dmg = Math.round(dmg*0.4f);
break; break;
} }

View File

@ -64,7 +64,7 @@ public class Armor extends EquipableItem {
private int hitsToKnow = HITS_TO_KNOW; private int hitsToKnow = HITS_TO_KNOW;
public Glyph glyph; public Glyph glyph;
private boolean seal; public boolean seal;
public Armor( int tier ) { public Armor( int tier ) {
@ -167,9 +167,9 @@ public class Armor extends EquipableItem {
if (seal) Buff.affect(ch, BrokenSeal.WarriorShield.class).setArmor(this); if (seal) Buff.affect(ch, BrokenSeal.WarriorShield.class).setArmor(this);
} }
public void affixSeal(BrokenSeal sigil){ public void affixSeal(BrokenSeal seal){
this.seal = true; this.seal = true;
if (sigil.level() > 0){ if (seal.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);
} }

View File

@ -20,8 +20,11 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items.armor; package com.shatteredpixel.shatteredpixeldungeon.items.armor;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
@ -53,6 +56,10 @@ abstract public class ClassArmor extends Armor {
switch (owner.heroClass) { switch (owner.heroClass) {
case WARRIOR: case WARRIOR:
classArmor = new WarriorArmor(); classArmor = new WarriorArmor();
classArmor.seal = armor.seal;
if (armor.seal && armor.isEquipped(owner)){
Buff.affect(Dungeon.hero, BrokenSeal.WarriorShield.class).setArmor(classArmor);
}
break; break;
case ROGUE: case ROGUE:
classArmor = new RogueArmor(); classArmor = new RogueArmor();