Changeset 9125

Timestamp:

2017-07-26 13:52:18 (6 years ago)

Author:

npo17_65

Message:

pyssyt toimivat ja liikkeet sekä animaatiot

Location:

2017/30/HugoE/HanniAndHoo/HanniAndHoo/HanniAndHoo

Files:

• HanniAndHoo.cs (modified) (7 diffs)
• bin/x86/Debug/HanniAndHoo.exe (modified) (previous)
• bin/x86/Debug/HanniAndHoo.pdb (modified) (previous)
• obj/x86/Debug/HanniAndHoo.exe (modified) (previous)
• obj/x86/Debug/HanniAndHoo.pdb (modified) (previous)

2017/30/HugoE/HanniAndHoo/HanniAndHoo/HanniAndHoo/HanniAndHoo.cs

@@ -12 +12 @@
      Image HoonKuva = LoadImage("Hoo");
 
-    AssaultRifle HanninAse;
 
+    PlasmaCannon HanninAse;    
     Cannon HoonAse;
     
-
-    
+        
     PlatformCharacter Hanni;
-    PhysicsObject Hoo;
+    PlatformCharacter Hoo;
     
     public override void Begin()
     {
         LuoKentta();
+        LuoPelaajat();
         LuoNappaimet();
-        LuoPelaajat();
-
-        AmmuAseella(HanninAse);
-        AmmuAseella2(HoonAse);
-
-
-
-
-
-
     }
 
     void LuoPelaajat()
     {
-
         Hanni = new PlatformCharacter(80.0, 80.0);
         Hanni.X = Level.Left + 100.0;
@@ -46 +35 @@
         Hanni.Color = Color.Blue;
         Hanni.Image = HanninKuva;
-        Hanni.CanRotate = false;
+        Hanni.CanRotate = false;       
         Add(Hanni);
-        HanninAse = new AssaultRifle(60, 20);
+        HanninAse = new PlasmaCannon(60, 20);
         HanninAse.ProjectileCollision = AmmusOsui;
         HanninAse.X += 50;
-        Hanni.Add(HanninAse);
-
-                
+        Keyboard.Listen(Key.S, ButtonState.Pressed, AmmuAseella, "Ammu", HanninAse);
+        Hanni.Weapon = HanninAse;                
         Hoo = new PlatformCharacter (100.0, 100.0);
         Hoo.X = Level.Right - 100.0;
@@ -61 +49 @@
         Hoo.Image = HoonKuva;
         Hoo.CanRotate = false;
-        Add(Hoo);
+        Add(Hoo);       
         HoonAse = new Cannon (90, 30);
         HoonAse.ProjectileCollision = AmmusOsui;
         HoonAse.X += 80;
-        Hoo.Add(HoonAse);
+        Hoo.Weapon = HoonAse;
+        Keyboard.Listen(Key.Down, ButtonState.Pressed, AmmuAseella2, "Ammu2", HoonAse);
         HoonAse.Power.DefaultValue = 20000;
+        AddCollisionHandler(Hoo, Hanni, Tormaa);
+    }
+    void Tormaa(PhysicsObject tormaaja, PhysicsObject kohde)
+    {
+        kohde.Destroy();
     }
 
@@ -72 +66 @@
     {
         Ammus.Destroy();
-
     }
     void LuoNappaimet()
     {
-        Keyboard.Listen(Key.W, ButtonState.Pressed, LiikutaHannia, null, new Vector(0, 700));
-        Keyboard.Listen(Key.D, ButtonState.Down, LiikutaHannia, null, new Vector(500.0, 0.0));
-        Keyboard.Listen(Key.D, ButtonState.Released, LiikutaHannia, null, new Vector(0, 0));
-        Keyboard.Listen(Key.A, ButtonState.Down, LiikutaHannia, null, new Vector(-500, 0));
-        Keyboard.Listen(Key.A, ButtonState.Released, LiikutaHannia, null, new Vector(0, 0));
-
-
-        Keyboard.Listen(Key.Up, ButtonState.Pressed, LiikutaHoota, null, new Vector(0, 700));
-        Keyboard.Listen(Key.Right, ButtonState.Down, LiikutaHoota, null, new Vector(500.0, 0.0));
-        Keyboard.Listen(Key.Right, ButtonState.Released, LiikutaHoota, null, new Vector(0, 0));
-        Keyboard.Listen(Key.Left, ButtonState.Down, LiikutaHoota, null, new Vector(-500, 0));
-        Keyboard.Listen(Key.Left, ButtonState.Released, LiikutaHoota, null, new Vector(0, 0));
-
-
-
+        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppy, null, Hanni, 1000.0);
+        Keyboard.Listen(Key.D, ButtonState.Down, Kavely, null, Hanni, 500.0);       
+        Keyboard.Listen(Key.A, ButtonState.Down, Kavely, null, Hanni, -500.0);
+        Keyboard.Listen(Key.Up, ButtonState.Pressed, Hyppy, null, Hoo, 1000.0);
+        Keyboard.Listen(Key.Right, ButtonState.Down, Kavely, null, Hoo, 500.0);
+        Keyboard.Listen(Key.Left, ButtonState.Down, Kavely, null, Hoo, -500.0);    
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
 
@@ -107 +91 @@
 
 
-    void LiikutaHannia(Vector vektori)
+    void Kavely(PlatformCharacter tyyppi, double liikkumisenMaara)
     {
-        Hanni.Velocity = (vektori);
         
+        tyyppi.Walk(liikkumisenMaara);
 
     }
-    void LiikutaHoota(Vector vektori)
+    void Hyppy(PlatformCharacter tyyppi, double hypynMaara)
     {
-        Hoo.Velocity = (vektori);
+        tyyppi.Jump(hypynMaara);
     }
 
-    void AmmuAseella(AssaultRifle HanninAse)
+    void AmmuAseella(PlasmaCannon HanninAse)
     {
-        PhysicsObject Ammus = HanninAse.Shoot();
-        Keyboard.Listen(Key.S, ButtonState.Pressed, AmmuAseella, "Ammu", HanninAse);
-        HanninAse.FireRate = 0.25;
-
+        PhysicsObject Ammus = HanninAse.Shoot();      
+        HanninAse.FireRate = 2;
         if (Ammus != null)
         {
             Ammus.Size *= 3;
             Ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0);
-
         }
 
@@ -136 +117 @@
     {
         PhysicsObject Ammus = HoonAse.Shoot();
-        Keyboard.Listen(Key.Down, ButtonState.Pressed, AmmuAseella2, "Ammu2", HoonAse);
-        HoonAse.FireRate = 0.25;
-        
-
+        HoonAse.FireRate = 1;
         if (Ammus != null)
         {
             Ammus.Size *= 4;
             Ammus.MaximumLifetime = TimeSpan.FromSeconds(4.0);
-
         }
 
+    }
+    
+    class Hyvis : PhysicsObject
+    {
+        private IntMeter elamaLaskuri = new IntMeter(3, 0, 3);
+        public IntMeter ElamaLaskuri { get { return elamaLaskuri; } }
 
+        public Hyvis(double leveys, double korkeus)
+        : base(leveys, korkeus)
+    {
+            elamaLaskuri.LowerLimit += delegate { this.Destroy(); };
+        }
 
     }
@@ -154 +142 @@
 
 }
+   
+   
+
+   
+