fanboi & chumchum

28 files changed, 278 insertions, 5 deletions

diff --git a/Penguloon/Content/Content.mgcb b/Penguloon/Content/Content.mgcb
index f20b8fc..b7d585f 100644
--- a/Penguloon/Content/Content.mgcb
+++ b/Penguloon/Content/Content.mgcb
@@ -667,3 +667,99 @@
 /processorParam:TextureFormat=Color
 /build:SplashArt/3.png
 
+#begin Tiles/sand.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sand.png
+
+#begin Tiles/sandCornerLeftDown.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sandCornerLeftDown.png
+
+#begin Tiles/sandCornerLeftTop.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sandCornerLeftTop.png
+
+#begin Tiles/sandCornerRightDown.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sandCornerRightDown.png
+
+#begin Tiles/sandCornerRightTop.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sandCornerRightTop.png
+
+#begin Tiles/sandHorizontal.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sandHorizontal.png
+
+#begin Tiles/sandVertical.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Tiles/sandVertical.png
+
+#begin SplashArt/4.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:SplashArt/4.png
+
diff --git a/Penguloon/Content/SplashArt/4.png b/Penguloon/Content/SplashArt/4.png
new file mode 100644
index 0000000..9623939
--- /dev/null
+++ b/Penguloon/Content/SplashArt/4.png
diff --git a/Penguloon/Content/Tiles/sand.png b/Penguloon/Content/Tiles/sand.png
new file mode 100644
index 0000000..abd640e
--- /dev/null
+++ b/Penguloon/Content/Tiles/sand.png
diff --git a/Penguloon/Content/Tiles/sandCornerLeftDown.png b/Penguloon/Content/Tiles/sandCornerLeftDown.png
new file mode 100644
index 0000000..f4c453e
--- /dev/null
+++ b/Penguloon/Content/Tiles/sandCornerLeftDown.png
diff --git a/Penguloon/Content/Tiles/sandCornerLeftTop.png b/Penguloon/Content/Tiles/sandCornerLeftTop.png
new file mode 100644
index 0000000..a6cc065
--- /dev/null
+++ b/Penguloon/Content/Tiles/sandCornerLeftTop.png
diff --git a/Penguloon/Content/Tiles/sandCornerRightDown.png b/Penguloon/Content/Tiles/sandCornerRightDown.png
new file mode 100644
index 0000000..279f15a
--- /dev/null
+++ b/Penguloon/Content/Tiles/sandCornerRightDown.png
diff --git a/Penguloon/Content/Tiles/sandCornerRightTop.png b/Penguloon/Content/Tiles/sandCornerRightTop.png
new file mode 100644
index 0000000..9289be5
--- /dev/null
+++ b/Penguloon/Content/Tiles/sandCornerRightTop.png
diff --git a/Penguloon/Content/Tiles/sandHorizontal.png b/Penguloon/Content/Tiles/sandHorizontal.png
new file mode 100644
index 0000000..859ae74
--- /dev/null
+++ b/Penguloon/Content/Tiles/sandHorizontal.png
diff --git a/Penguloon/Content/Tiles/sandVertical.png b/Penguloon/Content/Tiles/sandVertical.png
new file mode 100644
index 0000000..3e17fad
--- /dev/null
+++ b/Penguloon/Content/Tiles/sandVertical.png
diff --git a/Penguloon/Content/UI/sand.png b/Penguloon/Content/UI/sand.png
new file mode 100644
index 0000000..abd640e
--- /dev/null
+++ b/Penguloon/Content/UI/sand.png
diff --git a/Penguloon/Content/UI/sandCornerLeftDown.png b/Penguloon/Content/UI/sandCornerLeftDown.png
new file mode 100644
index 0000000..f4c453e
--- /dev/null
+++ b/Penguloon/Content/UI/sandCornerLeftDown.png
diff --git a/Penguloon/Content/UI/sandCornerLeftTop.png b/Penguloon/Content/UI/sandCornerLeftTop.png
new file mode 100644
index 0000000..a6cc065
--- /dev/null
+++ b/Penguloon/Content/UI/sandCornerLeftTop.png
diff --git a/Penguloon/Content/UI/sandCornerRightDown.png b/Penguloon/Content/UI/sandCornerRightDown.png
new file mode 100644
index 0000000..279f15a
--- /dev/null
+++ b/Penguloon/Content/UI/sandCornerRightDown.png
diff --git a/Penguloon/Content/UI/sandCornerRightTop.png b/Penguloon/Content/UI/sandCornerRightTop.png
new file mode 100644
index 0000000..9289be5
--- /dev/null
+++ b/Penguloon/Content/UI/sandCornerRightTop.png
diff --git a/Penguloon/Content/UI/sandHorizontal.png b/Penguloon/Content/UI/sandHorizontal.png
new file mode 100644
index 0000000..859ae74
--- /dev/null
+++ b/Penguloon/Content/UI/sandHorizontal.png
diff --git a/Penguloon/Content/UI/sandVertical.png b/Penguloon/Content/UI/sandVertical.png
new file mode 100644
index 0000000..3e17fad
--- /dev/null
+++ b/Penguloon/Content/UI/sandVertical.png
diff --git a/Penguloon/ContentManager.cs b/Penguloon/ContentManager.cs
index e7077f8..561eead 100644
--- a/Penguloon/ContentManager.cs
+++ b/Penguloon/ContentManager.cs
@@ -135,6 +135,29 @@ namespace Penguloon
             return null;
         }
 
+        public static Texture2D GetSandTileTextureByType(int type)
+        {
+            switch (type)
+            {
+                case 0:
+                    return GetTexture("Tiles/sand");
+                case 1:
+                    return GetTexture("Tiles/sandCornerLeftDown");
+                case 2:
+                    return GetTexture("Tiles/sandCornerLeftTop");
+                case 3:
+                    return GetTexture("Tiles/sandCornerRightDown");
+                case 4:
+                    return GetTexture("Tiles/sandCornerRightTop");
+                case 5:
+                    return GetTexture("Tiles/sandHorizontal");
+                case 6:
+                    return GetTexture("Tiles/sandVertical");
+            }
+
+            return null;
+        }
+
         public static void DisposeContent()
         {
             foreach (var entry in TextureDictionary)
diff --git a/Penguloon/ContentPathManager.cs b/Penguloon/ContentPathManager.cs
index 9f0f108..22f93a9 100644
--- a/Penguloon/ContentPathManager.cs
+++ b/Penguloon/ContentPathManager.cs
@@ -32,6 +32,14 @@ namespace Penguloon
             "Tiles/waterHorizontal",
             "Tiles/waterVertical",
 
+            "Tiles/sand",
+            "Tiles/sandCornerLeftDown",
+            "Tiles/sandCornerLeftTop",
+            "Tiles/sandCornerRightDown",
+            "Tiles/sandCornerRightTop",
+            "Tiles/sandHorizontal",
+            "Tiles/sandVertical",
+
             "UI/btnDisabled",
             "UI/btnIdle",
             "UI/btnPressed",
@@ -54,6 +62,7 @@ namespace Penguloon
             "SplashArt/1",
             "SplashArt/2",
             "SplashArt/3",
+            "SplashArt/4",
 
             "Enemies/pop",
             "Enemies/red",
diff --git a/Penguloon/Controls/LevelSelector.cs b/Penguloon/Controls/LevelSelector.cs
index 3e06968..64355d0 100644
--- a/Penguloon/Controls/LevelSelector.cs
+++ b/Penguloon/Controls/LevelSelector.cs
@@ -106,6 +106,8 @@ namespace Penguloon.Controls
             Levels.Add(new IceLevel());
             Levels.Add(new IceLevel2());
             Levels.Add(new IceLevel3());
+
+            Levels.Add(new SandLevel1());
         }
 
         public override void Draw(float deltaTime)
diff --git a/Penguloon/Controls/ObjectSelector.cs b/Penguloon/Controls/ObjectSelector.cs
index 277107b..a13f3eb 100644
--- a/Penguloon/Controls/ObjectSelector.cs
+++ b/Penguloon/Controls/ObjectSelector.cs
@@ -17,7 +17,7 @@ namespace Penguloon.Controls
 
     public class ObjectSelector : ControlBase
     {
-        public State State { get; set; }
+        public State State { get; set; } = State.Idle;
 
         public int SelectedObjectIndex { get; set; } = -1;
 
diff --git a/Penguloon/Enums.cs b/Penguloon/Enums.cs
index 31d4943..4305744 100644
--- a/Penguloon/Enums.cs
+++ b/Penguloon/Enums.cs
@@ -56,4 +56,10 @@ namespace Penguloon
         None,
         Finish
     }
+
+    public enum LevelType
+    {
+        Ice,
+        Sand
+    }
 }
\ No newline at end of file
diff --git a/Penguloon/Levels/IceLevel.cs b/Penguloon/Levels/IceLevel.cs
index 1a810a7..d041095 100644
--- a/Penguloon/Levels/IceLevel.cs
+++ b/Penguloon/Levels/IceLevel.cs
@@ -14,7 +14,8 @@ namespace Penguloon.Levels
             this.Money = 350;
             this.Health = 200;
             this.ID = 1;
-            this.MinimumLevel = 0;
+            this.MinimumLevel = 1;
+            LevelType = LevelType.Ice;
         }
 
         public override void DrawUnique(float deltaTime)
diff --git a/Penguloon/Levels/IceLevel2.cs b/Penguloon/Levels/IceLevel2.cs
index 86e3ce3..d225a14 100644
--- a/Penguloon/Levels/IceLevel2.cs
+++ b/Penguloon/Levels/IceLevel2.cs
@@ -15,6 +15,7 @@ namespace Penguloon.Levels
             this.Health = 200;
             this.ID = 2;
             this.MinimumLevel = 5;
+            LevelType = LevelType.Ice;
         }
 
         public override void DrawUnique(float deltaTime)
diff --git a/Penguloon/Levels/IceLevel3.cs b/Penguloon/Levels/IceLevel3.cs
index 1a7451d..e70ea70 100644
--- a/Penguloon/Levels/IceLevel3.cs
+++ b/Penguloon/Levels/IceLevel3.cs
@@ -15,6 +15,7 @@ namespace Penguloon.Levels
             this.Health = 200;
             this.ID = 3;
             this.MinimumLevel = 5;
+            LevelType = LevelType.Ice;
         }
 
         public override void DrawUnique(float deltaTime)
diff --git a/Penguloon/Levels/LevelBase.cs b/Penguloon/Levels/LevelBase.cs
index e077ee4..dc8b5af 100644
--- a/Penguloon/Levels/LevelBase.cs
+++ b/Penguloon/Levels/LevelBase.cs
@@ -10,6 +10,8 @@ namespace Penguloon.Levels
 {
     public abstract class LevelBase
     {
+        public LevelType LevelType { get; set; }
+
         public GameScene ParentScene { get; set; }
 
         public Texture2D SplashArt { get; set; }
@@ -88,6 +90,8 @@ namespace Penguloon.Levels
 
             for(int i = 0; i < touchLocations.Length; i++)
             {
+                if (touchLocations[i].State != TouchLocationState.Released) continue;
+
                 if (touchLocations[i].Position.X > Map.MapWidth) return;
                 if (touchLocations[i].Position.Y > Map.MapHeight) return;
 
@@ -164,7 +168,9 @@ namespace Penguloon.Levels
         }
 
         public void FinishGame()
-        {         
+        {
+            Finished = true;
+
             // upload score here or something
             UserdataManager.GamesPlayed++;
             UserdataManager.TotalKills += Kills;
diff --git a/Penguloon/Levels/Map.cs b/Penguloon/Levels/Map.cs
index f3adf64..03e1c4f 100644
--- a/Penguloon/Levels/Map.cs
+++ b/Penguloon/Levels/Map.cs
@@ -33,6 +33,8 @@ namespace Penguloon.Levels
 
         public LevelBase Level { get; set; }
 
+        public int SpareTilesY { get; set; }
+
         public Map(GameScene parentScene, LevelBase level)
         {
             this.ParentScene = parentScene;
@@ -56,6 +58,8 @@ namespace Penguloon.Levels
             MapWidth = TileWidth * 18;
             MapHeight = TileHeight * 13;
 
+            SpareTilesY = ((int)StaticUIValues.ScreenViewport.Y - MapHeight) / TileHeight; SpareTilesY += 1;
+
             WaveManager = new WaveManager(this);
         }
 
@@ -64,9 +68,16 @@ namespace Penguloon.Levels
             for (int y = 0; y < TileMap.GetLength(0); y++)
             {
                 for (int x = 0; x < TileMap.GetLength(1); x++)
-                {                    
-                    Texture2D tileTexture = ContentManager.GetTileTextureByType(TileMap[y, x].Type);
+                {
+                    Texture2D tileTexture = null;
 
+                    switch (Level.LevelType)
+                    {
+                        case LevelType.Ice: tileTexture = ContentManager.GetTileTextureByType(TileMap[y, x].Type); break;
+                        case LevelType.Sand: tileTexture = ContentManager.GetSandTileTextureByType(TileMap[y, x].Type); break;
+                    }
+
+                    if(tileTexture != null)
                     ParentScene.Main.SpriteBatch.Draw(tileTexture,
                         destinationRectangle: new Rectangle(x * TileWidth, y * TileHeight, TileWidth, TileHeight));
 
@@ -76,6 +87,33 @@ namespace Penguloon.Levels
                 }
             }
 
+            Texture2D tileTextureSpare = null;
+            Texture2D unplaceableTileTexture = null;
+
+            unplaceableTileTexture = ContentManager.GetTexture("UI/unselectableTile");
+
+            switch (Level.LevelType)
+            {
+                case LevelType.Ice: tileTextureSpare = ContentManager.GetTileTextureByType(0); break;
+                case LevelType.Sand: tileTextureSpare = ContentManager.GetSandTileTextureByType(0); break;
+            }
+
+            // draw spare tiles 
+            for (int y = 0; y < SpareTilesY; y++)
+            {
+                for (int x = 0; x < TileMap.GetLength(1); x++)
+                {
+                    if (tileTextureSpare != null)
+                        ParentScene.Main.SpriteBatch.Draw(tileTextureSpare,
+                            destinationRectangle: new Rectangle(x * TileWidth, MapHeight + (y * TileHeight), TileWidth, TileHeight));
+
+                    if (ParentScene.ObjectSeletor.State == Controls.State.Selected)
+                        ParentScene.Main.SpriteBatch.Draw(unplaceableTileTexture,
+                        destinationRectangle: new Rectangle(x * TileWidth, MapHeight + (y * TileHeight), TileWidth, TileHeight));
+                }
+            }
+
+
             for (int i = 0; i < Enemies.Count; i++)
             {
                 if (Enemies[i].Texture != null)
diff --git a/Penguloon/Levels/SandLevel1.cs b/Penguloon/Levels/SandLevel1.cs
new file mode 100644
index 0000000..d8340f6
--- /dev/null
+++ b/Penguloon/Levels/SandLevel1.cs
@@ -0,0 +1,89 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input.Touch;
+using Penguloon.Enemies;
+using Penguloon.Objects;
+using Penguloon.Scenes;
+
+namespace Penguloon.Levels
+{
+    public class SandLevel1 : LevelBase
+    {
+        public SandLevel1() : base()
+        {
+            this.SplashArt = ContentManager.GetTexture("SplashArt/4");
+            this.Money = 350;
+            this.Health = 200;
+            this.ID = 4;
+            this.MinimumLevel = 15;
+            LevelType = LevelType.Sand;
+        }
+
+        public override void DrawUnique(float deltaTime)
+        {
+            base.DrawUnique(deltaTime);
+        }
+
+        public override void UpdateUnique(float deltaTime, TouchLocation[] touchLocations)
+        {
+            base.UpdateUnique(deltaTime, touchLocations);
+        }
+
+        public override void CreateMap()
+        {
+            Map = new Map(ParentScene, this);
+            Map.SpawnPoint = new Vector2(-1 * Map.TileWidth, 6 * Map.TileHeight);
+            Map.SpawnPointTargetPos = new Vector2(0 * Map.TileWidth, 6 * Map.TileHeight);
+            Map.FinishPoint = new Vector2(18 * Map.TileWidth, 10 * Map.TileHeight);
+
+            Tile OO = new Tile(0, Direction.None);
+
+            Tile DN = new Tile(6, Direction.Down);
+            Tile RT = new Tile(5, Direction.Right);
+            Tile LT = new Tile(5, Direction.Left);
+            Tile UP = new Tile(6, Direction.Up);
+
+            Tile TR = new Tile(4, Direction.Right);
+            Tile RU = new Tile(4, Direction.Up);
+            Tile DR = new Tile(3, Direction.Right);
+
+            Tile DL = new Tile(1, Direction.Down);
+            Tile RD = new Tile(3, Direction.Down);
+            Tile LD = new Tile(1, Direction.Left);
+            Tile LU = new Tile(2, Direction.Left);
+            Tile TL = new Tile(2, Direction.Up);
+
+            Tile FN = new Tile(5, Direction.Finish);
+
+            Map.TileMap = new Tile[13, 18]
+            {
+                { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+                { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+                { OO,OO,DR,RT,RT,DL,OO,OO,OO,DR,RT,RT,RT,RT,RT,DL,OO,OO },
+                { OO,OO,UP,OO,OO,DN,OO,OO,OO,UP,OO,OO,OO,OO,OO,DN,OO,OO },
+                { OO,OO,UP,OO,OO,DN,OO,OO,OO,UP,OO,OO,OO,OO,RD,LU,OO,OO },
+                { OO,OO,UP,OO,OO,DN,OO,OO,OO,UP,OO,OO,OO,OO,DN,OO,OO,OO },
+                { RT,RT,TL,OO,OO,DN,OO,OO,OO,UP,OO,OO,OO,OO,DN,OO,OO,OO },
+                { OO,OO,OO,OO,OO,DN,OO,OO,OO,UP,OO,OO,OO,OO,DN,OO,OO,OO },
+                { OO,OO,OO,OO,RD,LU,OO,OO,OO,RU,LD,OO,OO,OO,DN,OO,OO,OO },
+                { OO,OO,OO,OO,DN,OO,OO,OO,OO,OO,UP,OO,OO,OO,DN,OO,OO,OO },
+                { OO,OO,OO,OO,TR,RT,RT,RT,RT,RT,TL,OO,OO,OO,TR,RT,RT,FN },
+                { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+                { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            };
+
+            //{ OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+            //    { OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO,OO },
+        }
+    }
+}
\ No newline at end of file
diff --git a/Penguloon/Penguloon.csproj b/Penguloon/Penguloon.csproj
index 43b57c9..95ec810 100644
--- a/Penguloon/Penguloon.csproj
+++ b/Penguloon/Penguloon.csproj
@@ -81,6 +81,7 @@
     <Compile Include="Enemies\RainbowBalloon.cs" />
     <Compile Include="Enemies\RedBalloon.cs" />
     <Compile Include="Enemies\YellowBalloon.cs" />
+    <Compile Include="Levels\SandLevel1.cs" />
     <Compile Include="Levels\IceLevel3.cs" />
     <Compile Include="Levels\IceLevel2.cs" />
     <Compile Include="Levels\WaveManager.cs" />