1.2

4 files changed, 37 insertions, 37 deletions

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);