sagi/Far-Out
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merged from Matan - fixed some changes

Browse source
This commit is contained in:
Sagi Dayan 2016-03-20 20:33:09 +02:00
commit 804ed3946a
10 changed files with 328 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/com/sagi/dayan/Games/Engine/GameEngine.java
View file

@ -173,16 +173,25 @@ public class GameEngine {
stage.removeKeyListener(scene); stage.removeKeyListener(scene);
switch (currentLevel){ switch (currentLevel){
case 0: case 0:
scene = new FirstStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 1.0 =-", new int[]{5, 1,1,1}); scene = new FirstStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 1.0 =-", new int[]{5, 5});
break; break;
case 1: case 1:
scene = new SecondStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 2.0 =-", new int[]{5, 5,5,5}); scene = new SecondStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 2.0 =-", new int[]{5, 5,5});
break; break;
case 2: case 2:
scene = new ThirdStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 3.0 =-", new int[]{5, 0,0,8}); scene = new ThirdStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 3.0 =-", new int[]{5, 0,2,8});
break; break;
case 3: case 3:
scene = new FourthStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 4.0 =-", new int[]{5, 0,0,8}); scene = new FourthStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 4.0 =-", new int[]{5, 0,0,7});
break;
case 4:
scene = new FifthStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 5.0 =-", new int[]{5, 1,3,8, 10, 10});
break;
case 5:
scene = new SixthStage(pWidth, pHeight, numOfPlayers, this, "-= STAGE 6.0 =-", new int[]{5, 0,0,0, 0, 0, 10, 20});
break;
case 6:
scene = new BlitzStage(pWidth, pHeight, numOfPlayers, this, "-= BLITZ STAGE =-", new int[]{5, 0,0,0, 0, 0, 0, 0, 0, 0, 0});
break; break;
} }

91
src/com/sagi/dayan/Games/Stage/BlitzStage.java Normal file
View file

@ -0,0 +1,91 @@
package com.sagi.dayan.Games.Stage;
import com.sagi.dayan.Games.Elements.Wave;
import com.sagi.dayan.Games.Engine.GameEngine;
import com.sagi.dayan.Games.Utils.WaveConfig;
import com.sagi.dayan.Games.Utils.WaveConfigs;
/**
* Created by sagi on 3/19/16.
*/
public class BlitzStage extends Level{
protected final int NUM_OF_WAVES = 4;
public BlitzStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) {
super(width, height, numOfPlayers, engine, stageTitle, waveDelay);
numOfWaves = NUM_OF_WAVES;
}
@Override
protected void launchWave(long now) {
lastWaveTime = now;
System.out.println("New Wave!! " + currentWave + ", Time: " + now);
WaveConfig wc;
int numOfEnemies = 5, numOfHits = 1;
double launchDelay = 0.5, fireDelay = 5;
switch (currentWave){
case 0:
numOfEnemies = 35;
fireDelay = 0.5;
launchDelay = 0.5;
numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(0);
break;
case 1:
numOfEnemies = 35;
fireDelay = 0.3;
launchDelay = 0.5;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(1);
break;
case 2:
numOfEnemies = 45;
fireDelay = 0.3;
launchDelay = 0.5;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(2);
break;
case 3:
numOfEnemies = 45;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(3);
break;
case 4:
numOfEnemies = 55;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(4);
break;
case 5:
numOfEnemies = 55;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(5);
break;
case 6:
numOfEnemies = 65;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(6);
break;
case 7:
numOfEnemies = 65;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 10;
wc = engine.getWaveConfigs().getWaveConfig(7);
break;
default:
wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO);
break;
}
waves.add(new Wave(numOfEnemies, wc.getMoveVector(), fireDelay, wc.getStepDelay(), launchDelay, wc.getAcc(), "L1-ES1.png", wc.getStartX(), wc.getStartY(), this, numOfHits));
currentWave++;
}
}

77
src/com/sagi/dayan/Games/Stage/FifthStage.java Normal file
View file

