From 95d7601b7742ed560a9d8e00269217f62fc7ce32 Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Sun, 10 Nov 2013 22:11:08 -0600
Subject: Chubas's House happened.

---
 Super Polarity/InputController.cs | 118 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 Super Polarity/InputController.cs

(limited to 'Super Polarity/InputController.cs')

diff --git a/Super Polarity/InputController.cs b/Super Polarity/InputController.cs
new file mode 100644
index 0000000..405b3ab
--- /dev/null
+++ b/Super Polarity/InputController.cs	
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework.Input;
+
+namespace SuperPolarity
+{
+    static class InputController
+    {
+        static Dictionary<string, List<Action<float>>> Listeners;
+        static Dictionary<string, List<Keys>> RegisteredKeys;
+        static Dictionary<string, List<Buttons>> RegisteredButtons;
+
+        static GamePadState InputGamePadState;
+        static KeyboardState InputKeyboardState;
+
+        /*
+         * Registered Events.
+         * 
+         * You register: name of the event (ie. attack) and a key associated with it.
+         * or button... Left Stick /always/ dispatches move event.
+         */
+
+        static InputController()
+        {
+            Listeners = new Dictionary<string,List<Action<float>>>();
+            InputKeyboardState = new KeyboardState();
+            InputGamePadState = new GamePadState();
+        }
+
+        public static void UpdateInput()
+        {
+            Poll();
+            DispatchMoveEvents();
+            DispatchRegisteredEvents();
+        }
+
+        private static void Poll()
+        {
+            InputGamePadState = GamePad.GetState(Microsoft.Xna.Framework.PlayerIndex.One);
+            InputKeyboardState = Keyboard.GetState();
+        }
+
+        private static void DispatchRegisteredEvents()
+        {
+        }
+
+        private static void DispatchMoveEvents()
+        {
+            float xMovement = 0.0f;
+            float yMovement = 0.0f;
+            // Dispatch the moveX / MoveY events every frame.
+
+            xMovement = InputGamePadState.ThumbSticks.Left.X;
+            yMovement = -InputGamePadState.ThumbSticks.Left.Y;
+
+            Console.WriteLine("Dispatching Input {0}", InputKeyboardState.IsKeyDown(Keys.Left));
+
+            if (InputKeyboardState.IsKeyDown(Keys.Left))
+            {
+                xMovement = -1.0f;
+            }
+
+            if (InputKeyboardState.IsKeyDown(Keys.Right))
+            {
+                xMovement = 1.0f;
+            }
+
+            if (InputKeyboardState.IsKeyDown(Keys.Up))
+            {
+                yMovement = -1.0f;
+            }
+
+            if (InputKeyboardState.IsKeyDown(Keys.Down))
+            {
+                yMovement = 1.0f;
+            }
+
+            Dispatch("moveX", xMovement);
+            Dispatch("moveY", yMovement);
+        }
+
+        public static void Bind(string eventName, Action<float> listener)
+        {
+            List<Action<float>> newListenerList;
+            List<Action<float>> listenerList;
+            bool               foundListeners;
+
+            if (!Listeners.ContainsKey(eventName)) {
+               newListenerList = new List<Action<float>>();
+               Listeners.Add(eventName, newListenerList);
+            }
+
+            foundListeners = Listeners.TryGetValue(eventName, out listenerList);
+
+            listenerList.Add(listener);
+        }
+
+        public static void Dispatch(string eventName, float value)
+        {
+            List<Action<float>> listenerList;
+            bool foundListeners;
+
+            foundListeners = Listeners.TryGetValue(eventName, out listenerList);
+
+            if (!foundListeners)
+            {
+                return;
+            }
+
+            foreach (Action<float> method in listenerList)
+            {
+                method(value);
+            }
+        }
+    }
+}
-- 
cgit 


From 2af83e98005a14c439b360a5b9ac636f594d9f0c Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Tue, 12 Nov 2013 06:44:55 -0600
Subject: Implements polarity system

---
 .../Graphics/negative-ship.png                     | Bin 0 -> 824 bytes
 .../Super Polarity ContentContent.contentproj      |   7 +
 Super Polarity.suo                                 | Bin 31744 -> 38400 bytes
 Super Polarity/Actor.cs                            | 154 -------------------
 Super Polarity/ActorFactory.cs                     |  36 ++++-
 Super Polarity/ActorManager.cs                     |  41 ++++++
 Super Polarity/Actors/Actor.cs                     | 161 ++++++++++++++++++++
 Super Polarity/Actors/MainShip.cs                  | 163 +++++++++++++++++++++
 Super Polarity/Actors/Ship.cs                      |  91 ++++++++++++
 Super Polarity/Actors/StandardShip.cs              | 114 ++++++++++++++
 Super Polarity/Content/Graphics/negative-ship.xnb  | Bin 0 -> 11707 bytes
 Super Polarity/Content/Graphics/player.xnb         | Bin 32203 -> 0 bytes
 Super Polarity/InputController.cs                  |  82 ++++++++++-
 Super Polarity/MainShip.cs                         |  66 ---------
 Super Polarity/ParticleEngine.cs                   |   7 +-
 Super Polarity/Ship.cs                             |  38 -----
 Super Polarity/Super Polarity.csproj               |  10 +-
 Super Polarity/SuperPolarity.cs                    |  10 +-
 .../WindowsGL/Debug/Content/Graphics/player.xnb    | Bin 32203 -> 0 bytes
 .../bin/WindowsGL/Debug/Super Polarity.exe         | Bin 47104 -> 53248 bytes
 .../bin/WindowsGL/Debug/Super Polarity.pdb         | Bin 50688 -> 58880 bytes
 .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 8028 -> 8150 bytes
 .../Super Polarity.csproj.FileListAbsolute.txt     |   1 +
 Super Polarity/obj/x86/Debug/Super Polarity.exe    | Bin 47104 -> 53248 bytes
 Super Polarity/obj/x86/Debug/Super Polarity.pdb    | Bin 50688 -> 58880 bytes
 25 files changed, 708 insertions(+), 273 deletions(-)
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Graphics/negative-ship.png
 delete mode 100644 Super Polarity/Actor.cs
 create mode 100644 Super Polarity/Actors/Actor.cs
 create mode 100644 Super Polarity/Actors/MainShip.cs
 create mode 100644 Super Polarity/Actors/Ship.cs
 create mode 100644 Super Polarity/Actors/StandardShip.cs
 create mode 100644 Super Polarity/Content/Graphics/negative-ship.xnb
 delete mode 100644 Super Polarity/Content/Graphics/player.xnb
 delete mode 100644 Super Polarity/MainShip.cs
 delete mode 100644 Super Polarity/Ship.cs
 delete mode 100644 Super Polarity/bin/WindowsGL/Debug/Content/Graphics/player.xnb

(limited to 'Super Polarity/InputController.cs')

diff --git a/Super Polarity Content/Super Polarity ContentContent/Graphics/negative-ship.png b/Super Polarity Content/Super Polarity ContentContent/Graphics/negative-ship.png
new file mode 100644
index 0000000..1407d5d
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Graphics/negative-ship.png differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj
index 4e7a9f0..f86c49e 100644
--- a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj	
+++ b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj	
@@ -129,6 +129,13 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Graphics\negative-ship.png">
+      <Name>negative-ship</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Super Polarity.suo b/Super Polarity.suo
index c83e2df..8b2aaea 100644
Binary files a/Super Polarity.suo and b/Super Polarity.suo differ
diff --git a/Super Polarity/Actor.cs b/Super Polarity/Actor.cs
deleted file mode 100644
index f0da244..0000000
--- a/Super Polarity/Actor.cs	
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Content;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace SuperPolarity
-{
-    class Actor
-    {
-        // Graphics / In-Game
-        protected Texture2D Texture;
-        protected Vector2 Origin;
-        public bool Active;
-
-        // Physical Properties
-        protected Vector2 Position;
-        protected Vector2 Velocity;
-        protected Vector2 Acceleration;
-        protected float Angle;
-
-        // Constraints / Behavior
-        protected float MaxVelocity;
-        protected float AccelerationRate;
-
-        public int Width
-        {
-            get { return Texture.Width; }
-        }
-
-        public int Height
-        {
-            get { return Texture.Height; }
-        }
-
-        public virtual void Initialize(ContentManager Content, Texture2D texture, Vector2 position)
-        {
-            Texture = texture;
-            Position = position;
-            Active = true;
-
-            Origin = new Vector2(Texture.Width / 2, Texture.Height / 2);
-            Velocity = new Vector2(0, 0);
-            Acceleration = new Vector2(0, 0);
-
-            MaxVelocity = 5;
-            AccelerationRate = 10;
-        }
-
-        public void AutoDeccelerate(GameTime gameTime)
-        {
-            if (Acceleration.X == 0 && Velocity.X > 0)
-            {
-                if (AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds > Velocity.X)
-                {
-                    Velocity.X = 0;
-                    Acceleration.X = 0;
-                }
-                else
-                {
-                    Acceleration.X = -AccelerationRate;
-                }
-            }
-
-            if (Acceleration.X == 0 && Velocity.X < 0)
-            {
-                if (-AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds < Velocity.X)
-                {
-                    Velocity.X = 0;
-                    Acceleration.X = 0;
-                }
-                else
-                {
-                    Acceleration.X = AccelerationRate;
-                }
-            }
-
-            if (Acceleration.Y == 0 && Velocity.Y > 0)
-            {
-                if (AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds > Velocity.Y)
-                {
-                    Velocity.Y = 0;
-                    Acceleration.Y = 0;
-                }
-                else
-                {
-                    Acceleration.Y = -AccelerationRate;
-                }
-            }
-
-            if (Acceleration.Y == 0 && Velocity.Y < 0)
-            {
-                if (-AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds < Velocity.Y)
-                {
-                    Velocity.Y = 0;
-                    Acceleration.Y = 0;
-                }
-                else
-                {
-                    Acceleration.Y = AccelerationRate;
-                }
-            }
-        }
-
-        public virtual void Update(GameTime gameTime)
-        {
-            Move(gameTime);
-            ChangeAngle();
-        }
-
-        public void Move(GameTime gameTime)
-        {
-            AutoDeccelerate(gameTime);
-
-            Velocity.X = Velocity.X + Acceleration.X * (float)gameTime.ElapsedGameTime.TotalSeconds;
-            Velocity.Y = Velocity.Y + Acceleration.Y * (float)gameTime.ElapsedGameTime.TotalSeconds;
-
-            if (Velocity.X > MaxVelocity)
-            {
-                Velocity.X = MaxVelocity;
-            }
-
-            if (Velocity.X < -MaxVelocity)
-            {
-                Velocity.X = -MaxVelocity;
-            }
-
-            if (Velocity.Y > MaxVelocity)
-            {
-                Velocity.Y = MaxVelocity;
-            }
-
-            if (Velocity.Y < -MaxVelocity)
-            {
-                Velocity.Y = -MaxVelocity;
-            }
-
-            Position.X = Position.X + Velocity.X;
-            Position.Y = Position.Y + Velocity.Y;
-        }
-
-        public void ChangeAngle()
-        {
-            Angle = (float)Math.Atan2(Velocity.Y, Velocity.X);
-        }
-
-        public virtual void Draw(SpriteBatch spriteBatch)
-        {
-            spriteBatch.Draw(Texture, Position, null, Color.White, Angle, Origin, 1f, SpriteEffects.None, 0f);
-        }
-    }
-}
diff --git a/Super Polarity/ActorFactory.cs b/Super Polarity/ActorFactory.cs
index 5438b77..3e2f80b 100644
--- a/Super Polarity/ActorFactory.cs	
+++ b/Super Polarity/ActorFactory.cs	
@@ -10,21 +10,47 @@ namespace SuperPolarity
 {
     static class ActorFactory
     {
-        static internal ContentManager Content;
+        static internal Game Game;
 
         static public MainShip CreateMainShip(Vector2 position)
         {
-            MainShip mainShip = new MainShip();
-            mainShip.Initialize(Content, Content.Load<Texture2D>("Graphics\\main-ship"), position);
+            MainShip mainShip = new MainShip(Game);
+            mainShip.Initialize(Game.Content.Load<Texture2D>("Graphics\\main-ship"), position);
 
             ActorManager.CheckIn(mainShip);
 
             return mainShip;
         }
 
-        internal static void SetContentManager(ContentManager content)
+        static public StandardShip CreateShip(Ship.Polarity polarity, Vector2 position)
         {
-            Content = content;
+            StandardShip ship = new StandardShip(Game);
+            Texture2D texture;
+            
+            if (polarity == Ship.Polarity.Positive)
+            {
+                texture = Game.Content.Load<Texture2D>("Graphics\\positive-ship");
+            }
+            else if (polarity == Ship.Polarity.Negative)
+            {
+                texture = Game.Content.Load<Texture2D>("Graphics\\negative-ship");
+            }
+            else
+            {
+                texture = Game.Content.Load<Texture2D>("Graphics\\neutral-ship");
+            }
+
+            ship.Initialize(texture, position);
+            ship.SetPolarity(polarity);
+
+            ActorManager.CheckIn(ship);
+
+            return ship;
+        }
+
+        internal static void SetGame(Game game)
+        {
+            ActorFactory.Game = game;
         }
     }
 }
diff --git a/Super Polarity/ActorManager.cs b/Super Polarity/ActorManager.cs
index bca7168..39ae336 100644
--- a/Super Polarity/ActorManager.cs	
+++ b/Super Polarity/ActorManager.cs	
@@ -28,6 +28,7 @@ namespace SuperPolarity
 
         static public void Update(GameTime gameTime) 
         {
+            CheckActors();
             foreach (Actor actor in Actors)
             {
                 actor.Update(gameTime);
@@ -41,5 +42,45 @@ namespace SuperPolarity
                 actor.Draw(spriteBatch);
             }
         }
