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

v0.3.2c: added visual effect for soul mark, reduced soul mark duration considerably

Browse Source
This commit is contained in:
Evan Debenham 2015-11-23 15:22:29 -05:00
parent 0ef4ad71fc
commit 38d25f33bb
3 changed files with 94 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SoulMark.java
View File

@ -20,13 +20,12 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
public class SoulMark extends FlavourBuff { public class SoulMark extends FlavourBuff {
public static final float DURATION = 50f; public static final float DURATION = 10f;
{ {
type = buffType.NEGATIVE; type = buffType.NEGATIVE;
@ -38,17 +37,14 @@ public class SoulMark extends FlavourBuff {
} }
@Override @Override
public String toString() { public void fx(boolean on) {
return "Soul Marked"; if (on) target.sprite.add(CharSprite.State.MARKED);
else target.sprite.remove(CharSprite.State.MARKED);
} }
@Override @Override
public boolean attachTo(Char target) { public String toString() {
if (super.attachTo(target) && target.sprite != null){ return "Soul Marked";
target.sprite.emitter().burst(ShadowParticle.UP, 10);
return true;
} else
return false;
} }
@Override @Override

2
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
View File

@ -135,7 +135,7 @@ public abstract class Wand extends Item {
if (target != Dungeon.hero && if (target != Dungeon.hero &&
Dungeon.hero.subClass == HeroSubClass.WARLOCK && Dungeon.hero.subClass == HeroSubClass.WARLOCK &&
Random.Float() < .15f + (level()*chargesUsed*0.03f)){ Random.Float() < .15f + (level()*chargesUsed*0.03f)){
SoulMark.prolong(target, SoulMark.class, SoulMark.DURATION); SoulMark.prolong(target, SoulMark.class, SoulMark.DURATION + level());
} }
} }

14
src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
View File

@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.sprites; package com.shatteredpixel.shatteredpixeldungeon.sprites;
import com.shatteredpixel.shatteredpixeldungeon.effects.DarkBlock; import com.shatteredpixel.shatteredpixeldungeon.effects.DarkBlock;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SnowParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SnowParticle;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.MovieClip; import com.watabou.noosa.MovieClip;
@ -60,7 +61,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
private static final float FLASH_INTERVAL = 0.05f; private static final float FLASH_INTERVAL = 0.05f;
public enum State { public enum State {
BURNING, LEVITATING, INVISIBLE, PARALYSED, FROZEN, ILLUMINATED, CHILLED, DARKENED BURNING, LEVITATING, INVISIBLE, PARALYSED, FROZEN, ILLUMINATED, CHILLED, DARKENED, MARKED
} }
protected Animation idle; protected Animation idle;
@ -76,6 +77,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
protected Emitter burning; protected Emitter burning;
protected Emitter chilled; protected Emitter chilled;
protected Emitter marked;
protected Emitter levitation; protected Emitter levitation;
protected IceBlock iceBlock; protected IceBlock iceBlock;
@ -290,6 +292,10 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
case DARKENED: case DARKENED:
darkBlock = DarkBlock.darken( this ); darkBlock = DarkBlock.darken( this );
break; break;
case MARKED:
marked = emitter();
marked.pour(ShadowParticle.UP, 0.1f);
break;
} }
} }
@ -337,6 +343,12 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
darkBlock = null; darkBlock = null;
} }
break; break;
case MARKED:
if (marked != null){
marked.on = false;
marked = null;
}
break;
} }
} }