From 45bbe9f283b30f03167548c2b41eee22784a974f Mon Sep 17 00:00:00 2001 From: aldrikboy Date: Fri, 19 Jan 2018 18:34:46 +0100 Subject: 1.2 --- Penguloon/AdManager.cs | 4 ++++ Penguloon/ContentPathManager.cs | 1 + Penguloon/Levels/IceLevel.cs | 2 ++ Penguloon/Levels/Map.cs | 6 ++++++ Penguloon/Objects/GoldPenguinObject.cs | 18 +++++++++--------- Penguloon/Objects/KingPenguinObject.cs | 18 +++++++++--------- Penguloon/Objects/MortarObject.cs | 20 ++++++++++---------- Penguloon/Objects/PenguinObject.cs | 18 +++++++++--------- Penguloon/Penguloon.csproj | 3 +++ Penguloon/Properties/AndroidManifest.xml | 9 ++++----- 10 files changed, 57 insertions(+), 42 deletions(-) diff --git a/Penguloon/AdManager.cs b/Penguloon/AdManager.cs index af49d17..2537a9d 100644 --- a/Penguloon/AdManager.cs +++ b/Penguloon/AdManager.cs @@ -25,6 +25,8 @@ namespace Penguloon public static void Load(Main main) { + return; + GameOverAd = new InterstitialAd(main.Context); GameOverAd.AdUnitId = "ca-app-pub-5292616698166001/6013632836"; GameOverAd.LoadAd(new AdRequest.Builder().Build()); @@ -32,6 +34,8 @@ namespace Penguloon public static void ShowGameOverAd() { + return; + if (GameOverAd.IsLoaded) GameOverAd.Show(); } diff --git a/Penguloon/ContentPathManager.cs b/Penguloon/ContentPathManager.cs index 825f5d7..915b93e 100644 --- a/Penguloon/ContentPathManager.cs +++ b/Penguloon/ContentPathManager.cs @@ -79,6 +79,7 @@ namespace Penguloon "UI/BtnUnmutePressed", "UI/checkbox-empty", "UI/checkbox-selected", + "UI/circle", "UI/speed", "UI/money", diff --git a/Penguloon/Levels/IceLevel.cs b/Penguloon/Levels/IceLevel.cs index d041095..58513c5 100644 --- a/Penguloon/Levels/IceLevel.cs +++ b/Penguloon/Levels/IceLevel.cs @@ -49,6 +49,8 @@ namespace Penguloon.Levels Tile FN = new Tile(5, Direction.Finish); + //Map.WaveManager.CurrentWave = 34; + Map.TileMap = new Tile[13, 18] { { OO,DN,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO }, diff --git a/Penguloon/Levels/Map.cs b/Penguloon/Levels/Map.cs index 1ca9ee4..c428e49 100644 --- a/Penguloon/Levels/Map.cs +++ b/Penguloon/Levels/Map.cs @@ -173,6 +173,12 @@ namespace Penguloon.Levels Objects[i].Update(deltaTime); } + for (int i = 0; i < Enemies.Count; i++) + { + if (Enemies[i] == null) + Enemies.RemoveAt(i); + } + CheckIfRoundCompleted(); } diff --git a/Penguloon/Objects/GoldPenguinObject.cs b/Penguloon/Objects/GoldPenguinObject.cs index 5926559..ef02e56 100644 --- a/Penguloon/Objects/GoldPenguinObject.cs +++ b/Penguloon/Objects/GoldPenguinObject.cs @@ -31,19 +31,19 @@ namespace Penguloon.Objects public override void CreateUpgrades() { - ObjectUpgrade pop3 = new ObjectUpgrade(550, UpgradeType.PopCount, "+1 pop", null, Map.Level); - ObjectUpgrade pop2 = new ObjectUpgrade(400, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); - ObjectUpgrade pop1 = new ObjectUpgrade(250, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); + ObjectUpgrade pop3 = new ObjectUpgrade(850, UpgradeType.PopCount, "+1 pop", null, Map.Level); + ObjectUpgrade pop2 = new ObjectUpgrade(600, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); + ObjectUpgrade pop1 = new ObjectUpgrade(450, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); pop1.OnClick += delegate { extraPops++; }; pop2.OnClick += delegate { extraPops++; }; pop3.OnClick += delegate { extraPops++; }; - ObjectUpgrade rng3 = new ObjectUpgrade(550, UpgradeType.Range, "+1 range", null, Map.Level); - ObjectUpgrade rng2 = new ObjectUpgrade(400, UpgradeType.Range, "+1 range", rng3, Map.Level); - ObjectUpgrade rng1 = new ObjectUpgrade(250, UpgradeType.Range, "+1 range", rng2, Map.Level); + ObjectUpgrade rng3 = new ObjectUpgrade(850, UpgradeType.Range, "+1 range", null, Map.Level); + ObjectUpgrade rng2 = new ObjectUpgrade(600, UpgradeType.Range, "+1 range", rng3, Map.Level); + ObjectUpgrade rng1 = new ObjectUpgrade(450, 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(550, UpgradeType.Speed, "+0.1 speed", null, Map.Level); - ObjectUpgrade spd2 = new ObjectUpgrade(400, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); - ObjectUpgrade spd1 = new ObjectUpgrade(250, UpgradeType.Speed, "+0.1 speed", spd2, Map.Level); + ObjectUpgrade spd3 = new ObjectUpgrade(850, UpgradeType.Speed, "+0.1 speed", null, Map.Level); + ObjectUpgrade spd2 = new ObjectUpgrade(600, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); + ObjectUpgrade spd1 = new ObjectUpgrade(450, 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 b9cb1b1..ee17227 100644 --- a/Penguloon/Objects/KingPenguinObject.cs +++ b/Penguloon/Objects/KingPenguinObject.cs @@ -31,19 +31,19 @@ namespace Penguloon.Objects public override void CreateUpgrades() { - ObjectUpgrade pop3 = new ObjectUpgrade(1850, UpgradeType.PopCount, "+1 pop", null, Map.Level); - ObjectUpgrade pop2 = new ObjectUpgrade(1200, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); - ObjectUpgrade pop1 = new ObjectUpgrade(850, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); + ObjectUpgrade pop3 = new ObjectUpgrade(3850, UpgradeType.PopCount, "+1 pop", null, Map.Level); + ObjectUpgrade pop2 = new ObjectUpgrade(2200, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); + ObjectUpgrade pop1 = new ObjectUpgrade(1850, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); pop1.OnClick += delegate { extraPops++; }; pop2.OnClick += delegate { extraPops++; }; pop3.OnClick += delegate { extraPops++; }; - ObjectUpgrade rng3 = new ObjectUpgrade(1850, UpgradeType.Range, "+1 range", null, Map.Level); - ObjectUpgrade rng2 = new ObjectUpgrade(1200, UpgradeType.Range, "+1 range", rng3, Map.Level); - ObjectUpgrade rng1 = new ObjectUpgrade(850, UpgradeType.Range, "+1 range", rng2, Map.Level); + ObjectUpgrade rng3 = new ObjectUpgrade(3850, UpgradeType.Range, "+1 range", null, Map.Level); + ObjectUpgrade rng2 = new ObjectUpgrade(2200, UpgradeType.Range, "+1 range", rng3, Map.Level); + ObjectUpgrade rng1 = new ObjectUpgrade(1850, 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(1850, UpgradeType.Speed, "+0.1 speed", null, Map.Level); - ObjectUpgrade spd2 = new ObjectUpgrade(1200, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); - ObjectUpgrade spd1 = new ObjectUpgrade(850, UpgradeType.Speed, "+0.1 speed", spd2, Map.Level); + ObjectUpgrade spd3 = new ObjectUpgrade(3850, UpgradeType.Speed, "+0.1 speed", null, Map.Level); + ObjectUpgrade spd2 = new ObjectUpgrade(2200, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); + ObjectUpgrade spd1 = new ObjectUpgrade(1850, 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/MortarObject.cs b/Penguloon/Objects/MortarObject.cs index e1d58ca..6cf03de 100644 --- a/Penguloon/Objects/MortarObject.cs +++ b/Penguloon/Objects/MortarObject.cs @@ -33,19 +33,19 @@ namespace Penguloon.Objects public override void CreateUpgrades() { - ObjectUpgrade pop3 = new ObjectUpgrade(850, 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); + ObjectUpgrade pop3 = new ObjectUpgrade(2850, UpgradeType.PopCount, "+1 pop", null, Map.Level); + ObjectUpgrade pop2 = new ObjectUpgrade(1700, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); + ObjectUpgrade pop1 = new ObjectUpgrade(1550, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); pop1.OnClick += delegate { extraPops++; }; pop2.OnClick += delegate { extraPops++; }; pop3.OnClick += delegate { extraPops++; }; - ObjectUpgrade rng3 = new ObjectUpgrade(850, 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); + ObjectUpgrade rng3 = new ObjectUpgrade(2850, UpgradeType.Range, "+1 range", null, Map.Level); + ObjectUpgrade rng2 = new ObjectUpgrade(1700, UpgradeType.Range, "+1 range", rng3, Map.Level); + ObjectUpgrade rng1 = new ObjectUpgrade(1550, 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(850, 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); + ObjectUpgrade spd3 = new ObjectUpgrade(2850, UpgradeType.Speed, "+0.1 speed", null, Map.Level); + ObjectUpgrade spd2 = new ObjectUpgrade(1700, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); + ObjectUpgrade spd1 = new ObjectUpgrade(1150, 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); @@ -65,7 +65,7 @@ namespace Penguloon.Objects public override void SpawnUnique() { - Projectiles.Add(new SnowballProjectile(this, this.Rotation, extraPops)); + Projectiles.Add(new CannonballProjectile(this, this.Rotation, extraPops)); } } } \ No newline at end of file diff --git a/Penguloon/Objects/PenguinObject.cs b/Penguloon/Objects/PenguinObject.cs index 00aa1da..2b93372 100644 --- a/Penguloon/Objects/PenguinObject.cs +++ b/Penguloon/Objects/PenguinObject.cs @@ -32,19 +32,19 @@ namespace Penguloon.Objects public override void CreateUpgrades() { - ObjectUpgrade pop3 = new ObjectUpgrade(450, UpgradeType.PopCount, "+1 pop", null, Map.Level); - ObjectUpgrade pop2 = new ObjectUpgrade(300, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); - ObjectUpgrade pop1 = new ObjectUpgrade(150, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); + ObjectUpgrade pop3 = new ObjectUpgrade(550, UpgradeType.PopCount, "+1 pop", null, Map.Level); + ObjectUpgrade pop2 = new ObjectUpgrade(400, UpgradeType.PopCount, "+1 pop", pop3, Map.Level); + ObjectUpgrade pop1 = new ObjectUpgrade(250, UpgradeType.PopCount, "+1 pop", pop2, Map.Level); pop1.OnClick += delegate { extraPops++; }; pop2.OnClick += delegate { extraPops++; }; pop3.OnClick += delegate { extraPops++; }; - ObjectUpgrade rng3 = new ObjectUpgrade(450, UpgradeType.Range, "+1 range", null, Map.Level); - ObjectUpgrade rng2 = new ObjectUpgrade(300, UpgradeType.Range, "+1 range", rng3, Map.Level); - ObjectUpgrade rng1 = new ObjectUpgrade(150, UpgradeType.Range, "+1 range", rng2, Map.Level); + ObjectUpgrade rng3 = new ObjectUpgrade(550, UpgradeType.Range, "+1 range", null, Map.Level); + ObjectUpgrade rng2 = new ObjectUpgrade(400, UpgradeType.Range, "+1 range", rng3, Map.Level); + ObjectUpgrade rng1 = new ObjectUpgrade(250, 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(450, UpgradeType.Speed, "+0.1 speed", null, Map.Level); - ObjectUpgrade spd2 = new ObjectUpgrade(300, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); - ObjectUpgrade spd1 = new ObjectUpgrade(150, UpgradeType.Speed, "+0.1 speed", spd2, Map.Level); + ObjectUpgrade spd3 = new ObjectUpgrade(550, UpgradeType.Speed, "+0.1 speed", null, Map.Level); + ObjectUpgrade spd2 = new ObjectUpgrade(400, UpgradeType.Speed, "+0.1 speed", spd3, Map.Level); + ObjectUpgrade spd1 = new ObjectUpgrade(250, 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/Penguloon.csproj b/Penguloon/Penguloon.csproj index abece7a..70adb27 100644 --- a/Penguloon/Penguloon.csproj +++ b/Penguloon/Penguloon.csproj @@ -47,6 +47,9 @@ 4 False SdkOnly + false + false + false diff --git a/Penguloon/Properties/AndroidManifest.xml b/Penguloon/Properties/AndroidManifest.xml index 36bdb0e..3396c13 100644 --- a/Penguloon/Properties/AndroidManifest.xml +++ b/Penguloon/Properties/AndroidManifest.xml @@ -1,11 +1,10 @@  - + - - - + + + \ No newline at end of file -- cgit v1.2.3-70-g09d2