ye

10 files changed, 147 insertions, 6 deletions

diff --git a/Penguloon/Enemies/DarkRainbowBalloon.cs b/Penguloon/Enemies/DarkRainbowBalloon.cs
new file mode 100644
index 0000000..167aa69
--- /dev/null
+++ b/Penguloon/Enemies/DarkRainbowBalloon.cs
@@ -0,0 +1,16 @@
+using Penguloon.Levels;
+
+namespace Penguloon.Enemies
+{
+    class DarkRainbowBalloon : EnemyBase
+    {
+        public DarkRainbowBalloon(Map map) : base(map)
+        {
+            this.Texture = ContentManager.GetTexture("Enemies/rainbow_dark");
+            this.Speed = 85f;
+            this.Health = 1;
+            this.ChildObject = typeof(RainbowBalloon);
+            this.HealthToTake = 8;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Penguloon/Enemies/GreenBalloon.cs b/Penguloon/Enemies/GreenBalloon.cs
new file mode 100644
index 0000000..9aad202
--- /dev/null
+++ b/Penguloon/Enemies/GreenBalloon.cs
@@ -0,0 +1,16 @@
+using Penguloon.Levels;
+
+namespace Penguloon.Enemies
+{
+    class GreenBalloon : EnemyBase
+    {
+        public GreenBalloon(Map map) : base(map)
+        {
+            this.Texture = ContentManager.GetTexture("Enemies/green");
+            this.Speed = 55f;
+            this.Health = 1;
+            this.ChildObject = typeof(YellowBalloon);
+            this.HealthToTake = 4;
+        }
+    }
+}
diff --git a/Penguloon/Enemies/OrangeBalloon.cs b/Penguloon/Enemies/OrangeBalloon.cs
new file mode 100644
index 0000000..12a4651
--- /dev/null
+++ b/Penguloon/Enemies/OrangeBalloon.cs
@@ -0,0 +1,16 @@
+using Penguloon.Levels;
+
+namespace Penguloon.Enemies
+{
+    class OrangeBalloon : EnemyBase
+    {
+        public OrangeBalloon(Map map) : base(map)
+        {
+            this.Texture = ContentManager.GetTexture("Enemies/orange");
+            this.Speed = 125f;
+            this.Health = 1;
+            this.ChildObject = typeof(GreenBalloon);
+            this.HealthToTake = 5;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Penguloon/Enemies/PurpleBalloon.cs b/Penguloon/Enemies/PurpleBalloon.cs
new file mode 100644
index 0000000..30a81dc
--- /dev/null
+++ b/Penguloon/Enemies/PurpleBalloon.cs
@@ -0,0 +1,16 @@
+using Penguloon.Levels;
+
+namespace Penguloon.Enemies
+{
+    class PurpleBalloon : EnemyBase
+    {
+        public PurpleBalloon(Map map) : base(map)
+        {
+            this.Texture = ContentManager.GetTexture("Enemies/purple");
+            this.Speed = 85f;
+            this.Health = 1;
+            this.ChildObject = typeof(OrangeBalloon);
+            this.HealthToTake = 6;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Penguloon/Enemies/RainbowBalloon.cs b/Penguloon/Enemies/RainbowBalloon.cs
new file mode 100644
index 0000000..3947201
--- /dev/null
+++ b/Penguloon/Enemies/RainbowBalloon.cs
@@ -0,0 +1,16 @@
+using Penguloon.Levels;
+
+namespace Penguloon.Enemies
+{
+    class RainbowBalloon : EnemyBase
+    {
+        public RainbowBalloon(Map map) : base(map)
+        {
+            this.Texture = ContentManager.GetTexture("Enemies/rainbow");
+            this.Speed = 85f;
+            this.Health = 1;
+            this.ChildObject = typeof(PurpleBalloon);
+            this.HealthToTake = 7;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Penguloon/Enemies/YellowBalloon.cs b/Penguloon/Enemies/YellowBalloon.cs
new file mode 100644
index 0000000..4a8412a
--- /dev/null
+++ b/Penguloon/Enemies/YellowBalloon.cs
@@ -0,0 +1,15 @@
+using Penguloon.Levels;
+namespace Penguloon.Enemies
+{
+    class YellowBalloon : EnemyBase
+    {
+        public YellowBalloon(Map map) : base(map)
+        {
+            this.Texture = ContentManager.GetTexture("Enemies/yellow");
+            this.Speed = 45f;
+            this.Health = 1;
+            this.ChildObject = typeof(BlueBalloon);
+            this.HealthToTake = 3;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Penguloon/Levels/IceLevel.cs b/Penguloon/Levels/IceLevel.cs
index 20e3b58..d9be5bb 100644
--- a/Penguloon/Levels/IceLevel.cs
+++ b/Penguloon/Levels/IceLevel.cs
@@ -64,9 +64,9 @@ namespace Penguloon.Levels
                 { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
             };
 
-            //Map.Objects.Add(new PenguinObject(new Vector2(0, 0), Map));
-            //Map.Objects.Add(new PenguinObject(new Vector2(Map.TileWidth * 2, Map.TileHeight * 4), Map));
-            Map.Objects.Add(new CannonObject(new Vector2(Map.TileWidth * 1, Map.TileHeight * 8), Map));
+            Map.Objects.Add(new GoldPenguinObject(new Vector2(0, 0), Map));
+            Map.Objects.Add(new GoldPenguinObject(new Vector2(Map.TileWidth * 2, Map.TileHeight * 4), Map));
+            Map.Objects.Add(new GoldPenguinObject(new Vector2(Map.TileWidth * 1, Map.TileHeight * 8), Map));
         }
     }
 }
\ No newline at end of file
diff --git a/Penguloon/Levels/Map.cs b/Penguloon/Levels/Map.cs
index 05d1669..5248a25 100644
--- a/Penguloon/Levels/Map.cs
+++ b/Penguloon/Levels/Map.cs
@@ -122,6 +122,42 @@ namespace Penguloon.Levels
                 b.Position = pos; b.TargetPosition = target;
                 Enemies.Insert(index, b);
             }
+            if (type == typeof(YellowBalloon))
+            {
+                var b = new YellowBalloon(this);
+                b.Position = pos; b.TargetPosition = target;
+                Enemies.Insert(index, b);
+            }
+            if (type == typeof(GreenBalloon))
+            {
+                var b = new GreenBalloon(this);
+                b.Position = pos; b.TargetPosition = target;
+                Enemies.Insert(index, b);
+            }
+            if (type == typeof(OrangeBalloon))
+            {
+                var b = new OrangeBalloon(this);
+                b.Position = pos; b.TargetPosition = target;
+                Enemies.Insert(index, b);
+            }
+            if (type == typeof(PurpleBalloon))
+            {
+                var b = new PurpleBalloon(this);
+                b.Position = pos; b.TargetPosition = target;
+                Enemies.Insert(index, b);
+            }
+            if (type == typeof(RainbowBalloon))
+            {
+                var b = new RainbowBalloon(this);
+                b.Position = pos; b.TargetPosition = target;
+                Enemies.Insert(index, b);
+            }
+            if (type == typeof(DarkRainbowBalloon))
+            {
+                var b = new DarkRainbowBalloon(this);
+                b.Position = pos; b.TargetPosition = target;
+                Enemies.Insert(index, b);
+            }
         }
     }
 
diff --git a/Penguloon/Levels/WaveManager.cs b/Penguloon/Levels/WaveManager.cs
index bb738fb..022b5d2 100644
--- a/Penguloon/Levels/WaveManager.cs
+++ b/Penguloon/Levels/WaveManager.cs
@@ -26,9 +26,13 @@ namespace Penguloon.Levels
 
         private void CreateWaves()
         {
-            Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RedBalloon), 5) }, 500));
-            Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RedBalloon), 10) }, 500));
-            Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(BlueBalloon), 5) }, 500));
+            /*  1 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RedBalloon), 10) }, 500));
+            /*  2 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RedBalloon), 25) }, 500));
+            /*  3 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RedBalloon), 25), new Tuple<Type, int>(typeof(BlueBalloon), 7) }, 500));
+            /*  4 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(BlueBalloon), 25), new Tuple<Type, int>(typeof(BlueBalloon), 12) }, 500));
+            /*  5 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(BlueBalloon), 7), new Tuple<Type, int>(typeof(BlueBalloon), 20) }, 500));
+
+
         }
 
         public void StartSpawningEnemies()
diff --git a/Penguloon/Penguloon.csproj b/Penguloon/Penguloon.csproj
index fb68443..8e3e22a 100644
--- a/Penguloon/Penguloon.csproj
+++ b/Penguloon/Penguloon.csproj
@@ -67,8 +67,14 @@
     <Compile Include="Controls\Button.cs" />
     <Compile Include="Controls\ControlBase.cs" />
     <Compile Include="Enemies\BlueBalloon.cs" />
+    <Compile Include="Enemies\DarkRainbowBalloon.cs" />
     <Compile Include="Enemies\EnemyBase.cs" />
+    <Compile Include="Enemies\GreenBalloon.cs" />
+    <Compile Include="Enemies\OrangeBalloon.cs" />
+    <Compile Include="Enemies\PurpleBalloon.cs" />
+    <Compile Include="Enemies\RainbowBalloon.cs" />
     <Compile Include="Enemies\RedBalloon.cs" />
+    <Compile Include="Enemies\YellowBalloon.cs" />
     <Compile Include="Levels\WaveManager.cs" />
     <Compile Include="Objects\CannonObject.cs" />
     <Compile Include="Objects\GoldPenguinObject.cs" />