Compare commits

..

No commits in common. "master" and "yoloshots" have entirely different histories.

214 changed files with 1055 additions and 6877 deletions

1
.gitignore vendored
View File

@ -5,4 +5,3 @@
bin
compiled
game.jar
Highscore

View File

@ -1,23 +1,15 @@
.PHONY: clean run stat debug compile
.PHONY: clean run
game.jar: compile
echo 'Main-Class: de.teamteamteam.spacescooter.Main' >compiled/manifest.txt
jar cvfe game.jar 'de.teamteamteam.spacescooter.Main' -C compiled de -C compiled images -C compiled sounds -C compiled music -C compiled levels
compile: clean
game.jar: clean
mkdir -p compiled
find src/ -type f -name '*.java' -print0 | xargs -0 javac -cp src/ -d compiled/
cp -r res/* compiled/
echo 'Main-Class: de.teamteamteam.spacescooter.Main' >compiled/manifest.txt
jar cvfe game.jar 'de.teamteamteam.spacescooter.Main' -C compiled de -C compiled images -C compiled sounds
run: game.jar
java -jar game.jar
debug: compile
java -cp compiled/ de.teamteamteam.spacescooter.Main
clean:
rm -rf compiled
rm -f game.jar
stat:
find . -type f -name '*.java' -print0 | xargs -0 wc -l

View File

@ -28,10 +28,6 @@ There are some minor things you need to set up to your project in eclipse:
* Add the folder res/ to your *build path*!
* You're now set up to develop and test!
Stats
-----
If you're interested in the amount of code, run 'make stat'.
Troubleshooting
---------------

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View File

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

BIN
res/images/Item2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

BIN
res/images/Item3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

BIN
res/images/Item4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 999 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 561 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 580 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 777 B

After

Width:  |  Height:  |  Size: 777 B

View File

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
res/images/explosion2_3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
res/images/explosion2_5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 967 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 897 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 KiB

View File

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 375 B

View File

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 251 B

View File

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

View File

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 253 B

View File

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 KiB

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1010 KiB

View File

@ -1,201 +0,0 @@
name:Much Level
backgroundMusic:music/ScooterFriendsTurbo8Bit.wav
background:DogeBackground
nextLevel:
-
[0-1]
spawn:StoneOne,1,4,5
spawn:StoneOne,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneThree,1,4,85
spawn:StoneThree,1,4,100
[1-2]
spawn:StoneOne,1,6,15
spawn:StoneOne,1,6,35
spawn:StoneTwo,1,6,55
spawn:StoneTwo,1,6,75
spawn:StoneThree,1,6,95
[2-3]
spawn:StoneThree,1,4,5
spawn:StoneOne,1,4,25
spawn:StoneOne,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneThree,1,4,100
[3-4]
spawn:StoneThree,1,6,15
spawn:StoneOne,1,6,35
spawn:StoneOne,1,6,55
spawn:StoneOne,1,6,75
spawn:StoneOne,1,6,95
[4-5]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneThree,1,4,65
spawn:StoneThree,1,4,85
spawn:StoneThree,1,4,100
[5-6]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneTwo,1,6,55
spawn:StoneTwo,1,6,75
spawn:StoneTwo,1,6,95
[6-7]
spawn:StoneOne,1,4,5
spawn:StoneOne,1,4,25
spawn:StoneOne,1,4,45
spawn:StoneOne,1,4,65
spawn:StoneOne,1,4,85
spawn:StoneOne,1,4,100
[7-8]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[8-9]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[9-10]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[10-11]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[11-12]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[12-13]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[13-14]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[14-15]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[15-16]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[16-17]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[17-18]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[18-19]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[20-21]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[21-22]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[22-23]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[23-24]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[24-25]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[25-26]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[26-27]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[27-28]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[28-29]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95
[29-30]
spawn:StoneTwo,1,4,5
spawn:StoneTwo,1,4,25
spawn:StoneTwo,1,4,45
spawn:StoneTwo,1,4,65
spawn:StoneTwo,1,4,85
spawn:StoneTwo,1,4,100
[30-31]
spawn:StoneThree,1,6,15
spawn:StoneThree,1,6,35
spawn:StoneThree,1,6,55
spawn:StoneThree,1,6,75
spawn:StoneThree,1,6,95

View File

@ -1,22 +0,0 @@
name:Level Zwai! :D
backgroundMusic:music/ScooterFriendsTurbo8Bit.wav
background:EarthBackground
nextLevel:levels/doge.level
-
[0-1]
spawn:EnemyBoss,1,1,50
[1-2]
spawn:StoneOne,2,1,0
spawn:StoneOne,2,1,80
spawn:StoneThree,2,1,90
spawn:StoneThree,2,1,100
[2-4]
spawn:EnemyOne,1,5,20
spawn:StoneOne,4,5,50
[4-10]
spawn:EnemyTwo,1,10,60
[10-25]
spawn:EnemyThree,2,4,33
spawn:EnemyTwo,5,6,10
[25-30]
spawn:EnemyBigBoss,1,1,1

View File

@ -1,67 +0,0 @@
name:Level One
backgroundMusic:music/ScooterFriendsTurbo8Bit.wav
background:CloudBackground
nextLevel:levels/second.level
-
[0-3]
spawn:EnemyFour,5,5,5,540;306;10;300
spawn:EnemyFour,5,5,10,540;306;0;600
spawn:EnemyFour,5,5,15,540;306;0;550
spawn:EnemyFour,5,5,20,540;306;0;500
spawn:EnemyFour,5,5,25,540;306;0;450
spawn:EnemyFour,5,5,30,540;306;10;300
spawn:EnemyFour,5,5,35,540;306;0;250
spawn:EnemyFour,5,5,40,540;306;0;200
spawn:EnemyFour,5,5,45,540;306;10;300
spawn:EnemyFour,5,5,50,540;306;0;100
spawn:EnemyFour,5,5,55,540;306;0;60
[3-6]
spawn:EnemyFour,5,5,30,540;306;0;575
spawn:EnemyFour,5,5,35,540;306;10;300
spawn:EnemyFour,5,5,40,540;306;0;525
spawn:EnemyFour,5,5,45,540;306;0;475
spawn:EnemyFour,5,5,50,540;306;10;300
spawn:EnemyFour,5,5,55,540;306;10;300
spawn:EnemyFour,5,5,60,540;306;0;225
spawn:EnemyFour,5,5,65,540;306;0;175
spawn:EnemyFour,5,5,70,540;306;0;125
spawn:EnemyFour,5,5,75,540;306;0;60
spawn:EnemyFour,5,5,80,540;306;10;300
[6-9]
spawn:EnemyFour,5,5,5,540;306;10;300
spawn:EnemyFour,5,5,10,540;306;0;600
spawn:EnemyFour,5,5,15,540;306;0;550
spawn:EnemyFour,5,5,20,540;306;0;500
spawn:EnemyFour,5,5,25,540;306;0;450
spawn:EnemyFour,5,5,30,540;306;10;300
spawn:EnemyFour,5,5,35,540;306;0;250
spawn:EnemyFour,5,5,40,540;306;0;200
spawn:EnemyFour,5,5,45,540;306;10;300
spawn:EnemyFour,5,5,50,540;306;0;100
spawn:EnemyFour,5,5,55,540;306;0;60
[9-12]
spawn:EnemyFour,5,5,35,540;306;0;575
spawn:EnemyFour,5,5,40,540;306;10;300
spawn:EnemyFour,5,5,45,540;306;0;525
spawn:EnemyFour,5,5,50,540;306;0;475
spawn:EnemyFour,5,5,55,540;306;10;300
spawn:EnemyFour,5,5,60,540;306;10;300
spawn:EnemyFour,5,5,65,540;306;0;225
spawn:EnemyFour,5,5,70,540;306;0;175
spawn:EnemyFour,5,5,75,540;306;0;125
spawn:EnemyFour,5,5,80,540;306;10;300
spawn:EnemyFour,5,5,85,540;306;0;60
[12-20]
spawn:EnemyTwo,2,15,30
spawn:EnemyThree,2,15,40
spawn:EnemyThree,2,15,50
spawn:EnemyTwo,2,15,60
[20-35]
spawn:EnemyTwo,2,4,33
spawn:EnemyTwo,2,4,44
spawn:EnemyThree,2,4,55
spawn:EnemyThree,2,4,66
spawn:EnemyOne,2,4,77
[35-40]
spawn:EnemyBoss,1,1,50

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More