summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraldrikboy <aldrikboy@gmail.com>2018-01-19 18:34:46 +0100
committeraldrikboy <aldrikboy@gmail.com>2018-01-19 18:34:46 +0100
commit45bbe9f283b30f03167548c2b41eee22784a974f (patch)
tree6493792b98b1b9f7d6460203d0fdad74d273b999
parenta49c13ab80a76ec81f36d6cbc8c37721f24f828c (diff)
1.2
Diffstat
-rw-r--r--Penguloon/AdManager.cs4
-rw-r--r--Penguloon/ContentPathManager.cs1
-rw-r--r--Penguloon/Levels/IceLevel.cs2
-rw-r--r--Penguloon/Levels/Map.cs6
-rw-r--r--Penguloon/Objects/GoldPenguinObject.cs18
-rw-r--r--Penguloon/Objects/KingPenguinObject.cs18
-rw-r--r--Penguloon/Objects/MortarObject.cs20
-rw-r--r--Penguloon/Objects/PenguinObject.cs18
-rw-r--r--Penguloon/Penguloon.csproj3
-rw-r--r--Penguloon/Properties/AndroidManifest.xml9
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 @@
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="GooglePlayServicesLib">
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Penguloon.Penguloon" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.release.penguloon" android:versionCode="3" android:versionName="1.2" 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" />
<application android:label="Penguloon" android:icon="@drawable/Splash">
- <activity android:name="com.google.android.gms.ads.AdActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
- <meta-data android:name="com.google.android.gms.version"
- android:value="@integer/google_play_services_version"/>
- </application>
+ <activity android:name="com.google.android.gms.ads.AdActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
+ <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
+ </application>
</manifest> \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-06 07:24:32 +0000