Changeset 3633 for 2012/27

Timestamp:

2012-07-06 10:14:10 (11 years ago)

Author:

dezhidki

Message:

Talletus.

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame

Files:

• EntityTemplates.cs (modified) (4 diffs)
• InGameGui.cs (modified) (3 diffs)
• Player.cs (modified) (16 diffs)
• TheDungeonGame.cs (modified) (1 diff)

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/EntityTemplates.cs

@@ -70 +70 @@
         public override bool hit(int damage)
         {
-            TheDungeonGame.soundEffects[3].Play();
+                TheDungeonGame.soundEffects[3].Play();
             return base.hit(damage);
         }
@@ -102 +102 @@
         public override bool hit(int damage)
         {
-            TheDungeonGame.soundEffects[3].Play();
+                TheDungeonGame.soundEffects[3].Play();
             return base.hit(damage);
         }
@@ -203 +203 @@
             Animation = normalWalkingAnimation;
             Animation.Start();
-            
+
             Collided += collided;
         }
@@ -277 +277 @@
                     player.hit(2);
                 else player.hit(1);
+                turtle.Destroy();
             }
         }

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/InGameGui.cs

@@ -15 +15 @@
         public IntMeter bossHealth;
         private BarGauge bossMeterBar;
+       
 
         public InGameGui(TheDungeonGame game)
@@ -26 +27 @@
             setupHealthMeter();
             //   setupInventory();
+        }
+
+        public void setupInfoMeters()
+        {
+            Label weaponSpeedText = new Label();
+            weaponSpeedText.BindTo(game.Player.weaponSpeedMeter);
+            weaponSpeedText.Right += 200;
+            weaponSpeedText.Top += 30;
+            weaponSpeedText.TextColor = Color.White;
+            weaponSpeedText.Color = Color.Transparent;
+            Add(weaponSpeedText);
+
+            Label weaponSpeedInfo = new Label("Weapon's speed");
+            weaponSpeedInfo.Top += 30;
+            weaponSpeedInfo.Right += 90;
+            weaponSpeedInfo.TextColor = Color.White;
+            weaponSpeedInfo.Color = Color.Transparent;
+            Add(weaponSpeedInfo);
+
+            Label weaponDamageText = new Label();
+            weaponDamageText.BindTo(game.Player.weaponDamageMeter);
+            weaponDamageText.Right += 200;
+            weaponDamageText.Top += 10;
+            weaponDamageText.TextColor = Color.White;
+            weaponDamageText.Color = Color.Transparent;
+            Add(weaponDamageText);
+
+            Label weaponDamageInfo = new Label("Weapon's damage");
+            weaponDamageInfo.Top += 10;
+            weaponDamageInfo.Right += 80;
+            weaponDamageInfo.TextColor = Color.White;
+            weaponDamageInfo.Color = Color.Transparent;
+            Add(weaponDamageInfo);
+
+
+            Label bulletLifeText = new Label();
+            bulletLifeText.BindTo(game.Player.bulletLifeMeter);
+            bulletLifeText.Top -= 10;
+            bulletLifeText.Right += 200;
+            bulletLifeText.TextColor = Color.White;
+            bulletLifeText.Color = Color.Transparent;
+            Add(bulletLifeText);
+
+            Label bulletLifeInfo = new Label("Bullet's lifetime");
+            bulletLifeInfo.Top -= 10;
+            bulletLifeInfo.Right += 95;
+            bulletLifeInfo.TextColor = Color.White;
+            bulletLifeInfo.Color = Color.Transparent;
+            Add(bulletLifeInfo);
+
+
         }
 
@@ -93 +145 @@
             bossMeterBar.BarColor = Color.Green;
             bossMeterBar.BorderColor = Color.White;
+            bossMeterBar.Right -= 40;
             bossMeterBar.BindTo(bossHealth);
             Add(bossMeterBar);

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Player.cs

@@ -27 +27 @@
         private Item itemInInventory;
         private AssaultRifle weapon;
+        private int damage;
 
         private Angle UpAngle = Angle.FromDegrees(90);
@@ -40 +41 @@
         private bool isAnimationRunning = false;
 
+        public DoubleMeter weaponSpeedMeter, bulletLifeMeter;
+        public IntMeter weaponDamageMeter;
+
         private SoundEffect hitSound = TheDungeonGame.LoadSoundEffect("sound/robot_hit");
 
