Changeset 3568 for 2012/27

Timestamp:

2012-07-05 10:46:03 (11 years ago)

Author:

dezhidki

Message:

Talletus.

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame

Files:

• TheDungeonGame/CollisionGroups.cs (added)
• TheDungeonGame/EntityTemplates.cs (modified) (2 diffs)
• TheDungeonGame/LevelGenerator.cs (modified) (3 diffs)
• TheDungeonGame/ObjectRock.cs (added)
• TheDungeonGame/Room.cs (modified) (3 diffs)
• TheDungeonGame/RoomTemplates.cs (modified) (2 diffs)
• TheDungeonGame/TheDungeonGame.cs (modified) (3 diffs)
• TheDungeonGame/TheDungeonGame.csproj (modified) (2 diffs)
• TheDungeonGameContent/TheDungeonGameContent.contentproj (modified) (1 diff)
• TheDungeonGameContent/objects/rock.png (added)

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

@@ -4 +4 @@
 using System.Text;
 using Jypeli;
+using Jypeli.Assets;
 
 namespace Entity
@@ -19 +20 @@
         }
     }
+
+   public class EntityFly : EntityBase
+   {
+       public EntityFly(TheDungeonGame game, Vector pos, Vector size, Shape shape)
+            : base(game, pos, size, shape)
+        {
+        }
+
+       public override void init()
+       {
+           Brain = new FollowerBrain(game.Player,200);
+           Brain.Active = true;
+       }
+   }
 }

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

@@ -47 +47 @@
         }
 