+
+        static void CheckActors()
+        {
+            var i = 0;
+            foreach (Actor actor in Actors)
+            {
+                i++;
+                foreach (Actor other in Actors.Skip(i))
+                {
+                    CheckCollision(actor, other);
+
+                    if (actor.GetType().IsSubclassOf(typeof(Ship)) && other.GetType().IsSubclassOf(typeof(Ship)))
+                    {
+                        CheckMagnetism((Ship)actor, (Ship)other);
+                    }
+                }
+            }
+        }
+
+        static void CheckCollision(Actor actor, Actor other)
+        {
+
+        }
+
+        static void CheckMagnetism(Ship actor, Ship other)
+        {
+            if (actor.CurrentPolarity != Ship.Polarity.Neutral && other.CurrentPolarity != Ship.Polarity.Neutral)
+            {
+                var dy = other.Position.Y - actor.Position.Y;
+                var dx = other.Position.X - actor.Position.X;
+                var linearDistance = Math.Sqrt(Math.Pow(dx, 2) + Math.Pow(dy, 2));
+                var angle = (float) Math.Atan2(dy, dx);
+
+                if (linearDistance < actor.MagneticRadius || linearDistance < other.MagneticRadius)
+                {
+                    actor.Magnetize(other, (float)linearDistance, angle);
+                    other.Magnetize(actor, (float)linearDistance, 90 - angle);
+                }
+            }
+        }
     }
 }
diff --git a/Super Polarity/Actors/Actor.cs b/Super Polarity/Actors/Actor.cs
new file mode 100644
index 0000000..4351bf2
--- /dev/null
+++ b/Super Polarity/Actors/Actor.cs	
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace SuperPolarity
+{
+    class Actor
+    {
+        protected Game game;
+
+        // Graphics / In-Game
+        protected Texture2D Texture;
+        protected Vector2 Origin;
+        public bool Active;
+
+        // Physical Properties
+        public Vector2 Position;
+        protected Vector2 Velocity;
+        protected Vector2 Acceleration;
+        protected float Angle;
+
+        // Constraints / Behavior
+        protected float MaxVelocity;
+        protected float AccelerationRate;
+
+        public int Width
+        {
+            get { return Texture.Width; }
+        }
+
+        public int Height
+        {
+            get { return Texture.Height; }
+        }
+
+        public Actor(Game newGame)
+        {
+            game = newGame;
+        }
+
+        public virtual void Initialize(Texture2D texture, Vector2 position)
+        {
+            Texture = texture;
+            Position = position;
+            Active = true;
+
+            Origin = new Vector2(Texture.Width / 2, Texture.Height / 2);
+            Velocity = new Vector2(0, 0);
+            Acceleration = new Vector2(0, 0);
+
+            MaxVelocity = 5;
+            AccelerationRate = 10;
+        }
+
+        public void AutoDeccelerate(GameTime gameTime)
+        {
+            if (Acceleration.X == 0 && Velocity.X > 0)
+            {
+                if (AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds > Velocity.X)
+                {
+                    Velocity.X = 0;
+                    Acceleration.X = 0;
+                }
+                else
+                {
+                    Acceleration.X = -AccelerationRate;
+                }
+            }
+
+            if (Acceleration.X == 0 && Velocity.X < 0)
+            {
+                if (-AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds < Velocity.X)
+                {
+                    Velocity.X = 0;
+                    Acceleration.X = 0;
+                }
+                else
+                {
+                    Acceleration.X = AccelerationRate;
+                }
+            }
+
+            if (Acceleration.Y == 0 && Velocity.Y > 0)
+            {
+                if (AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds > Velocity.Y)
+                {
+                    Velocity.Y = 0;
+                    Acceleration.Y = 0;
+                }
+                else
+                {
+                    Acceleration.Y = -AccelerationRate;
+                }
+            }
+
+            if (Acceleration.Y == 0 && Velocity.Y < 0)
+            {
+                if (-AccelerationRate * gameTime.ElapsedGameTime.TotalSeconds < Velocity.Y)
+                {
+                    Velocity.Y = 0;
+                    Acceleration.Y = 0;
+                }
+                else
+                {
+                    Acceleration.Y = AccelerationRate;
+                }
+            }
+        }
+
+        public virtual void Update(GameTime gameTime)
+        {
+            Move(gameTime);
+            ChangeAngle();
+        }
+
+        public void Move(GameTime gameTime)
+        {
+            AutoDeccelerate(gameTime);
+
+            Velocity.X = Velocity.X + Acceleration.X * (float)gameTime.ElapsedGameTime.TotalSeconds;
+            Velocity.Y = Velocity.Y + Acceleration.Y * (float)gameTime.ElapsedGameTime.TotalSeconds;
+
+            if (Velocity.X > MaxVelocity)
+            {
+                Velocity.X = MaxVelocity;
+            }
+
+            if (Velocity.X < -MaxVelocity)
+            {
+                Velocity.X = -MaxVelocity;
+            }
+
+            if (Velocity.Y > MaxVelocity)
+            {
+                Velocity.Y = MaxVelocity;
+            }
+
+            if (Velocity.Y < -MaxVelocity)
+            {
+                Velocity.Y = -MaxVelocity;
+            }
+
+            Position.X = Position.X + Velocity.X;
+            Position.Y = Position.Y + Velocity.Y;
+        }
+
+        public void ChangeAngle()
+        {
+            Angle = (float)Math.Atan2(Velocity.Y, Velocity.X);
+        }
+
+        public virtual void Draw(SpriteBatch spriteBatch)
+        {
+            spriteBatch.Draw(Texture, Position, null, Color.White, Angle, Origin, 1f, SpriteEffects.None, 0f);
+        }
+    }
+}
diff --git a/Super Polarity/Actors/MainShip.cs b/Super Polarity/Actors/MainShip.cs
new file mode 100644
index 0000000..851c658
--- /dev/null
+++ b/Super Polarity/Actors/MainShip.cs	
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace SuperPolarity
+{
+    class MainShip : Ship
+    {
+        
+        uint Multiplier;
+        uint Lives;
+        uint Score;
+        ParticleEngine particleEngine;
+
+        public MainShip(Game newGame) : base(newGame) {}
+
+        public override void Initialize(Texture2D texture, Vector2 position)
+        {
+            base.Initialize(texture, position);
+
+            InitParticleEngine();
+            SetPolarity(Polarity.Positive);
+
+            Multiplier = 1;
+            Lives = 3;
+            Score = 0;
+
+            BindInput();
+        }
+
+        void InitParticleEngine()
+        {
+            List<Texture2D> texturesList = new List<Texture2D>();
+            texturesList.Add(game.Content.Load<Texture2D>("Graphics\\circle"));
+            texturesList.Add(game.Content.Load<Texture2D>("Graphics\\diamond"));
+            texturesList.Add(game.Content.Load<Texture2D>("Graphics\\star"));
+
+            particleEngine = new ParticleEngine(texturesList, Position);
+        }
+
+        void BindInput()
+        {
+            InputController.Bind("moveX", HandleHorizontalMovement);
+            InputController.Bind("moveY", HandleVerticalMovement);
+            InputController.Bind("changePolarity", HandleChangePolarity);
+        }
+
+        protected void HandleChangePolarity(float value)
+        {
+            SwitchPolarity();
+        }
+
+        public void HandleHorizontalMovement(float value)
+        {
+            Acceleration.X = value * AccelerationRate;
+
+            if (value > 0.1 && Velocity.X < 0 || value < 0.1 && Velocity.X > 0)
+            {
+                Acceleration.X *= 2;
+            }
+
+            if (value > 0.1 && Velocity.Y < 0 || value < 0.1 && Velocity.Y > 0)
+            {
+                Acceleration.Y *= 2;
+            }
+        }
+
+        public void HandleVerticalMovement(float value)
+        {
+            Acceleration.Y = value * AccelerationRate;
+        }
+
+        public override void SwitchPolarity()
+        {
+            base.SwitchPolarity();
+            SwitchParticleEngine(CurrentPolarity);
+        }
+
+        public override void SetPolarity(Polarity newPolarity)
+        {
+            base.SetPolarity(newPolarity);
+            SwitchParticleEngine(newPolarity);
+        }
+
+        protected void SwitchParticleEngine(Polarity polarity)
+        {
+            if (polarity == Polarity.Positive)
+            {
+                particleEngine.Color = Color.Red;
+            }
+            else if (polarity == Polarity.Negative)
+            {
+                particleEngine.Color = Color.Blue;
+            }
+            else
+            {
+                particleEngine.Color = Color.Gray;
+            }
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            base.Update(gameTime);
+            particleEngine.EmitterLocation = Position;
+            particleEngine.Update();
+            ConstrainToEdges();
+        }
+
+        public override void Magnetize(Ship ship, float distance, float angle)
+        {
+        }
+
+        protected void ConstrainToEdges()
+        {
+            if (Position.X < 0)
+            { 
+                Position.X = 0;
+
+                if (Velocity.X < 0)
+                {
+                    Velocity.X = 0;
+                }
+            }
+            if (Position.X > game.GraphicsDevice.Viewport.Width)
+            { 
+                Position.X = game.GraphicsDevice.Viewport.Width;
+
+                if (Velocity.X > 0)
+                {
+                    Velocity.X = 0;
+                }
+            }
+            if (Position.Y < 0) 
+            {
+                Position.Y = 0;
+
+                if (Velocity.Y < 0)
+                {
+                    Velocity.Y = 0;
+                }
+            }
+            if (Position.Y > game.GraphicsDevice.Viewport.Height)
+            {
+                Position.Y = game.GraphicsDevice.Viewport.Height;
+
+                if (Velocity.Y < 0)
+                {
+                    Velocity.Y = 0;
+                }
+            }
+        }
+
+        public override void Draw(SpriteBatch spriteBatch)
+        {
+            particleEngine.Draw(spriteBatch);
+            base.Draw(spriteBatch);
+        }
+    }
+}
diff --git a/Super Polarity/Actors/Ship.cs b/Super Polarity/Actors/Ship.cs
new file mode 100644
index 0000000..502c22e
--- /dev/null
+++ b/Super Polarity/Actors/Ship.cs	
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace SuperPolarity
+{
+    class Ship : Actor
+    {
+        public enum Polarity : byte { Negative, Positive, Neutral };
+
+        protected uint HP;
+        public Polarity CurrentPolarity;
+        public uint MagneticRadius;
+
+        protected float FleeVelocity;
+        protected float ActVelocity;
+        protected float ChargeVelocity;
+        protected int RepelRadius;
+
+        protected bool Magnetizing;
+
+        public Ship(Game newGame) : base(newGame) {
+            MagneticRadius = 250;
+            RepelRadius = 100;
+
+            FleeVelocity = 5;
+            ActVelocity = 3;
+            ChargeVelocity = 1.5f;
+            CurrentPolarity = Polarity.Neutral;
+            Magnetizing = false;
+        }
+
+        public virtual void SwitchPolarity()
+        {
+            if (CurrentPolarity == Polarity.Positive)
+            {
+                CurrentPolarity = Polarity.Negative;
+            }
+            else
+            {
+                CurrentPolarity = Polarity.Positive;
+            }
+        }
+
+        public virtual void SetPolarity(Polarity newPolarity)
+        {
+            CurrentPolarity = newPolarity;
+        }
+
+        public virtual void Shoot()
+        {
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            base.Update(gameTime);
+            Magnetizing = false;
+        }
+
+        public virtual void Magnetize(Ship ship, float distance, float angle)
+        {
+            Magnetizing = true;
+            Polarity polarity = ship.CurrentPolarity;
+
+            if (polarity != CurrentPolarity)
+            {
+                Attract(angle);
+            }
+            else
+            {
+                Repel(distance, angle);
+            }
+        }
+
+        protected void Attract(float angle)
+        {
+            Velocity.X = (float) (ChargeVelocity * Math.Cos(angle));
+            Velocity.Y = (float) (ChargeVelocity * Math.Sin(angle));
+        }
+
+        protected void Repel(float distance, float angle)
+        {
+            if (distance > RepelRadius) { Magnetizing = false; return; }
+            Velocity.X = -(float)(FleeVelocity * Math.Cos(angle));
+            Velocity.Y = -(float)(FleeVelocity * Math.Sin(angle));
+        }
+    }
+}
diff --git a/Super Polarity/Actors/StandardShip.cs b/Super Polarity/Actors/StandardShip.cs
new file mode 100644
index 0000000..50a671a
--- /dev/null
+++ b/Super Polarity/Actors/StandardShip.cs	
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Content;
+using System.Security.Cryptography; 
+
+namespace SuperPolarity
+{
+    class StandardShip : Ship
+    {
+
+        protected int ChangeRate;
+        protected int CurrentTime;
+        protected int AngleChangeProbability;
+        protected int BouncePadding;
+        protected float RotationFactor;
+        protected Random Random;
+        protected bool AddingAngle;
+
+        public StandardShip(Game newGame) : base(newGame) {}
+
+        public override void  Initialize(Texture2D texture, Vector2 position)
+        {
+            base.Initialize(texture, position);
+
+            var cryptoResult = new byte[4];
+            new RNGCryptoServiceProvider().GetBytes(cryptoResult);
+
+            ChangeRate = 50;
+            AngleChangeProbability = 50;
+            BouncePadding = 0;
+            MaxVelocity = 1;
+            CurrentTime = 0;
+            RotationFactor = (float) (3 * Math.PI / 180);
+            Random = new Random(BitConverter.ToInt32(cryptoResult, 0));
+            AddingAngle = true;
+        }
+
+        public override void Magnetize(Ship ship, float distance, float angle)
+        {
+            if (ship.GetType() == typeof(MainShip)) {
+                base.Magnetize(ship, distance, angle);
+            }
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            CurrentTime += gameTime.ElapsedGameTime.Milliseconds;
+            if (!Magnetizing)
+            {
+                AutoMove();
+                BounceBack();
+            }
+            ChangeAngle();
+            Position += Velocity;
+            Magnetizing = false;
+        }
+
+        protected void AutoMove()
+        {
+            float newAngle = Angle;
+
+            if (CurrentTime < ChangeRate)
+            {
+                return;
+            }
+
+            if (Random.Next(AngleChangeProbability) == 2)
+            {
+                AddingAngle = !AddingAngle;
+            }
+
+            CurrentTime = 0;
+
+            if (AddingAngle)
+            {
+                newAngle += (float) ( Random.NextDouble() * RotationFactor);
+            }
+            else
+            {
+                newAngle -= (float) (Random.NextDouble() * RotationFactor);
+            }
+
+            Velocity.X = (float) (MaxVelocity * Math.Cos(newAngle));
+            Velocity.Y = (float) (MaxVelocity * Math.Sin(newAngle));
+        }
+
+        protected void BounceBack()
+        {
+            if (Position.X + Width < -BouncePadding && Velocity.X < 0)
+            {
+                Velocity.X = -Velocity.X;
+            }
+
+            if (Position.Y + Height < -BouncePadding && Velocity.Y < 0)
+            {
+                Velocity.Y = -Velocity.Y;
+            }
+
+            if (Position.X > game.GraphicsDevice.Viewport.Width +  BouncePadding && Velocity.X > 0)
+            {
+                Velocity.X = -Velocity.X;
+            }
+
+            if (Position.Y > game.GraphicsDevice.Viewport.Height + BouncePadding && Velocity.Y > 0)
+            {
+                Velocity.Y = -Velocity.Y;
+            }
+        }
+    }
+}
diff --git a/Super Polarity/Content/Graphics/negative-ship.xnb b/Super Polarity/Content/Graphics/negative-ship.xnb
new file mode 100644
index 0000000..ed41216
Binary files /dev/null and b/Super Polarity/Content/Graphics/negative-ship.xnb differ
diff --git a/Super Polarity/Content/Graphics/player.xnb b/Super Polarity/Content/Graphics/player.xnb
deleted file mode 100644
index 55c6d4c..0000000
Binary files a/Super Polarity/Content/Graphics/player.xnb and /dev/null differ
diff --git a/Super Polarity/InputController.cs b/Super Polarity/InputController.cs
index 405b3ab..ad07717 100644
--- a/Super Polarity/InputController.cs	
+++ b/Super Polarity/InputController.cs	
@@ -11,6 +11,8 @@ namespace SuperPolarity
         static Dictionary<string, List<Action<float>>> Listeners;
         static Dictionary<string, List<Keys>> RegisteredKeys;
         static Dictionary<string, List<Buttons>> RegisteredButtons;