@ -0,0 +1,77 @@
package com.sagi.dayan.Games.Stage;
import com.sagi.dayan.Games.Elements.Wave;
import com.sagi.dayan.Games.Engine.GameEngine;
import com.sagi.dayan.Games.Utils.WaveConfig;
import com.sagi.dayan.Games.Utils.WaveConfigs;
/**
* Created by sagi on 3/19/16.
*/
public class FifthStage extends Level{
protected final int NUM_OF_WAVES = 4;
public FifthStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) {
super(width, height, numOfPlayers, engine, stageTitle, waveDelay);
numOfWaves = NUM_OF_WAVES;
}
@Override
protected void launchWave(long now) {
lastWaveTime = now;
System.out.println("New Wave!! " + currentWave + ", Time: " + now);
WaveConfig wc;
int numOfEnemies = 5, numOfHits = 1;
double launchDelay = 0.5, fireDelay = 5;
switch (currentWave){
case 0:
numOfEnemies = 15;
fireDelay = 0.3;
launchDelay = 0.7;
numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(1);
break;
case 1:
numOfEnemies = 15;
fireDelay = 0.3;
launchDelay = 0.7;
numOfHits = 2;
wc = engine.getWaveConfigs().getWaveConfig(4);
break;
case 2:
numOfEnemies = 20;
fireDelay = 0.3;
launchDelay = 0.7;
numOfHits = 3;
wc = engine.getWaveConfigs().getWaveConfig(5);
break;
case 3:
numOfEnemies = 25;
fireDelay = 0.3;
launchDelay = 0.7;
numOfHits = 3;
wc = engine.getWaveConfigs().getWaveConfig(0);
break;
case 4:
numOfEnemies = 35;
fireDelay = 0.2;
launchDelay = 0.5;
numOfHits = 3;
wc = engine.getWaveConfigs().getWaveConfig(3);
break;
case 5:
numOfEnemies = 35;
fireDelay = 0.1;
launchDelay = 0.3;
numOfHits = 5;
wc = engine.getWaveConfigs().getWaveConfig(2);
break;
default:
wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO);
break;
}
waves.add(new Wave(numOfEnemies, wc.getMoveVector(), fireDelay, wc.getStepDelay(), launchDelay, wc.getAcc(), "L1-ES1.png", wc.getStartX(), wc.getStartY(), this, numOfHits));
currentWave++;
}
}

31
src/com/sagi/dayan/Games/Stage/FirstStage.java
View file