+        public void initDungeon()
+        {
+            foreach (Room room in roomList)
+            {
+                room.initRoom();
+            }
+        }
+
         public void buildDungeon()
         {
             foreach (Room room in roomList)
             {
-                room.initRoom();
                 room.buildLevel();
             }
@@ -73 +80 @@
                 if (room == 0)
                 {
-                    lastRoom = new TestRoom(game, VecMath.mul(CenterRoom, new Vector(TheDungeonGame.ROOMWIDTH + TheDungeonGame.ROOMTHICKNESS, -TheDungeonGame.ROOMHEIGHT - TheDungeonGame.ROOMTHICKNESS)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS);
+                    lastRoom = new EmptyRoom(game, VecMath.mul(CenterRoom, new Vector(TheDungeonGame.ROOMWIDTH + TheDungeonGame.ROOMTHICKNESS, -TheDungeonGame.ROOMHEIGHT - TheDungeonGame.ROOMTHICKNESS)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS);
                     placeRoomAt(lastRoom, (int)CenterRoom.X, (int)CenterRoom.Y);
                     continue;
@@ -113 +120 @@
         {
             if (getRoomFromDirection(lastRoom, dir) != null) return false;
-            currentRoom = new TestRoom(game, VecMath.mul(pos, new Vector(TheDungeonGame.ROOMWIDTH + TheDungeonGame.ROOMTHICKNESS, -TheDungeonGame.ROOMHEIGHT - TheDungeonGame.ROOMTHICKNESS)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS);
+            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/Room.cs

@@ -49 +49 @@
         public abstract void initRoom();
 
+        protected void createLevelDecorations()
+        {
+            int level = Game.LevelGen.level;
+            createBorders(Game.getTopBottomWall(level), Game.getLeftRightWall(level));
+            addDoors(Game.objectTextures[0]);
+            roomDecorations.Add(createBackground(Game.getLevelBackground(level)));
+        }
+
         public void buildLevel()
         {
@@ -95 +103 @@
         public void addBlock(IPhysicsObject obj, 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);
+            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0) throw new Exception("Can't put block to " + bx + " , " + by);
             obj.Left = insidePos.X + (bx * blockWidth);
             obj.Top = insidePos.Y - (by * blockHeight);
             insideObjects[bx, by] = obj;
+        }
+
+        public void addBlock(IPhysicsObject obj, int bx, int by, Vector offset)
+        {
+            addBlock(obj, bx, by);
+            obj.Position += offset;
         }
 
@@ -115 +129 @@
             ent.Top = insidePos.Y + (by * blockHeight);
             insideObjects[bx, by] = ent;
+        }
+
+        public void deleteBlock(int bx, int by)
+        {
+            insideObjects[bx, by].Destroy();
+            insideObjects[bx, by] = null;
         }
 

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

@@ -10 +10 @@
 namespace Rooms
 {
-    class TestRoom : Room
+    class EmptyRoom : Room
     {
-        public TestRoom(TheDungeonGame game, Vector pos, Vector size, double thickness)
+        public EmptyRoom(TheDungeonGame game, Vector pos, Vector size, double thickness)
             : base(game, pos, size, thickness)
         {
@@ -19 +19 @@
         public override void initRoom()
         {
-            int level = Game.LevelGen.level;
-            createBorders(Game.getTopBottomWall(level), Game.getLeftRightWall(level));
-            addDoors(Game.objectTextures[0]);
-            roomDecorations.Add(createBackground(Game.getLevelBackground(level)));
-            ItemEntity testItem = new ItemEntity(new Items.TestItem(TheDungeonGame.LoadImage("items/testItem"), "Test Item", true));
-            addBlock(testItem, 0, 0);
-            //TestEntity entity = new TestEntity(Game, Vector.Zero, new Vector(40, 40), Shape.Rectangle);
-            //addEntityAt(entity, 0, 0);
-            //RandomMoverBrain brain = new RandomMoverBrain(10000);
-            //brain.ChangeMovementSeconds = 0.5;
-            //entity.Brain = brain;
-            //entity.Brain.Active = true;
+            createLevelDecorations();
         }
     }
-   
+
+    class RoomType1 : Room
+    {
+        public RoomType1(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
+
+            addBlock(new ObjectRock(blockWidth, blockHeight), 0, 0);
+            addBlock(new ObjectRock(blockWidth, blockHeight), bWidth - 1, 0);
+            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));
+        }
+    }
+
+    class RoomType2 : Room
+    {
+        public RoomType2(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
+
+            for (int i = 0; i < 4; i++)
+            {
+                addBlock(new ObjectRock(blockWidth, blockHeight), 1, 1 + i, new Vector(0, -50));
+            }
+
+            for (int i = 0; i < 4; i++)
+            {
+                addBlock(new ObjectRock(blockWidth, blockHeight), 8, 1 + i, new Vector(0, -50));
+            }
+        }
+    }
+
+    class RoomType3 : Room
+    {
+        public RoomType3(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
+
+            for (int i = 0; i < 4; i++)
+            {
+                addBlock(new ObjectRock(blockWidth, blockHeight), i, 1);
+            }
+
+            for (int i = 0; i < 4; i++)
+            {
+                addBlock(new ObjectRock(blockWidth, blockHeight), i, 4);
+            }
+
+            for (int i = 0; i < 4; i++)
+            {
+                addBlock(new ObjectRock(blockWidth, blockHeight), i + 6, 1);
+            }
+
+            for (int i = 0; i < 4; i++)
+            {
+                addBlock(new ObjectRock(blockWidth, blockHeight), i + 6, 4);
+            }
+        }
+    }
+
+    class RoomType4 : Room
+    {
+        public RoomType4(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
+
+            for (int y = 1; y < bHeight; y++)
+            {
+                for (int x = 1; x < bWidth - 1; x++)
+                {
+                    if (x % 2 != 0 && y % 2 != 0)
+                        addBlock(new ObjectRock(blockWidth, blockHeight), x, y, new Vector(40, 0));
+                }
+            }
+        }
+    }
+
+    class RoomType5 : Room
+    {
+        public RoomType5(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
+
+            for (int y = 0; y < 3; y++)
+            {
+                for (int x = 0; x < 3; x++)
+                {
+                    addBlock(new ObjectRock(blockWidth, blockHeight), x + 3, y + 1, new Vector(30, -20));
+                }
+            }
+
+            deleteBlock(bWidth / 2 - 1, bHeight / 2);
+        }
+    }
+
+    class RoomType6 : Room
+    {
+        public RoomType6(TheDungeonGame game, Vector pos, Vector size, double thickness)
+            : base(game, pos, size, thickness)
+        {
+        }
+
+        public override void initRoom()
+        {
+            createLevelDecorations();
+
+            for (int i = 0; i < 5; i++)
+            {
+                int bx = RandomGen.NextInt(bWidth);
+                int by = RandomGen.NextInt(bHeight);
+                addBlock(new ObjectRock(blockWidth, blockHeight), bx, by);
+            }
+        }
+    }
+
+    class RoomCreator
+    {
+        public static Room createRoom(TheDungeonGame game, Vector pos, Vector size, double thickness, int room)
+        {
+            Room result = null;
+            if (room == 0)
+                result = new EmptyRoom(game, pos, size, thickness);
+            else if (room == 1)
+                result = new RoomType1(game, pos, size, thickness);
+            else if (room == 2)
+                result = new RoomType2(game, pos, size, thickness);
+            else if (room == 3)
+                result = new RoomType3(game, pos, size, thickness);
+            else if (room == 4)
+                result = new RoomType4(game, pos, size, thickness);
+            else if (room == 5)
+                result = new RoomType5(game, pos, size, thickness);
+            else if (room == 6)
+                result = new RoomType6(game, pos, size, thickness);
+
+            return result;
+        }
+    }
 }

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

@@ -46 +46 @@
         generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
         generator.generateRandomLevel(5, 10);
+        generator.initDungeon();
         generator.buildDungeon();
         Room centerRoom = generator.getRoomAt((int)(generator.CenterRoom.X), (int)(generator.CenterRoom.Y));
@@ -128 +129 @@
         player.Position = generator.getRoomAt(generator.CenterRoom).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
         player.currentRoom = generator.getRoomAt(generator.CenterRoom);
-        Add(player, 1);
+        Add(player, 2);
     }
 
@@ -136 +137 @@
         generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
         generator.generateRandomLevel(10, 15);
+        generator.initDungeon();
         generator.buildDungeon();
         player.currentRoom = generator.getRoomAt(generator.CenterRoom);

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

@@ -113 +113 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CollisionGroups.cs" />
     <Compile Include="Entity.cs" />
     <Compile Include="EntityTemplates.cs" />
@@ -119 +120 @@
     <Compile Include="ItemEntity.cs" />
     <Compile Include="LevelGenerator.cs" />
+    <Compile Include="ObjectRock.cs" />
     <Compile Include="Room.cs" />
     <Compile Include="Player.cs" />

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGameContent/TheDungeonGameContent.contentproj

@@ -91 +91 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="objects\rock.png">
+      <Name>rock</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.