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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Evan Debenham 2014-10-03 14:00:25 -04:00
commit 960f39b56b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java
View File

@ -47,7 +47,7 @@ public class GooWarn extends Blob {
@Override @Override
public void use( BlobEmitter emitter ) { public void use( BlobEmitter emitter ) {
super.use( emitter ); super.use( emitter );
emitter.start(GooWarnParticle.FACTORY, 0.2f, 0 ); emitter.start(GooWarnParticle.FACTORY, 0.1f, 0 );
} }
@Override @Override

4
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/GooWarnParticle.java
View File

@ -5,7 +5,7 @@ import com.watabou.noosa.particles.Emitter;
/** /**
* Created by Evan on 30/09/2014. * Created by Evan on 30/09/2014.
*/ */
public class GooWarnParticle extends WindParticle { public class GooWarnParticle extends FlameParticle {
public static final Emitter.Factory FACTORY = new Emitter.Factory() { public static final Emitter.Factory FACTORY = new Emitter.Factory() {
@Override @Override
@ -20,6 +20,6 @@ public class GooWarnParticle extends WindParticle {
float p = left / lifespan; float p = left / lifespan;
color( 0x000000 ); color( 0x000000 );
am = (p < 0.5f ? p : 1 - p) * size; am = (1 - p*0.9f) + 0.1f;
} }
} }