+        static List<string> BlockedKeys;
+        static List<string> BlockedButtons;
 
         static GamePadState InputGamePadState;
         static KeyboardState InputKeyboardState;
@@ -25,6 +27,10 @@ namespace SuperPolarity
         static InputController()
         {
             Listeners = new Dictionary<string,List<Action<float>>>();
+            RegisteredButtons = new Dictionary<string, List<Buttons>>();
+            RegisteredKeys = new Dictionary<string, List<Keys>>();
+            BlockedKeys = new List<string>();
+            BlockedButtons = new List<string>();
             InputKeyboardState = new KeyboardState();
             InputGamePadState = new GamePadState();
         }
@@ -42,8 +48,82 @@ namespace SuperPolarity
             InputKeyboardState = Keyboard.GetState();
         }
 
+        public static void RegisterEventForKey(string eventName, Keys key)
+        {
+            List<Keys> newKeyList;
+            if (!RegisteredKeys.ContainsKey(eventName))
+            {
+                newKeyList = new List<Keys>();
+                RegisteredKeys.Add(eventName, newKeyList);
+            }
+
+            RegisteredKeys.TryGetValue(eventName, out newKeyList);
+
+            newKeyList.Add(key);
+        }
+
+        public static void RegisterEventForButton(string eventName, Buttons button)
+        {
+            List<Buttons> newButtonList;
+            if (!RegisteredButtons.ContainsKey(eventName))
+            {
+                newButtonList = new List<Buttons>();
+                RegisteredButtons.Add(eventName, newButtonList);
+            }
+
+            RegisteredButtons.TryGetValue(eventName, out newButtonList);
+
+            newButtonList.Add(button);
+        }
+
         private static void DispatchRegisteredEvents()
         {
+            var keyFired = false;
+
+            foreach (KeyValuePair<string,List<Keys>> entry in RegisteredKeys) {
+                keyFired = false;
+                foreach (Keys key in entry.Value)
+                {
+                    if (InputKeyboardState.IsKeyDown(key))
+                    {
+                        if (!BlockedKeys.Contains(entry.Key))
+                        {
+                            Dispatch(entry.Key, 1);
+                            BlockedKeys.Add(entry.Key);
+                        }
+                        keyFired = true;
+                        break;
+                    }
+                }
+
+                if (!keyFired)
+                {
+                    BlockedKeys.Remove(entry.Key);
+                }
+            }
+
+            foreach (KeyValuePair<string, List<Buttons>> entry in RegisteredButtons)
+            {
+                keyFired = false;
+                foreach (Buttons button in entry.Value)
+                {
+                    if (InputGamePadState.IsButtonDown(button))
+                    {
+                        if (!BlockedButtons.Contains(entry.Key))
+                        {
+                            Dispatch(entry.Key, 1);
+                            BlockedButtons.Add(entry.Key);
+                        }
+                        keyFired = true;
+                        break;
+                    };
+                }
+
+                if (!keyFired)
+                {
+                    BlockedButtons.Remove(entry.Key);
+                }
+            }
         }
 
         private static void DispatchMoveEvents()
@@ -55,8 +135,6 @@ namespace SuperPolarity
             xMovement = InputGamePadState.ThumbSticks.Left.X;
             yMovement = -InputGamePadState.ThumbSticks.Left.Y;
 
-            Console.WriteLine("Dispatching Input {0}", InputKeyboardState.IsKeyDown(Keys.Left));
-
             if (InputKeyboardState.IsKeyDown(Keys.Left))
             {
                 xMovement = -1.0f;
diff --git a/Super Polarity/MainShip.cs b/Super Polarity/MainShip.cs
deleted file mode 100644
index 92ccab7..0000000
--- a/Super Polarity/MainShip.cs	
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Content;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace SuperPolarity
-{
-    class MainShip : Ship
-    {
-        
-        uint Multiplier;
-        uint Lives;
-        uint Score;
-        ParticleEngine particleEngine;
-
-        public override void Initialize(ContentManager Content, Texture2D texture, Vector2 position)
-        {
-            base.Initialize(Content, texture, position);
-
-            Multiplier = 1;
-            Lives = 3;
-            Score = 0;
-
-            List<Texture2D> texturesList = new List<Texture2D>();
-            texturesList.Add(Content.Load<Texture2D>("Graphics\\circle"));
-            texturesList.Add(Content.Load<Texture2D>("Graphics\\diamond"));
-            texturesList.Add(Content.Load<Texture2D>("Graphics\\star"));
-
-            particleEngine = new ParticleEngine(texturesList, Position);
-
-            BindInput();
-        }
-
-        void BindInput()
-        {
-            InputController.Bind("moveX", HandleHorizontalMovement);
-            InputController.Bind("moveY", HandleVerticalMovement);
-        }
-
-        public void HandleHorizontalMovement(float value)
-        {
-            Acceleration.X = value * AccelerationRate;
-        }
-
-        public void HandleVerticalMovement(float value)
-        {
-            Acceleration.Y = value * AccelerationRate;
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            base.Update(gameTime);
-            particleEngine.EmitterLocation = Position;
-            particleEngine.Update();
-        }
-
-        public override void Draw(SpriteBatch spriteBatch)
-        {
-            particleEngine.Draw(spriteBatch);
-            base.Draw(spriteBatch);
-        }
-    }
-}
diff --git a/Super Polarity/ParticleEngine.cs b/Super Polarity/ParticleEngine.cs
index 5cf6bdb..0fced25 100644
--- a/Super Polarity/ParticleEngine.cs	
+++ b/Super Polarity/ParticleEngine.cs	
@@ -11,6 +11,7 @@ namespace SuperPolarity
     {
         private Random random;
         public Vector2 EmitterLocation { get; set; }
+        public Color Color;
         private List<Particle> particles;
         private List<Texture2D> textures;
 
@@ -20,6 +21,7 @@ namespace SuperPolarity
             this.textures = textures;
             this.particles = new List<Particle>();
             random = new Random();
+            Color = Color.Red;
         }
 
         private Particle GenerateNewParticle()
@@ -31,10 +33,7 @@ namespace SuperPolarity
                 1f * (float)(random.NextDouble() * 2 - 1));
             float angle = 0;
             float angularVelocity = 0.1f * (float)(random.NextDouble() * 2 - 1);
-            Color color = new Color(
-                (float)random.NextDouble(),
-                (float)random.NextDouble(),
-                (float)random.NextDouble());
+            Color color = Color;
             float size = (float)random.NextDouble();
 
             int ttl = 20 + random.Next(40);
diff --git a/Super Polarity/Ship.cs b/Super Polarity/Ship.cs
deleted file mode 100644
index 5105882..0000000
--- a/Super Polarity/Ship.cs	
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace SuperPolarity
-{
-    class Ship : Actor
-    {
-        public enum Polarity : byte { Negative, Positive, Neutral };
-
-        protected uint HP;
-        protected Polarity CurrentPolarity;
-
-        public void SwitchPolarity()
-        {
-            if (CurrentPolarity == Polarity.Positive)
-            {
-                CurrentPolarity = Polarity.Negative;
-            }
-            else
-            {
-                CurrentPolarity = Polarity.Positive;
-            }
-        }
-
-        public void SetPolarity(Polarity newPolarity)
-        {
-            CurrentPolarity = newPolarity;
-        }
-
-        public virtual void Shoot()
-        {
-        }
-    }
-}
diff --git a/Super Polarity/Super Polarity.csproj b/Super Polarity/Super Polarity.csproj
index 672b39b..4ed5c42 100644
--- a/Super Polarity/Super Polarity.csproj	
+++ b/Super Polarity/Super Polarity.csproj	
@@ -37,12 +37,13 @@
   <ItemGroup>
     <Compile Include="ActorFactory.cs" />
     <Compile Include="ActorManager.cs" />
+    <Compile Include="Actors\StandardShip.cs" />
     <Compile Include="InputController.cs" />
-    <Compile Include="MainShip.cs" />
+    <Compile Include="Actors\MainShip.cs" />
     <Compile Include="Particle.cs" />
     <Compile Include="ParticleEngine.cs" />
-    <Compile Include="Actor.cs" />
-    <Compile Include="Ship.cs" />
+    <Compile Include="Actors\Actor.cs" />
+    <Compile Include="Actors\Ship.cs" />
     <Compile Include="SuperPolarity.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -92,6 +93,9 @@
     <None Include="Content\Graphics\negative-scout.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Graphics\negative-ship.xnb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Graphics\negative-supercruiser.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/Super Polarity/SuperPolarity.cs b/Super Polarity/SuperPolarity.cs
index e5f565b..b590079 100644
--- a/Super Polarity/SuperPolarity.cs	
+++ b/Super Polarity/SuperPolarity.cs	
@@ -26,7 +26,7 @@ namespace SuperPolarity
             SuperPolarity.graphics = new GraphicsDeviceManager(this);
             SuperPolarity.graphics.PreferMultiSampling = true;
             Content.RootDirectory = "Content";
-            ActorFactory.SetContentManager(Content);
+            ActorFactory.SetGame(this);
         }
 
         /// <summary>
@@ -38,6 +38,12 @@ namespace SuperPolarity
         protected override void Initialize()
         {
             base.Initialize();
+
+            InputController.RegisterEventForButton("changePolarity", Buttons.A);
+            InputController.RegisterEventForKey("changePolarity", Keys.Z);
+
+            InputController.RegisterEventForButton("shoot", Buttons.X);
+            InputController.RegisterEventForKey("shoot", Keys.X);
         }
 
         /// <summary>
@@ -51,6 +57,8 @@ namespace SuperPolarity
 
             Vector2 playerPosition = new Vector2(GraphicsDevice.Viewport.TitleSafeArea.X, GraphicsDevice.Viewport.TitleSafeArea.Y + GraphicsDevice.Viewport.TitleSafeArea.Height / 2);
 
+            ActorFactory.CreateShip(Ship.Polarity.Positive, new Vector2(200, 200));
+            ActorFactory.CreateShip(Ship.Polarity.Negative, new Vector2(400, 200));
             ActorFactory.CreateMainShip(playerPosition);
         }
 
diff --git a/Super Polarity/bin/WindowsGL/Debug/Content/Graphics/player.xnb b/Super Polarity/bin/WindowsGL/Debug/Content/Graphics/player.xnb
deleted file mode 100644
index 55c6d4c..0000000
Binary files a/Super Polarity/bin/WindowsGL/Debug/Content/Graphics/player.xnb and /dev/null differ
diff --git a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe
index ab0249d..9279018 100644
Binary files a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe and b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe differ
diff --git a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb
index 9b87d93..d363b2b 100644
Binary files a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb and b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb differ
diff --git a/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 6e72e0f..907615f 100644
Binary files a/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt b/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt
index f85e488..99c9bb4 100644
--- a/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt	
+++ b/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt	
@@ -26,3 +26,4 @@ C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarit
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\circle.xnb
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\diamond.xnb
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\star.xnb
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\negative-ship.xnb
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.exe b/Super Polarity/obj/x86/Debug/Super Polarity.exe
index ab0249d..9279018 100644
Binary files a/Super Polarity/obj/x86/Debug/Super Polarity.exe and b/Super Polarity/obj/x86/Debug/Super Polarity.exe differ
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.pdb b/Super Polarity/obj/x86/Debug/Super Polarity.pdb
index 9b87d93..d363b2b 100644
Binary files a/Super Polarity/obj/x86/Debug/Super Polarity.pdb and b/Super Polarity/obj/x86/Debug/Super Polarity.pdb differ
-- 
cgit 


From 38c7d3f9eb7d63937c6654ff5dd6046ce02dd59c Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Tue, 12 Nov 2013 22:40:29 -0600
Subject: I think bullets come out now.

