diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java index 0cbf2f140..fbbcb50e8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java @@ -45,10 +45,10 @@ public class Halo extends Image { Bitmap bmp = Bitmap.createBitmap( RADIUS * 2, RADIUS * 2, Bitmap.Config.ARGB_8888 ); Canvas canvas = new Canvas( bmp ); Paint paint = new Paint(); - paint.setColor( 0xFFFFFFFF ); - canvas.drawCircle( RADIUS, RADIUS, RADIUS * 0.75f, paint ); - paint.setColor( 0x88FFFFFF ); - canvas.drawCircle( RADIUS, RADIUS, RADIUS, paint ); + paint.setColor( 0x0AFFFFFF ); + for (int i = 0; i < 50; i++) { + canvas.drawCircle(RADIUS, RADIUS, RADIUS * (i+1)/50f, paint); + } TextureCache.add( CACHE_KEY, new SmartTexture( bmp ) ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java index 967133e80..33e7fd58c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java @@ -33,7 +33,7 @@ public class TorchHalo extends Halo { private float phase = 0; public TorchHalo( CharSprite sprite ) { - super( 24, 0xFFDDCC, 0.15f ); + super( 20, 0xFFDDCC, 0.2f ); target = sprite; am = 0; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java index 90c0626ef..246818e93 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java @@ -84,10 +84,10 @@ public class WandmakerSprite extends MobSprite { public Shield() { - super( 14, 0xBBAACC, 1f ); + super( 9, 0xBBAACC, 1f ); - am = -1; - aa = +1; + am = -0.33f; + aa = +0.33f; phase = 1; }