Merging 1.7.5 Source: effect changes

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BlastParticle.java

@@ -0,0 +1,62 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.effects.particles;
+
+import com.watabou.noosa.particles.Emitter;
+import com.watabou.noosa.particles.PixelParticle;
+import com.watabou.noosa.particles.Emitter.Factory;
+import com.watabou.utils.Random;
+
+public class BlastParticle extends PixelParticle.Shrinking {
+	
+	public static final Factory FACTORY = new Factory() {
+		@Override
+		public void emit( Emitter emitter, int index, float x, float y ) {
+			((BlastParticle)emitter.recycle( BlastParticle.class )).reset( x, y );
+		}
+		@Override
+		public boolean lightMode() {
+			return true;
+		};
+	};
+	
+	public BlastParticle() {
+		super();
+		
+		color( 0xEE7722 );		
+		acc.set( 0, +50 );
+	}
+	
+	public void reset( float x, float y ) {
+		revive();
+		
+		this.x = x;
+		this.y = y;
+		
+		left = lifespan = Random.Float();
+		
+		size = 8;
+		speed.polar( -Random.Float( 3.1415926f ), Random.Float( 32, 64 ) );
+	}
+	
+	@Override
+	public void update() {
+		super.update();
+		am = left > 0.8f ? (1 - left) * 5 : 1;
+	}
+}

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EnergyParticle.java

@@ -42,7 +42,7 @@ public class EnergyParticle extends PixelParticle {
 		lifespan = 1f;
 		color( 0xFFFFAA );
 		
-		speed.polar( Random.Float( 2 * PointF.PI ), Random.Float( 24, 32 ) );
+		speed.polar( Random.Float( PointF.PI2 ), Random.Float( 24, 32 ) );
 	}
 	
 	public void reset( float x, float y ) {

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PoisonParticle.java

@@ -63,7 +63,7 @@ public class PoisonParticle extends PixelParticle {
 		
 		left = lifespan;
 		
-		speed.polar( Random.Float( 3.1415926f ), Random.Float( 6 ) );
+		speed.polar( -Random.Float( 3.1415926f ), Random.Float( 6 ) );
 	}
 	
 	public void resetSplash( float x, float y ) {

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PurpleParticle.java

@@ -66,7 +66,7 @@ public class PurpleParticle extends PixelParticle {
 		this.x = x;
 		this.y = y;
 		
-		speed.polar( Random.Float( 360 ), Random.Float( 16, 32 ) );
+		speed.polar( Random.Float( PointF.PI2 ), Random.Float( 16, 32 ) );
 		
 		left = lifespan;
 	}

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShadowParticle.java

@@ -65,7 +65,7 @@ public class ShadowParticle extends PixelParticle.Shrinking {
 		size = 8;
 		left = lifespan = 0.5f;
 		
-		speed.polar( Random.Float( 2 * PointF.PI ), Random.Float( 16, 32 ) );
+		speed.polar( Random.Float( PointF.PI2 ), Random.Float( 16, 32 ) );
 		this.x = x - speed.x * lifespan;
 		this.y = y - speed.y * lifespan;
 	}

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SmokeParticle.java

@@ -0,0 +1,60 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.effects.particles;
+
+import com.watabou.noosa.particles.Emitter;
+import com.watabou.noosa.particles.PixelParticle;
+import com.watabou.noosa.particles.Emitter.Factory;
+import com.watabou.utils.Random;
+
+public class SmokeParticle extends PixelParticle {
+	
+	public static final Factory FACTORY = new Factory() {
+		@Override
+		public void emit( Emitter emitter, int index, float x, float y ) {
+			((SmokeParticle)emitter.recycle( SmokeParticle.class )).reset( x, y );
+		}
+	};
+	
+	public SmokeParticle() {
+		super();
+		
+		color( 0x222222 );
+		
+		acc.set( 0, -40 );
+	}
+	
+	public void reset( float x, float y ) {
+		revive();
+		
+		this.x = x;
+		this.y = y;
+		
+		left = lifespan = Random.Float( 0.6f, 1f );
+		speed.set( Random.Float( -4, +4 ), Random.Float( -8, +8 ) );
+	}
+	
+	@Override
+	public void update() {
+		super.update();
+		
+		float p = left / lifespan;
+		am = p > 0.8f ? 2 - 2*p : p * 0.5f;
+		size( 16 - p * 8 );
+	}
+}

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SparkParticle.java

@@ -51,7 +51,7 @@ public class SparkParticle extends PixelParticle {
 		
 		left = lifespan = Random.Float( 0.5f, 1.0f );
 		
-		speed.polar( Random.Float( 3.1415926f ), Random.Float( 20, 40 ) );
+		speed.polar( -Random.Float( 3.1415926f ), Random.Float( 20, 40 ) );
 	}
 	
 	@Override

src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WindParticle.java

@@ -36,7 +36,7 @@ public class WindParticle extends PixelParticle {
 		}
 	};
 	
-	private static float angle = Random.Float( PointF.PI * 2 );
+	private static float angle = Random.Float( PointF.PI2 );
 	private static PointF speed = new PointF().polar( angle, 5 );