---
 .../Graphics/square.png                            | Bin 0 -> 169 bytes
 .../Super Polarity ContentContent.contentproj      |   8 +++
 Super Polarity/ActorFactory.cs                     |  13 ++++
 Super Polarity/ActorManager.cs                     |  27 ++++++-
 Super Polarity/Actors/Actor.cs                     |  30 +++++++-
 Super Polarity/Actors/Bullet.cs                    |  47 +++++++++++++
 Super Polarity/Actors/MainShip.cs                  |  78 +++++++++++++++++----
 Super Polarity/Actors/Ship.cs                      |   2 +-
 Super Polarity/Content/Graphics/square.xnb         | Bin 0 -> 1147 bytes
 Super Polarity/InputController.cs                  |  10 ++-
 Super Polarity/ParticleEffectFactory.cs            |  66 +++++++++++++++++
 Super Polarity/ParticleEngine.cs                   |  18 ++++-
 Super Polarity/Renderer.cs                         |  37 ++++++++++
 Super Polarity/Super Polarity.csproj               |   6 ++
 Super Polarity/SuperPolarity.cs                    |  14 ++--
 .../bin/WindowsGL/Debug/Super Polarity.exe         | Bin 53248 -> 55808 bytes
 .../bin/WindowsGL/Debug/Super Polarity.pdb         | Bin 58880 -> 81408 bytes
 .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 8150 -> 8265 bytes
 .../Super Polarity.csproj.FileListAbsolute.txt     |   1 +
 Super Polarity/obj/x86/Debug/Super Polarity.exe    | Bin 53248 -> 55808 bytes
 Super Polarity/obj/x86/Debug/Super Polarity.pdb    | Bin 58880 -> 81408 bytes
 21 files changed, 329 insertions(+), 28 deletions(-)
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Graphics/square.png
 create mode 100644 Super Polarity/Actors/Bullet.cs
 create mode 100644 Super Polarity/Content/Graphics/square.xnb
 create mode 100644 Super Polarity/ParticleEffectFactory.cs
 create mode 100644 Super Polarity/Renderer.cs

(limited to 'Super Polarity/InputController.cs')

diff --git a/Super Polarity Content/Super Polarity ContentContent/Graphics/square.png b/Super Polarity Content/Super Polarity ContentContent/Graphics/square.png
new file mode 100644
index 0000000..960c50a
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Graphics/square.png differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj
index f86c49e..1aedf53 100644
--- a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj	
+++ b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj	
@@ -110,6 +110,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Fonts\" />
     <Folder Include="Sound\" />
   </ItemGroup>
   <ItemGroup>
@@ -136,6 +137,13 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Graphics\square.png">
+      <Name>square</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Super Polarity/ActorFactory.cs b/Super Polarity/ActorFactory.cs
index 3e2f80b..4ebbb4c 100644
--- a/Super Polarity/ActorFactory.cs	
+++ b/Super Polarity/ActorFactory.cs	
@@ -52,5 +52,18 @@ namespace SuperPolarity
         {
             ActorFactory.Game = game;
         }
+
+        internal static Bullet CreateBullet(Vector2 position, float angle)
+        {
+            Bullet bullet = new Bullet(Game);
+
+            bullet.Initialize(Game.Content.Load<Texture2D>("Graphics\\square"), position);
+
+            bullet.Angle = angle;
+
+            ActorManager.CheckIn(bullet);
+
+            return bullet;
+        }
     }
 }
diff --git a/Super Polarity/ActorManager.cs b/Super Polarity/ActorManager.cs
index 39ae336..1b4ef96 100644
--- a/Super Polarity/ActorManager.cs	
+++ b/Super Polarity/ActorManager.cs	
@@ -9,10 +9,14 @@ namespace SuperPolarity
 {
     static class ActorManager
     {
+
+        static Game Game;
+        static int OutlierBounds;
         static List<Actor> Actors;
 
         static ActorManager()
         {
+            OutlierBounds = 100;
             Actors = new List<Actor>();
         }
 
@@ -29,6 +33,7 @@ namespace SuperPolarity
         static public void Update(GameTime gameTime) 
         {
             CheckActors();
+            CheckOutliers();
             foreach (Actor actor in Actors)
             {
                 actor.Update(gameTime);
@@ -74,13 +79,33 @@ namespace SuperPolarity
                 var dx = other.Position.X - actor.Position.X;
                 var linearDistance = Math.Sqrt(Math.Pow(dx, 2) + Math.Pow(dy, 2));
                 var angle = (float) Math.Atan2(dy, dx);
+                var otherAngle = (float)Math.Atan2(-dy, -dx);
 
                 if (linearDistance < actor.MagneticRadius || linearDistance < other.MagneticRadius)
                 {
                     actor.Magnetize(other, (float)linearDistance, angle);
-                    other.Magnetize(actor, (float)linearDistance, 90 - angle);
+                    other.Magnetize(actor, (float)linearDistance, otherAngle);
                 }
             }
         }
+
+        static void CheckOutliers()
+        {
+            for (var i = Actors.Count; i > 0; i--)
+            {
+                var actor = Actors[i-1];
+                if (actor.Position.X < -OutlierBounds || actor.Position.Y < -OutlierBounds ||
+                    actor.Position.X > Game.GraphicsDevice.Viewport.Width + OutlierBounds ||
+                    actor.Position.Y > Game.GraphicsDevice.Viewport.Height + OutlierBounds)
+                {
+                    CheckOut(actor);
+                }
+            }
+        }
+
+        internal static void SetGame(Game game)
+        {
+            Game = game;
+        }
     }
 }
diff --git a/Super Polarity/Actors/Actor.cs b/Super Polarity/Actors/Actor.cs
index 4351bf2..588ff14 100644
--- a/Super Polarity/Actors/Actor.cs	
+++ b/Super Polarity/Actors/Actor.cs	
@@ -12,6 +12,8 @@ namespace SuperPolarity
     {
         protected Game game;
 
+        public List<Actor> Children;
+
         // Graphics / In-Game
         protected Texture2D Texture;
         protected Vector2 Origin;
@@ -21,7 +23,7 @@ namespace SuperPolarity
         public Vector2 Position;
         protected Vector2 Velocity;
         protected Vector2 Acceleration;
-        protected float Angle;
+        public float Angle;
 
         // Constraints / Behavior
         protected float MaxVelocity;
@@ -48,6 +50,8 @@ namespace SuperPolarity
             Position = position;
             Active = true;
 
+            Children = new List<Actor>();
+
             Origin = new Vector2(Texture.Width / 2, Texture.Height / 2);
             Velocity = new Vector2(0, 0);
             Acceleration = new Vector2(0, 0);
@@ -115,12 +119,15 @@ namespace SuperPolarity
         {
             Move(gameTime);
             ChangeAngle();
+            CheckOutliers();
         }
 
-        public void Move(GameTime gameTime)
+        public virtual void Move(GameTime gameTime)
         {
             AutoDeccelerate(gameTime);
 
+            var maxVelocity = MaxVelocity;
+
             Velocity.X = Velocity.X + Acceleration.X * (float)gameTime.ElapsedGameTime.TotalSeconds;
             Velocity.Y = Velocity.Y + Acceleration.Y * (float)gameTime.ElapsedGameTime.TotalSeconds;
 
@@ -155,7 +162,26 @@ namespace SuperPolarity
 
         public virtual void Draw(SpriteBatch spriteBatch)
         {
+            foreach (Actor child in Children)
+            {
+                child.Draw(spriteBatch);
+            }
+
             spriteBatch.Draw(Texture, Position, null, Color.White, Angle, Origin, 1f, SpriteEffects.None, 0f);
         }
+
+        void CheckOutliers()
+        {
+            for (var i = Children.Count; i > 0; i--)
+            {
+                var actor = Children[i - 1];
+                if (actor.Position.X < -SuperPolarity.OutlierBounds || actor.Position.Y < -SuperPolarity.OutlierBounds ||
+                    actor.Position.X > game.GraphicsDevice.Viewport.Width + SuperPolarity.OutlierBounds ||
+                    actor.Position.Y > game.GraphicsDevice.Viewport.Height + SuperPolarity.OutlierBounds)
+                {
+                    Children.Remove(actor);
+                }
+            }
+        }
     }
 }
diff --git a/Super Polarity/Actors/Bullet.cs b/Super Polarity/Actors/Bullet.cs
new file mode 100644
index 0000000..6862e69
--- /dev/null
+++ b/Super Polarity/Actors/Bullet.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace SuperPolarity
+{
+    class Bullet : Actor
+    {
+        protected ParticleEngine particleEngine;
+
+        public Bullet(Game newGame)
+            : base(newGame)
+        {
+        }
+
+        ~Bullet()
+        {
+            particleEngine = null;
+        }
+
+        public override void Initialize(Texture2D texture, Vector2 position)
+        {
+            base.Initialize(texture, position);
+            particleEngine = ParticleEffectFactory.CreateBullet(position);
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            Velocity.X = (float)(MaxVelocity * Math.Cos(Angle));
+            Velocity.Y = (float)(MaxVelocity * Math.Sin(Angle));
+
+            Position += Velocity;
+
+            particleEngine.Update();
+            particleEngine.EmitterLocation = Position;
+        }
+
+        public override void Draw(SpriteBatch spriteBatch)
+        {
+            base.Draw(spriteBatch);
+            particleEngine.Draw(spriteBatch);
+        }
+    }
+}
diff --git a/Super Polarity/Actors/MainShip.cs b/Super Polarity/Actors/MainShip.cs
index 851c658..1f4f22a 100644
--- a/Super Polarity/Actors/MainShip.cs	
+++ b/Super Polarity/Actors/MainShip.cs	
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
@@ -10,36 +11,40 @@ namespace SuperPolarity
 {
     class MainShip : Ship
     {
-        
-        uint Multiplier;
-        uint Lives;
-        uint Score;
+
+        public static Color BlueColor;
+        public static Color RedColor;
+
         ParticleEngine particleEngine;
 
+        protected bool Shooting;
+        protected int ShotCooldown;
+
         public MainShip(Game newGame) : base(newGame) {}
 
+        ~MainShip()
+        {
+            particleEngine = null;
+        }
+
         public override void Initialize(Texture2D texture, Vector2 position)
         {
             base.Initialize(texture, position);
 
+            MainShip.BlueColor = new Color(230, 244, 249);
+            MainShip.RedColor = new Color(255, 234, 241);
+
             InitParticleEngine();
             SetPolarity(Polarity.Positive);
 
-            Multiplier = 1;
-            Lives = 3;
-            Score = 0;
+            ShotCooldown = 50;
 
             BindInput();
         }
 
         void InitParticleEngine()
         {
-            List<Texture2D> texturesList = new List<Texture2D>();
-            texturesList.Add(game.Content.Load<Texture2D>("Graphics\\circle"));
-            texturesList.Add(game.Content.Load<Texture2D>("Graphics\\diamond"));
-            texturesList.Add(game.Content.Load<Texture2D>("Graphics\\star"));
-
-            particleEngine = new ParticleEngine(texturesList, Position);
+            particleEngine = ParticleEffectFactory.CreatePolarCircle(Position);
         }
 
         void BindInput()
@@ -47,6 +52,20 @@ namespace SuperPolarity
             InputController.Bind("moveX", HandleHorizontalMovement);
             InputController.Bind("moveY", HandleVerticalMovement);
             InputController.Bind("changePolarity", HandleChangePolarity);
+            InputController.Bind("shoot", HandleShot);
+        }
+
+        protected void HandleShot(float value)
+        {
+            Children.Add(ActorFactory.CreateBullet(Position, Angle));
+            Shooting = true;
+            Timer t = new Timer(new TimerCallback(UnlockShot));
+            t.Change(ShotCooldown, Timeout.Infinite);
+        }
+
+        protected void UnlockShot(object state)
+        {
+            InputController.Unlock("shoot");
         }
 
         protected void HandleChangePolarity(float value)
@@ -90,11 +109,11 @@ namespace SuperPolarity
         {
             if (polarity == Polarity.Positive)
             {
-                particleEngine.Color = Color.Red;
+                particleEngine.Color = MainShip.RedColor;
             }
             else if (polarity == Polarity.Negative)
             {
-                particleEngine.Color = Color.Blue;
+                particleEngine.Color = MainShip.BlueColor;
             }
             else
             {
@@ -108,6 +127,35 @@ namespace SuperPolarity
             particleEngine.EmitterLocation = Position;
             particleEngine.Update();
             ConstrainToEdges();
+            Shooting = false;
+        }
+
+        public override void Move(GameTime gameTime)
+        {
+            base.Move(gameTime);
+
+            if (Shooting)
+            {
+                if (Velocity.X > ActVelocity)
+                {
+                    Velocity.X = ActVelocity;
+                }
+
+                if (Velocity.X < -ActVelocity)
+                {
+                    Velocity.X = -ActVelocity;
+                }
+
+                if (Velocity.Y > ActVelocity)
+                {
+                    Velocity.Y = ActVelocity;
+                }
+
+                if (Velocity.Y < -ActVelocity)
+                {
+                    Velocity.Y = -ActVelocity;
+                }
+            }
         }
 
         public override void Magnetize(Ship ship, float distance, float angle)
diff --git a/Super Polarity/Actors/Ship.cs b/Super Polarity/Actors/Ship.cs
index 502c22e..b4706ac 100644
--- a/Super Polarity/Actors/Ship.cs	
+++ b/Super Polarity/Actors/Ship.cs	
@@ -27,7 +27,7 @@ namespace SuperPolarity
             RepelRadius = 100;
 
             FleeVelocity = 5;
-            ActVelocity = 3;
+            ActVelocity = 2;
             ChargeVelocity = 1.5f;
             CurrentPolarity = Polarity.Neutral;
             Magnetizing = false;
diff --git a/Super Polarity/Content/Graphics/square.xnb b/Super Polarity/Content/Graphics/square.xnb
new file mode 100644
index 0000000..5a88d89
Binary files /dev/null and b/Super Polarity/Content/Graphics/square.xnb differ
diff --git a/Super Polarity/InputController.cs b/Super Polarity/InputController.cs
index ad07717..79bd039 100644
--- a/Super Polarity/InputController.cs	
+++ b/Super Polarity/InputController.cs	
@@ -88,8 +88,8 @@ namespace SuperPolarity
                     {
                         if (!BlockedKeys.Contains(entry.Key))
                         {
-                            Dispatch(entry.Key, 1);
                             BlockedKeys.Add(entry.Key);
+                            Dispatch(entry.Key, 1);
                         }
                         keyFired = true;
                         break;
@@ -111,8 +111,8 @@ namespace SuperPolarity
                     {
                         if (!BlockedButtons.Contains(entry.Key))
                         {
-                            Dispatch(entry.Key, 1);
                             BlockedButtons.Add(entry.Key);
+                            Dispatch(entry.Key, 1);
                         }
                         keyFired = true;
                         break;
@@ -192,5 +192,11 @@ namespace SuperPolarity
                 method(value);
             }
         }
+
+        public static void Unlock(string eventName)
+        {
+            BlockedButtons.Remove(eventName);
+            BlockedKeys.Remove(eventName);
+        }
     }
 }
