diff --git a/res/images/dogebackground.png b/res/images/dogebackground.png new file mode 100644 index 0000000..9d369e3 Binary files /dev/null and b/res/images/dogebackground.png differ diff --git a/res/levels/doge.level b/res/levels/doge.level new file mode 100644 index 0000000..4792ce4 --- /dev/null +++ b/res/levels/doge.level @@ -0,0 +1,201 @@ +name:Much Level +backgroundMusic:music/ScooterFriendsTurbo8Bit.wav +background:DogeBackground +nextLevel:levels/second.level +- + +[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 diff --git a/res/levels/test.level b/res/levels/test.level index 13232da..ec6e5fd 100644 --- a/res/levels/test.level +++ b/res/levels/test.level @@ -1,85 +1,67 @@ name:Testlevel \o/ backgroundMusic:music/ScooterFriendsTurbo8Bit.wav background:CloudBackground -nextLevel:levels/second.level +nextLevel:levels/doge.level - -[0-1] -spawn:EnemyTwo,1,4,5 -spawn:EnemyTwo,1,4,25 -spawn:EnemyTwo,1,4,45 -spawn:EnemyTwo,1,4,65 -spawn:EnemyTwo,1,4,85 -spawn:EnemyTwo,1,4,100 -[1-2] -spawn:EnemyTwo,1,6,15 -spawn:EnemyTwo,1,6,35 -spawn:EnemyTwo,1,6,55 -spawn:EnemyTwo,1,6,75 -spawn:EnemyTwo,1,6,95 -[2-3] -spawn:EnemyTwo,1,4,5 -spawn:EnemyTwo,1,4,25 -spawn:EnemyTwo,1,4,45 -spawn:EnemyTwo,1,4,65 -spawn:EnemyTwo,1,4,85 -spawn:EnemyTwo,1,4,100 -[3-4] -spawn:EnemyTwo,1,6,15 -spawn:EnemyTwo,1,6,35 -spawn:EnemyTwo,1,6,55 -spawn:EnemyTwo,1,6,75 -spawn:EnemyTwo,1,6,95 -[4-5] -spawn:EnemyTwo,1,4,5 -spawn:EnemyTwo,1,4,25 -spawn:EnemyTwo,1,4,45 -spawn:EnemyTwo,1,4,65 -spawn:EnemyTwo,1,4,85 -spawn:EnemyTwo,1,4,100 -[5-6] -spawn:EnemyTwo,1,6,15 -spawn:EnemyTwo,1,6,35 -spawn:EnemyTwo,1,6,55 -spawn:EnemyTwo,1,6,75 -spawn:EnemyTwo,1,6,95 -[6-7] -spawn:EnemyTwo,1,4,5 -spawn:EnemyTwo,1,4,25 -spawn:EnemyTwo,1,4,45 -spawn:EnemyTwo,1,4,65 -spawn:EnemyTwo,1,4,85 -spawn:EnemyTwo,1,4,100 -[7-8] -spawn:EnemyTwo,1,6,15 -spawn:EnemyTwo,1,6,35 -spawn:EnemyTwo,1,6,55 -spawn:EnemyTwo,1,6,75 -spawn:EnemyTwo,1,6,95 -[8-9] -spawn:EnemyTwo,1,4,5 -spawn:EnemyTwo,1,4,25 -spawn:EnemyTwo,1,4,45 -spawn:EnemyTwo,1,4,65 -spawn:EnemyTwo,1,4,85 -spawn:EnemyTwo,1,4,100 -[9-10] -spawn:EnemyTwo,1,6,15 -spawn:EnemyTwo,1,6,35 -spawn:EnemyTwo,1,6,55 -spawn:EnemyTwo,1,6,75 -spawn:EnemyTwo,1,6,95 -[10-12] -spawn:StoneOne,2,1,0 -spawn:StoneOne,2,1,80 -spawn:StoneThree,2,1,90 -spawn:StoneThree,2,1,100 -[12-14] -spawn:EnemyOne,1,5,20 -spawn:StoneOne,4,5,50 -[14-20] -spawn:EnemyTwo,1,10,60 + +[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:EnemyThree,2,4,33 -spawn:EnemyTwo,5,6,10 +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 diff --git a/src/de/teamteamteam/spacescooter/background/DogeBackground.java b/src/de/teamteamteam/spacescooter/background/DogeBackground.java new file mode 100644 index 0000000..e15225e --- /dev/null +++ b/src/de/teamteamteam/spacescooter/background/DogeBackground.java @@ -0,0 +1,11 @@ +package de.teamteamteam.spacescooter.background; + +public class DogeBackground extends ScrollingBackground { + + public DogeBackground(int x, int y) { + super(x, y); + this.setImage("images/dogebackground.png"); + this.setScrollingSpeed(-1); + } + +} diff --git a/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java b/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java index a636c16..528c944 100644 --- a/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java +++ b/src/de/teamteamteam/spacescooter/background/FuckedUpCloudBackground.java @@ -7,9 +7,9 @@ import de.teamteamteam.spacescooter.brain.GameConfig; public class FuckedUpCloudBackground extends ScrollingBackground { private double x; - private double x_delta; + /*private double x_delta; private int percentage; - private int timer; + private int timer;*/ public FuckedUpCloudBackground(int x, int y) { super(x, y); diff --git a/src/de/teamteamteam/spacescooter/entity/Entity.java b/src/de/teamteamteam/spacescooter/entity/Entity.java index 40b49ff..4428de0 100644 --- a/src/de/teamteamteam/spacescooter/entity/Entity.java +++ b/src/de/teamteamteam/spacescooter/entity/Entity.java @@ -27,7 +27,7 @@ public abstract class Entity implements Updateable, Paintable { */ public static enum availableNames { /* Backgrounds */ - StarBackground, CloudBackground, EarthBackground, + StarBackground, CloudBackground, EarthBackground, DogeBackground, /* Enemies */ EnemyOne, EnemyTwo, EnemyThree, EnemyFour, /* Boss Enemies and belongings */ @@ -37,7 +37,7 @@ public abstract class Entity implements Updateable, Paintable { /* Stones */ StoneOne, StoneTwo, StoneThree, /* Items */ - ItemCredit, ItemHeal, ItemIncreaseDamage, ItemNuke, ItemOneUp, ItemRocket, ItemShield, + ItemCredit, ItemHeal, ItemIncreaseDamage, ItemNuke, ItemOneUp, ItemRocket, ItemShield, } /** diff --git a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java index ae17cbd..8bd5d4c 100644 --- a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java +++ b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java @@ -252,7 +252,7 @@ public abstract class ShootingEntity extends LivingEntity { this.getY() + this.shootSpawnY, this.shootDirection, this.shootSpeed, - (int) (this.shootDamage*5), + (int) (this.shootDamage*1.5), this. primaryShotImage ); } diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java index 969e24d..1de9033 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java @@ -19,7 +19,7 @@ public class EnemyBossMinion extends Enemy{ this.setShootDelay(30); this.setShootSpawn(-10, 10); this.setShootDamage(5); - this.setHealthPoints(15); + this.setHealthPoints(10); this.setCollisionDamage(10); this.setScore(10); this.newY = this.getY(); diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java index 42826f2..877704a 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java @@ -16,7 +16,7 @@ public class EnemyFour extends Enemy{ private double y; private double vektorX; private double vektorY; - private int speed = 2; + private int speed = 4; public EnemyFour(int x, int y, ArrayList points) { super(x, y); @@ -28,7 +28,7 @@ public class EnemyFour extends Enemy{ this.setShootSpawn(-10, 10); this.setShootDamage(5); this.setCollisionDamage(5); - this.setHealthPoints(5); + this.setHealthPoints(20); this.setScore(40); this.points = points; this.x = x; diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java index 8c0f3d4..57ac1ea 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java @@ -19,7 +19,7 @@ public class EnemyThree extends Enemy{ this.setShootDelay(62); this.setShootSpawn(-10, 10); this.setShootDamage(5); - this.setHealthPoints(15); + this.setHealthPoints(40); this.setCollisionDamage(10); this.setScore(30); this.newY = this.getY(); diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java index 15c92a3..fc1949b 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java @@ -13,7 +13,7 @@ public class EnemyTwo extends Enemy{ this.setShootSpawn(-10, 10); this.setShootDamage(5); this.setCollisionDamage(5); - this.setHealthPoints(5); + this.setHealthPoints(45); this.setScore(20); } diff --git a/src/de/teamteamteam/spacescooter/level/Level.java b/src/de/teamteamteam/spacescooter/level/Level.java index b8c34f7..c05d06a 100644 --- a/src/de/teamteamteam/spacescooter/level/Level.java +++ b/src/de/teamteamteam/spacescooter/level/Level.java @@ -4,6 +4,7 @@ import java.awt.Point; import java.util.ArrayList; import de.teamteamteam.spacescooter.background.CloudBackground; +import de.teamteamteam.spacescooter.background.DogeBackground; import de.teamteamteam.spacescooter.background.EarthBackground; import de.teamteamteam.spacescooter.background.StarBackground; import de.teamteamteam.spacescooter.brain.GameConfig; @@ -231,6 +232,9 @@ public final class Level { case CloudBackground: new CloudBackground(x, y); break; + case DogeBackground: + new DogeBackground(x, y); + break; case EarthBackground: new EarthBackground(x, y); break;