Changeset 7217

Timestamp:

2016-06-09 21:12:07 (7 years ago)

Author:

empaheik

Message:

ruma aseviritelmä ahoy

Location:

2016/23/ohjaajat/Punasininen/Punasininen

Files:

• Punasininen/Punasininen.cs (modified) (11 diffs)
• Punasininen/WeaponCrate.cs (modified) (2 diffs)
• PunasininenContent/PunasininenContent.contentproj (modified) (1 diff)
• PunasininenContent/dungeon1.png (modified) (previous)

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

@@ -13 +13 @@
     private const double JUMPSPEED = 1250;
     private const int TILE_SIZE = 60;
-    private const int MATCH_LENGTH = 30;
+    private const int MATCH_LENGTH = 60;
 
     private Player blue;
@@ -37 +37 @@
     DoubleMeter percentageTracker;
 
+    Dictionary<Vector, WeaponCrate> cratePositions = new Dictionary<Vector, WeaponCrate>();
+
     private Shader shader;
 
@@ -63 +65 @@
 
         ColorTileMap map = ColorTileMap.FromLevelAsset("dungeon1");
-        map.SetTileMethod(Color.Black, AddPlatform);
-        map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate (Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, blueColor, blueWalkImages, bluePistolpic); });
-        map.SetTileMethod(Color.FromHexCode("FFD800"), CreateWeaponCrate);
-        map.SetTileMethod(Color.Red, delegate (Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redColor, orangeWalkImages, orangePistolpic); });
+        map.SetTileMethod(Color.Black, delegate(Vector vektori, double leveys, double korkeus) { AddPlatform(vektori, leveys, korkeus); });
+        map.SetTileMethod(Color.FromHexCode("#FF0026FF"), delegate(Vector paikka, double leveys, double korkeus) { blue = CreatePlayer(paikka, leveys, korkeus, blueColor, blueWalkImages, bluePistolpic); });
+        map.SetTileMethod(Color.FromHexCode("FFD800"), delegate(Vector a, double b, double c) { cratePositions.Add(a, CreateWeaponCrate(a, b, c)); });
+        map.SetTileMethod(Color.Red, delegate(Vector paikka, double leveys, double korkeus) { red = CreatePlayer(paikka, leveys, korkeus, redColor, orangeWalkImages, orangePistolpic); });
         map.Execute(TILE_SIZE, TILE_SIZE);
 
-        Surface bottom = Surface.CreateBottom(Level);
-        bottom.Width *= 5;
-        bottom.Y -= Level.Height / 2;
+        Tile bottom = AddPlatform(new Vector(0, Level.Bottom - 100), Level.Width * 4, 100);
         bottom.Tag = "death";
-        bottom.Color = Color.HanPurple; //terveisin
         Add(bottom);
 
@@ -96 +95 @@
         });
 
+        Timer spawnTimer = new Timer() { };
+
         Camera.ZoomToLevel();
         Level.Background.Color = Color.Black;
@@ -146 +147 @@
     }
 
-    void CreateWeaponCrate(Vector place, double width, double height)
+    WeaponCrate CreateWeaponCrate(Vector place, double width, double height)
     {
         WeaponCrate crate = new WeaponCrate(width, height);
@@ -156 +157 @@
 
         crate.Oscillate(Vector.UnitY, 10, 0.4);
-    }
-
-    void AddPlatform(Vector paikka, double leveys, double korkeus)
+
+        return crate;
+    }
+
+    Tile AddPlatform(Vector paikka, double leveys, double korkeus)
     {
         Tile platform = new Tile(leveys, korkeus, paikka);
@@ -165 +168 @@
         platform.Tag = "platform";
         Add(platform);
+        return platform;
     }
 
@@ -181 +185 @@
             AttackSound = null,
             MaxAmmoLifetime = TimeSpan.FromSeconds(8),
-            ProjectileCollision = BulletHitsSomething,
+            ProjectileCollision = delegate(PhysicsObject a, PhysicsObject b) { ColorTile(a, b); a.Destroy(); },
+            // ProjectileCollision = BulletHitsSomething,
             Image = pistolPic,
             Y = 5
         };
 
