Changeset 4468 for 2013

Timestamp:

2013-07-05 11:34:25 (7 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game

Files:

• Game/Game.cs (modified) (6 diffs)
• Game/Game.csproj.Debug.cachefile (modified) (2 diffs)
• Game/Player.cs (modified) (5 diffs)
• GameContent/EasterEgg.mp3 (added)
• GameContent/GameContent.contentproj (modified) (1 diff)

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

@@ -15 +15 @@
 
         audio.RegisterType("Background", 4);
-        audio.RegisterType("EasterEgg", 0);
         audio.RegisterType("Enemyspawn", 0);
         audio.RegisterType("GameOver", 0);
@@ -28 +27 @@
     private IntMeter scoreboard;
     public Player player { get; private set; }
-    private List<Zombie> enemies = new List<Zombie>();
+    private List<Enemy> enemies = new List<Enemy>();
 
     public override void Begin()
@@ -46 +45 @@
         menu.AddItemHandler(3, Exit);
         Add(menu);
+        audio.Play("MenuMusic", true);
     }
 
@@ -72 +72 @@
                 audio.Console(p.InputBox.Text.Substring(6));
             }
+            else if (commands[0] == "lol")
+            {
+                audio.PlayOne("EasterEgg", false);
+            }
             else if (commands[0] == "score")
             {
@@ -168 +172 @@
                 for (int i = 0; i < enemies.Count; i++)
                 {
-                    if (enemies[i].IsDestroyed)
+                    if (enemies[i].IsDestroyed || enemies[i].IsDestroying)
                     {
                         enemies.RemoveAt(i);
@@ -197 +201 @@
         AddScoreMeter();
         CreateLifeMeter();
+
+        audio.Play("Background", true);
 
         Timer t = new Timer();

2013/27/TeemuM/Game/Game/Game/Game.csproj.Debug.cachefile

@@ -13 +13 @@
 Content\MenuMusic0.xnb
 Content\Randomsound0.xnb
-Content\EasterEgg0.xnb
 Content\Zombiebite0.xnb
 Content\Zombiesound0.xnb
 Content\Zombiesound1.xnb
 Content\Zombiesound2.xnb
+Content\EasterEgg.xnb
 Content\Background0.wma
 Content\Background1.wma
@@ -27 +27 @@
 Content\MenuMusic0.wma
 Content\Randomsound0.wma
-Content\EasterEgg0.wma
 Content\Zombiebite0.wma
 Content\Zombiesound0.wma
 Content\Zombiesound1.wma
 Content\Zombiesound2.wma
+Content\EasterEgg.wma

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

@@ -16 +16 @@
     const double defaultSpeed = 1000;
     const int defaultPower = 10000;
+    const int defaultLaserGunDamage = 10;
+    const int defaultAssaultRifleDamage = 10;
+    const int defaultPlasmaCannonDamage = 10;
+    const int defaultCannonDamage = 10;
+
     private double speed = defaultSpeed;
-    private double power = defaultPower;
+    private int power = defaultPower;
+    private int laserGunDamage = defaultLaserGunDamage;
+    private int AssaultRifleDamage = defaultAssaultRifleDamage;
+    private int plasmaCannonDamage = defaultPlasmaCannonDamage;
+    private int cannonDamage = defaultCannonDamage;
 
     private Weapon weapon;
@@ -70 +79 @@
             Explosion(target.Position);
             if (weapon is Cannon)
-                ((Enemy)target).Health(-100);
+                ((Enemy)target).Health(-cannonDamage);
             else if (weapon is PlasmaCannon)
-                ((Enemy)target).Health(-100);
+                ((Enemy)target).Health(-plasmaCannonDamage);
             else if (weapon is LaserGun)
-                ((Enemy)target).Health(-50);
+                ((Enemy)target).Health(-laserGunDamage);
             else if (weapon is AssaultRifle)
-                ((Enemy)target).Health(-50);
+                ((Enemy)target).Health(-AssaultRifleDamage);
         }
         projectile.Destroy();
@@ -88 +97 @@
         {
             speed = defaultSpeed * value;
-            return true;
         }
         else if (type == "power")
         {
-            power = defaultPower * value;
-            return true;
+            power = defaultPower * (int)value;
         }
-
-        return false;
+        else if (type == "cannondamage")
+        {
+            cannonDamage = defaultCannonDamage * (int)value;
+        }
+        else if (type == "assaultrifledamage")
+        {
+            AssaultRifleDamage = defaultAssaultRifleDamage * (int)value;
+        }
+        else if (type == "lasergundamage")
+        {
+            laserGunDamage = defaultLaserGunDamage * (int)value;
+        }
+        else if (type == "plasmacannondamage")
+        {
+            plasmaCannonDamage = defaultPlasmaCannonDamage * (int)value;
+        }
+        else
+            return false;
+        return true;
     }
 
@@ -112 +136 @@
         else if (itemName.ToLower() == "assaultrifle")
             weapon = new AssaultRifle(75, 25);
+        weapon.Y += 10;
 
         if (weapon != null)
@@ -118 +143 @@
             weapon.ProjectileCollision = ProjectileHanlder;
             weapon.Angle = Angle.FromDegrees(90);
-            weapon.CanHitOwner = true;
             this.Add(weapon);
             return true;

2013/27/TeemuM/Game/Game/GameContent/GameContent.contentproj

@@ -120 +120 @@
       <Processor>SongProcessor</Processor>
     </Compile>
-    <Compile Include="EasterEgg0.mp3">
-      <Name>EasterEgg0</Name>
+    <Compile Include="EasterEgg.mp3">
+      <Name>EasterEgg</Name>
       <Importer>Mp3Importer</Importer>
       <Processor>SongProcessor</Processor>