Balancing

10 files changed, 35 insertions, 25 deletions

diff --git a/Penguloon/Enemies/DarkRainbowBalloon.cs b/Penguloon/Enemies/DarkRainbowBalloon.cs
index c1349be..6ff599a 100644
--- a/Penguloon/Enemies/DarkRainbowBalloon.cs
+++ b/Penguloon/Enemies/DarkRainbowBalloon.cs
@@ -7,7 +7,7 @@ namespace Penguloon.Enemies
         public DarkRainbowBalloon(Map map) : base(map)
         {
             this.Texture = ContentManager.GetTexture("Enemies/rainbow_dark");
-            this.Speed = 105f;
+            this.Speed = 135f;
             this.Health = 1;
             this.ChildObject = typeof(RainbowBalloon);
             this.HealthToTake = 8;
diff --git a/Penguloon/Enemies/PurpleBalloon.cs b/Penguloon/Enemies/PurpleBalloon.cs
index 30a81dc..1f27297 100644
--- a/Penguloon/Enemies/PurpleBalloon.cs
+++ b/Penguloon/Enemies/PurpleBalloon.cs
@@ -7,7 +7,7 @@ namespace Penguloon.Enemies
         public PurpleBalloon(Map map) : base(map)
         {
             this.Texture = ContentManager.GetTexture("Enemies/purple");
-            this.Speed = 85f;
+            this.Speed = 95f;
             this.Health = 1;
             this.ChildObject = typeof(OrangeBalloon);
             this.HealthToTake = 6;
diff --git a/Penguloon/Enemies/RainbowBalloon.cs b/Penguloon/Enemies/RainbowBalloon.cs
index 3947201..2b4d889 100644
--- a/Penguloon/Enemies/RainbowBalloon.cs
+++ b/Penguloon/Enemies/RainbowBalloon.cs
@@ -7,7 +7,7 @@ namespace Penguloon.Enemies
         public RainbowBalloon(Map map) : base(map)
         {
             this.Texture = ContentManager.GetTexture("Enemies/rainbow");
-            this.Speed = 85f;
+            this.Speed = 115f;
             this.Health = 1;
             this.ChildObject = typeof(PurpleBalloon);
             this.HealthToTake = 7;
diff --git a/Penguloon/Levels/Map.cs b/Penguloon/Levels/Map.cs
index c428e49..f05c8f5 100644
--- a/Penguloon/Levels/Map.cs
+++ b/Penguloon/Levels/Map.cs
@@ -159,8 +159,7 @@ namespace Penguloon.Levels
         public void Update(float deltaTime)
         {
             for (int i = 0; i < Enemies.Count; i++)
-            {
-           
+            {        
                 if (Enemies[i] != null)
                 Enemies[i].Update(deltaTime);
             }
diff --git a/Penguloon/Levels/WaveManager.cs b/Penguloon/Levels/WaveManager.cs
index 96efa6d..510714c 100644
--- a/Penguloon/Levels/WaveManager.cs
+++ b/Penguloon/Levels/WaveManager.cs
@@ -46,12 +46,12 @@ namespace Penguloon.Levels
 
             /* 16 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 10) }, 500));
             /* 17 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 25) }, 500));
-            /* 18 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 25), new Tuple<Type, int>(typeof(DarkRainbowBalloon), 7) }, 500));
-            /* 19 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 25), new Tuple<Type, int>(typeof(DarkRainbowBalloon), 12) }, 500));
-            /* 20 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 7), new Tuple<Type, int>(typeof(DarkRainbowBalloon), 20) }, 500));
+            /* 18 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 25), new Tuple<Type, int>(typeof(DarkRainbowBalloon), 7) }, 400));
+            /* 19 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 25), new Tuple<Type, int>(typeof(DarkRainbowBalloon), 12) }, 400));
+            /* 20 */ Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(RainbowBalloon), 7), new Tuple<Type, int>(typeof(DarkRainbowBalloon), 20) }, 400));
 
             for (int i = 0; i < 400; i++)
-            Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(DarkRainbowBalloon), 30 + (i * 10)) }, 300));
+            Waves.Add(new Wave(new List<Tuple<Type, int>>() { new Tuple<Type, int>(typeof(DarkRainbowBalloon), 30 + (i * 18)) }, 200));
         }
 
         public void StartSpawningEnemies()