-        AddCollisionHandler(player, "platform", delegate (PhysicsObject a, PhysicsObject b)
+        AddCollisionHandler(player, "platform", delegate(PhysicsObject a, PhysicsObject b)
         {
             ColorTile(a, b);
         });
-        AddCollisionHandler(player, "crate", delegate (PhysicsObject a, PhysicsObject b)
+        AddCollisionHandler(player, "crate", delegate(PhysicsObject a, PhysicsObject b)
         {
             GunLottery(player);
             b.Destroy();
         });
-        AddCollisionHandler(player, "death", delegate (PhysicsObject a, PhysicsObject b)
+        AddCollisionHandler(player, "death", delegate(PhysicsObject a, PhysicsObject b)
         {
             Restore((Player)a);
@@ -208 +213 @@
     }
 
-    void BulletHitsSomething(PhysicsObject bullet, PhysicsObject target)
-    {
-        if (target.Tag.ToString() == "platform")
-        {
-            // TODO bullet must know its owner
-            if (bullet.Color == blueColor)
-            {
-                ColorTile(blue, target);
-            }
-            else if (bullet.Color == redColor)
-            {
-                ColorTile(red, target);
-            }
-        }
-        bullet.Destroy();
-    }
-
     void GunLottery(Player player)
     {
-        player.Weapon = new ColorGun(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, player, this);
+        int hurdur = RandomGen.NextInt(0, 3);
+
+        switch (hurdur)
+        {
+            case 0:
+                player.Weapon = new AssaultRifle(player.Weapon.Width, player.Weapon.Height) { Image = player.Weapon.Image,  ProjectileCollision = delegate(PhysicsObject a, PhysicsObject b) { ColorTile(a, b); a.Destroy(); }, AttackSound = null, MaxAmmoLifetime = TimeSpan.FromSeconds(4) };
+                break;
+            case 1:
+                player.Weapon = new ColorGun(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, player);
+                break;
+            case 2:
+                player.Weapon = new LaserGun(player.Weapon.Width, player.Weapon.Height) { Image = player.Weapon.Image, ProjectileCollision = delegate(PhysicsObject a, PhysicsObject b) { ColorTile(a, b); a.Destroy(); }, AttackSound = null, MaxAmmoLifetime = TimeSpan.FromSeconds(4) };
+                break;
+            default:
+                break;
+        };
+
+        Timer undo = new Timer() { Interval = 5 };
+        undo.Timeout += delegate()
+        {
+            undo.Stop();
+            player.Weapon = new AssaultRifle(player.Weapon.Width, player.Weapon.Height)
+        {
+            FireRate = 3,
+            AttackSound = null,
+            MaxAmmoLifetime = TimeSpan.FromSeconds(8),
+            Image = player.Weapon.Image,
+            ProjectileCollision = delegate(PhysicsObject a, PhysicsObject b) { ColorTile(a, b); a.Destroy(); },
+            Y = 5,
+        };
+        };
+        undo.Start();
+
     }
 
@@ -258 +278 @@
         zoomTimer.IgnorePause = true;
         zoomTimer.Start();
+
+        cratePositions.Clear();
     }
 
@@ -265 +287 @@
         var glowImg = player.Color == blueColor ? blueGlow : orangeGlow;
 
-        ((Tile)platform).SetColor(imgs, glowImg, player.Color, UpdatePercentage);
+        if (platform is Tile)
+        {
+            ((Tile)platform).SetColor(imgs, glowImg, player.Color, UpdatePercentage);
+        }
     }
 

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

@@ -20 +20 @@
     public Player Owner;
 
-    public Game MyGame;
-
     protected override PhysicsObject CreateProjectile()
     {
         Grenade test = new Grenade(10, TimeSpan.FromSeconds(1));
         test.Explosion.ShockwaveColor = Owner.Color;
+        test.Explosion.Size *= 3;
+        test.Explosion.Sound = null;
+        test.Explosion.ShockwaveReachesObject += delegate(IPhysicsObject a, Vector b) 
+        {
+            if (a is Tile)
+            {
+                ((Punasininen)Game).ColorTile(test, (Tile)a);
+            }
+        };
         return test;
     }
 
-    public ColorGun(double leveys, double korkeus, Image image, Player owner, Game game)
+    public ColorGun(double leveys, double korkeus, Image image, Player owner)
         : base(leveys, korkeus)
     {
@@ -35 +42 @@
         AttackSound = null;
         FireRate = 1;
-        Power.DefaultValue = 15000;
+        Power.DefaultValue = 30000;
         Owner = owner;
-        MyGame = game;
        
     }

2016/23/ohjaajat/Punasininen/Punasininen/PunasininenContent/PunasininenContent.contentproj

@@ -16 +16 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">