Changeset 9119 for 2017/30/HugoE

Timestamp:

2017-07-26 12:43:10 (2 years ago)

Author:

npo17_65

Message:

 

Location:

2017/30/HugoE/HanniAndHoo/HanniAndHoo

Files:

• HanniAndHoo/HanniAndHoo.cs (modified) (9 diffs)
• HanniAndHoo/bin/x86/Debug/HanniAndHoo.exe (modified) (previous)
• HanniAndHoo/bin/x86/Debug/HanniAndHoo.pdb (modified) (previous)
• HanniAndHoo/obj/x86/Debug/HanniAndHoo.exe (modified) (previous)
• HanniAndHoo/obj/x86/Debug/HanniAndHoo.pdb (modified) (previous)
• HanniAndHooContent/bin/x86/Release (added)

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

@@ -14 +14 @@
     AssaultRifle HanninAse;
 
-    AssaultRifle HoonAse;
+    Cannon HoonAse;
     
 
@@ -28 +28 @@
 
         AmmuAseella(HanninAse);
+        AmmuAseella2(HoonAse);
 
 
@@ -40 +41 @@
 
         Hanni = new PlatformCharacter(80.0, 80.0);
-        Hanni.X = Level.Left + 20.0;
+        Hanni.X = Level.Left + 100.0;
         Hanni.Y = 0.0;
         Hanni.Shape = Shape.Circle;
@@ -54 +55 @@
                 
         Hoo = new PlatformCharacter (100.0, 100.0);
-        Hoo.X = Level.Right - 20.0;
+        Hoo.X = Level.Right - 100.0;
         Hoo.Y = 0.0;
         Hoo.Shape = Shape.Circle;
@@ -61 +62 @@
         Hoo.CanRotate = false;
         Add(Hoo);
-        HoonAse = new AssaultRifle(90, 30);
+        HoonAse = new Cannon (90, 30);
         HoonAse.ProjectileCollision = AmmusOsui;
-        HoonAse.X += 50;
-        HoonAse.Y -= 10;
+        HoonAse.X += 80;
         Hoo.Add(HoonAse);
+        HoonAse.Power.DefaultValue = 20000;
     }
 
     void AmmusOsui(PhysicsObject Ammus, PhysicsObject Kohde)
     {
-        //Ammus.Destroy, Kohde;
+        Ammus.Destroy();
 
     }
@@ -95 +96 @@
     void LuoKentta()
     {
-        Gravity = new Vector(0.0, -800.0);
-
-        
+        Gravity = new Vector(0.0, -800.0);        
         PhysicsObject AlaReuna = Level.CreateBottomBorder(0.0, false);
         PhysicsObject OikeaReuna = Level.CreateRightBorder(0.0, false);
         PhysicsObject VasenReuna = Level.CreateLeftBorder(0.0, false);
+        PhysicsObject YläReuna = Level.CreateTopBorder(0.0, false);
 
-        
-        
 
-        
     }
 
@@ -124 +121 @@
     {
         PhysicsObject Ammus = HanninAse.Shoot();
-        Keyboard.Listen(Key.Space, ButtonState.Pressed, AmmuAseella, "Ammu", HanninAse);
+        Keyboard.Listen(Key.S, ButtonState.Pressed, AmmuAseella, "Ammu", HanninAse);
+        HanninAse.FireRate = 0.25;
 
         if (Ammus != null)
@@ -133 +131 @@
         }
 
+    }
+
+    void AmmuAseella2(Cannon HoonAse)
+    {
+        PhysicsObject Ammus = HoonAse.Shoot();
+        Keyboard.Listen(Key.Down, ButtonState.Pressed, AmmuAseella2, "Ammu2", HoonAse);
+        HoonAse.FireRate = 0.25;
+        
+
+        if (Ammus != null)
+        {
+            Ammus.Size *= 4;
+            Ammus.MaximumLifetime = TimeSpan.FromSeconds(4.0);
+
+        }
+
+
 
     }
@@ -138 +153 @@
 
 
-
-
-
-
-
-
-
-
-
 }