diff --git a/Super Polarity/ParticleEffectFactory.cs b/Super Polarity/ParticleEffectFactory.cs
new file mode 100644
index 0000000..0cd9ed3
--- /dev/null
+++ b/Super Polarity/ParticleEffectFactory.cs	
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace SuperPolarity
+{
+    static class ParticleEffectFactory
+    {
+        static Game Game;
+        static Random random;
+
+        static ParticleEffectFactory()
+        {
+            random = new Random();
+        }
+
+        public static ParticleEngine CreatePolarCircle(Vector2 location)
+        {
+            List<Texture2D> texturesList = new List<Texture2D>();
+
+            //texturesList.Add(Game.Content.Load<Texture2D>("Graphics\\circle"));
+            texturesList.Add(Game.Content.Load<Texture2D>("Graphics\\diamond"));
+            texturesList.Add(Game.Content.Load<Texture2D>("Graphics\\square"));
+
+            ParticleEngine particleEngine = new ParticleEngine(texturesList, location);
+
+            particleEngine.Color = new Color(239, 203, 204);
+            particleEngine.TTL = 10;
+            particleEngine.TTLRandomFactor = 5;
+            particleEngine.ScatterFactor = 40;
+            particleEngine.ParticleCount = 50;
+            particleEngine.StretchFactor = 2.8f;
+
+
+            return particleEngine;
+        }
+
+        public static ParticleEngine CreateBullet(Vector2 location)
+        {
+            List<Texture2D> texturesList = new List<Texture2D>();
+
+            texturesList.Add(Game.Content.Load<Texture2D>("Graphics\\circle"));
+            //texturesList.Add(Game.Content.Load<Texture2D>("Graphics\\diamond"));
+            texturesList.Add(Game.Content.Load<Texture2D>("Graphics\\square"));
+
+            ParticleEngine particleEngine = new ParticleEngine(texturesList, location);
+
+            particleEngine.Color = Color.Gray;
+            particleEngine.TTL = 5;
+            particleEngine.TTLRandomFactor = 5;
+            particleEngine.ScatterFactor = 5;
+            particleEngine.ParticleCount = 10;
+            particleEngine.StretchFactor = 1;
+
+            return particleEngine;
+        }
+
+        internal static void SetGame(Game game)
+        {
+            ParticleEffectFactory.Game = game;
+        }
+    }
+}
diff --git a/Super Polarity/ParticleEngine.cs b/Super Polarity/ParticleEngine.cs
index 0fced25..51188ae 100644
--- a/Super Polarity/ParticleEngine.cs	
+++ b/Super Polarity/ParticleEngine.cs	
@@ -11,7 +11,12 @@ namespace SuperPolarity
     {
         private Random random;
         public Vector2 EmitterLocation { get; set; }
-        public Color Color;
+        public Color Color; //TODO: Color list for random colors.
+        public int TTL;
+        public int TTLRandomFactor;
+        public int ScatterFactor;
+        public int ParticleCount;
+        public float StretchFactor;
         private List<Particle> particles;
         private List<Texture2D> textures;
 
@@ -22,6 +27,9 @@ namespace SuperPolarity
             this.particles = new List<Particle>();
             random = new Random();
             Color = Color.Red;
+            TTL = 20;
+            TTLRandomFactor = 40;
+            StretchFactor = 1;
         }
 
         private Particle GenerateNewParticle()
@@ -31,12 +39,16 @@ namespace SuperPolarity
             Vector2 velocity = new Vector2(
                 1f * (float)(random.NextDouble() * 2 - 1),
                 1f * (float)(random.NextDouble() * 2 - 1));
+
             float angle = 0;
             float angularVelocity = 0.1f * (float)(random.NextDouble() * 2 - 1);
             Color color = Color;
-            float size = (float)random.NextDouble();
+            float size = (float)random.NextDouble() * StretchFactor;
+
+            position.X += random.Next(-ScatterFactor, ScatterFactor);
+            position.Y += random.Next(-ScatterFactor, ScatterFactor);
 
-            int ttl = 20 + random.Next(40);
+            int ttl = TTL + random.Next(TTLRandomFactor);
 
             return new Particle(texture, position, velocity, angle, angularVelocity, color, size, ttl);
         }
diff --git a/Super Polarity/Renderer.cs b/Super Polarity/Renderer.cs
new file mode 100644
index 0000000..2f5c5aa
--- /dev/null
+++ b/Super Polarity/Renderer.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace SuperPolarity
+{
+    class Renderer
+    {
+        
+        static List<Actor> Actors;
+
+        static Renderer()
+        {
+            Actors = new List<Actor>();
+        }
+
+        static public void CheckIn(Actor actor)
+        {
+            Actors.Add(actor);
+        }
+
+        static public void CheckOut(Actor actor)
+        {
+            Actors.Remove(actor);
+        }
+
+        static public void Draw(SpriteBatch spriteBatch)
+        {
+            foreach (Actor actor in Actors)
+            {
+                actor.Draw(spriteBatch);
+            }
+        }
+    }
+}
diff --git a/Super Polarity/Super Polarity.csproj b/Super Polarity/Super Polarity.csproj
index 4ed5c42..193edde 100644
--- a/Super Polarity/Super Polarity.csproj	
+++ b/Super Polarity/Super Polarity.csproj	
@@ -38,12 +38,15 @@
     <Compile Include="ActorFactory.cs" />
     <Compile Include="ActorManager.cs" />
     <Compile Include="Actors\StandardShip.cs" />
+    <Compile Include="Actors\Bullet.cs" />
     <Compile Include="InputController.cs" />
     <Compile Include="Actors\MainShip.cs" />
     <Compile Include="Particle.cs" />
+    <Compile Include="ParticleEffectFactory.cs" />
     <Compile Include="ParticleEngine.cs" />
     <Compile Include="Actors\Actor.cs" />
     <Compile Include="Actors\Ship.cs" />
+    <Compile Include="Renderer.cs" />
     <Compile Include="SuperPolarity.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -129,6 +132,9 @@
     <None Include="Content\Graphics\positive-supercruiser.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Graphics\square.xnb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Graphics\star.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/Super Polarity/SuperPolarity.cs b/Super Polarity/SuperPolarity.cs
index b590079..21d1ed4 100644
--- a/Super Polarity/SuperPolarity.cs	
+++ b/Super Polarity/SuperPolarity.cs	
@@ -20,6 +20,8 @@ namespace SuperPolarity
         public static GraphicsDeviceManager graphics;
         SpriteBatch spriteBatch;
 
+        public static int OutlierBounds;
+
         public SuperPolarity()
             : base()
         {
@@ -27,6 +29,8 @@ namespace SuperPolarity
             SuperPolarity.graphics.PreferMultiSampling = true;
             Content.RootDirectory = "Content";
             ActorFactory.SetGame(this);
+            ParticleEffectFactory.SetGame(this);
+            ActorManager.SetGame(this);
         }
 
         /// <summary>
@@ -39,6 +43,8 @@ namespace SuperPolarity
         {
             base.Initialize();
 
+            OutlierBounds = 100;
+
             InputController.RegisterEventForButton("changePolarity", Buttons.A);
             InputController.RegisterEventForKey("changePolarity", Keys.Z);
 
@@ -57,9 +63,9 @@ namespace SuperPolarity
 
             Vector2 playerPosition = new Vector2(GraphicsDevice.Viewport.TitleSafeArea.X, GraphicsDevice.Viewport.TitleSafeArea.Y + GraphicsDevice.Viewport.TitleSafeArea.Height / 2);
 
-            ActorFactory.CreateShip(Ship.Polarity.Positive, new Vector2(200, 200));
-            ActorFactory.CreateShip(Ship.Polarity.Negative, new Vector2(400, 200));
-            ActorFactory.CreateMainShip(playerPosition);
+            Renderer.CheckIn(ActorFactory.CreateMainShip(playerPosition));
+            Renderer.CheckIn(ActorFactory.CreateShip(Ship.Polarity.Positive, new Vector2(200, 200)));
+            Renderer.CheckIn(ActorFactory.CreateShip(Ship.Polarity.Negative, new Vector2(400, 200)));
         }
 
         /// <summary>
@@ -99,7 +105,7 @@ namespace SuperPolarity
 
             spriteBatch.Begin();
 
-            ActorManager.Draw(spriteBatch);
+            Renderer.Draw(spriteBatch);
 
             spriteBatch.End();
 
diff --git a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe
index 9279018..906274f 100644
Binary files a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe and b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe differ
diff --git a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb
index d363b2b..837ce9b 100644
Binary files a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb and b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb differ
diff --git a/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 907615f..c87641f 100644
Binary files a/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt b/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt
index 99c9bb4..aa6ffb3 100644
--- a/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt	
+++ b/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt	
@@ -27,3 +27,4 @@ C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarit
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\diamond.xnb
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\star.xnb
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\negative-ship.xnb
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\square.xnb
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.exe b/Super Polarity/obj/x86/Debug/Super Polarity.exe
index 9279018..906274f 100644
Binary files a/Super Polarity/obj/x86/Debug/Super Polarity.exe and b/Super Polarity/obj/x86/Debug/Super Polarity.exe differ
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.pdb b/Super Polarity/obj/x86/Debug/Super Polarity.pdb
index d363b2b..837ce9b 100644
Binary files a/Super Polarity/obj/x86/Debug/Super Polarity.pdb and b/Super Polarity/obj/x86/Debug/Super Polarity.pdb differ
-- 
cgit 


From b587e9d8e0cc5eb1edf972fd3b644704441e5289 Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Sat, 23 Nov 2013 13:54:16 -0600
Subject: Protoshow sprint.

---
 .../Fonts/bigfont.png                              | Bin 0 -> 18385 bytes
 .../Fonts/smallfont.png                            | Bin 0 -> 8490 bytes
 .../Graphics/pause-screen.png                      | Bin 0 -> 34294 bytes
 .../Graphics/polaritydemotitle.png                 | Bin 0 -> 16528 bytes
 .../Sound/polaritytheme.wav                        | Bin 0 -> 48384044 bytes
 .../Super Polarity ContentContent.contentproj      |  32 +++-
 Super Polarity.suo                                 | Bin 58880 -> 58880 bytes
 Super Polarity/ActorFactory.cs                     |  11 +-
 Super Polarity/ActorManager.cs                     |  38 +++++
 Super Polarity/Actors/Actor.cs                     |  20 ++-
 Super Polarity/Actors/Bullet.cs                    |   6 +
 Super Polarity/Actors/MainShip.cs                  | 102 ++++++++----
 Super Polarity/Actors/Ship.cs                      |   2 +-
 Super Polarity/BasicGenerator.cs                   |  14 +-
 Super Polarity/Content/Fonts/bigfont.xnb           | Bin 0 -> 115931 bytes
 Super Polarity/Content/Fonts/smallfont.xnb         | Bin 0 -> 50395 bytes
 Super Polarity/Content/Graphics/pause-screen.xnb   | Bin 0 -> 3686587 bytes
 .../Content/Graphics/polaritydemotitle.xnb         | Bin 0 -> 3686587 bytes
 Super Polarity/Content/Sound/bomb.wav              | Bin 0 -> 403244 bytes
 Super Polarity/Content/Sound/bullet.wav            | Bin 0 -> 201644 bytes
 Super Polarity/Content/Sound/gameover.wav          | Bin 0 -> 1612844 bytes
 Super Polarity/Content/Sound/hit.wav               | Bin 0 -> 403244 bytes
 Super Polarity/Content/Sound/life.wav              | Bin 0 -> 403244 bytes
 Super Polarity/Content/Sound/polaritychange.wav    | Bin 0 -> 403244 bytes
 Super Polarity/Content/Sound/polaritytheme.wav     | Bin 0 -> 48384044 bytes
 Super Polarity/GameScreen.cs                       | 178 +++++++++++++++++++--
 Super Polarity/InputController.cs                  |  52 +++++-
 Super Polarity/Player.cs                           |  39 ++++-
 Super Polarity/Renderer.cs                         |   5 +
 Super Polarity/Screen.cs                           |   2 +
 Super Polarity/ScreenManager.cs                    |  17 +-
 Super Polarity/Super Polarity.csproj               |  37 ++++-
 Super Polarity/SuperPolarity.cs                    |  41 +++--
 Super Polarity/TitleScreen.cs                      |  38 +++++
 .../bin/WindowsGL/Debug/Super Polarity.exe         | Bin 62976 -> 68096 bytes
 .../bin/WindowsGL/Debug/Super Polarity.pdb         | Bin 116224 -> 130560 bytes
 .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 8367 -> 9636 bytes
 .../Super Polarity.csproj.FileListAbsolute.txt     |  11 ++
 Super Polarity/obj/x86/Debug/Super Polarity.exe    | Bin 62976 -> 68096 bytes
 Super Polarity/obj/x86/Debug/Super Polarity.pdb    | Bin 116224 -> 130560 bytes
 40 files changed, 564 insertions(+), 81 deletions(-)
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Fonts/bigfont.png
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Fonts/smallfont.png
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Graphics/pause-screen.png
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Graphics/polaritydemotitle.png
 create mode 100644 Super Polarity Content/Super Polarity ContentContent/Sound/polaritytheme.wav
 create mode 100644 Super Polarity/Content/Fonts/bigfont.xnb
 create mode 100644 Super Polarity/Content/Fonts/smallfont.xnb
 create mode 100644 Super Polarity/Content/Graphics/pause-screen.xnb
 create mode 100644 Super Polarity/Content/Graphics/polaritydemotitle.xnb
 create mode 100644 Super Polarity/Content/Sound/bomb.wav
 create mode 100644 Super Polarity/Content/Sound/bullet.wav
 create mode 100644 Super Polarity/Content/Sound/gameover.wav
 create mode 100644 Super Polarity/Content/Sound/hit.wav
 create mode 100644 Super Polarity/Content/Sound/life.wav
 create mode 100644 Super Polarity/Content/Sound/polaritychange.wav
 create mode 100644 Super Polarity/Content/Sound/polaritytheme.wav

