Added Music Ready for Jam.

LanceJZ · Dec 5, 2017 · add457b · add457b
1 parent 65eff11
commit add457b
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 32 deletions.
diff --git a/Shadow and Planet/Content/Content.mgcb b/Shadow and Planet/Content/Content.mgcb
@@ -1002,3 +1002,9 @@
 /processorParam:Quality=Best
 /build:Sounds/ShotHit.wav
 
+#begin SongOne.mp3
+/importer:Mp3Importer
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:SongOne.mp3
+
diff --git a/Shadow and Planet/Content/SongOne.mp3 b/Shadow and Planet/Content/SongOne.mp3
diff --git a/Shadow and Planet/Engine/Words.cs b/Shadow and Planet/Engine/Words.cs
@@ -76,6 +76,12 @@ public void UpdateWords(string words)
                         Mod letterE = InitiateLetter(letval);
                         letterE.Scale = Scale;
                     }
+
+                }
+
+                if ((int)letter == 32)
+                {
+                    WordEs.Add(new Mod(Game));
                 }
             }
 
@@ -121,6 +127,7 @@ public void ShowWords(bool show)
                 foreach (Mod word in WordEs)
                 {
                     word.Active = show;
+                    word.Visable = show;
                 }
             }
         }

diff --git a/Shadow and Planet/Entities/Asteroid.cs b/Shadow and Planet/Entities/Asteroid.cs
@@ -79,9 +79,14 @@ void CheckCollusion()
 
             foreach (Pirate pirate in PiratesRef.Pirates)
             {
-                if (CirclesIntersect(pirate))
+                if (pirate.Active)
                 {
-                    pirate.Bumped(Position, Velocity);
+                    if (CirclesIntersect(pirate))
+                    {
+                        pirate.Bumped(Position, Velocity);
+                    }
+
+                    pirate.CheckMissileHit(this);
                 }
             }
 

diff --git a/Shadow and Planet/Entities/Background.cs b/Shadow and Planet/Entities/Background.cs
@@ -13,7 +13,7 @@ namespace Shadow_and_Planet.Entities
 
     public class Background : GameComponent, IBeginable, IUpdateableComponent, ILoadContent
     {
-        Engine.AModel[] Stars = new Engine.AModel[400];
+        Engine.AModel[] Stars = new Engine.AModel[600];
         Engine.AModel[] StarsBack = new Engine.AModel[40];
 
         Vector3[] StarsOrg;

diff --git a/Shadow and Planet/Entities/Base.cs b/Shadow and Planet/Entities/Base.cs
@@ -41,7 +41,7 @@ public override void LoadContent()
 
         public override void BeginRun()
         {
-            OreText.ProcessWords("BASE_ORE", Vector3.Zero, 2);
+            OreText.ProcessWords("BASE ORE", Vector3.Zero, 2);
             OreText.Position.Z = 150;
             OreAmount.ProcessNumber(OreOnBase, Vector3.Zero, 2);
             OreAmount.Position.Z = 150;

diff --git a/Shadow and Planet/Entities/Missile.cs b/Shadow and Planet/Entities/Missile.cs
@@ -16,6 +16,7 @@ public class Missile : Mod
         PositionedObject TargetRef;
         Timer LifeTimer;
         SoundEffect HitSound;
+        SoundEffect MissileSound;
         Explode Explosion;
 
         public Missile(Game game) : base(game)
@@ -36,6 +37,7 @@ public override void LoadContent()
         {
             LoadModel("SandP-Missile");
             HitSound = LoadSoundEffect("MissileHit");
+            MissileSound = LoadSoundEffect("PirateMissile");
 
             BeginRun();
         }
@@ -50,38 +52,37 @@ public override void Update(GameTime gameTime)
         {
             if (Active)
             {
-                RotationVelocity.Z = AimAtTarget(TargetRef.Position, Rotation.Z, MathHelper.PiOver4 *0.25f);
+                if (TargetRef != null)
+                {
+                    RotationVelocity.Z = AimAtTarget(TargetRef.Position, Rotation.Z, MathHelper.PiOver4 * 0.25f);
+                }
+
                 Velocity = SetVelocityFromAngle(Rotation.Z, 200);
 
                 if (LifeTimer.Expired)
                 {
                     Active = false;
                 }
-
-                CheckCollusions();
             }
 
             base.Update(gameTime);
         }
 
         public void Spawn(Vector3 postion, Vector3 rotation, PositionedObject target, float timer)
         {
+            MissileSound.Play();
             Active = true;
             Position = postion;
             Rotation.Z = rotation.Z;
             TargetRef = target;
             LifeTimer.Reset(timer);
         }
 
-        void CheckCollusions()
+        public void HitTarget()
         {
-            if (CirclesIntersect(TargetRef))
-            {
-                HitSound.Play();
-                Explosion.Spawn(Position, Radius * 0.25f);
-                TargetRef.Hit = true;
-                Active = false;
-            }
+            HitSound.Play();
+            Explosion.Spawn(Position, Radius * 0.25f);
+            Active = false;
         }
 
         void CheckEdge()

diff --git a/Shadow and Planet/Entities/Pirate.cs b/Shadow and Planet/Entities/Pirate.cs
@@ -23,10 +23,9 @@ public class Pirate : Mod
 
         XnaModel HealthModel;
 
-        SoundEffect ExplodSound;
+        SoundEffect ExplodeSound;
         SoundEffect HitSound;
         SoundEffect BumpSound;
-        SoundEffect MissileSound;
 
         Vector3 NewHeading = Vector3.Zero;
 
@@ -59,10 +58,9 @@ public override void LoadContent()
         {
             LoadModel("SandP-Pirate");
             HealthModel = Load("cube");
-            ExplodSound = LoadSoundEffect("PirateExplode");
+            ExplodeSound = LoadSoundEffect("PirateExplode");
             HitSound = LoadSoundEffect("PirateHit");
             BumpSound = LoadSoundEffect("PirateBump");
-            MissileSound = LoadSoundEffect("PirateMissile");
 
             BeginRun();
         }
@@ -156,15 +154,29 @@ public void GameOver()
             }
         }
 
