Changeset 3596 for 2012/27

Timestamp:

2012-07-05 14:47:54 (11 years ago)

Author:

dezhidki

Message:

Talletus.

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame

Files:

• Entity.cs (modified) (2 diffs)
• EntityTemplates.cs (modified) (2 diffs)
• LevelGenerator.cs (modified) (5 diffs)
• MobTags.cs (added)
• ObjectDoor.cs (added)
• Player.cs (modified) (9 diffs)
• Room.cs (modified) (14 diffs)
• RoomTemplates.cs (modified) (7 diffs)
• TheDungeonGame.cs (modified) (5 diffs)
• TheDungeonGame.csproj (modified) (1 diff)

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

@@ -7 +7 @@
 namespace Entity
 {
-    public abstract class EntityBase : PhysicsObject
+    public class EntityBase : PhysicsObject
     {
         protected TheDungeonGame game;
-        protected int maxHealth;
+        protected int health;
 
         public EntityBase(TheDungeonGame game, Vector pos, Vector size, Shape shape)
@@ -16 +16 @@
         {
             this.game = game;
+            Tag = "Enemy";
             Position = pos;
         }
 
-       public abstract void init();
+        public virtual void init() { }
 
-        public void setMaxHealth(int health)
+        public void hideEntity()
         {
-            maxHealth = health;
+            if (Brain != null)
+                Brain.Active = false;
+            IsVisible = false;
         }
 
+        public void showEntity()
+        {
+            if (Brain != null)
+                Brain.Active = true;
+            IsVisible = true;
+        }
+
+        public void setHealth(int hp)
+        {
+            health = hp;
+        }
+
+        public void hit(int damage)
+        {
+            health -= damage;
+            if (health <= 0)
+                Destroy();
+        }
+
+        public EntityBase CopyEntity()
+        {
+            EntityBase result = new EntityBase(game, Position, Size, Shape);
+            result.Brain = Brain;
+            result.health = health;
+            return result;
+        }
     }
 }

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

@@ -8 +8 @@
 namespace Entity
 {
+    public class Entities
+    {
+        public static EntityFly fly = new EntityFly((TheDungeonGame)TheDungeonGame.Instance, Vector.Zero, new Vector(40, 40), Shape.Circle);
+        public static EntityBase[] entities = { fly };
+    }
+
+
    public class TestEntity : EntityBase
     {
@@ -26 +33 @@
             : base(game, pos, size, shape)
         {
+            Brain = new FollowerBrain(game.Player, 100);
+            Brain.Active = false;
+            CollisionIgnoreGroup = CollisionGroups.Rocks;
         }
 
        public override void init()
        {
-           Brain = new FollowerBrain(game.Player,200);
-           Brain.Active = true;
+           
        }
+
    }
 }

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

@@ -16 +16 @@
         private List<Room> roomList = new List<Room>();
         public int level = 1;
+        private int roomsPlaced = 0;
+        private int roomAmount = 0;
 
         public LevelGenerator(TheDungeonGame game, Vector size, Vector roomamount)
@@ -69 +71 @@
                 room.destroyLevel();
             }
+            roomAmount = 0;
+            roomsPlaced = 0;
         }
 
         public void generateRandomLevel(int minRooms, int maxRooms)
         {
-            int roomAmount = RandomGen.NextInt(minRooms, maxRooms);
+            roomAmount = RandomGen.NextInt(minRooms, maxRooms);
             Room lastRoom = null;
 
@@ -99 +103 @@
                     else
                     {
-                        checkedSides++;
+                    //    checkedSides++;
                         sideChecked[dir] = true;
                     }
@@ -106 +110 @@
                     {
                         lastRoom = currentRoom;
+                        roomsPlaced++;
                         break;
                     }
-
                 }
 
@@ -114 +118 @@
         }
 