@@ -93,6 +93,11 @@ namespace Penguloon.Levels
                 {
                     Map.Level.Map.WaveManager.StartSpawningEnemies();
                     Map.Level.ParentScene.StartRoundBtn.ControlState = ControlState.Disabled;
+
+                    ////////////////////////////
+                    // call RoundIsFinished for each object
+                    for (int i = 0; i < Map.Objects.Count; i++)
+                        Map.Objects[i].RoundIsFinished();
                 }
             }
         }
diff --git a/Penguloon/Main.cs b/Penguloon/Main.cs
index a6658a3..5f94763 100644
--- a/Penguloon/Main.cs
+++ b/Penguloon/Main.cs
@@ -103,11 +103,16 @@ namespace Penguloon
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         protected override void Update(GameTime gameTime)
         {
-            var delta = (float)gameTime.ElapsedGameTime.TotalSeconds;
+            // bug free code XDDDDDDdd
+            try
+            {
+                var delta = (float)gameTime.ElapsedGameTime.TotalSeconds;
 
-            TouchLocation[] touchLocations = TouchPanel.GetState().ToArray();
+                TouchLocation[] touchLocations = TouchPanel.GetState().ToArray();
 
-            SceneManager.Update(delta, touchLocations);
+                SceneManager.Update(delta, touchLocations);
+            }
+            catch { }
 
             base.Update(gameTime);
         }
