From 6b72f83ccdd3b379ac6d731d3eb9139ddd179a35 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 4 Oct 2014 02:53:17 -0400 Subject: [PATCH] V0.2.1 : Updated Goo particle effects again, small tweak --- .../shatteredpixeldungeon/actors/blobs/GooWarn.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java | 2 +- .../effects/particles/GooWarnParticle.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java index c5a94d479..fb435ceaf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java @@ -47,7 +47,7 @@ public class GooWarn extends Blob { @Override public void use( BlobEmitter emitter ) { super.use( emitter ); - emitter.start(GooWarnParticle.FACTORY, 0.1f, 0 ); + emitter.start(GooWarnParticle.FACTORY, 0.05f, 0 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index e640af805..e730e9353 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -68,7 +68,7 @@ public class Goo extends Mob { for (int i = 0; i < Level.NEIGHBOURS9DIST2.length; i++) { int j = pos + Level.NEIGHBOURS9DIST2[i]; if (j >= 0 && j <= 1023 && Level.passable[j]) - CellEmitter.get(j).burst(ElmoParticle.FACTORY, 5); + CellEmitter.get(j).burst(ElmoParticle.FACTORY, 10); } Sample.INSTANCE.play( Assets.SND_BURNING ); return Random.NormalIntRange( 5, 30 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/GooWarnParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/GooWarnParticle.java index 9140e4837..c23ee649a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/GooWarnParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/GooWarnParticle.java @@ -20,6 +20,6 @@ public class GooWarnParticle extends FlameParticle { float p = left / lifespan; color( 0x000000 ); - am = (1 - p*0.9f) + 0.1f; + am = p > 0.5f ? (1.2f - p*0.8f) : (p*3 - 0.7f); } }