Concluding projectiles

Author: redomar

src/com/redomar/game/entities/Mob.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Random;
 
+import com.redomar.game.entities.projectiles.Medium;
 import com.redomar.game.entities.projectiles.Projectile;
 import com.redomar.game.entities.projectiles.Small;
 import com.redomar.game.level.LevelHandler;
@@ -233,13 +234,19 @@ protected void moveMob(double xa, double ya, Mob mob) {
 		}
 	}
 
-	protected void shoot(double x, double y, double dir){
+	protected void shoot(double x, double y, double dir, double buttonId, boolean secondry){
 //		dir = dir * (180 /Math.PI); 
 //		Printing print = new Printing();
 //		print.print("Angle: "+ dir, PrintTypes.GAME);
-		Projectile p = new Small(level, (int) x,(int) y, dir);
-		projectiles.add(p);
-		level.addProjectileEntities(p);
+		if(buttonId == 1){
+			Projectile p = new Small(level, (int) x,(int) y, dir);
+			projectiles.add(p);
+			level.addProjectileEntities(p);
+		} else if(buttonId == 3 && secondry == true){
+			Projectile p = new Medium(level, (int) x,(int) y, dir);
+			projectiles.add(p);
+			level.addProjectileEntities(p);
+		}
 	}
 
 	public String getName() {

src/com/redomar/game/entities/Player.java

@@ -3,6 +3,7 @@
 import com.redomar.game.Game;
 import com.redomar.game.InputHandler;
 import com.redomar.game.entities.efx.Swim;
+import com.redomar.game.entities.projectiles.Medium;
 import com.redomar.game.entities.projectiles.Projectile;
 import com.redomar.game.entities.projectiles.Small;
 import com.redomar.game.gfx.Colours;
@@ -63,13 +64,19 @@ public void tick() {
 
 		if(fireRate > 0) fireRate--;
 
-		if (Game.getMouse().getButton() == 1 && fireRate <= 0){
-			if(!swim.isActive(swimType)){
-				double dx = Game.getMouse().getX() - 480/2;
-				double dy = Game.getMouse().getY() - 320/2;
-				double dir = Math.atan2(dy, dx);
-				shoot(x, y, dir);
-				fireRate = Small.FIRE_RATE;
+		if (Game.getMouse().getButton() == 1 || Game.getMouse().getButton() == 3){
+			if(fireRate <= 0){
+				if(Game.getMouse().getButton()== 1){
+					fireRate = Small.FIRE_RATE;	
+				}else if(Game.getMouse().getButton() == 3){
+					fireRate = Medium.FIRE_RATE;
+				}
+				if(!swim.isActive(swimType)){
+					double dx = Game.getMouse().getX() - 480/2;
+					double dy = Game.getMouse().getY() - 320/2;
+					double dir = Math.atan2(dy, dx);
+					shoot(x, y, dir, Game.getMouse().getButton(), false);
+				}				
 			}
 		}
 

src/com/redomar/game/entities/projectiles/Medium.java

@@ -0,0 +1,39 @@
+package com.redomar.game.entities.projectiles;
+
+import com.redomar.game.gfx.Colours;
+import com.redomar.game.gfx.Screen;
+import com.redomar.game.level.LevelHandler;
+
+public class Medium extends Projectile{
+	
+	public static final int FIRE_RATE = 20;
+
+	public Medium(LevelHandler level, int x, int y, double dir) {
+		super(level, x, y, dir);
+		range = 60 - life.nextInt(10);
+		damage = 80;
+		speed = 1;
+		
+		nx = speed * Math.cos(angle);
+		ny = speed * Math.sin(angle);
+	}
+	
+	public void tick() {
+		if (tileCollision(x, y,(int) nx,(int) ny)) remove();
+		move();
+	}
+
+	protected void move() {
+		x += nx;
+		y += ny;
+		
+		double distance = Math.sqrt(Math.abs((xOrigin - x)*(xOrigin - x)+(yOrigin - y)*(yOrigin - y)));
+		this.distance = distance;
+		if(this.distance > range) remove();
+	}
+
+	public void render(Screen screen) {
+		screen.render((int)x, (int)y, 7 * 32, Colours.get(-1, 311, 510, 544), 0x00, 1);
+	}
+
+}

src/com/redomar/game/script/Printing.java

@@ -40,7 +40,7 @@ public void setMessage(String message) {
 	}
 
 	private void readMessageType(PrintTypes type){
-		if(type == PrintTypes.LEVEL){
+		if(type == PrintTypes.ERROR){
 			this.redMode = true;
 		} else {
 			this.redMode = false;