-
-
         private Room currentRoom;
         private bool tryCreateRoom(int dir, Vector pos, Room lastRoom)
         {
             if (getRoomFromDirection(lastRoom, dir) != null) return false;
+
+            if (roomsPlaced == roomAmount-5)
+            {
+                currentRoom = RoomCreator.createRoom(game, VecMath.mul(pos, new Vector(TheDungeonGame.ROOMWIDTH + TheDungeonGame.ROOMTHICKNESS, -TheDungeonGame.ROOMHEIGHT - TheDungeonGame.ROOMTHICKNESS)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS, 7);
+                return placeRoomAt(currentRoom, (int)pos.X, (int)pos.Y);
+            }
+
             currentRoom = RoomCreator.createRoom(game, VecMath.mul(pos, new Vector(TheDungeonGame.ROOMWIDTH + TheDungeonGame.ROOMTHICKNESS, -TheDungeonGame.ROOMHEIGHT - TheDungeonGame.ROOMTHICKNESS)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS, RandomGen.NextInt(6)+1);
-            //currentRoom = new EmptyRoom(game, VecMath.mul(pos, new Vector(TheDungeonGame.ROOMWIDTH + TheDungeonGame.ROOMTHICKNESS, -TheDungeonGame.ROOMHEIGHT - TheDungeonGame.ROOMTHICKNESS)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS);
+
             return placeRoomAt(currentRoom, (int)pos.X, (int)pos.Y);
         }

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

@@ -14 +14 @@
     public class Player : PhysicsObject
     {
-        public const double playerWidth = 120/3;
-        public const double playerHeight = 180/3;
-       // private PhysicsObject head;
+        public const double playerWidth = 120 / 3;
+        public const double playerHeight = 180 / 3;
+        // private PhysicsObject head;
         public Vector movementVector = Vector.Zero;
         public bool isMoving = false;
         private Keyboard keyboard;
-        public double speed = 200;
+        public double speed = 250;
         private TheDungeonGame game;
         public Room currentRoom;
         public IntMeter playerHealth = new IntMeter(5, 0, 30);
         private Item itemInInventory;
+        private AssaultRifle weapon;
+
+        private Angle UpAngle = Angle.FromDegrees(90);
+        private Angle RightAngle = Angle.Zero;
+        private Angle DownAngle = Angle.FromDegrees(270);
+        private Angle LeftAngle = Angle.FromDegrees(180);
 
         public Player(TheDungeonGame game, Vector pos, Image texture)
@@ -35 +41 @@
             Image = texture;
             itemInInventory = new TestItem(TheDungeonGame.LoadImage("items/testItem"), "Test Item", false);
+            Tag = "Player";
+
+            weapon = new AssaultRifle(playerWidth / 3, playerHeight / 3);
+            weapon.Top = Top;
+            weapon.Image = null;
+            weapon.Color = Color.Transparent;
+            weapon.CanHitOwner = false;
+            weapon.InfiniteAmmo = true;
+            weapon.MaxAmmoLifetime = TimeSpan.FromSeconds(0.5);
+            weapon.TimeBetweenUse = TimeSpan.FromSeconds(0.4);
+            weapon.ProjectileCollision = bulletCollided;
+            Add(weapon);
         }
 
@@ -48 +66 @@
             keyboard.Listen(Key.S, ButtonState.Released, removeMovement, null, new Vector(0, -speed));
             keyboard.Listen(Key.D, ButtonState.Released, removeMovement, null, new Vector(speed, 0));
+
+            keyboard.Listen(Key.Up, ButtonState.Down, shootAmmo, "Shoot up", UpAngle);
+            keyboard.Listen(Key.Down, ButtonState.Down, shootAmmo, "Shoot up", DownAngle);
+            keyboard.Listen(Key.Right, ButtonState.Down, shootAmmo, "Shoot up", RightAngle);
+            keyboard.Listen(Key.Left, ButtonState.Down, shootAmmo, "Shoot up", LeftAngle);
+
             keyboard.Listen(Key.Space, ButtonState.Pressed, useItemInInventory, "Use Item");
+        }
+
+        private void bulletCollided(PhysicsObject collidingObject, PhysicsObject targetObject)
+        {
+
+            if (targetObject.Tag.Equals("Enemy"))
+            {
+                EntityBase entity = (EntityBase)targetObject;
+                entity.hit(WeaponDamage);
+                collidingObject.Destroy();
+                currentRoom.EntityAmount--;
+            }
+            else if(targetObject.Tag.Equals("Wall") || targetObject.Tag.Equals("ObjectRock"))
+                collidingObject.Destroy();
+        }
+
+        public TimeSpan WeaponSpeed
+        {
+            get
+            {
+                return weapon.TimeBetweenUse;
+            }
+            set
+            {
+                weapon.TimeBetweenUse = value;
+            }
+        }
+
+        public TimeSpan BulletLife
+        {
+            get
+            {
+                return weapon.MaxAmmoLifetime;
+            }
+            set
+            {
+                weapon.MaxAmmoLifetime = value;
+            }
+        }
+
+        public int WeaponDamage
+        {
+            get;
+            set;
+        }
+
+        private void shootAmmo(Angle angle)
+        {
+            weapon.Angle = angle;
+            weapon.Shoot();
         }
 
@@ -78 +152 @@
         {
             Room room;
+            if (target.Tag.Equals(RoomDirection.North) || target.Tag.Equals(RoomDirection.East) || target.Tag.Equals(RoomDirection.South) || target.Tag.Equals(RoomDirection.West))
+            {
+                ObjectDoor door = (ObjectDoor)target;
+                if (door != null && door.IsLocked) return;
+            }
+            
             if (target.Tag.Equals(RoomDirection.North))
             {
@@ -83 +163 @@
                 game.moveToRoom(room, RoomDirection.North);
                 currentRoom = room;
-            }else
-                if(target.Tag.Equals(RoomDirection.East))
+            }
+            else
+                if (target.Tag.Equals(RoomDirection.East))
                 {
                     room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.East));
@@ -91 +172 @@
                 }
                 else
-                    if(target.Tag.Equals(RoomDirection.South))
+                    if (target.Tag.Equals(RoomDirection.South))
                     {
                         room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.South));
@@ -97 +178 @@
                         currentRoom = room;
                     }
-                    else 
-                        if(target.Tag.Equals(RoomDirection.West))
+                    else
+                        if (target.Tag.Equals(RoomDirection.West))
                         {
                             room = game.LevelGen.getRoomAt(currentRoom.PosOnGrid + RoomDirection.getOffsetFromDir(RoomDirection.West));
@@ -108 +189 @@
         public void handleItemPickup(IPhysicsObject player, IPhysicsObject item)
         {
-            ItemEntity itemEnt =  (ItemEntity)item;
+            ItemEntity itemEnt = (ItemEntity)item;
             itemEnt.bindedItem.onPickup(this);
             item.Destroy();
@@ -122 +203 @@
 
             isMoving = false;
+
+            Console.WriteLine(currentRoom.EntityAmount);
+
+            if (currentRoom.EntityAmount == 0)
+            {
+                foreach (ObjectDoor door in currentRoom.doors)
+                {
+                    if (door != null)
+                        door.IsLocked = false;
+                }
+            }
+            else
+            {
+                foreach (ObjectDoor door in currentRoom.doors)
+                {
+                    if (door != null)
+                        door.IsLocked = true;
+                }
+            }
+
 
             base.Update(time);

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

@@ -18 +18 @@
         public bool isBuilt = false;
         protected IPhysicsObject[,] insideObjects;
-        protected PhysicsObject[] doors = new PhysicsObject[4];
+        public ObjectDoor[] doors = new ObjectDoor[4];
         protected double blockWidth, blockHeight;
         protected double insideWidth, insideHeight;
@@ -49 +49 @@
         public abstract void initRoom();
 
+        public void spawnRandomEntities(int entityAmount)
+        {
+            int entitiesSpawned = 0;
+            while (entitiesSpawned < entityAmount)
+            {
+                   EntityBase entity = RoomCreator.getEntity(Entities.entities.Length-1);
+                   if (!addEntityAt(entity, RandomGen.NextInt(bWidth - 2) + 1, RandomGen.NextInt(bHeight - 2) + 1))
+                       continue;
+                   entitiesSpawned++;
+            }
+            //for (int i = 0; i < entityAmount; i++)
+            //{
+            //    EntityBase entity = RoomCreator.getEntity(Entities.entities.Length-1);
+            //    if(!addEntityAt(entity, RandomGen.NextInt(bWidth-2)+1, RandomGen.NextInt(bHeight-2)+1))
+
+            //}
+        }
+
         protected void createLevelDecorations()
         {
@@ -74 +92 @@
             {
                 if (obj != null)
-                    Game.Add(obj, 1);
+                {
+                    if (obj.Tag.Equals("Enemy"))
+                        Game.Add(obj, 2);
+                    else Game.Add(obj, 1);
+                }
+                    
             }
 
@@ -117 +140 @@
             {
                 if (obj != null)
-                    obj.IsVisible = false;
+                    obj.IsVisible = false;  
             }
         }
@@ -137 +160 @@
             {
                 if (obj != null)
-                    obj.IsVisible = true;
+                    obj.IsVisible = true;                    
+            }
+        }
+
+        public void restoreBrains()
+        {
+            foreach (IPhysicsObject obj in insideObjects)
+            {
+                if (obj != null)
+                {
+                    if (obj.Brain != null)
+                        obj.Brain.Active = true;
+                }
+            }
+        }
+
+        public void killBrains()
+        {
+            foreach (IPhysicsObject obj in insideObjects)
+            {
+                if (obj != null)
+                {
+                    if (obj.Tag.Equals("Enemy"))
+                        obj.Brain.Active = false;
+                    obj.Stop();
+                }
             }
         }
@@ -143 +191 @@
         public void addBlock(IPhysicsObject obj, int bx, int by)
         {
-            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0) throw new Exception("Can't put block to " + bx + " , " + by);
+            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0 || insideObjects[bx, by] != null) return;
             obj.Left = insidePos.X + (bx * blockWidth);
             obj.Top = insidePos.Y - (by * blockHeight);
@@ -162 +210 @@
         }
 
-        public void addEntityAt(EntityBase ent, int bx, int by)
-        {
-            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0 || insideObjects[bx, by] != null) throw new Exception("Can't put block to " + bx + " , " + by);
-            EntityAmount++;
+        public bool addEntityAt(EntityBase ent, int bx, int by)
+        {
+            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0 || insideObjects[bx, by] != null) return false;
+            ++EntityAmount;
             ent.Left = insidePos.X + (bx * blockWidth);
-            ent.Top = insidePos.Y + (by * blockHeight);
+            ent.Top = insidePos.Y - (by * blockHeight);
             insideObjects[bx, by] = ent;
+            return true;
         }
 
@@ -187 +236 @@
                 if (room == null) continue;
 
-                PhysicsObject door = null;
+                ObjectDoor door = null;
 
                 if (i == RoomDirection.North)
                 {
-                    door = PhysicsObject.CreateStaticObject(thickness, thickness);
+                    door = new ObjectDoor(thickness, thickness);
                     door.Position = Position + new Vector((width + thickness) / 2, -thickness / 2);
                     door.Image = doorTexture;
@@ -199 +248 @@
                     if (i == RoomDirection.East)
                     {
-                        door = PhysicsObject.CreateStaticObject(thickness, thickness);
+                        door = new ObjectDoor(thickness, thickness);
                         door.Position = Position + new Vector(width + thickness / 2, -(height + thickness) / 2);
                         door.Image = doorTexture;
@@ -208 +257 @@
                         if (i == RoomDirection.South)
                         {
-                            door = PhysicsObject.CreateStaticObject(thickness, thickness);
+                            door = new ObjectDoor(thickness, thickness);
                             door.Position = Position + new Vector((thickness + width) / 2, -height - thickness / 2);
                             door.Image = Image.Flip(doorTexture);
@@ -216 +265 @@
                             if (i == RoomDirection.West)
                             {
-                                door = PhysicsObject.CreateStaticObject(thickness, thickness);
+                                door = new ObjectDoor(thickness, thickness);
                                 door.Position = Position + new Vector(thickness / 2, -height / 2 - thickness / 2);
                                 door.Image = doorTexture;
@@ -234 +283 @@
         {
             PhysicsObject result = null;
-            for (int i = 0; i < doors.Length; i++ )
+            for (int i = 0; i < doors.Length; i++)
             {
                 PhysicsObject door = doors[i];
@@ -252 +301 @@
             wallTop.Color = Color.Blue;
             wallTop.Image = topBottom;
-            PhysicsObject wallLeft = createWall(VecMath.sub(Position, new Vector(0, thickness)), thickness, height);
+            PhysicsObject wallLeft = createWall(VecMath.sub(Position, new Vector(0, thickness)), thickness, height - thickness);
             wallLeft.Color = Color.Red;
             wallLeft.Image = leftRight;
             PhysicsObject wallDown = createWall(VecMath.sub(Position, new Vector(0, height)), width + thickness, thickness);
             wallDown.Color = Color.Black;
-           if(topBottom != null) wallDown.Image = Image.Flip(topBottom);
+            if (topBottom != null) wallDown.Image = Image.Flip(topBottom);
             PhysicsObject wallRight = createWall(VecMath.add(Position, new Vector(width, -thickness)), thickness, height - thickness);
             wallRight.Color = Color.Orange;
-           if(leftRight != null) wallRight.Image = Image.Mirror(leftRight);
+            if (leftRight != null) wallRight.Image = Image.Mirror(leftRight);
             roomDecorations.Add(wallTop);
             roomDecorations.Add(wallLeft);
@@ -270 +319 @@
         {
             wall = PhysicsObject.CreateStaticObject(width, height);
+            wall.Tag = "Wall";
             wall.Left = pos.X;
             wall.Top = pos.Y;

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

@@ -38 +38 @@
             addBlock(new ObjectRock(blockWidth, blockHeight), 0, bHeight - 1, new Vector(0, -50));
             addBlock(new ObjectRock(blockWidth, blockHeight), bWidth - 1, bHeight - 1, new Vector(0, -50));
+
+            spawnRandomEntities(5);
         }
     }
@@ -61 +63 @@
                 addBlock(new ObjectRock(blockWidth, blockHeight), 8, 1 + i, new Vector(0, -50));
             }
+
+            spawnRandomEntities(5);
         }
     }
@@ -94 +98 @@
                 addBlock(new ObjectRock(blockWidth, blockHeight), i + 6, 4);
             }
+
+            spawnRandomEntities(5);
         }
     }