(limited to 'Super Polarity/InputController.cs')

diff --git a/Super Polarity Content/Super Polarity ContentContent/Fonts/bigfont.png b/Super Polarity Content/Super Polarity ContentContent/Fonts/bigfont.png
new file mode 100644
index 0000000..67307dd
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Fonts/bigfont.png differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Fonts/smallfont.png b/Super Polarity Content/Super Polarity ContentContent/Fonts/smallfont.png
new file mode 100644
index 0000000..51a2c14
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Fonts/smallfont.png differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Graphics/pause-screen.png b/Super Polarity Content/Super Polarity ContentContent/Graphics/pause-screen.png
new file mode 100644
index 0000000..0d6db73
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Graphics/pause-screen.png differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Graphics/polaritydemotitle.png b/Super Polarity Content/Super Polarity ContentContent/Graphics/polaritydemotitle.png
new file mode 100644
index 0000000..10a9b92
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Graphics/polaritydemotitle.png differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Sound/polaritytheme.wav b/Super Polarity Content/Super Polarity ContentContent/Sound/polaritytheme.wav
new file mode 100644
index 0000000..28a6bce
Binary files /dev/null and b/Super Polarity Content/Super Polarity ContentContent/Sound/polaritytheme.wav differ
diff --git a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj
index 2b327e7..12417a2 100644
--- a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj	
+++ b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj	
@@ -110,7 +110,11 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Sound\" />
+    <Compile Include="Graphics\pause-screen.png">
+      <Name>pause-screen</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Graphics\circle.png">
@@ -150,6 +154,32 @@
       <Processor>FontDescriptionProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Sound\polaritytheme.wav">
+      <Name>polaritytheme</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SongProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Graphics\polaritydemotitle.png">
+      <Name>polaritydemotitle</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Fonts\bigfont.png">
+      <Name>bigfont</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>FontTextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Fonts\smallfont.png">
+      <Name>smallfont</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>FontTextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Super Polarity.suo b/Super Polarity.suo
index 4f5c9c9..ae197e2 100644
Binary files a/Super Polarity.suo and b/Super Polarity.suo differ
diff --git a/Super Polarity/ActorFactory.cs b/Super Polarity/ActorFactory.cs
index 9995707..f9c7697 100644
--- a/Super Polarity/ActorFactory.cs	
+++ b/Super Polarity/ActorFactory.cs	
@@ -18,7 +18,6 @@ namespace SuperPolarity
             mainShip.Initialize(Game.Content.Load<Texture2D>("Graphics\\main-ship"), position);
 
             ActorManager.CheckIn(mainShip);
-            Renderer.CheckIn(mainShip);
 
             return mainShip;
         }
@@ -45,7 +44,6 @@ namespace SuperPolarity
             ship.SetPolarity(polarity);
 
             ActorManager.CheckIn(ship);
-            Renderer.CheckIn(ship);
 
             return ship;
         }
@@ -64,7 +62,6 @@ namespace SuperPolarity
             bullet.Angle = angle;
 
             ActorManager.CheckIn(bullet);
-            Renderer.CheckIn(bullet);
 
             return bullet;
         }
@@ -93,7 +90,7 @@ namespace SuperPolarity
             ship.BoxDimensions.Z = 10;
 
             ship.Initialize(texture, position);
-            ship.MaxVelocity = 5.5f;
+            ship.MaxVelocity = 5.2f;
             ship.FleeVelocity = 6.5f;
             ship.ChargeVelocity = 5.5f;
             ship.Value = 3;
@@ -102,7 +99,6 @@ namespace SuperPolarity
             ship.SetPolarity(polarity);
 
             ActorManager.CheckIn(ship);
-            Renderer.CheckIn(ship);
 
             return ship;
         }
@@ -131,15 +127,16 @@ namespace SuperPolarity
             ship.BoxDimensions.Z = 40;
 
             ship.Initialize(texture, position);
+            ship.MagneticRadius = 1000;
+            ship.RepelRadius = 200;
             ship.MaxVelocity = 0.5f;
             ship.FleeVelocity = 5;
             ship.ChargeVelocity = 1;
             ship.Value = 10;
-            ship.HP = 9;
+            ship.HP = 29;
             ship.SetPolarity(polarity);
 
             ActorManager.CheckIn(ship);
-            Renderer.CheckIn(ship);
 
             return ship;
         }
diff --git a/Super Polarity/ActorManager.cs b/Super Polarity/ActorManager.cs
index 8cd265a..f5587b9 100644
--- a/Super Polarity/ActorManager.cs	
+++ b/Super Polarity/ActorManager.cs	
@@ -27,7 +27,9 @@ namespace SuperPolarity
 
         static public void CheckOut(Actor actor)
         {
+            actor.CleanUp();
             Actors.Remove(actor);
+            actor = null;
         }
 
         static public void Update(GameTime gameTime) 
@@ -55,6 +57,12 @@ namespace SuperPolarity
                 if (i >= Actors.Count) {
                     i = Actors.Count - 1;
                 }
+
+                if (Actors.Count == 0)
+                {
+                    return;
+                }
+
                 Actor actor = Actors[i];
                 for (var j = i - 1; j >= 0; j--)
                 {
@@ -110,13 +118,43 @@ namespace SuperPolarity
                     actor.Position.Y > Game.GraphicsDevice.Viewport.Height + OutlierBounds)
                 {
                     CheckOut(actor);
+                    if (actor.Parent != null)
+                    {
+                        actor.Parent.Children.Remove(actor);
+                    }
                 }
             }
         }
 
+        static public void Empty()
+        {
+            foreach (Actor actor in Actors) {
+                actor.CleanUp();
+            }
+            Actors.Clear();
+        }
+
         internal static void SetGame(SuperPolarity game)
         {
             Game = game;
         }
+
+        public static void Bomb()
+        {
+            for (var i = Actors.Count - 1; i >= 0; i--)
+            {
+                var actor = Actors[i];
+                if (actor.GetType() == typeof(StandardShip))
+                {
+                    CheckOut(actor);
+                    Renderer.CheckOut(actor);
+                }
+            }
+        }
+
+        public static int CountBaddies()
+        {
+            return Actors.Where(a => a.GetType() == typeof(StandardShip)).Count();
+        }
     }
 }
diff --git a/Super Polarity/Actors/Actor.cs b/Super Polarity/Actors/Actor.cs
index c317796..3bb06be 100644
--- a/Super Polarity/Actors/Actor.cs	
+++ b/Super Polarity/Actors/Actor.cs	
@@ -204,13 +204,21 @@ namespace SuperPolarity
 
         public virtual void Draw(SpriteBatch spriteBatch)
         {
-            foreach (Actor child in Children)
+            Actor child = null;
+            
+            //  TODO: Check what's up with the null children.
+            if (Children == null)
             {
+                return;
+            }
+            for (var i = Children.Count - 1; i >= 0; i--)
+            {
+                child = Children[i];
                 child.Draw(spriteBatch);
             }
 
             spriteBatch.Draw(Texture, Position, null, Color, Angle, Origin, 1f, SpriteEffects.None, 0f);
-            spriteBatch.Draw(BoxTexture, Box, new Color(255, 0, 255, 25));
+            //spriteBatch.Draw(BoxTexture, Box, new Color(255, 0, 255, 25));
         }
 
         void CheckOutliers()
@@ -247,5 +255,13 @@ namespace SuperPolarity
         {
             Dying = true;
         }
+
+        public virtual void CleanUp()
+        {
+            Texture = null;
+            BoxTexture = null;
+            Children = null;
+            Texture = null;
+        }
     }
 }
diff --git a/Super Polarity/Actors/Bullet.cs b/Super Polarity/Actors/Bullet.cs
index 6b797c2..d20289c 100644
--- a/Super Polarity/Actors/Bullet.cs	
+++ b/Super Polarity/Actors/Bullet.cs	
@@ -70,5 +70,11 @@ namespace SuperPolarity
             Renderer.CheckOut(this);
             Parent.Children.Remove(this);
         }
+
+        public override void CleanUp()
+        {
+            base.CleanUp();
+            this.particleEngine = null;
+        }
     }
 }
diff --git a/Super Polarity/Actors/MainShip.cs b/Super Polarity/Actors/MainShip.cs
index 616f16e..9f28c80 100644
--- a/Super Polarity/Actors/MainShip.cs	
+++ b/Super Polarity/Actors/MainShip.cs	
@@ -6,6 +6,7 @@ using System.Threading;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Audio;
 
 namespace SuperPolarity
 {
@@ -24,6 +25,10 @@ namespace SuperPolarity
         protected float MaxImmortalTime;
         protected bool Flashing;
 
+        protected SoundEffect PolarityChange;
+        protected SoundEffect ShootSound;
+        protected SoundEffect Hit;
+
         public MainShip(SuperPolarity newGame) : base(newGame) {}
 
         ~MainShip()
@@ -35,12 +40,18 @@ namespace SuperPolarity
         {
             base.Initialize(texture, position);
 
-            MainShip.BlueColor = new Color(230, 244, 249);
-            MainShip.RedColor = new Color(255, 234, 241);
+            MainShip.BlueColor = new Color(0, 184, 229);
+            MainShip.RedColor = new Color(201, 0, 68);
+
+            PolarityChange = game.Content.Load<SoundEffect>("Sound\\polaritychange");
+            ShootSound = game.Content.Load<SoundEffect>("Sound\\bullet");
+            Hit = game.Content.Load<SoundEffect>("Sound\\hit");
 
             InitParticleEngine();
             SetPolarity(Polarity.Positive);
 
+            ActVelocity = 2.5f;
+
             ShotCooldown = 50;
             MaxImmortalTime = 1500;
 
@@ -68,19 +79,28 @@ namespace SuperPolarity
 
         protected void HandleShot(float value)
         {
+
+            Shooting = true;
+            Timer t = new Timer(new TimerCallback(UnlockShot));
+            t.Change(ShotCooldown, Timeout.Infinite);
+
+            if (Children.Count > 10)
+            {
+                return;
+            }
+
             var bullet = ActorFactory.CreateBullet(Position, Angle);
 
             Children.Add(bullet);
             bullet.Parent = this;
 
-            Shooting = true;
-            Timer t = new Timer(new TimerCallback(UnlockShot));
-            t.Change(ShotCooldown, Timeout.Infinite);
+            ShootSound.Play();
         }
 
         protected void UnlockShot(object state)
         {
             InputController.Unlock("shoot");
+            Shooting = false;
         }
 
         protected void HandleChangePolarity(float value)
@@ -90,28 +110,29 @@ namespace SuperPolarity
 
         public void HandleHorizontalMovement(float value)
         {
-            Acceleration.X = value * AccelerationRate;
-
-            if (value > 0.1 && Velocity.X < 0 || value < 0.1 && Velocity.X > 0)
+            if (value >= -0.5 && value <= 0.5)
             {
-                Acceleration.X *= 2;
+                value = 0;
             }
 
-            if (value > 0.1 && Velocity.Y < 0 || value < 0.1 && Velocity.Y > 0)
-            {
-                Acceleration.Y *= 2;
-            }
+            Velocity.X = value * MaxVelocity;
         }
 
         public void HandleVerticalMovement(float value)
         {
-            Acceleration.Y = value * AccelerationRate;
+            if (value >= -0.5 && value <= 0.5)
+            {
+                value = 0;
+            }
+
+            Velocity.Y = value * MaxVelocity;
         }
 
         public override void SwitchPolarity()
         {
             base.SwitchPolarity();
             SwitchParticleEngine(CurrentPolarity);
+            PolarityChange.Play();
             game.Player.ResetMultiplier();
         }
 
@@ -144,7 +165,6 @@ namespace SuperPolarity
             particleEngine.Update();
             ConstrainToEdges();
             UpdateImmortality(gameTime);
-            Shooting = false;
         }
 
         public void UpdateImmortality(GameTime gameTime)
@@ -174,30 +194,36 @@ namespace SuperPolarity
 
         public override void Move(GameTime gameTime)
         {
-            base.Move(gameTime);
+            var VelocityLimit = MaxVelocity;
+            var SavedVelocity = new Vector2(Velocity.X, Velocity.Y);
 
             if (Shooting)
             {
-                if (Velocity.X > ActVelocity)
-                {
-                    Velocity.X = ActVelocity;
-                }
+                VelocityLimit = ActVelocity;
+            }
 
-                if (Velocity.X < -ActVelocity)
-                {
-                    Velocity.X = -ActVelocity;
-                }
+            if (SavedVelocity.X > VelocityLimit)
+            {
+                SavedVelocity.X = VelocityLimit;
+            }
 
-                if (Velocity.Y > ActVelocity)
-                {
-                    Velocity.Y = ActVelocity;
-                }
+            if (SavedVelocity.X < -VelocityLimit)
+            {
+                SavedVelocity.X = -VelocityLimit;
+            }
 
-                if (Velocity.Y < -ActVelocity)
-                {
-                    Velocity.Y = -ActVelocity;
-                }
+            if (SavedVelocity.Y > VelocityLimit)
+            {
+                SavedVelocity.Y = VelocityLimit;
+            }
+
+            if (SavedVelocity.Y < -VelocityLimit)
+            {
+                SavedVelocity.Y = -VelocityLimit;
             }
+
+            Position.X = Position.X + SavedVelocity.X;
+            Position.Y = Position.Y + SavedVelocity.Y;
         }
 
         public override void Magnetize(Ship ship, float distance, float angle)
@@ -266,11 +292,23 @@ namespace SuperPolarity
             if (game.Player.Lives < 0)
             {
                 Dying = true;
+                game.GameOver();
             }
             else {
+                Hit.Play();
                 Immortal = true;
                 CurrentImmortalTime = 0;
             }
         }
