Changeset 2286

Timestamp:

2011-06-29 13:33:46 (12 years ago)

Author:

teeevasa

Message:

 

Location:

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372

Files:

• Rogue Agent 2372/GenWeapon.cs (modified) (2 diffs)
• Rogue Agent 2372/Peli.cs (modified) (1 diff)
• Rogue Agent 2372/Player.cs (modified) (3 diffs)
• Rogue Agent 2372/Weapons.cs (modified) (2 diffs)
• Rogue Agent 2372Content/Rogue Agent 2372Content.contentproj (modified) (1 diff)

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/GenWeapon.cs

@@ -12 +12 @@
     GenWeapon(string weaponName)
     {
-    
+        loadWeapon(weaponName);
     }
 
@@ -26 +26 @@
 }
 
-struct Weapon
+public struct Weapon
 { 
     private int reloadTime;

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Peli.cs

@@ -19 +19 @@
         createLevel();
 
-        //MediaPlayer.Play("SuperMetroidCrateriaSurface.wma");
+        MediaPlayer.Play("Sounds/Stage1Music");
+        MediaPlayer.Volume = 0.5;
 
         Camera.Follow(player);

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Player.cs

@@ -8 +8 @@
 public class Player : GenCharacter
 {
-    int speed = 200;
+    const int speed = 200;
     const int jumpSpeed = 1000;
+    const int mass = 10;
     Image portrait = Game.LoadImage("Images/character");
-    SoundEffect walking = Game.LoadSoundEffect("Sounds/pistolshot");
+    SoundEffect walking = Game.LoadSoundEffect("Sounds/walkingsound");
+
+    Timer walker;
+    
 
         public Player(double width, double height, Shape shape)
@@ -19 +23 @@
         AddedToGame += addControls;
         this.Image = portrait;
+
+        walker = new Timer();
+        walker.Interval = 1.0;
+        walker.Trigger += playWalkingSound;
+
         }
 
-    public void addControls()
+    private void addControls()
     {
         Game.Keyboard.Listen(Key.Right, ButtonState.Down, moveRight, "Moves right", speed);
@@ -28 +37 @@
     }
 
-    public void moveRight(int speed)
+    private void playWalkingSound(Timer sender)
     {
-        this.Walk(speed);
-        //this.Image = Image.Mirror(portrait);
-
+        this.walking.Play();
     }
 
-    public void moveLeft(int speed)
+    private void moveRight(int speed)
     {
+        walker.Start();
+        this.Walk(speed);
+        //this.Image = Image.Mirror(portrait); // Doesn't work at all!
+    }
+
+    private void moveLeft(int speed)
+    {
+        walker.Start();
         this.Walk(-speed);
         this.Image = Image.Mirror(portrait);
-        this.walking.Play();
     }
 

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Weapons.cs

@@ -20 +20 @@
 public static class Weapons
 {
-    /*public static Weapon Pistol()
+    public static Weapon Pistol()
     {
         return new Weapon(
@@ -29 +29 @@
             "",
             "Sounds/pistolshot");
+    }
+
+    /*public static Weapon Rifle()
+    { 
+    
     }*/
 }

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372Content/Rogue Agent 2372Content.contentproj

@@ -108 +108 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Sounds\walkingsound.wav">
+      <Name>walkingsound</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</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.