konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up formatting:

Browse Source 
- removed trailing whitespace
- changed all leading whitespace to tabs
- removed IDE created author comments
This commit is contained in:
Evan Debenham
2015-06-12 16:22:26 -04:00
parent baa83b7e43
commit cebdff0221
335 changed files with 8555 additions and 8714 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BlastParticle.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class BlastParticle extends PixelParticle.Shrinking {
public BlastParticle() {
super();
color( 0xEE7722 );
color( 0xEE7722 );
acc.set( 0, +50 );
}
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BloodParticle.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.watabou.utils.Random;
public class BloodParticle extends PixelParticle.Shrinking {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((BloodParticle)emitter.recycle( BloodParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EarthParticle.java
+2 -2
View File
@@ -23,9 +23,9 @@ import com.watabou.noosa.particles.Emitter.Factory;
import com.watabou.utils.ColorMath;
import com.watabou.utils.Random;
public class EarthParticle extends PixelParticle {
public class EarthParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((EarthParticle)emitter.recycle( EarthParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ElmoParticle.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.watabou.noosa.particles.Emitter.Factory;
public class ElmoParticle extends PixelParticle.Shrinking {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((ElmoParticle)emitter.recycle( ElmoParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EnergyParticle.java
+2 -2
View File
@@ -25,7 +25,7 @@ import com.watabou.utils.Random;
public class EnergyParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((EnergyParticle)emitter.recycle( EnergyParticle.class )).reset( x, y );
@@ -59,7 +59,7 @@ public class EnergyParticle extends PixelParticle {
super.update();
float p = left / lifespan;
am = p < 0.5f ? p * p * 4 : (1 - p) * 2;
am = p < 0.5f ? p * p * 4 : (1 - p) * 2;
size( Random.Float( 5 * left / lifespan ) );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlameParticle.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.watabou.noosa.particles.Emitter.Factory;
public class FlameParticle extends PixelParticle.Shrinking {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((FlameParticle)emitter.recycle( FlameParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlowParticle.java
+2 -2
View File
@@ -29,7 +29,7 @@ import com.watabou.utils.Random;
public class FlowParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((FlowParticle)emitter.recycle( FlowParticle.class )).reset( x, y );
@@ -100,7 +100,7 @@ public class FlowParticle extends PixelParticle {
delay = Random.Float( DELAY );
((FlowParticle)recycle( FlowParticle.class )).reset(
((FlowParticle)recycle( FlowParticle.class )).reset(
x + Random.Float( DungeonTilemap.SIZE ), y );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/LeafParticle.java
+2 -2
View File
@@ -30,7 +30,7 @@ public class LeafParticle extends PixelParticle.Shrinking {
public static int color2;
public static final Emitter.Factory GENERAL = new Factory() {
public static final Emitter.Factory GENERAL = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
LeafParticle p = ((LeafParticle)emitter.recycle( LeafParticle.class ));
@@ -39,7 +39,7 @@ public class LeafParticle extends PixelParticle.Shrinking {
}
};
public static final Emitter.Factory LEVEL_SPECIFIC = new Factory() {
public static final Emitter.Factory LEVEL_SPECIFIC = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
LeafParticle p = ((LeafParticle)emitter.recycle( LeafParticle.class ));
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PoisonParticle.java
+2 -2
View File
@@ -25,7 +25,7 @@ import com.watabou.utils.Random;
public class PoisonParticle extends PixelParticle {
public static final Emitter.Factory MISSILE = new Factory() {
public static final Emitter.Factory MISSILE = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((PoisonParticle)emitter.recycle( PoisonParticle.class )).resetMissile( x, y );
@@ -36,7 +36,7 @@ public class PoisonParticle extends PixelParticle {
};
};
public static final Emitter.Factory SPLASH = new Factory() {
public static final Emitter.Factory SPLASH = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((PoisonParticle)emitter.recycle( PoisonParticle.class )).resetSplash( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PurpleParticle.java
+2 -2
View File
@@ -26,14 +26,14 @@ import com.watabou.utils.Random;
public class PurpleParticle extends PixelParticle {
public static final Emitter.Factory MISSILE = new Factory() {
public static final Emitter.Factory MISSILE = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((PurpleParticle)emitter.recycle( PurpleParticle.class )).reset( x, y );
}
};
public static final Emitter.Factory BURST = new Factory() {
public static final Emitter.Factory BURST = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((PurpleParticle)emitter.recycle( PurpleParticle.class )).resetBurst( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/RainbowParticle.java
+35 -38
View File
@@ -5,56 +5,53 @@ import com.watabou.noosa.particles.PixelParticle;
import com.watabou.utils.PointF;
import com.watabou.utils.Random;
/**
* Created by Evan on 11/04/2015.
*/
public class RainbowParticle extends PixelParticle {
public static final Emitter.Factory BURST = new Emitter.Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((RainbowParticle)emitter.recycle( RainbowParticle.class )).resetBurst( x, y );
}
@Override
public boolean lightMode() {
return true;
}
};
public static final Emitter.Factory BURST = new Emitter.Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((RainbowParticle)emitter.recycle( RainbowParticle.class )).resetBurst( x, y );
}
@Override
public boolean lightMode() {
return true;
}
};
public RainbowParticle() {
super();
color( Random.Int( 0x1000000 ) );
lifespan = 0.5f;
}
public RainbowParticle() {
super();
color( Random.Int( 0x1000000 ) );
lifespan = 0.5f;
}
public void reset( float x, float y ) {
revive();
public void reset( float x, float y ) {
revive();
this.x = x;
this.y = y;
this.x = x;
this.y = y;
speed.set( Random.Float(-5, +5), Random.Float( -5, +5 ) );
speed.set( Random.Float(-5, +5), Random.Float( -5, +5 ) );
left = lifespan;
}
left = lifespan;
}
public void resetBurst( float x, float y ) {
revive();
public void resetBurst( float x, float y ) {
revive();
this.x = x;
this.y = y;
this.x = x;
this.y = y;
speed.polar( Random.Float( PointF.PI2 ), Random.Float( 16, 32 ) );
speed.polar( Random.Float( PointF.PI2 ), Random.Float( 16, 32 ) );
left = lifespan;
}
left = lifespan;
}
@Override
public void update() {
super.update();
// alpha: 1 -> 0; size: 1 -> 5
size( 5 - (am = left / lifespan) * 4 );
}
@Override
public void update() {
super.update();
// alpha: 1 -> 0; size: 1 -> 5
size( 5 - (am = left / lifespan) * 4 );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShadowParticle.java
+4 -4
View File
@@ -26,21 +26,21 @@ import com.watabou.utils.Random;
public class ShadowParticle extends PixelParticle.Shrinking {
public static final Emitter.Factory MISSILE = new Factory() {
public static final Emitter.Factory MISSILE = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((ShadowParticle)emitter.recycle( ShadowParticle.class )).reset( x, y );
}
};
public static final Emitter.Factory CURSE = new Factory() {
public static final Emitter.Factory CURSE = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((ShadowParticle)emitter.recycle( ShadowParticle.class )).resetCurse( x, y );
}
};
public static final Emitter.Factory UP = new Factory() {
public static final Emitter.Factory UP = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((ShadowParticle)emitter.recycle( ShadowParticle.class )).resetUp( x, y );
@@ -88,6 +88,6 @@ public class ShadowParticle extends PixelParticle.Shrinking {
float p = left / lifespan;
// alpha: 0 -> 1 -> 0; size: 6 -> 0; color: 0x660044 -> 0x000000
color( ColorMath.interpolate( 0x000000, 0x440044, p ) );
am = p < 0.5f ? p * p * 4 : (1 - p) * 2;
am = p < 0.5f ? p * p * 4 : (1 - p) * 2;
}
}
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShaftParticle.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.watabou.utils.Random;
public class ShaftParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((ShaftParticle)emitter.recycle( ShaftParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SnowParticle.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.watabou.utils.Random;
public class SnowParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((SnowParticle)emitter.recycle( SnowParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SparkParticle.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.watabou.utils.Random;
public class SparkParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((SparkParticle)emitter.recycle( SparkParticle.class )).reset( x, y );
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WebParticle.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.watabou.utils.Random;
public class WebParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
for (int i=0; i < 3; i++) {
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WindParticle.java
+3 -3
View File
@@ -29,7 +29,7 @@ import com.watabou.utils.Random;
public class WindParticle extends PixelParticle {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((WindParticle)emitter.recycle( WindParticle.class )).reset( x, y );
@@ -103,8 +103,8 @@ public class WindParticle extends PixelParticle {
delay = Random.Float( 5 );
((WindParticle)recycle( WindParticle.class )).reset(
x + Random.Float( DungeonTilemap.SIZE ),
((WindParticle)recycle( WindParticle.class )).reset(
x + Random.Float( DungeonTilemap.SIZE ),
y + Random.Float( DungeonTilemap.SIZE ) );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WoolParticle.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.watabou.utils.Random;
public class WoolParticle extends PixelParticle.Shrinking {
public static final Emitter.Factory FACTORY = new Factory() {
public static final Emitter.Factory FACTORY = new Factory() {
@Override
public void emit( Emitter emitter, int index, float x, float y ) {
((WoolParticle)emitter.recycle( WoolParticle.class )).reset( x, y );