From 184993936e6bcb838a1bd183767fcbe16b98647a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 10 Sep 2016 04:00:10 -0400 Subject: [PATCH] v0.4.2a: improved visual clarity on gas particles --- .../shatteredpixeldungeon/actors/blobs/ConfusionGas.java | 2 +- .../shatteredpixeldungeon/actors/blobs/ParalyticGas.java | 2 +- .../shatteredpixeldungeon/actors/blobs/StenchGas.java | 2 +- .../shatteredpixeldungeon/actors/blobs/ToxicGas.java | 2 +- .../shatteredpixeldungeon/actors/blobs/VenomGas.java | 2 +- .../shatteredpixeldungeon/effects/Speck.java | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java index 58f2d88ab..fa750e8df 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java @@ -53,7 +53,7 @@ public class ConfusionGas extends Blob { public void use( BlobEmitter emitter ) { super.use( emitter ); - emitter.pour( Speck.factory( Speck.CONFUSION, true ), 0.6f ); + emitter.pour( Speck.factory( Speck.CONFUSION, true ), 0.4f ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java index edc351602..1b6f0b8db 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java @@ -53,7 +53,7 @@ public class ParalyticGas extends Blob { public void use( BlobEmitter emitter ) { super.use( emitter ); - emitter.pour( Speck.factory( Speck.PARALYSIS ), 0.6f ); + emitter.pour( Speck.factory( Speck.PARALYSIS ), 0.4f ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java index a526e6e43..177af5bb6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java @@ -54,7 +54,7 @@ public class StenchGas extends Blob { public void use( BlobEmitter emitter ) { super.use( emitter ); - emitter.pour( Speck.factory(Speck.STENCH), 0.6f ); + emitter.pour( Speck.factory(Speck.STENCH), 0.4f ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java index 0de8e3015..f05ae9900 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java @@ -61,7 +61,7 @@ public class ToxicGas extends Blob implements Hero.Doom { public void use( BlobEmitter emitter ) { super.use( emitter ); - emitter.pour( Speck.factory( Speck.TOXIC ), 0.6f ); + emitter.pour( Speck.factory( Speck.TOXIC ), 0.4f ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java index e14722d0b..eb26f7c20 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java @@ -79,7 +79,7 @@ public class VenomGas extends Blob { public void use( BlobEmitter emitter ) { super.use( emitter ); - emitter.pour( Speck.factory(Speck.VENOM), 0.6f ); + emitter.pour( Speck.factory(Speck.VENOM), 0.4f ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java index a503e41ab..b742e64c4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java @@ -416,15 +416,15 @@ public class Speck extends Image { case PARALYSIS: case CONFUSION: case DUST: - am = p < 0.5f ? p : 1 - p; - scale.set( 1 + p * 2 ); + am = (float)Math.sqrt( (p < 0.5f ? p : 1 - p) * 0.5f ); + scale.set( 1 + p ); break; case VENOM: hardlight( ColorMath.interpolate( 0x8844FF, 0x00FF00 , p )); case STENCH: - am = (p < 0.5f ? p : 1 - p) * 2; - scale.set( 1 + p * 2 ); + am = (float)Math.sqrt( (p < 0.5f ? p : 1 - p) * 0.5f ); + scale.set( 1 + p ); break; case JET: