Changeset 3628

Timestamp:

2012-07-06 02:53:32 (11 years ago)

Author:

dezhidki

Message:

More sounds added

Location:

2012/27/DenisZ/TheDungeonGame

Files:

• Sound/bug_killed.mp3 (added)
• Sound/zombie_hit.mp3 (added)
• TheDungeonGame/TheDungeonGame/EntityTemplates.cs (modified) (14 diffs)
• TheDungeonGame/TheDungeonGame/Player.cs (modified) (3 diffs)
• TheDungeonGame/TheDungeonGame/TheDungeonGame.cs (modified) (4 diffs)
• TheDungeonGame/TheDungeonGameContent/TheDungeonGameContent.contentproj (modified) (2 diffs)
• TheDungeonGame/TheDungeonGameContent/sound/bug_hit.wav (added)
• TheDungeonGame/TheDungeonGameContent/sound/mario (added)
• TheDungeonGame/TheDungeonGameContent/sound/mario/mario_attack.wav (added)
• TheDungeonGame/TheDungeonGameContent/sound/mario/mario_hit.wav (added)
• TheDungeonGame/TheDungeonGameContent/sound/mario/mario_upgrade.wav (added)
• TheDungeonGame/TheDungeonGameContent/sound/robot_hit.wav (added)
• TheDungeonGame/TheDungeonGameContent/sound/zombie_hit.wav (added)

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/EntityTemplates.cs

@@ -13 +13 @@
             : base(game, pos, size, shape)
         {
+            health = 2;
             damage = 1;
             FollowerBrain brains = new FollowerBrain(game.Player, 100);
@@ -30 +31 @@
         }
 
+        public override bool hit(int damage)
+        {
+            TheDungeonGame.soundEffects[2].Play();
+            return base.hit(damage);
+        }
+
         public override void init()
         {
@@ -42 +49 @@
             : base(game, pos, size, shape)
         {
+            health = 3;
             damage = 2;
             Color = Color.Red;
@@ -59 +67 @@
             Animation.Start();
         }
+
+        public override bool hit(int damage)
+        {
+            TheDungeonGame.soundEffects[3].Play();
+            return base.hit(damage);
+        }
     }
 
@@ -66 +80 @@
             : base(game, pos, size, shape)
         {
+            health = 2;
             damage = 2;
             Color = Color.Green;
@@ -84 +99 @@
             Animation.Start();
         }
+
+        public override bool hit(int damage)
+        {
+            TheDungeonGame.soundEffects[3].Play();
+            return base.hit(damage);
+        }
     }
 
@@ -91 +112 @@
             : base(game, pos, size, shape)
         {
+            health = 1;
             damage = 1;
             Color = Color.Blue;
@@ -109 +131 @@
             Animation.Start();
             CanRotate = false;
+        }
+
+        public override bool hit(int damage)
+        {
+            TheDungeonGame.soundEffects[2].Play();
+            return base.hit(damage);
         }
     }
@@ -129 +157 @@
 
         private Animation normalWalkingAnimation, powerupWalkingAnimation;
+
+        private SoundEffect attackSound = TheDungeonGame.LoadSoundEffect("sound/mario/mario_attack");
+        private SoundEffect hitSound = TheDungeonGame.LoadSoundEffect("sound/mario/mario_hit");
+        private SoundEffect upgradeSound = TheDungeonGame.LoadSoundEffect("sound/mario/mario_upgrade");
 
         public EntityBossMario(TheDungeonGame game, Vector pos, Vector size, Shape shape)
@@ -167 +199 @@
 
             Brain = randomBrain;
-            Brain.Active = true;
+            Brain.Active = false;
             CanRotate = false;
             Animation = normalWalkingAnimation;
             Animation.Start();
-            brainTimer.Start();
+            
             Collided += collided;
         }
@@ -185 +217 @@
         public override bool hit(int damage)
         {
+            hitSound.Play();
             if (health <= 35 && !isPowerUpped)
                 upgradeMario();
@@ -193 +226 @@
         private void upgradeMario()
         {
-            Console.WriteLine("Upgrading...");
             if (isPowerUpped) return;
 
-            damage = 2;
+            upgradeSound.Play();
+            damage = 1;
             isPowerUpped = true;
             Animation = powerupWalkingAnimation;
@@ -204 +237 @@
             randomMoveTimer.Timeout += perfomAttack2;
             followingSpeed = 220;
-            randomSpeed = 1500;
+            randomSpeed = 15000;
+        }
+
+        public void enableMovement()
+        {
+            brainTimer.Start();
         }
 
@@ -289 +327 @@
             if (usedTurtles) return;
 
+            attackSound.Play();
             int turtleAmount = amount;
             for (int i = 0; i < turtleAmount; i++)

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Player.cs

@@ -40 +40 @@
         private bool isAnimationRunning = false;
 
-        public Player(TheDungeonGame game, Vector pos, Image texture)
+        private SoundEffect hitSound = TheDungeonGame.LoadSoundEffect("sound/robot_hit");
+
+        public Player(TheDungeonGame game, Vector pos)
             : base(playerWidth, playerHeight)
         {
@@ -48 +50 @@
             CanRotate = false;
             setupKeys();
-            idleTexture = texture;
+            idleTexture = TheDungeonGame.LoadImage("animations/player/idle");
             Image = idleTexture;
             for (int i = 0; i < walkingImages.Length; i++)
@@ -123 +125 @@
         {
             playerHealth.Value -= damage;
+            hitSound.Play();
             if (playerHealth.Value <= 0)
             {
                 showLostScreen();
-            }
-                
+            }         
         }
 

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.cs

@@ -27 +27 @@
     private bool moveCamera = false;
 
-    public Image playerPic = LoadImage("player");
     public List<Image> levelTopBottoms = new List<Image>();
     public List<Image> levelLeftRights = new List<Image>();
@@ -61 +60 @@
         soundPlayer = MediaPlayer;
 
-        player = new Player(this, Vector.Zero, playerPic);
+        player = new Player(this, Vector.Zero);
         player.setupWeapon();
 
@@ -84 +83 @@
         soundEffects.Add(LoadSoundEffect("sound/door_close"));
         soundEffects.Add(LoadSoundEffect("sound/door_open"));
+        soundEffects.Add(LoadSoundEffect("sound/bug_hit"));
+        soundEffects.Add(LoadSoundEffect("sound/zombie_hit"));
     }
 
@@ -157 +158 @@
                 EntityBossMario mario = (EntityBossMario)player.currentRoom.getEntityAt(3, 3);
                 gui.setupBossGauge(mario);
+                mario.enableMovement();
             }
         }

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGameContent/TheDungeonGameContent.contentproj

@@ -70 +70 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
-    <Compile Include="player.png">
-      <Name>player</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -258 +253 @@
       <Importer>TextureImporter</Importer>
       <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="sound\robot_hit.wav">
+      <Name>robot_hit</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="sound\bug_hit.wav">
+      <Name>bug_hit</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+    <Compile Include="sound\zombie_hit.wav">
+      <Name>zombie_hit</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="sound\mario\mario_attack.wav">
+      <Name>mario_attack</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+    <Compile Include="sound\mario\mario_hit.wav">
+      <Name>mario_hit</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+    <Compile Include="sound\mario\mario_upgrade.wav">
+      <Name>mario_upgrade</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
     </Compile>
   </ItemGroup>