@@ -116 +122 @@
                 }
             }
+
+            spawnRandomEntities(5);
         }
     }
@@ -139 +147 @@
 
             deleteBlock(bWidth / 2 - 1, bHeight / 2);
+            spawnRandomEntities(5);
         }
     }
@@ -159 +168 @@
                 addBlock(new ObjectRock(blockWidth, blockHeight), bx, by);
             }
+
+            spawnRandomEntities(5);
+        }
+    }
+
+    class BossRoom : Room
+    {
+        public BossRoom(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
         }
     }
@@ -181 +205 @@
             else if (room == 6)
                 result = new RoomType6(game, pos, size, thickness);
+            else if (room == 7)
+                result = new BossRoom(game, pos, size, thickness);
 
             return result;
         }
+
+        public static EntityBase getEntity(int id)
+        {
+            EntityBase ent = null;
+            if (id == 0)
+                ent = new EntityFly((TheDungeonGame)TheDungeonGame.Instance, Vector.Zero, new Vector(50, 50), Shape.Circle);
+            return ent;
+        }
     }
 }

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

@@ -41 +41 @@
         Level.Height = ROOMHEIGHT * 20;
         setupLevelTextures(1);
-        setupObjectTextures();      
-
-        generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
-        generator.generateRandomLevel(5, 10);
-        generator.initDungeon();
-        Room centerRoom = generator.getRoomAt((int)(generator.CenterRoom.X), (int)(generator.CenterRoom.Y));
-        Camera.Position = centerRoom.Position + new Vector(ROOMWIDTH / 2 + ROOMTHICKNESS / 2, -ROOMHEIGHT / 2 + ROOMTHICKNESS / 4);
+        setupObjectTextures();
 
         player = new Player(this, Vector.Zero, playerPic);
