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

v0.4.3a: reworked glyph of stone

Browse Source
This commit is contained in:
Evan Debenham 2016-10-18 02:10:33 -04:00
parent a6852b1b97
commit e524a0c486
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -58,6 +58,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.AntiMagic;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Flow;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Obfuscation;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Stone;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Swiftness;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Viscosity;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns;
@ -1084,9 +1085,18 @@ public class Hero extends Char {
if (step != -1) {
int moveTime = 1;
if (belongings.armor != null && belongings.armor.hasGlyph(Stone.class) &&
(Dungeon.level.map[pos] == Terrain.DOOR
|| Dungeon.level.map[pos] == Terrain.OPEN_DOOR
|| Dungeon.level.map[step] == Terrain.DOOR
|| Dungeon.level.map[step] == Terrain.OPEN_DOOR )){
moveTime *= 2;
}
sprite.move(pos, step);
move(step);
spend( 1 / speed() );
spend( moveTime / speed() );
return true;

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stone.java
View File

@ -30,15 +30,10 @@ public class Stone extends Armor.Glyph {
@Override
public int proc(Armor armor, Char attacker, Char defender, int damage) {
//no proc effect, see armor.DrMin
//no proc effect, see armor.DrMin and the end of hero.getCloser
return damage;
}
@Override
public float tierSTRAdjust() {
return 1.5f;
}
@Override
public ItemSprite.Glowing glowing() {
return GREY;

2
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -48,7 +48,7 @@ items.armor.glyphs.repulsion.name=%s of repulsion
items.armor.glyphs.repulsion.desc=This glyph rebounds force against attackers, sending them flying back.
items.armor.glyphs.stone.name=%s of stone
items.armor.glyphs.stone.desc=This glyph increases both the weight and defensive strength of armor it is attached to.
items.armor.glyphs.stone.desc=This glyph surrounds the armor with weightless magical stone that improves defense, but makes it difficult to fit through doorways.
items.armor.glyphs.swiftness.name=%s of swiftness
items.armor.glyphs.swiftness.desc=This glyph alters the nature of armor, reducing weight and increasing evasion and speed, at the cost of defense.