@ -10,7 +10,7 @@ import com.sagi.dayan.Games.Utils.WaveConfigs;
*/ */
public class FirstStage extends Level{ public class FirstStage extends Level{
protected final int NUM_OF_WAVES = 4; protected final int NUM_OF_WAVES = 2;
public FirstStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) { public FirstStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) {
super(width, height, numOfPlayers, engine, stageTitle, waveDelay); super(width, height, numOfPlayers, engine, stageTitle, waveDelay);
@ -27,31 +27,24 @@ public class FirstStage extends Level{
switch (currentWave){ switch (currentWave){
case 0: case 0:
numOfEnemies = 5; numOfEnemies = 5;
fireDelay = 0.1; fireDelay = 1.1;
launchDelay = 0.5; launchDelay = 2;
numOfHits = 1; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(6); wc = engine.getWaveConfigs().getWaveConfig(0);
break; break;
case 1: case 1:
numOfEnemies = 5; numOfEnemies = 5;
fireDelay = 1; fireDelay = 0.8;
launchDelay = 1; launchDelay = 2;
numOfHits = 2; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(3); wc = engine.getWaveConfigs().getWaveConfig(1);
break; break;
case 2: case 2:
numOfEnemies = 10;
fireDelay = 0.8;
launchDelay = 1;
numOfHits = 3;
wc = engine.getWaveConfigs().getWaveConfig(2);
break;
case 3:
numOfEnemies = 15; numOfEnemies = 15;
fireDelay = 1.5; fireDelay = 0.7;
launchDelay = 1; launchDelay = 1.5;
numOfHits = 5; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(7); wc = engine.getWaveConfigs().getWaveConfig(2);
break; break;
default: default:
wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO); wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO);

24
src/com/sagi/dayan/Games/Stage/FourthStage.java
View file

@ -26,30 +26,30 @@ public class FourthStage extends Level{
double launchDelay = 0.5, fireDelay = 5; double launchDelay = 0.5, fireDelay = 5;
switch (currentWave){ switch (currentWave){
case 0: case 0:
numOfEnemies = 5; numOfEnemies = 10;
fireDelay = 0.5; fireDelay = 0.5;
launchDelay = 0.5; launchDelay = 1;
numOfHits = 1; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(6); wc = engine.getWaveConfigs().getWaveConfig(3);
break; break;
case 1: case 1:
numOfEnemies = 5; numOfEnemies = 15;
fireDelay = 0.3; fireDelay = 0.3;
launchDelay = 1; launchDelay = 0.8;
numOfHits = 2; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(3); wc = engine.getWaveConfigs().getWaveConfig(6);
break; break;
case 2: case 2:
numOfEnemies = 10; numOfEnemies = 10;
fireDelay = 0.3; fireDelay = 0.3;
launchDelay = 1; launchDelay = 0.7;
numOfHits = 3; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(2); wc = engine.getWaveConfigs().getWaveConfig(0);
break; break;
case 3: case 3:
numOfEnemies = 15; numOfEnemies = 5;
fireDelay = 0.2; fireDelay = 0.2;
launchDelay = 1; launchDelay = 0.7;
numOfHits = 5; numOfHits = 5;
wc = engine.getWaveConfigs().getWaveConfig(7); wc = engine.getWaveConfigs().getWaveConfig(7);
break; break;

4
src/com/sagi/dayan/Games/Stage/Level.java
View file

@ -223,9 +223,7 @@ public abstract class Level extends Scene {
p1Missiles.add(new Missile(players.get(0).getCenterX() - 15, (int) players.get(0).getLocY(), getStageWidth(), getStageHeight(), players.get(0).getAcceleration() + 3, "P1Laser.png", 4)); p1Missiles.add(new Missile(players.get(0).getCenterX() - 15, (int) players.get(0).getLocY(), getStageWidth(), getStageHeight(), players.get(0).getAcceleration() + 3, "P1Laser.png", 4));
players.get(0).updateFireTime(); players.get(0).updateFireTime();
} }
} if(engine.getP1Health() <= 0 && engine.getP1Health() <= 0) {
if(keys.get(engine.getP1Controlles()[GameEngine.USE_CREDIT]) && engine.getP1Health() <= 0 ){
if(engine.getCredits() > 0) {
engine.revivePlayer(0); engine.revivePlayer(0);
players.get(0).resetPlayer(); players.get(0).resetPlayer();

38
src/com/sagi/dayan/Games/Stage/SecondStage.java
View file

@ -10,7 +10,7 @@ import com.sagi.dayan.Games.Utils.WaveConfigs;
*/ */
public class SecondStage extends Level{ public class SecondStage extends Level{
protected final int NUM_OF_WAVES = 4; protected final int NUM_OF_WAVES = 3;
public SecondStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) { public SecondStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) {
super(width, height, numOfPlayers, engine, stageTitle, waveDelay); super(width, height, numOfPlayers, engine, stageTitle, waveDelay);
@ -27,31 +27,31 @@ public class SecondStage extends Level{
switch (currentWave){ switch (currentWave){
case 0: case 0:
numOfEnemies = 5; numOfEnemies = 5;
fireDelay = 0.5; fireDelay = 1;
launchDelay = 0.5; launchDelay = 2;
numOfHits = 1; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(6);
break;
case 1:
numOfEnemies = 5;
fireDelay = 0.3;
launchDelay = 1;
numOfHits = 2;
wc = engine.getWaveConfigs().getWaveConfig(3); wc = engine.getWaveConfigs().getWaveConfig(3);
break; break;
case 2: case 1:
numOfEnemies = 10; numOfEnemies = 10;
fireDelay = 0.3; fireDelay = 0.8;
launchDelay = 1; launchDelay = 1.5;
numOfHits = 3; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(2); wc = engine.getWaveConfigs().getWaveConfig(4);
break;
case 2:
numOfEnemies = 15;
fireDelay = 0.7;
launchDelay = 1.3;
numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(5);
break; break;
case 3: case 3:
numOfEnemies = 15; numOfEnemies = 20;
fireDelay = 0.2; fireDelay = 0.6;
launchDelay = 1; launchDelay = 1;
numOfHits = 5; numOfHits = 2;
wc = engine.getWaveConfigs().getWaveConfig(7); wc = engine.getWaveConfigs().getWaveConfig(6);
break; break;
default: default:
wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO); wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO);

84
src/com/sagi/dayan/Games/Stage/SixthStage.java Normal file
View file

@ -0,0 +1,84 @@
package com.sagi.dayan.Games.Stage;
import com.sagi.dayan.Games.Elements.Wave;
import com.sagi.dayan.Games.Engine.GameEngine;
import com.sagi.dayan.Games.Utils.WaveConfig;
import com.sagi.dayan.Games.Utils.WaveConfigs;
/**
* Created by sagi on 3/19/16.
*/
public class SixthStage extends Level{
protected final int NUM_OF_WAVES = 4;
public SixthStage(int width, int height, int numOfPlayers, GameEngine engine, String stageTitle, int[] waveDelay) {
super(width, height, numOfPlayers, engine, stageTitle, waveDelay);
numOfWaves = NUM_OF_WAVES;
}
@Override
protected void launchWave(long now) {
lastWaveTime = now;
System.out.println("New Wave!! " + currentWave + ", Time: " + now);
WaveConfig wc;
int numOfEnemies = 5, numOfHits = 1;
double launchDelay = 0.5, fireDelay = 5;
switch (currentWave){
case 0:
numOfEnemies = 25;
fireDelay = 0.5;
launchDelay = 0.5;
numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(2);
break;
case 1:
numOfEnemies = 25;
fireDelay = 0.3;
launchDelay = 0.5;
numOfHits = 2;
wc = engine.getWaveConfigs().getWaveConfig(1);
break;
case 2:
numOfEnemies = 30;
fireDelay = 0.3;
launchDelay = 0.5;
numOfHits = 3;
wc = engine.getWaveConfigs().getWaveConfig(0);
break;
case 3:
numOfEnemies = 15;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 4;
wc = engine.getWaveConfigs().getWaveConfig(6);
break;
case 4:
numOfEnemies = 35;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 4;
wc = engine.getWaveConfigs().getWaveConfig(6);
break;
case 5:
numOfEnemies = 35;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 4;
wc = engine.getWaveConfigs().getWaveConfig(4);
break;
case 6:
numOfEnemies = 35;
fireDelay = 0.2;
launchDelay = 0.4;
numOfHits = 4;
wc = engine.getWaveConfigs().getWaveConfig(7);
break;
default:
wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO);
break;
}
waves.add(new Wave(numOfEnemies, wc.getMoveVector(), fireDelay, wc.getStepDelay(), launchDelay, wc.getAcc(), "L1-ES1.png", wc.getStartX(), wc.getStartY(), this, numOfHits));
currentWave++;
}
}

1
src/com/sagi/dayan/Games/Stage/Stage.java
View file

@ -46,7 +46,6 @@ public class Stage extends JPanel implements Runnable{
@Override @Override
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
// System.out.println("Paint Component");
super.paintComponent(g); super.paintComponent(g);
g.drawImage(engine.getScene(),0,0,this); g.drawImage(engine.getScene(),0,0,this);
g.dispose(); g.dispose();

38
src/com/sagi/dayan/Games/Stage/ThirdStage.java
View file

@ -26,32 +26,32 @@ public class ThirdStage extends Level{
double launchDelay = 0.5, fireDelay = 5; double launchDelay = 0.5, fireDelay = 5;
switch (currentWave){ switch (currentWave){
case 0: case 0:
numOfEnemies = 5; numOfEnemies = 10;
fireDelay = 0.5; fireDelay = 0.8;
launchDelay = 0.5; launchDelay = 1.5;
numOfHits = 1; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(6); wc = engine.getWaveConfigs().getWaveConfig(7);
break; break;
case 1: case 1:
numOfEnemies = 5; numOfEnemies = 15;
fireDelay = 0.3; fireDelay = 0.7;
launchDelay = 1; launchDelay = 1.4;
numOfHits = 2; numOfHits = 1;
wc = engine.getWaveConfigs().getWaveConfig(3);
break;
case 2:
numOfEnemies = 10;
fireDelay = 0.3;
launchDelay = 1;
numOfHits = 3;
wc = engine.getWaveConfigs().getWaveConfig(2); wc = engine.getWaveConfigs().getWaveConfig(2);
break; break;
case 2:
numOfEnemies = 25;
fireDelay = 0.5;
launchDelay = 1.4;
numOfHits = 2;
wc = engine.getWaveConfigs().getWaveConfig(0);
break;
case 3: case 3:
numOfEnemies = 15; numOfEnemies = 5;
fireDelay = 0.2; fireDelay = 0.4;
launchDelay = 1; launchDelay = 1;
numOfHits = 5; numOfHits = 4;
wc = engine.getWaveConfigs().getWaveConfig(7); wc = engine.getWaveConfigs().getWaveConfig(1);
break; break;
default: default:
wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO); wc = engine.getWaveConfigs().getWaveConfig(WaveConfigs.DEMO);