Changeset 4417 for 2013/27

Timestamp:

2013-07-03 15:29:58 (6 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game

Files:

• Game/Enemies.cs (modified) (3 diffs)
• Game/Game.cs (modified) (5 diffs)
• Game/Player.cs (modified) (2 diffs)
• GameContent/obj/x86/Debug/ResolveAssemblyReference.cache (modified) (previous)

2013/27/TeemuM/Game/Game/Game/Enemies.cs

@@ -12 +12 @@
 {
 
-    public IntMeter zombieHealth1;
+    private int health;
 
     private static Image[] Images = { Game.LoadImage("Zombie1"), Game.LoadImage("Zombie2"), Game.LoadImage("Zombie3"), Game.LoadImage("Zombie4") };
@@ -30 +30 @@
     public void createZHealth(int health)
     {
-        zombieHealth1 = new IntMeter(health, 0, health + 10);
-
+        this.health = health;
     }
 
@@ -39 +38 @@
     }
 
+    public void Healt(int healtChange)
+    {
+        health += healtChange;
+        if (health <= 0)
+        {
+            this.Destroy();
+        }
+    }
 
     private void CreateBrain()

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -11 +11 @@
     public static G game;
     IntMeter scoreboard;
-    public Player player;
+    public Player player { get; private set; }
 
     public override void Begin()
@@ -32 +32 @@
         prompt.TextEntered += delegate(InputWindow p)
         {
-            if (p.InputBox.Text.Length == 0) { IsPaused = false; return; } 
+            if (p.InputBox.Text.Length == 0) { IsPaused = false; return; }
             string[] commands = p.InputBox.Text.Split(' ');
 
@@ -50 +50 @@
                 if (commands[1] == "up")
                 {
-                   MessageDisplay.Add("+" + int.Parse(commands[2]) + " levels");
+                    MessageDisplay.Add("+" + int.Parse(commands[2]) + " levels");
                 }
                 else if (commands[1] == "down")
@@ -75 +75 @@
                     MessageDisplay.Add("No such powerup");
             }
+            else if (commands[0] == "spawn")
+            {
+                if (commands[1] == "zombie")
+                {
+                    if (commands.Length > 2)
+                    {
+                        for (int i = 0; i < int.Parse(commands[2]); i++)
+                            createZ();
+                    } else { createZ(); }
+                }
+            }
             else if (commands[0] == "exit")
             {
@@ -92 +103 @@
         AddScoreMeter();
 
-        player = new Player(50, 50, 5, true);
+        player = new Player(50, 50, 1, true);
         Add(player);
         createZ();
     }
-    
+
     void createZ()
     {
-        Add(new Zombie1(50, 50, 100, 100, 5));        
+        Zombie1 zed1 = new Zombie1(50, 50, RandomGen.NextDouble(Level.Left, Level.Right), RandomGen.NextDouble(Level.Bottom, Level.Top), 100);
+        Add(zed1);
+    }
+
+    void createPlayer()
+    {
+        player = new Player(50, 50, 100, true);
+        Add(player);
     }
 

2013/27/TeemuM/Game/Game/Game/Player.cs

@@ -79 +79 @@
         if (target is Zombie1)
         {
-            
+            if (weapon is Cannon)
+            {
+                ((Zombie1)target).Healt(-100);
+            }
+            else if (weapon is PlasmaCannon)
+            {
+                ((Zombie1)target).Healt(-50);
+            }
         }
+        projectile.Destroy();
     }
 
@@ -115 +123 @@
         }
         else
-            Game.MessageDisplay.Add("Weapon missing");
+            Game.MessageDisplay.Add("PEW PEW!");
     }