-        public void CheckMissileHit(PositionedObject target)
+        public bool CheckMissileHit(PositionedObject target)
         {
             foreach (Missile missile in Missiles)
             {
-                if (missile.CirclesIntersect(target))
+                if (missile.Active)
                 {
-                    missile.Active = false;
+                    if (missile.CirclesIntersect(target))
+                    {
+                        missile.HitTarget();
+                        return true;
+                    }
                 }
             }
+
+            return false;
+        }
+
+        public void CheckPlayerMissilHit()
+        {
+            if (PlayerRef.CheckMissileCollusions(this))
+            {
+                Hit = true;
+            }
         }
 
         void GenerateHealthBar()
@@ -209,6 +221,7 @@ void CheckForPlayer()
             if (DetectPlayer.CirclesIntersect(PlayerRef))
             {
                 Stop = true;
+                PlayerRef.MissileTarget = this;
             }
             else
             {
@@ -218,7 +231,6 @@ void CheckForPlayer()
 
         void FireMissile()
         {
-            MissileSound.Play();
             bool spawnNew = true;
             int freeOne = Missiles.Count;
 
@@ -278,17 +290,24 @@ void CheckCollusions()
                 if (HitPoints < 1)
                 {
                     Hit = true;
-                    ExplodSound.Play();
+                    ExplodeSound.Play();
                 }
             }
 
+            if (PlayerRef.CheckMissileCollusions(this))
+            {
+                HitSound.Play();
+                Hit = true;
+                ExplodeSound.Play();
+            }
+
             foreach(Missile missile in Missiles)
             {
                 if (missile.Active)
                 {
                     if (PlayerRef.CheckShotCollusions(missile))
                     {
-                        missile.Active = false;
+                        missile.HitTarget();
                     }
                 }
             }

diff --git a/Shadow and Planet/Entities/PirateControl.cs b/Shadow and Planet/Entities/PirateControl.cs
@@ -150,10 +150,10 @@ void CheckPirateCollusion()
                     Pirates[i].Active = false;
                     Pirates[i].Hit = false;
 
-                    if (Services.RandomMinMax(1, 6) > 4)
+                    if (Services.RandomMinMax(1, 7) > 4)
                         SpawnChest(Pirates[i].Position);
 
-                    if (Services.RandomMinMax(1, 100) > 90)
+                    if (Services.RandomMinMax(1, 100) > 95)
                         SpawnLavaLamp(Pirates[i].Position);
                 }
 
@@ -175,6 +175,11 @@ void CheckPirateCollusion()
                         GameOver();
                     }
                 }
+
+                if (Pirates[i].CheckMissileHit(PlayerRef))
+                {
+                    PlayerRef.Hit = true;
+                }
             }
 
             foreach (Pirate pirateA in Pirates)