From 6bda20b7b7e196693d794f2f28c947d66b43d710 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Fri, 10 Apr 2015 12:04:44 -0400
Subject: [PATCH] v0.3.0: refactored beam effects, added Light Ray effect.

---
 assets/effects.png                            | Bin 17450 -> 3037 bytes
 .../effects/{DeathRay.java => Beam.java}      |  26 +++++++++++----
 .../effects/Effects.java                      |  30 ++++++++++--------
 .../items/wands/WandOfDisintegration.java     |   4 +--
 .../sprites/EyeSprite.java                    |   4 +--
 5 files changed, 40 insertions(+), 24 deletions(-)
 rename src/com/shatteredpixel/shatteredpixeldungeon/effects/{DeathRay.java => Beam.java} (77%)

diff --git a/assets/effects.png b/assets/effects.png
index 708f04789f0cca5ae47cf47847dbe2661833a669..2e684a8e37b483a235bee34d568c26d9318ac216 100644
GIT binary patch
delta 3001
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

literal 17450
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

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/DeathRay.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java
similarity index 77%
rename from src/com/shatteredpixel/shatteredpixeldungeon/effects/DeathRay.java
rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java
index 9738f661a..b7dd5b9bb 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/DeathRay.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Beam.java
@@ -27,16 +27,16 @@ import com.watabou.noosa.audio.Sample;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.watabou.utils.PointF;
 
-public class DeathRay extends Image {
+public class Beam extends Image {
 	
 	private static final double A = 180 / Math.PI;
 	
-	private static final float DURATION	= 0.5f;
+	private  float duration;
 	
 	private float timeLeft;
-	
-	public DeathRay( PointF s, PointF e ) {
-		super( Effects.get( Effects.Type.RAY ) );
+
+	private Beam(PointF s, PointF e, Effects.Type asset, float duration) {
+		super( Effects.get( asset ) );
 		
 		origin.set( 0, height / 2 );
 		
@@ -50,14 +50,26 @@ public class DeathRay extends Image {
 		
 		Sample.INSTANCE.play( Assets.SND_RAY );
 		
-		timeLeft = DURATION;
+		timeLeft = this.duration = duration;
+	}
+
+	public static class DeathRay extends Beam{
+		public DeathRay(PointF s, PointF e){
+			super(s, e, Effects.Type.DEATH_RAY, 0.5f);
+		}
+	}
+
+	public static class LightRay extends Beam{
+		public LightRay(PointF s, PointF e){
+			super(s, e, Effects.Type.LIGHT_RAY, 1f);
+		}
 	}
 	
 	@Override
 	public void update() {
 		super.update();
 		
-		float p = timeLeft / DURATION;
+		float p = timeLeft / duration;
 		alpha( p );
 		scale.set( scale.x, p );
 		
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java
index 9b627b1d5..9d949e910 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java
@@ -26,24 +26,28 @@ public class Effects {
 		RIPPLE,
 		LIGHTNING,
 		WOUND,
-		RAY
+		DEATH_RAY,
+		LIGHT_RAY
 	};
 	
 	public static Image get( Type type ) {
 		Image icon = new Image( Assets.EFFECTS );
 		switch (type) {
-		case RIPPLE:
-			icon.frame( icon.texture.uvRect( 0, 0, 16, 16 ) );
-			break;
-		case LIGHTNING:
-			icon.frame( icon.texture.uvRect( 16, 0, 32, 8 ) );
-			break;
-		case WOUND:
-			icon.frame( icon.texture.uvRect( 16, 8, 32, 16 ) );
-			break;
-		case RAY:
-			icon.frame( icon.texture.uvRect( 16, 16, 32, 24 ) );
-			break;
+			case RIPPLE:
+				icon.frame(icon.texture.uvRect(0, 0, 16, 16));
+				break;
+			case LIGHTNING:
+				icon.frame(icon.texture.uvRect(16, 0, 32, 8));
+				break;
+			case WOUND:
+				icon.frame(icon.texture.uvRect(16, 8, 32, 16));
+				break;
+			case DEATH_RAY:
+				icon.frame(icon.texture.uvRect(16, 16, 32, 24));
+				break;
+			case LIGHT_RAY:
+				icon.frame(icon.texture.uvRect(16, 23, 32, 31));
+				break;
 		}
 		return icon;
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
index c54245470..e60b9db10 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
@@ -24,7 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
-import com.shatteredpixel.shatteredpixeldungeon.effects.DeathRay;
+import com.shatteredpixel.shatteredpixeldungeon.effects.Beam;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
@@ -113,7 +113,7 @@ public class WandOfDisintegration extends Wand {
 	protected void fx( Ballistica beam, Callback callback ) {
 		
 		int cell = beam.path.get(Math.min(beam.dist, distance()));
-		curUser.sprite.parent.add( new DeathRay( curUser.sprite.center(), DungeonTilemap.tileCenterToWorld( cell ) ) );		
+		curUser.sprite.parent.add(new Beam.LightRay(curUser.sprite.center(), DungeonTilemap.tileCenterToWorld( cell )));
 		callback.call();
 	}
 	
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java
index 59a56a3e8..aec19b662 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java
@@ -21,7 +21,7 @@ import com.watabou.noosa.TextureFilm;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap;
-import com.shatteredpixel.shatteredpixeldungeon.effects.DeathRay;
+import com.shatteredpixel.shatteredpixeldungeon.effects.Beam;
 
 public class EyeSprite extends MobSprite {
 	
@@ -61,7 +61,7 @@ public class EyeSprite extends MobSprite {
 		
 		if (anim == attack) {
 			if (Dungeon.visible[ch.pos] || Dungeon.visible[attackPos]) {
-				parent.add( new DeathRay( center(), DungeonTilemap.tileCenterToWorld( attackPos ) ) );
+				parent.add( new Beam.DeathRay( center(), DungeonTilemap.tileCenterToWorld( attackPos ) ) );
 			}
 		}
 	}