Changeset 7211 for 2016/23

Timestamp:

2016-06-09 09:08:18 (7 years ago)

Author:

sieerinn

Message:

Aseita ja tähtääminen

Location:

2016/23/ohjaajat/Punasininen/Punasininen

Files:

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

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

@@ -13 +13 @@
     public Vector Spawn;
 
-    public Player(double leveys, double korkeus, Image pic, Color color)
+    public Player(double leveys, double korkeus, Color color)
         : base(leveys, korkeus)
     {
-        Image = pic;
         Color = color;
         CanRotate = false;

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

@@ -23 +23 @@
     private Image blueGlow = LoadImage("blueglow");
 
-    private Image bluepic;
-    private Image redpic;
-
     Color blueColor = Color.FromHexCode("FF1D65CF");
     Color redColor = Color.FromHexCode("FABE1A");
@@ -38 +35 @@
     public override void Begin()
     {
-
-        IsMouseVisible = true; // <- voi ottaa pois
         shader = new Shader(GraphicsDevice, Content, Camera);
 
-        //Gravity = new Vector(0, -1000);
         CreateLevel();
         AddControls();
@@ -63 +57 @@
         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, bluepic, blueColor);});
+        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, redpic, redColor); });
+        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 *= 2;
+        bottom.Width *= 5;
         bottom.Y -= Level.Height / 2;
         bottom.Tag = "death";
+        bottom.Color = Color.HanPurple; //terveisin
         Add(bottom);
 
@@ -103 +98 @@
     }
 
-    Player CreatePlayer(Vector paikka, double leveys, double korkeus, Image playerspic, Color playersColor)
-    {
-        Player player = new Player(leveys * 1.1, korkeus * 1.5, playerspic, playersColor);
-        player.AnimWalk = new Animation(blueWalkImages) { FPS = 30 };
-        player.AnimIdle = new Animation(new[] { blueWalkImages[0] });
-        player.Position = paikka;
-        player.Spawn = paikka;
+    Player CreatePlayer(Vector paikka, double leveys, double korkeus, Color playersColor, Image[] animation, Image pistolPic)
+    {
+        Player player = new Player(leveys * 1, korkeus * 1.5, playersColor);
+        player.AnimWalk = new Animation(animation) { FPS = 30 };
+        player.AnimIdle = new Animation(new[] { animation[0] });
+        player.Position = paikka + new Vector(0, korkeus/2);
+        player.Spawn = player.Position;
         Add(player);
 
@@ -118 +113 @@
             MaxAmmoLifetime = TimeSpan.FromSeconds(8),
             ProjectileCollision = BulletHitsSomething,
-            Image = bluePistolpic,
+            Image = pistolPic,
             Y = 5
         };
@@ -128 +123 @@
         AddCollisionHandler(player, "crate", delegate(PhysicsObject a, PhysicsObject b)
         {
-            //((Player)a).Weapon = ((WeaponCrate)b).GiveWeapon(); 
-            player.Weapon = GunLottery();
+            GunLottery(player);
             b.Destroy();
         });
@@ -162 +156 @@
     }
 
-    Weapon GunLottery()
-    {
-        return new AssaultRifle(TILE_SIZE / 2, TILE_SIZE / 2) { FireRate = 1.5, AttackSound = null, MaxAmmoLifetime = TimeSpan.FromSeconds(8), ProjectileCollision = BulletHitsSomething };
+    void GunLottery(Player player)
+    {
+        player.Weapon = new ColorGun(player.Weapon.Width, player.Weapon.Height, player.Weapon.Image, player, this);
     }
 
@@ -183 +177 @@
     }
 
-    void ColorTile(PhysicsObject player, PhysicsObject platform)
+    public void ColorTile(PhysicsObject player, PhysicsObject platform)
     {
         var imgs = player.Color == blueColor? blueTileImages : orangeTileImages;
@@ -241 +235 @@
     void Aim(AnalogState stickState, Player player)
     {
-
+        player.Weapon.Angle = stickState.StateVector.Angle;
     }
 

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

@@ -9 +9 @@
 class WeaponCrate : PhysicsObject
 {
-
     public WeaponCrate(double leveys, double korkeus)
         : base(leveys, korkeus)
@@ -15 +14 @@
         Tag = "crate";
     }
+}
 
-    /*
-    public Weapon GiveWeapon()
+class ColorGun : Weapon
+{
+    public Player Owner;
+
+    public Game MyGame;
+
+    protected override PhysicsObject CreateProjectile()
     {
-        this.Destroy();
-    }*/
+        Grenade test = new Grenade(10, TimeSpan.FromSeconds(1));
+        test.Explosion.ShockwaveColor = Owner.Color;
+        return test;
+    }
+
+    public ColorGun(double leveys, double korkeus, Image image, Player owner, Game game)
+        : base(leveys, korkeus)
+    {
+        Image = image;
+        AttackSound = null;
+        FireRate = 1;
+        Power.DefaultValue = 15000;
+        Owner = owner;
+        MyGame = game;
+       
+    }
 }