+
+        public override void CleanUp()
+        {
+            base.CleanUp();
+            particleEngine = null;
+            InputController.Unbind("moveX", HandleHorizontalMovement);
+            InputController.Unbind("moveY", HandleVerticalMovement);
+            InputController.Unbind("changePolarity", HandleChangePolarity);
+            InputController.Unbind("shoot", HandleShot);
+        }
     }
 }
diff --git a/Super Polarity/Actors/Ship.cs b/Super Polarity/Actors/Ship.cs
index 49d0b14..229f639 100644
--- a/Super Polarity/Actors/Ship.cs	
+++ b/Super Polarity/Actors/Ship.cs	
@@ -17,7 +17,7 @@ namespace SuperPolarity
         public float FleeVelocity;
         public float ActVelocity;
         public float ChargeVelocity;
-        protected int RepelRadius;
+        public int RepelRadius;
 
         protected bool Magnetizing;
 
diff --git a/Super Polarity/BasicGenerator.cs b/Super Polarity/BasicGenerator.cs
index 7cc4544..ba51742 100644
--- a/Super Polarity/BasicGenerator.cs	
+++ b/Super Polarity/BasicGenerator.cs	
@@ -26,11 +26,17 @@ namespace SuperPolarity
             Rate = rate;
             Randomizer = new Random();
             Position = position;
+            CurrentTime = rate;
         }
 
         public void Update(GameTime gameTime)
         {
-            if (Game.Player.Score > ScoreThreshold)
+            if (ActorManager.CountBaddies() > 50)
+            {
+                return;
+            }
+
+            if (Game.Player.Score >= ScoreThreshold)
             {
                 CurrentTime = CurrentTime + gameTime.ElapsedGameTime.Milliseconds;
 
@@ -53,17 +59,17 @@ namespace SuperPolarity
 
             if (ShipType == Ships.Ship)
             {
-                ActorFactory.CreateShip(polarity, Position);
+                Renderer.CheckIn(ActorFactory.CreateShip(polarity, Position));
             }
 
             if (ShipType == Ships.Scout)
             {
-                ActorFactory.CreateScout(polarity, Position);
+                Renderer.CheckIn(ActorFactory.CreateScout(polarity, Position));
             }
 
             if (ShipType == Ships.Battlecruiser)
             {
-                ActorFactory.CreateCruiser(polarity, Position);
+                Renderer.CheckIn(ActorFactory.CreateCruiser(polarity, Position));
             }
 
         }
diff --git a/Super Polarity/Content/Fonts/bigfont.xnb b/Super Polarity/Content/Fonts/bigfont.xnb
new file mode 100644
index 0000000..c1d876c
Binary files /dev/null and b/Super Polarity/Content/Fonts/bigfont.xnb differ
diff --git a/Super Polarity/Content/Fonts/smallfont.xnb b/Super Polarity/Content/Fonts/smallfont.xnb
new file mode 100644
index 0000000..a87e66a
Binary files /dev/null and b/Super Polarity/Content/Fonts/smallfont.xnb differ
diff --git a/Super Polarity/Content/Graphics/pause-screen.xnb b/Super Polarity/Content/Graphics/pause-screen.xnb
new file mode 100644
index 0000000..2307009
Binary files /dev/null and b/Super Polarity/Content/Graphics/pause-screen.xnb differ
diff --git a/Super Polarity/Content/Graphics/polaritydemotitle.xnb b/Super Polarity/Content/Graphics/polaritydemotitle.xnb
new file mode 100644
index 0000000..2fa9cf3
Binary files /dev/null and b/Super Polarity/Content/Graphics/polaritydemotitle.xnb differ
diff --git a/Super Polarity/Content/Sound/bomb.wav b/Super Polarity/Content/Sound/bomb.wav
new file mode 100644
index 0000000..5af439b
Binary files /dev/null and b/Super Polarity/Content/Sound/bomb.wav differ
diff --git a/Super Polarity/Content/Sound/bullet.wav b/Super Polarity/Content/Sound/bullet.wav
new file mode 100644
index 0000000..6586489
Binary files /dev/null and b/Super Polarity/Content/Sound/bullet.wav differ
diff --git a/Super Polarity/Content/Sound/gameover.wav b/Super Polarity/Content/Sound/gameover.wav
new file mode 100644
index 0000000..cac9d23
Binary files /dev/null and b/Super Polarity/Content/Sound/gameover.wav differ
diff --git a/Super Polarity/Content/Sound/hit.wav b/Super Polarity/Content/Sound/hit.wav
new file mode 100644
index 0000000..43433cd
Binary files /dev/null and b/Super Polarity/Content/Sound/hit.wav differ
diff --git a/Super Polarity/Content/Sound/life.wav b/Super Polarity/Content/Sound/life.wav
new file mode 100644
index 0000000..a1d0436
Binary files /dev/null and b/Super Polarity/Content/Sound/life.wav differ
diff --git a/Super Polarity/Content/Sound/polaritychange.wav b/Super Polarity/Content/Sound/polaritychange.wav
new file mode 100644
index 0000000..25b59a4
Binary files /dev/null and b/Super Polarity/Content/Sound/polaritychange.wav differ
diff --git a/Super Polarity/Content/Sound/polaritytheme.wav b/Super Polarity/Content/Sound/polaritytheme.wav
new file mode 100644
index 0000000..28a6bce
Binary files /dev/null and b/Super Polarity/Content/Sound/polaritytheme.wav differ
diff --git a/Super Polarity/GameScreen.cs b/Super Polarity/GameScreen.cs
index 28fd7b7..783e3c1 100644
--- a/Super Polarity/GameScreen.cs	
+++ b/Super Polarity/GameScreen.cs	
@@ -4,6 +4,8 @@ using System.Linq;
 using System.Text;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Audio;
+using Microsoft.Xna.Framework.Media;
 using Microsoft.Xna.Framework.Input;
 
 namespace SuperPolarity
@@ -12,42 +14,196 @@ namespace SuperPolarity
     {
         public GameScreen(SuperPolarity newGame) : base(newGame) {}
 
-        private BasicGenerator generatorTest;
+        protected List<BasicGenerator> Generators;
+
+        protected int LivesRate;
+        protected int CurrentLivesRate;
+        protected int BombRate;
+        protected int CurrentBombRate;
+        protected SoundEffect BombSound;
+        protected SoundEffect LifeSound;
+        
+        protected bool Flashing;
+
+        protected bool IsPaused;
+        protected Texture2D PauseScreen;
 
         public override void Initialize()
         {
+            Generators = new List<BasicGenerator>();
+
+            CurrentBombRate = 1;
+            BombRate = 6000;
+
+            LivesRate = 10000;
+            CurrentLivesRate = 1;
+
             InputController.RegisterEventForButton("changePolarity", Buttons.A);
             InputController.RegisterEventForKey("changePolarity", Keys.Z);
 
             InputController.RegisterEventForButton("shoot", Buttons.X);
             InputController.RegisterEventForKey("shoot", Keys.X);
+
+            InputController.Bind("pause", HandlePause);
+
+            PauseScreen = Game.Content.Load<Texture2D>("Graphics\\pause-screen");
+        }
+
+        protected void HandlePause(float value)
+        {
+            Console.WriteLine("Paused");
+            IsPaused = !IsPaused;
+
+            if (IsPaused)
+            {
+                MediaPlayer.Volume = 0.05f;
+            }
+            else
+            {
+                MediaPlayer.Volume = 1;
+            }
         }
 
         public override void LoadContent()
         {
+            CreateGenerators();
+
+            Vector2 playerPosition = new Vector2(Game.GraphicsDevice.Viewport.TitleSafeArea.X + Game.GraphicsDevice.Viewport.Width / 2, Game.GraphicsDevice.Viewport.TitleSafeArea.Y + Game.GraphicsDevice.Viewport.TitleSafeArea.Height / 2);
 
-            generatorTest = new BasicGenerator();
-            generatorTest.Initialize(Game, new Vector2(100, 600), BasicGenerator.Ships.Scout, 3000, 10);
+            BombSound = Game.Content.Load<SoundEffect>("Sound\\bomb");
+            LifeSound = Game.Content.Load<SoundEffect>("Sound\\life");
 
-            Vector2 playerPosition = new Vector2(Game.GraphicsDevice.Viewport.TitleSafeArea.X, Game.GraphicsDevice.Viewport.TitleSafeArea.Y + Game.GraphicsDevice.Viewport.TitleSafeArea.Height / 2);
+            Renderer.CheckIn(ActorFactory.CreateMainShip(playerPosition));
 
-            ActorFactory.CreateMainShip(playerPosition);
-            ActorFactory.CreateShip(Ship.Polarity.Positive, new Vector2(200, 200));
-            ActorFactory.CreateShip(Ship.Polarity.Negative, new Vector2(400, 200));
-            ActorFactory.CreateScout(Ship.Polarity.Negative, new Vector2(500, 500));
-            ActorFactory.CreateCruiser(Ship.Polarity.Positive, new Vector2(40, 40));
+            Game.PlaySong("game");
+        }
+        
+        protected void CalculateBomb()
+        {
+            if (Game.Player.Score >= BombRate * CurrentBombRate)
+            {
+                ActorManager.Bomb();
+                Flashing = true;
+                BombSound.Play();
+                CurrentBombRate = CurrentBombRate + 1;
+            }
+        }
+
+        protected void CalculateLife()
+        {
+            if (Game.Player.Score >= LivesRate * CurrentLivesRate)
+            {
+                Game.Player.Lives = Game.Player.Lives + 1;
+                LifeSound.Play();
+                CurrentLivesRate = CurrentLivesRate + 1;
+            }
         }
 
         public override void Update(GameTime gameTime)
         {
-            InputController.UpdateInput();
+            CalculateBomb();
+            CalculateLife();
+            InputController.UpdateInput(IsPaused);
+            if (IsPaused)
+            {
+                return;
+            }
             ActorManager.Update(gameTime);
-            generatorTest.Update(gameTime);
+
+            foreach (BasicGenerator generator in Generators)
+            {
+                generator.Update(gameTime);
+            }
         }
 
         public override void Draw(SpriteBatch spriteBatch)
         {
             Renderer.Draw(spriteBatch);
+            Game.Player.Draw(spriteBatch);
+
+            if (IsPaused)
+            {
+                spriteBatch.Draw(PauseScreen, new Vector2(0, 0), Color.White);
+            }
+
+            if (Flashing)
+            {
+                Game.GraphicsDevice.Clear(Color.Black);
+                Flashing = false;
+            }
+        }
+
+        protected void CreateGenerators()
+        {
+            // The basic ship generators.
+            var gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(-50, -50), BasicGenerator.Ships.Ship, 3000, 0);
+            Generators.Add(gen); 
+            
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(-50, Game.GraphicsDevice.Viewport.Height + 50), BasicGenerator.Ships.Ship, 3000, 0);
+            Generators.Add(gen); 
+            
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width + 50, -50), BasicGenerator.Ships.Ship, 3000, 0);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width + 50, Game.GraphicsDevice.Viewport.Height + 50), BasicGenerator.Ships.Ship, 3000, 0);
+            Generators.Add(gen);
+
+            // After 1.5k liberate some sporadic Scouts, and add two more ship generators.
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width / 2, -50), BasicGenerator.Ships.Ship, 3000, 1500);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width / 2, Game.GraphicsDevice.Viewport.Height + 50), BasicGenerator.Ships.Ship, 3000, 1500);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(-50, Game.GraphicsDevice.Viewport.Height / 2), BasicGenerator.Ships.Scout, 6000, 1500);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width + 50, Game.GraphicsDevice.Viewport.Height / 2), BasicGenerator.Ships.Scout, 6000, 1500);
+            Generators.Add(gen);
+
+
+            // After 3k add more scouts.
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width / 2, -50), BasicGenerator.Ships.Scout, 3000, 3000);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width / 2, Game.GraphicsDevice.Viewport.Height + 50), BasicGenerator.Ships.Scout, 3000, 5000);
+            Generators.Add(gen);
+
+            // After 5k release more ships and a cruiser.
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width / 2, -50), BasicGenerator.Ships.Ship, 1500, 5000);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width / 2, Game.GraphicsDevice.Viewport.Height + 50), BasicGenerator.Ships.Ship, 1500, 5000);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(-50, Game.GraphicsDevice.Viewport.Height / 2), BasicGenerator.Ships.Battlecruiser, 10000, 5000);
+            Generators.Add(gen);
+
+            gen = new BasicGenerator();
+            gen.Initialize(Game, new Vector2(Game.GraphicsDevice.Viewport.Width + 50, Game.GraphicsDevice.Viewport.Height / 2), BasicGenerator.Ships.Battlecruiser, 10000, 5000);
+            Generators.Add(gen);
+        }
+
+        public override void CleanUp()
+        {
+            base.CleanUp();
+            Generators.Clear();
+            InputController.Unbind("pause", HandlePause);
+            Renderer.Empty();
+            ActorManager.Empty();
         }
     }
 }
diff --git a/Super Polarity/InputController.cs b/Super Polarity/InputController.cs
index 79bd039..c92bb9c 100644
--- a/Super Polarity/InputController.cs	
+++ b/Super Polarity/InputController.cs	
@@ -37,11 +37,42 @@ namespace SuperPolarity
 
         public static void UpdateInput()
         {
-            Poll();
             DispatchMoveEvents();
             DispatchRegisteredEvents();
         }
 