@@ -45 +49 @@
             : base(playerWidth, playerHeight)
         {
-            playerHealth = new IntMeter(10, 0, 50);
+
             this.game = game;
             keyboard = game.Keyboard;
@@ -59 +63 @@
             walkingAnimation.FPS = 10;
             Tag = "Player";
+
+            playerHealth = new IntMeter(10, 0, 50);
         }
 
         public void setupWeapon()
         {
+            weaponDamageMeter = new IntMeter(0, 0, 4);
+            weaponSpeedMeter = new DoubleMeter(0, 0.01, 2.0);
+            bulletLifeMeter = new DoubleMeter(0, 0.01, 2.0);
+
             weapon = new AssaultRifle(playerWidth / 3, playerHeight / 3);
             weapon.Top = Top;
@@ -73 +83 @@
             weapon.ProjectileCollision = bulletCollided;
             WeaponDamage = 1;
+            WeaponSpeed = weapon.TimeBetweenUse;
+            BulletLife = weapon.MaxAmmoLifetime;
             Add(weapon);
+
         }
 
@@ -105 +118 @@
             keyboard.Listen(Key.Left, ButtonState.Down, shootAmmo, "Shoot up", LeftAngle);
 
-          //  keyboard.Listen(Key.Space, ButtonState.Pressed, useItemInInventory, "Use Item");
+            keyboard.Listen(Key.F10, ButtonState.Pressed, playerCheat, null);
+
+            //  keyboard.Listen(Key.Space, ButtonState.Pressed, useItemInInventory, "Use Item");
+        }
+
+        private void playerCheat()
+        {
+            WeaponDamage = 5;
+            WeaponSpeed = TimeSpan.FromSeconds(0.2);
+            BulletLife = TimeSpan.FromSeconds(2);
+            playerHealth.Value = 50;
+            //       game.gui.updatePlayerStats();
         }
 
@@ -118 +142 @@
                 collidingObject.Destroy();
             }
-            else if (targetObject.Tag.Equals("Wall") || targetObject.Tag.Equals("ObjectRock") || targetObject.Tag.Equals("Item")) 
+            else if (targetObject.Tag.Equals("Wall") || targetObject.Tag.Equals("ObjectRock") || targetObject.Tag.Equals("Item"))
                 collidingObject.Destroy();
         }
@@ -129 +153 @@
             {
                 showLostScreen();
-            }         
+            }
         }
 
@@ -136 +160 @@
             if (isDead) return;
             isDead = true;
-            string[] buttonNames = {"Retry", "Exit Game"};
+            string[] buttonNames = { "Retry", "Exit Game" };
             keyboard.DisableAll();
             MultiSelectWindow lostWindow = new MultiSelectWindow("Oh noes! You appear to be dead! \nBut, you can always start a new journey...", buttonNames);
@@ -152 +176 @@
             set
             {
+                if (value.TotalSeconds < 0.01 && value.TotalSeconds > 2.0) return;
+                weaponSpeedMeter.Value = value.TotalSeconds;
                 weapon.TimeBetweenUse = value;
             }
@@ -164 +190 @@
             set
             {
+                if (value.TotalSeconds < 0.01 && value.TotalSeconds > 2.0) return;
+                bulletLifeMeter.Value = value.TotalSeconds;
                 weapon.MaxAmmoLifetime = value;
             }
@@ -170 +198 @@
         public int WeaponDamage
         {
-            get;
-            set;
+            get
+            {
+                return damage;
+            }
+            set
+            {
+                if (value < 0 || value > 4) return;
+                weaponDamageMeter.Value = value;
+                damage = value;
+            }
         }
 
@@ -254 +290 @@
                 movementVector = Vector.Zero;
                 Stop();
-                
+
             }
 
@@ -261 +297 @@
             if (currentRoom.EntityAmount == 0)
             {
-                for(int i = 0; i < 4; i++)
+                for (int i = 0; i < 4; i++)
                 {
                     if (currentRoom.doors[i] == null) continue;
@@ -270 +306 @@
             else
             {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        if (currentRoom.doors[i] == null) continue;
-                        currentRoom.doors[i].IsLocked = true;
-                        currentRoom.setDoorTexture(game.objectTextures[0], i);
-                    }
+                for (int i = 0; i < 4; i++)
+                {
+                    if (currentRoom.doors[i] == null) continue;
+                    currentRoom.doors[i].IsLocked = true;
+                    currentRoom.setDoorTexture(game.objectTextures[0], i);
+                }
             }
 
@@ -293 +329 @@
                 Animation.Start();
                 isAnimationRunning = true;
-            }         
+            }
             Move(movementVector);
             isMoving = true;

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.cs

@@ -72 +72 @@
         Add(gui);
 
+        gui.setupInfoMeters();
+
         AddCollisionHandler(player, player.performCollision);
         AddCollisionHandler(player, "Item", player.handleItemPickup);