valerie
/
SpaceWars
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

Conflicts:
	src/MAndApps/apps/spacewars/SpaceWars.java
master
Marcus Gosselin 2015-04-02 14:45:33 -04:00
parent 813909cd25 7ceec47bb8
commit 34411e6eb6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/MAndApps/apps/spacewars/SpaceWars.java
View File

@ -23,7 +23,10 @@ import MAndApps.apps.spacewars.shop.Shop;
import MAndApps.apps.spacewars.tools.Explosion; import MAndApps.apps.spacewars.tools.Explosion;
import MAndEngine.BasicApp; import MAndEngine.BasicApp;
import MAndEngine.Engine; import MAndEngine.Engine;
<<<<<<< HEAD
import MAndEngine.ImageCreator; import MAndEngine.ImageCreator;
=======
>>>>>>> origin/master
/** /**
* main basicapp class that takes care of managing the abstract concepts of the game. * main basicapp class that takes care of managing the abstract concepts of the game.
@ -88,11 +91,6 @@ public class SpaceWars implements BasicApp {
(int)enemies.elementAt(i).getX(), (int)enemies.elementAt(i).getX(),
(int)enemies.elementAt(i).getY(), 550, true, true, 10 ); (int)enemies.elementAt(i).getY(), 550, true, true, 10 );
log("You gained " + enemies.elementAt(i).getWorth() + " exp.");
addEXP(enemies.elementAt(i).getWorth());
enemies.remove(i); enemies.remove(i);
} else } else
@ -185,13 +183,12 @@ g.drawString("SDFGSDFGBORNJSTBRJOSNB", 100, 100);
@Override @Override
public void initialize() { public void initialize() {
try { try {
//background = ImageIO.read(new FileInputStream(new File("res/background.png")));
Engine.timeScale = 1d / (1000d/(1000d/60)); Engine.timeScale = 1d / (1000d/(1000d/60));
background = ImageCreator.colorNoise(Color.WHITE, .4, .6, CORRECTED_WIDTH, CORRECTED_HEIGHT); background = ImageCreator.colorNoise(Color.WHITE, .4, .6, CORRECTED_WIDTH, CORRECTED_HEIGHT);
for(int i = 0; i < 10; i ++) for(int i = 0; i < 10; i ++)
enemies.add(Enemy.getNewEnemy(Enemy.NORMAL, 0, 0)); enemies.add(Enemy.getNewEnemy(Enemy.NORMAL, 0, 0));
} catch (Exception e) { } catch (Exception e) {
background = (Image) new BufferedImage(1024, 600, BufferedImage.TRANSLUCENT); background = (Image) new BufferedImage(1024, 600, BufferedImage.TRANSLUCENT);
Graphics g = background.getGraphics(); Graphics g = background.getGraphics();
@ -210,6 +207,7 @@ g.drawString("SDFGSDFGBORNJSTBRJOSNB", 100, 100);
} else if (e.getKeyCode() == KeyEvent.VK_E) { } else if (e.getKeyCode() == KeyEvent.VK_E) {
xp = xpToNextLVL - 1; xp = xpToNextLVL - 1;
} else if (e.getKeyCode() == KeyEvent.VK_Q) { } else if (e.getKeyCode() == KeyEvent.VK_Q) {
System.out.println("YOEIRGSODBH");
debug = !debug; debug = !debug;
} else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { } else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
shopping = !shopping; shopping = !shopping;