diff --git a/Penguloon/Objects/CannonObject.cs b/Penguloon/Objects/CannonObject.cs
index e75639b..4fc8922 100644
--- a/Penguloon/Objects/CannonObject.cs
+++ b/Penguloon/Objects/CannonObject.cs
@@ -31,19 +31,19 @@ namespace Penguloon.Objects
 
         public override void CreateUpgrades()
         {
-            ObjectUpgrade pop3 = new ObjectUpgrade(650, UpgradeType.PopCount, "+1 pop", null, Map.Level);
-            ObjectUpgrade pop2 = new ObjectUpgrade(500, UpgradeType.PopCount, "+1 pop", pop3, Map.Level);
-            ObjectUpgrade pop1 = new ObjectUpgrade(350, UpgradeType.PopCount, "+1 pop", pop2, Map.Level);
+            ObjectUpgrade pop3 = new ObjectUpgrade(950, UpgradeType.PopCount, "+1 pop", null, Map.Level);
+            ObjectUpgrade pop2 = new ObjectUpgrade(700, UpgradeType.PopCount, "+1 pop", pop3, Map.Level);
+            ObjectUpgrade pop1 = new ObjectUpgrade(550, UpgradeType.PopCount, "+1 pop", pop2, Map.Level);
             pop1.OnClick += delegate { extraPops++; }; pop2.OnClick += delegate { extraPops++; }; pop3.OnClick += delegate { extraPops++; };
 
-            ObjectUpgrade rng3 = new ObjectUpgrade(650, UpgradeType.Range, "+1 range", null, Map.Level);
-            ObjectUpgrade rng2 = new ObjectUpgrade(500, UpgradeType.Range, "+1 range", rng3, Map.Level);
-            ObjectUpgrade rng1 = new ObjectUpgrade(350, UpgradeType.Range, "+1 range", rng2, Map.Level);
+            ObjectUpgrade rng3 = new ObjectUpgrade(950, UpgradeType.Range, "+1 range", null, Map.Level);
+            ObjectUpgrade rng2 = new ObjectUpgrade(700, UpgradeType.Range, "+1 range", rng3, Map.Level);
+            ObjectUpgrade rng1 = new ObjectUpgrade(550, UpgradeType.Range, "+1 range", rng2, Map.Level);
             rng1.OnClick += delegate { Range += Map.TileWidth; }; rng2.OnClick += delegate { Range += Map.TileWidth; }; rng3.OnClick += delegate { Range += Map.TileWidth; };
 
-            ObjectUpgrade spd3 = new ObjectUpgrade(650, UpgradeType.Speed, "+0.1 speed", null, Map.Level);
-            ObjectUpgrade spd2 = new ObjectUpgrade(500, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level);
-            ObjectUpgrade spd1 = new ObjectUpgrade(350, UpgradeType.Speed, "+0.1 speed", spd2, Map.Level);
+            ObjectUpgrade spd3 = new ObjectUpgrade(950, UpgradeType.Speed, "+0.1 speed", null, Map.Level);
+            ObjectUpgrade spd2 = new ObjectUpgrade(700, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level);
+            ObjectUpgrade spd1 = new ObjectUpgrade(550, UpgradeType.Speed, "+0.1 speed", spd2, Map.Level);
             spd1.OnClick += delegate { AttackSpeedMS -= 100; }; spd2.OnClick += delegate { AttackSpeedMS -= 100; }; spd3.OnClick += delegate { AttackSpeedMS -= 100; };
 
             UpgradeList.Add(pop1);
diff --git a/Penguloon/Objects/KingPenguinObject.cs b/Penguloon/Objects/KingPenguinObject.cs
index ee17227..da5e1b6 100644
--- a/Penguloon/Objects/KingPenguinObject.cs
+++ b/Penguloon/Objects/KingPenguinObject.cs
@@ -15,7 +15,7 @@ namespace Penguloon.Objects
             this.TileSpanX = 2;
             this.TileSpanY = 2;
             this.Range = Map.TileWidth * 3.5f;
-            this.AttackSpeedMS = 100;
+            this.AttackSpeedMS = 200;
             this.infoText = map.Level.ParentScene.Main.Resources.GetString(Resource.String.ObjectKingPenguin);
         }
 
@@ -25,7 +25,7 @@ namespace Penguloon.Objects
             this.TileSpanX = 2;
             this.TileSpanY = 2;
             this.Range = Map.TileWidth * 3.5f;
-            this.AttackSpeedMS = 100;
+            this.AttackSpeedMS = 200;
             this.infoText = map.Level.ParentScene.Main.Resources.GetString(Resource.String.ObjectKingPenguin);
         }
 
diff --git a/Penguloon/Properties/AndroidManifest.xml b/Penguloon/Properties/AndroidManifest.xml
index 3396c13..293905e 100644
--- a/Penguloon/Properties/AndroidManifest.xml
+++ b/Penguloon/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.release.penguloon" android:versionCode="3" android:versionName="1.2" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.release.penguloon" android:versionCode="4" android:versionName="1.3" android:installLocation="auto">
 	<uses-sdk android:targetSdkVersion="19" android:minSdkVersion="19" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/Penguloon/Scenes/SceneBase.cs b/Penguloon/Scenes/SceneBase.cs
index 4214e97..a56bf04 100644
--- a/Penguloon/Scenes/SceneBase.cs
+++ b/Penguloon/Scenes/SceneBase.cs
@@ -79,7 +79,8 @@ namespace Penguloon.Scenes
         /// <param name="size"></param>
         /// <param name="textAllignment"></param>
         /// <param name="color"></param>
-        public void DrawText(SpriteFont font, string text, Vector2 position, Vector2 size, TextAllignment textAllignment, Color color, Color borderColor, int borderWidth)
+        public void DrawText(SpriteFont font, string text, Vector2 position, Vector2 size, TextAllignment textAllignment, 
+            Color color, Color borderColor, int borderWidth)
         {
             if (font == null) return;