+        
+        generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
+        generator.generateRandomLevel(10, 20);
+        generator.initDungeon();
+        setupCamera();
+      //  Camera.Zoom(0.5);
         setupPlayer();
+        
+       
         AddCollisionHandler(player, player.performCollision);
         AddCollisionHandler(player, "Item", player.handleItemPickup);
@@ -97 +99 @@
         oldPos = player.currentRoom.Position + new Vector(ROOMWIDTH / 2 + ROOMTHICKNESS / 2, -ROOMHEIGHT / 2 + ROOMTHICKNESS / 4);
         newPos = room.Position + new Vector(ROOMWIDTH / 2 + ROOMTHICKNESS / 2, -ROOMHEIGHT / 2 + ROOMTHICKNESS / 4);
-        oldRoom = player.currentRoom;
+        oldRoom = player.currentRoom;       
         if (room.isBuilt) room.restoreLevel();
         else room.buildLevel();
+        oldRoom.killBrains();
         moveCameraTo(newPos - oldPos);
         player.Position = player.currentRoom.getDoor(dir).Position + RoomDirection.getOffsetFromWorldDir(dir) * 130;
@@ -123 +126 @@
             moveCamera = false;
             oldRoom.hideLevel();
+            player.currentRoom.restoreBrains();
         }
     }
@@ -130 +134 @@
         player.Position = generator.getRoomAt(generator.CenterRoom).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
         player.currentRoom = generator.getRoomAt(generator.CenterRoom);
-        player.currentRoom.buildLevel();
+        player.currentRoom.buildLevel();      
         Add(player, 2);
+    }
+
+    private void setupCamera()
+    {
+        Room centerRoom = generator.getRoomAt((int)(generator.CenterRoom.X), (int)(generator.CenterRoom.Y));
+        Camera.Position = centerRoom.Position + new Vector(ROOMWIDTH / 2 + ROOMTHICKNESS / 2, -ROOMHEIGHT / 2 + ROOMTHICKNESS / 4);
     }
 
@@ -138 +148 @@
         generator.destroyDungeon();
         generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
-        generator.generateRandomLevel(10, 15);
+        generator.generateRandomLevel(10, 20);
         generator.initDungeon();
-      //  generator.buildDungeon();
+        player.Position = generator.getRoomAt(generator.CenterRoom).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
         player.currentRoom = generator.getRoomAt(generator.CenterRoom);
         player.currentRoom.buildLevel();
+        setupCamera();
     }
 

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.csproj

@@ -120 +120 @@
     <Compile Include="ItemEntity.cs" />
     <Compile Include="LevelGenerator.cs" />
+    <Compile Include="MobTags.cs" />
+    <Compile Include="ObjectDoor.cs" />
     <Compile Include="ObjectRock.cs" />
     <Compile Include="Room.cs" />