+        public static void UpdateInput(bool highPriorityOnly) 
+        {
+            Poll();
+            DispatchPauseEvent();
+            if (!highPriorityOnly)
+            {
+                UpdateInput();
+            }
+        }
+
+        public static void DispatchPauseEvent()
+        {
+            // OK THIS IS ALL KINDS OF WRONG. THIS IS A PLACEHOLDER BECAUSE DEMO!
+            var keyPressed = false;
+            if ((InputKeyboardState.IsKeyDown(Keys.Enter) || InputGamePadState.IsButtonDown(Buttons.Start))) {
+                keyPressed = true;
+                if(!BlockedButtons.Contains("pause") && !BlockedKeys.Contains("pause"))
+                {
+                    BlockedButtons.Add("pause");
+                    BlockedKeys.Add("pause");
+                    Console.WriteLine("Dispatch");
+                    Dispatch("pause", 0);
+                }
+            }
+
+            if (!keyPressed)
+            {
+                BlockedButtons.Remove("pause");
+                BlockedKeys.Remove("pause");
+            }
+        }
+
         private static void Poll()
         {
             InputGamePadState = GamePad.GetState(Microsoft.Xna.Framework.PlayerIndex.One);
@@ -175,6 +206,21 @@ namespace SuperPolarity
             listenerList.Add(listener);
         }
 
+        public static void Unbind(string eventName, Action<float> listener)
+        {
+            List<Action<float>> listenerList;
+            bool foundListeners;
+
+            if (!Listeners.ContainsKey(eventName))
+            {
+                return;
+            }
+
+            foundListeners = Listeners.TryGetValue(eventName, out listenerList);
+
+            listenerList.Remove(listener);
+        }
+
         public static void Dispatch(string eventName, float value)
         {
             List<Action<float>> listenerList;
@@ -187,9 +233,9 @@ namespace SuperPolarity
                 return;
             }
 
-            foreach (Action<float> method in listenerList)
+            for (var i = listenerList.Count - 1; i >= 0; i--)
             {
-                method(value);
+                listenerList[i](value);
             }
         }
 
diff --git a/Super Polarity/Player.cs b/Super Polarity/Player.cs
index 25e66da..2680a1c 100644
--- a/Super Polarity/Player.cs	
+++ b/Super Polarity/Player.cs	
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 
 namespace SuperPolarity
 {
@@ -11,11 +13,20 @@ namespace SuperPolarity
         public int Multiplier;
         public int Lives;
 
-        public Player()
+
+        SpriteFont DebugFont;
+        SuperPolarity Game;
+
+        Texture2D LifeSprite;
+
+        public Player(SuperPolarity game)
         {
             Score = 0;
             Multiplier = 1;
             Lives = 3;
+            Game = game;
+            DebugFont = Game.Content.Load<SpriteFont>("Fonts\\bigfont");
+            LifeSprite = Game.Content.Load<Texture2D>("Graphics\\neutral-ship");
         }
 
         public void AddScore(int value)
@@ -33,14 +44,38 @@ namespace SuperPolarity
             Multiplier = 1;
         }
 
-        public void Draw()
+        public void Draw(SpriteBatch spriteBatch)
         {
+            var UiColor = new Color(0, 0, 0, 200);
+            var lightColor = new Color(0, 0, 0, 128);
+            spriteBatch.DrawString(DebugFont, Score.ToString(), new Vector2(10, 10), UiColor);
+            spriteBatch.DrawString(DebugFont, "x" + Multiplier.ToString(), new Vector2(10, 30), lightColor);
 
+            var lifePosition = new Vector2(Game.GraphicsDevice.Viewport.Width - 120, 10);
+            if (Lives > 4)
+            {
+                spriteBatch.Draw(LifeSprite, lifePosition, null, UiColor, (float)(Math.PI / 2), Vector2.Zero, 0.5f, SpriteEffects.None, 0f);
+                spriteBatch.DrawString(DebugFont, "x " + Lives.ToString(), new Vector2(lifePosition.X + 8, lifePosition.Y + 5), UiColor);
+            }
+            else
+            {
+                for (var i = 0; i < Lives; i++)
+                {
+                    spriteBatch.Draw(LifeSprite, new Vector2(lifePosition.X + (i * 28), lifePosition.Y), null, UiColor, (float)(Math.PI / 2), Vector2.Zero, 0.5f, SpriteEffects.None, 0f);
+                }
+            }
         }
 
         public void Update()
         {
 
         }
+
+        public void Reset()
+        {
+            Score = 0;
+            Multiplier = 1;
+            Lives = 3;
+        }
     }
 }
diff --git a/Super Polarity/Renderer.cs b/Super Polarity/Renderer.cs
index 2f5c5aa..7ca8158 100644
--- a/Super Polarity/Renderer.cs	
+++ b/Super Polarity/Renderer.cs	
@@ -33,5 +33,10 @@ namespace SuperPolarity
                 actor.Draw(spriteBatch);
             }
         }
+
+        static public void Empty()
+        {
+            Actors.Clear();
+        }
     }
 }
diff --git a/Super Polarity/Screen.cs b/Super Polarity/Screen.cs
index 8cea5c9..006b047 100644
--- a/Super Polarity/Screen.cs	
+++ b/Super Polarity/Screen.cs	
@@ -10,8 +10,10 @@ namespace SuperPolarity
     class Screen
     {
         protected SuperPolarity Game;
+        public bool Active;
         public Screen(SuperPolarity game)
         {
+            Active = false;
             Game = game;
         }
 
diff --git a/Super Polarity/ScreenManager.cs b/Super Polarity/ScreenManager.cs
index 04c10a4..b88741b 100644
--- a/Super Polarity/ScreenManager.cs	
+++ b/Super Polarity/ScreenManager.cs	
@@ -19,12 +19,22 @@ namespace SuperPolarity
 
         static public void Push(Screen screen)
         {
+            if (Screens.Count > 0)
+            {
+                Screens.Peek().Active = false;
+            }
+
+            screen.LoadContent();
+            screen.Active = true;
             Screens.Push(screen);
         }
 
         static public void Pop()
         {
-            Screens.Pop();
+            var screen = Screens.Pop();
+            screen.Active = false;
+            screen.CleanUp();
+            Screens.Peek().Active = true;
         }
 
         static public void Update(GameTime gameTime)
@@ -34,10 +44,7 @@ namespace SuperPolarity
 
         static public void Draw(SpriteBatch spriteBatch)
         {
-            foreach (Screen screen in Screens)
-            {
-                screen.Draw(spriteBatch);
-            }
+            Screens.Peek().Draw(spriteBatch);
         }
 
         internal static void SetGame(SuperPolarity game)
diff --git a/Super Polarity/Super Polarity.csproj b/Super Polarity/Super Polarity.csproj
index 27ea7c5..32e8d63 100644
--- a/Super Polarity/Super Polarity.csproj	
+++ b/Super Polarity/Super Polarity.csproj	
@@ -82,15 +82,40 @@
       <Link>SDL.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Sound\bomb.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sound\bullet.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sound\gameover.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sound\hit.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sound\life.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sound\polaritychange.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sound\polaritytheme.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Icon.ico" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="Content\Sound\" />
-  </ItemGroup>
-  <ItemGroup>
+    <None Include="Content\Fonts\bigfont.xnb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Fonts\SegoeUIMono14.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Fonts\smallfont.xnb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Graphics\circle.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -127,6 +152,12 @@
     <None Include="Content\Graphics\neutral-ship.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Graphics\pause-screen.xnb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Graphics\polaritydemotitle.xnb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="neutral-supercruiser.xnb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/Super Polarity/SuperPolarity.cs b/Super Polarity/SuperPolarity.cs
index 6689167..8125f8c 100644
--- a/Super Polarity/SuperPolarity.cs	
+++ b/Super Polarity/SuperPolarity.cs	
@@ -7,6 +7,8 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Storage;
 using Microsoft.Xna.Framework.GamerServices;
+using Microsoft.Xna.Framework.Media;
+using Microsoft.Xna.Framework.Audio;
 using SuperPolarity;
 #endregion
 
@@ -26,7 +28,9 @@ namespace SuperPolarity
 
         Screen EntryScreen;
 
-        SpriteFont DebugFont;
+        protected Song TitleSong;
+        protected Song GameSong;
+        protected SoundEffect GameOverSound;
 
         public SuperPolarity()
             : base()
@@ -43,7 +47,7 @@ namespace SuperPolarity
             ActorManager.SetGame(this);
             ScreenManager.SetGame(this);
 
-            EntryScreen = (Screen)new GameScreen(this);
+            EntryScreen = (Screen)new TitleScreen(this);
         }
 
         /// <summary>
@@ -60,7 +64,6 @@ namespace SuperPolarity
             InputController.Bind("fullScreenToggle", HandleFullScreenToggle);
 
             EntryScreen.Initialize();
-            ScreenManager.Push(EntryScreen);
 
             OutlierBounds = 100;
         }
@@ -77,13 +80,17 @@ namespace SuperPolarity
         /// </summary>
         protected override void LoadContent()
         {
+
+            MediaPlayer.IsRepeating = true;
+            GameSong = Content.Load<Song>("Sound\\polaritytheme.wav");
+            GameOverSound = Content.Load<SoundEffect>("Sound\\gameover");
+
             // Create a new SpriteBatch, which can be used to draw textures.
             spriteBatch = new SpriteBatch(GraphicsDevice);
 
-            EntryScreen.LoadContent();
+            ScreenManager.Push(EntryScreen);
 
-            Player = new Player();
-            DebugFont = Content.Load<SpriteFont>("Fonts\\SegoeUIMono14");
+            Player = new Player(this);
         }
 
         /// <summary>
@@ -107,6 +114,8 @@ namespace SuperPolarity
 
             ScreenManager.Update(gameTime);
 
+            Player.Update();
+
             base.Update(gameTime);
         }
 
@@ -122,13 +131,25 @@ namespace SuperPolarity
 
             ScreenManager.Draw(spriteBatch);
 
-            spriteBatch.DrawString(DebugFont, "Score: " + Player.Score.ToString(), new Vector2(10, 10), Color.LightGray);
-            spriteBatch.DrawString(DebugFont, "Multiplier: " + Player.Multiplier.ToString(), new Vector2(10, 30), Color.LightGray);
-            spriteBatch.DrawString(DebugFont, "Lives: " + Player.Lives.ToString(), new Vector2(10, 50), Color.LightGray);
-
             spriteBatch.End();
 
             base.Draw(gameTime);
         }
+
+        public void PlaySong(string songName)
+        {
+            // temp stuff before media manager is in
+            if (songName == "game")
+            {
+                MediaPlayer.Play(GameSong);
+            }
+        }
+
+        public void GameOver()
+        {
+            MediaPlayer.Stop();
+            GameOverSound.Play();
+            ScreenManager.Pop();
+        }
     }
 }
diff --git a/Super Polarity/TitleScreen.cs b/Super Polarity/TitleScreen.cs
index 5b33218..a953f27 100644
--- a/Super Polarity/TitleScreen.cs	
+++ b/Super Polarity/TitleScreen.cs	
@@ -2,11 +2,49 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 
 namespace SuperPolarity
 {
     class TitleScreen : Screen
     {
+        protected Texture2D TitleImage;
+
         public TitleScreen(SuperPolarity newGame) : base(newGame) {}
+
+        public override void LoadContent()
+        {
+            base.LoadContent();
+            TitleImage = Game.Content.Load<Texture2D>("Graphics\\polaritydemotitle");
+            InputController.Bind("pause", HandleStart);
+        }
+
+        public void HandleStart(float value)
+        {
+            if (!Active) { return; }
+            Game.Player.Reset();
+            var gameScreen = new GameScreen(Game);
+            gameScreen.Initialize();
+            ScreenManager.Push(gameScreen);
+        }
+
+        public override void CleanUp()
+        {
+            base.CleanUp();
+            TitleImage = null;
+        }
+
+        public override void Draw(SpriteBatch spriteBatch)
+        {
+            base.Draw(spriteBatch);
+            spriteBatch.Draw(TitleImage, new Vector2(0, 0), Color.White);
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            base.Update(gameTime);
+            InputController.UpdateInput(false);
+        }
     }
 }
diff --git a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe
index 0740117..15c20d0 100644
Binary files a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe and b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.exe differ
diff --git a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb
index b09aea1..6c1adfe 100644
Binary files a/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb and b/Super Polarity/bin/WindowsGL/Debug/Super Polarity.pdb differ
diff --git a/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bb51f56..b8a1d5f 100644
Binary files a/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Super Polarity/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt b/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt
index e25ddab..cabc9d2 100644
--- a/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt	
+++ b/Super Polarity/obj/x86/Debug/Super Polarity.csproj.FileListAbsolute.txt	
@@ -29,3 +29,14 @@ C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarit
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\square.xnb
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Fonts\SegoeUIMono14.xnb
 C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\neutral-supercruiser.xnb
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\polaritytheme.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\bullet.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\polaritychange.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\pause-screen.xnb
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Graphics\polaritydemotitle.xnb
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\gameover.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\bomb.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\hit.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Sound\life.wav
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Fonts\bigfont.xnb
+C:\Users\Miau\documents\visual studio 2010\Projects\Super Polarity\Super Polarity\bin\WindowsGL\Debug\Content\Fonts\smallfont.xnb
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.exe b/Super Polarity/obj/x86/Debug/Super Polarity.exe
index 0740117..15c20d0 100644
Binary files a/Super Polarity/obj/x86/Debug/Super Polarity.exe and b/Super Polarity/obj/x86/Debug/Super Polarity.exe differ
diff --git a/Super Polarity/obj/x86/Debug/Super Polarity.pdb b/Super Polarity/obj/x86/Debug/Super Polarity.pdb
index b09aea1..6c1adfe 100644
Binary files a/Super Polarity/obj/x86/Debug/Super Polarity.pdb and b/Super Polarity/obj/x86/Debug/Super Polarity.pdb differ
-- 
cgit