Changeset 7205 for 2016

Timestamp:

2016-06-08 11:34:27 (7 years ago)

Author:

sieerinn

Message:

Nimiä vaihdettu englanninkielelle ja kenttää paranneltu

Location:

2016/23/ohjaajat/Punasininen/Punasininen

Files:

• Punasininen/Player.cs (modified) (2 diffs)
• Punasininen/Punasininen.cs (modified) (10 diffs)
• PunasininenContent/dungeon1.png (modified) (previous)

2016/23/ohjaajat/Punasininen/Punasininen/Punasininen/Player.cs

@@ -10 +10 @@
 {
 
-    Weapon Secondary;
+    public Weapon Secondary;
 
     public Player(double leveys, double korkeus, Image pic, Color color)
@@ -21 +21 @@
         Tag = "player";
         Acceleration = 5000;
+      
 
     }

2016/23/ohjaajat/Punasininen/Punasininen/Punasininen/Punasininen.cs

@@ -57 +57 @@
 
         ColorTileMap map = ColorTileMap.FromLevelAsset("dungeon1");
-        map.SetTileMethod(Color.Black, LisaaTaso);
+        map.SetTileMethod(Color.Black, AddPlatform);
         map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, bluepic, Color.Blue);});
         map.SetTileMethod(Color.FromHexCode("FFD800"), CreateWeaponCrate);
@@ -83 +83 @@
     }
 
-    void LisaaTaso(Vector paikka, double leveys, double korkeus)
+    void AddPlatform(Vector paikka, double leveys, double korkeus)
     {
         PhysicsObject platform = PhysicsObject.CreateStaticObject(leveys, korkeus);
@@ -98 +98 @@
         Add(player);
 
+        player.Weapon = new AssaultRifle(leveys / 2, korkeus / 2) { FireRate = 1.5, AttackSound = null, MaxAmmoLifetime = TimeSpan.FromSeconds(8), ProjectileCollision = BulletHitsSomething};
+
         AddCollisionHandler(player, "platform", delegate(PhysicsObject a, PhysicsObject b)
         {
@@ -104 +106 @@
         AddCollisionHandler(player, "crate", delegate(PhysicsObject a, PhysicsObject b)
         {
-            //((Player)a).Weapon = ((WeaponCrate)b).GiveWeapon();
-            ((Player)a).Weapon = GunLottery();
-            ((Player)a).Weapon.ProjectileCollision = BulletHitsSomething;
+            //((Player)a).Weapon = ((WeaponCrate)b).GiveWeapon(); 
+            player.Weapon = GunLottery();
             b.Destroy();
         });
@@ -113 +114 @@
     }
 
-    void BulletHitsSomething (PhysicsObject bullet, PhysicsObject target)
+    void BulletHitsSomething(PhysicsObject bullet, PhysicsObject target)
     {
         if (target.Tag == "platform")
@@ -132 +133 @@
     Weapon GunLottery()
     {
-        return new AssaultRifle(50, 50);
+        return new AssaultRifle(TILE_SIZE / 2, TILE_SIZE / 2) { FireRate = 1.5, AttackSound = null, MaxAmmoLifetime = TimeSpan.FromSeconds(8), ProjectileCollision = BulletHitsSomething };
     }
 
@@ -148 +149 @@
         };
         Add(announcement);
-
        
     }
@@ -175 +175 @@
         ControllerOne.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, "Tähtää", red);
         ControllerOne.ListenAnalog(AnalogControl.RightTrigger, 0.1, Shoot, "", red);
+        ControllerOne.ListenAnalog(AnalogControl.LeftTrigger, 0.1, Shoot, "", red);
 
         ControllerTwo.ListenAnalog(AnalogControl.LeftStick, 0.1, Move, "Liikuta pelaajaa", blue);
@@ -180 +181 @@
         ControllerOne.ListenAnalog(AnalogControl.RightStick, 0.1, Aim, null, blue);
         ControllerTwo.ListenAnalog(AnalogControl.RightTrigger, 0.1, Shoot, "", blue);
+        ControllerTwo.ListenAnalog(AnalogControl.LeftTrigger, 0.1, Shoot, "", blue);
 
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Ohjeet");
@@ -210 +212 @@
     }
 
-    void Aim(AnalogState tatinTila, Player player)
+    void Aim(AnalogState stickState, Player player)
     {