Hochschulprojekte
/
SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter

This commit is contained in:
Licht 2014-11-25 11:50:33 +01:00
parent 543cc82344 d2e28477f0
commit 1d00e840ca
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/levels/test.level
View File

@ -1,10 +1,11 @@
name:Lustiger Levelname
backgroundMusic:music/bla.wav
background:FooBackground
bossEnemy:TheBigOne
-
[0-2025]
spawn:GegnerOne,2,6
[2026-2168]
spawn:GegnerOne,2,4
spawn:GegnerTwo,5,6
spawn:GegnerTwo,5,6
[2169-2170]
spawn:BossGegner,1,1

8
src/de/teamteamteam/spacescooter/level/Level.java
View File

@ -9,10 +9,6 @@ import de.teamteamteam.spacescooter.entity.enemy.EnemyBoss;
import de.teamteamteam.spacescooter.entity.enemy.EnemyFour;
import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
import de.teamteamteam.spacescooter.entity.item.ItemChance;
import de.teamteamteam.spacescooter.gui.HealthBar;
import de.teamteamteam.spacescooter.gui.InterfaceBar;
import de.teamteamteam.spacescooter.gui.ScoreBar;
import de.teamteamteam.spacescooter.gui.ShieldBar;
import de.teamteamteam.spacescooter.screen.GameScreen;
import de.teamteamteam.spacescooter.utility.Loader;
@ -44,6 +40,7 @@ public final class Level {
* Initialize the level based on the LevelConfig attributes.
*/
public void doBuildUp() {
new StarBackground(0, 50);
GameScreen.setPlayer(new Player(200, 300));
@ -53,9 +50,6 @@ public final class Level {
points.add(new Point(600,100));
points.add(new Point(0,500));
new EnemyFour(800, 400, points);
new StarBackground(0, 50);
new EnemyThree(450, 100);
new EnemyBoss(200, 300);

9
src/de/teamteamteam/spacescooter/level/LevelConfigParser.java
View File

@ -80,8 +80,13 @@ public class LevelConfigParser {
this.currentIntervalEnd = Integer.parseInt(intervalBorder[1]);
this.levelConfig.addIntervalToList(this.currentIntervalStart, this.currentIntervalEnd);
} else {
String[] entitySpawnRule = line.split(",", 3);
this.levelConfig.addEntitySpawnRule(this.currentIntervalStart, this.currentIntervalEnd, entitySpawnRule[0], Integer.parseInt(entitySpawnRule[1]), Integer.parseInt(entitySpawnRule[2]));
String[] rule = line.split(":", 2);
if(rule[0].equals("spawn")) {
String[] entitySpawnRule = rule[1].split(",", 3);
this.levelConfig.addEntitySpawnRule(this.currentIntervalStart, this.currentIntervalEnd, entitySpawnRule[0], Integer.parseInt(entitySpawnRule[1]), Integer.parseInt(entitySpawnRule[2]));
} else {
System.err.println("Unknown rule type: '"+rule[0]+"' : '"+line+"'");
}
}
break;
default: