Version being turned into CFN Game Jam #2.

Had to change some of the engine, was a bug that caused all kinds of issues when I made it so it started over for the next level. After this I'm going to rewrite my engine from the ground up.
LanceJZ · Jan 14, 2018 · de2249e · de2249e
1 parent 436164c
commit de2249e
Show file tree

Hide file tree

Showing 21 changed files with 159 additions and 95 deletions.
diff --git a/CFNGamejam2/CFNGamejam2.csproj b/CFNGamejam2/CFNGamejam2.csproj
@@ -24,7 +24,7 @@
     <AssemblyFileVersionSettings>MMddStamp.DayOfYearStamp.MonthStamp.TimeStamp</AssemblyFileVersionSettings>
     <AssemblyInfoVersionSettings>YearStamp.DateStamp.DeltaDayStamp.Increment</AssemblyInfoVersionSettings>
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
-    <AssemblyVersion>1.721.13.0101</AssemblyVersion>
+    <AssemblyVersion>1.764.14.0101</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/CFNGamejam2/Engine/AModel.cs b/CFNGamejam2/Engine/AModel.cs
@@ -11,7 +11,7 @@
 
 namespace Engine
 {
-    public class AModel : PositionedObject, IDrawComponent, ILoadContent
+    public class AModel : PositionedObject, IDrawComponent
     {
         public Vector3 DefuseColor = new Vector3(1,1,1);
         Texture2D XNATexture;
@@ -46,7 +46,6 @@ public override void Initialize()
         {
             Enabled = true;
             Services.AddDrawableComponent(this);
-            Services.AddLoadable(this);
 
             Services.GraphicsDM.GraphicsDevice.RasterizerState = RasterizerState.CullCounterClockwise;
             Services.GraphicsDM.GraphicsDevice.SamplerStates[0] = SamplerState.AnisotropicWrap;
@@ -60,7 +59,6 @@ public override void Initialize()
 
         public override void BeginRun()
         {
-            LoadContent();
             base.BeginRun();
         }
 
@@ -286,11 +284,6 @@ public SoundEffect LoadSoundEffect(string soundName)
             return Game.Content.Load<SoundEffect>("Sounds/" + soundName);
         }
 
-        public virtual void LoadContent()
-        {
-            //This method intentionally left blank.
-        }
-
         public void Destroy()
         {
             //if (ModelTransforms != null)

diff --git a/CFNGamejam2/Engine/ExplodeParticle.cs b/CFNGamejam2/Engine/ExplodeParticle.cs
@@ -15,16 +15,19 @@ public class ExplodeParticle : AModel
         public ExplodeParticle(Game game) : base(game)
         {
             LifeTimer = new Timer(game);
+
+            LoadContent();
         }
 
         public override void Initialize()
         {
             base.Initialize();
         }
 
-        public override void LoadContent()
+        public void LoadContent()
         {
 
+            BeginRun();
         }
 
         public override void BeginRun()

diff --git a/CFNGamejam2/Engine/Numbers.cs b/CFNGamejam2/Engine/Numbers.cs
@@ -25,9 +25,9 @@ public Numbers(Game game) : base(game)
 
         public override void Initialize()
         {
-            Services.AddLoadable(this);
-
             base.Initialize();
+            LoadContent();
+            BeginRun();
         }
 
         public void LoadContent()

diff --git a/CFNGamejam2/Engine/PositionedObject.cs b/CFNGamejam2/Engine/PositionedObject.cs
@@ -89,11 +89,11 @@ public bool Active
 
 				if (m_Parent)
 				{
-                    foreach (PositionedObject child in ChildrenPOs)
-                    {
-                        if (child.ActiveDependent)
-                            child.Active = value;
-                    }
+					foreach (PositionedObject child in ChildrenPOs)
+					{
+						if (child.ActiveDependent)
+							child.Active = value;
+					}
 				}
 			}
 		}
@@ -126,26 +126,24 @@ public Rectangle BoundingBox
 		/// <param name="game">The game class</param>
 		public PositionedObject(Game game) : base(game)
 		{
-            ChildrenPOs = new List<PositionedObject>();
-			game.Components.Add(this);
-		}
-		#endregion
-		#region Public Methods
-		public override void Initialize()
+			ChildrenPOs = new List<PositionedObject>();
+            Game.Components.Add(this);
+        }
+        #endregion
+        #region Public Methods
+        public override void Initialize()
 		{
-			base.Initialize();
-			BeginRun();
+            base.Initialize();
 		}
 
 		public virtual void BeginRun()
 		{
-
-		}
-		/// <summary>
-		/// Allows the game component to be updated.
-		/// </summary>
-		/// <param name="gameTime">Provides a snapshot of timing values.</param>
-		public override void Update(GameTime gameTime)
+        }
+        /// <summary>
+        /// Allows the game component to be updated.
+        /// </summary>
+        /// <param name="gameTime">Provides a snapshot of timing values.</param>
+        public override void Update(GameTime gameTime)
 		{
 			if (Moveable)
 			{
@@ -194,8 +192,8 @@ public virtual void AddAsChildOf(PositionedObject Parent, bool activeDependent,
 			Child = true;
 			ParentPO = Parent;
 			ParentPO.Parent = true;
-            ParentPO.ChildrenPOs.Add(this);
-        }
+			ParentPO.ChildrenPOs.Add(this);
+		}
 
 		public void Remove()
 		{

diff --git a/CFNGamejam2/Engine/SmokeParticle.cs b/CFNGamejam2/Engine/SmokeParticle.cs
@@ -16,6 +16,8 @@ public class SmokeParticle : AModel
         public SmokeParticle(Game game) : base(game)
         {
             LifeTimer = new Timer(game);
+
+            LoadContent();
         }
 
         public override void Initialize()
@@ -25,9 +27,10 @@ public override void Initialize()
 
         }
 
-        public override void LoadContent()
+        public void LoadContent()
         {
 
+            BeginRun();
         }
 
         public override void BeginRun()

diff --git a/CFNGamejam2/Engine/Words.cs b/CFNGamejam2/Engine/Words.cs
@@ -27,8 +27,8 @@ public Words (Game game) : base(game)
         public override void Initialize()
         {
             base.Initialize();
-            Services.AddLoadable(this);
-            Services.AddBeginable(this);
+            LoadContent();
+            BeginRun();
         }
 
         public void LoadContent()

diff --git a/CFNGamejam2/Entities/Bomb.cs b/CFNGamejam2/Entities/Bomb.cs
@@ -23,6 +23,7 @@ public Bomb(Game game, GameLogic gameLogic) : base(game)
             Explosion = new Explode(game);
             LifeTimer = new Timer(game, 5);
 
+            LoadContent();
         }
 
         public override void Initialize()
@@ -31,10 +32,12 @@ public override void Initialize()
             base.Initialize();
         }
 
-        public override void LoadContent()
+        public void LoadContent()
         {
             LoadModel("Bomb");
             ExplodeSound = LoadSoundEffect("BombExplode");
+
+            BeginRun();
         }
 
         public override void BeginRun()

diff --git a/CFNGamejam2/Entities/Duck.cs b/CFNGamejam2/Entities/Duck.cs
@@ -41,7 +41,7 @@ public Duck(Game game, GameLogic gameLogic) : base(game)
             RefGameLogic = gameLogic;
 
             for (int i = 0; i < 2; i++)
-               Wings[i] = new AModel(game);
+                Wings[i] = new AModel(Game);
 
             Bombs = new List<Bomb>();
             Explosion = new Explode(game);
@@ -51,6 +51,8 @@ public Duck(Game game, GameLogic gameLogic) : base(game)
             DropBombTimer = new Timer(game, 2);
             ChangeHeadingTimer = new Timer(game);
             QuackTimer = new Timer(game);
+
+            LoadContent();
         }
 
         public override void Initialize()
@@ -59,14 +61,17 @@ public override void Initialize()
             base.Initialize();
         }
 
-        public override void LoadContent()
+        public void LoadContent()
         {
             LoadModel("DuckBody");
+
             Wings[0].LoadModel("DuckLWing");
             Wings[1].LoadModel("DuckRWing");
 
             QuackSound = LoadSoundEffect("Duck");
             DropBombSound = LoadSoundEffect("DropBomb");
+
+            BeginRun();
         }
 
         public override void BeginRun()
@@ -248,8 +253,8 @@ void DropBomb()
 
             if (spawnNew)
             {
+                thisOne = Bombs.Count;
                 Bombs.Add(new Bomb(Game, RefGameLogic));
-                thisOne = Bombs.Count - 1;
             }
 
             Bombs[thisOne].Spawn(Position, Rotation, Velocity / 4);

diff --git a/CFNGamejam2/Entities/EnemyControl.cs b/CFNGamejam2/Entities/EnemyControl.cs
@@ -18,6 +18,7 @@ public class EnemyControl : GameComponent, IBeginable, IUpdateableComponent, ILo
         List<Wall> TheWall;
         XnaModel WallPiece;
         Gateway TheGateway;
+        int Wave;
 
         public List<MissileBattery> BatterysRef { get => TheBatterys; }
 
@@ -76,7 +77,7 @@ public void GameOver()
 
         }
 
-        public void NewGame()
+        public void NewWave()
         {
             foreach (Duck duck in TheDucks)
             {
@@ -85,21 +86,38 @@ public void NewGame()
 
             int border = RefGameLogic.RefGround.TheBorder;
 
-            for (int i = 0; i < 4; i++)
+            for (int i = 0; i < (1 + Wave); i++)
                 SpawnDuck(new Vector3(Services.RandomMinMax(-border, border), 200, border + 500));
 
-            foreach(MissileBattery battery in TheBatterys)
+            foreach (MissileBattery battery in TheBatterys)
             {
                 battery.Active = false;
             }
 
-            for (int i = 0; i < 4; i++)
+            TheGateway.Spawn(TheGateway.Position);
+
+            PlaceBatteries();
+
+            Wave++;
+        }
+
+        public void NewGame()
+        {
+            Wave = 0;
+            NewWave();
+        }
+
+        void PlaceBatteries()
+        {
+            int rows = Wave + 1;
+
+            if (rows > 5) rows = 5;
+
+            for (int i = 0; i < rows; i++)
             {
-                SpawnBattery(new Vector3(-150, 20, -700 + (i * 500)));
-                SpawnBattery(new Vector3(150, 20, -700 + (i * 500)));
+                SpawnBattery(new Vector3(-150, 20, -700 + (i * 400)));
+                SpawnBattery(new Vector3(150, 20, -700 + (i * 400)));
             }
-
-            TheGateway.Spawn(TheGateway.Position);
         }
 
         void SpawnWall(Vector3 position)

diff --git a/CFNGamejam2/Entities/Gateway.cs b/CFNGamejam2/Entities/Gateway.cs
@@ -32,6 +32,8 @@ public Gateway(Game game, GameLogic gameLogic) : base(game)
                 Doors[i] = new AModel(game);
                 DoorExplosions[i] = new Explode(game);
             }
+
+            LoadContent();
         }
 
         public override void Initialize()
@@ -40,7 +42,7 @@ public override void Initialize()
 
         }
 
-        public override void LoadContent()
+        public void LoadContent()
         {
             LoadModel("GateFrame");
             HealthBar.LoadModel("Core/Cube");
@@ -52,6 +54,8 @@ public override void LoadContent()
             }
 
             ExplodeSound = LoadSoundEffect("GateExplode");
+
+            BeginRun();
         }
 
         public override void BeginRun()
@@ -72,6 +76,7 @@ public override void BeginRun()
             for (int i = 0; i < 2; i++)
             {
                 Doors[i].AddAsChildOf(this, true, false);
+                DoorExplosions[i].DefuseColor = new Vector3(0.4f, 0.4f, 0.5f);
             }
 
             HealthBar.DefuseColor = new Vector3(0, 2, 0);
@@ -152,7 +157,7 @@ void CheckCollide()
 
                         foreach(AModel door in Doors)
                         {
-                            DoorExplosions[i].Spawn(door.Position, 5, 100);
+                            DoorExplosions[i].Spawn(door.Position, 10, 100);
                             i++;
                         }
 

diff --git a/CFNGamejam2/Entities/Missile.cs b/CFNGamejam2/Entities/Missile.cs
@@ -24,6 +24,8 @@ public Missile(Game game, GameLogic gameLogic) : base(game)
             RefGameLogic = gameLogic;
             LifeTimer = new Timer(game);
             Explosion = new Explode(game);
+
+            LoadContent();
         }
 
         public override void Initialize()
@@ -32,10 +34,12 @@ public override void Initialize()
             base.Initialize();
         }
 
-        public override void LoadContent()
+        public void LoadContent()
         {
             LoadModel("Missile");
             HitSound = LoadSoundEffect("MissileHit");
+
+            BeginRun();
         }
 
         public override void BeginRun()