Changeset 3517 for 2012

Timestamp:

2012-07-03 23:13:34 (9 years ago)

Author:

dezhidki

Message:

 

Location:

2012/27/DenisZ/TheDungeonGame

Files:

• Pics (added)
• Pics/Dark-Wood-Texture-9.jpg (added)
• Pics/Floor-Ceramic-Tiles.jpg (added)
• Pics/brickcorner.png (added)
• Pics/door-3.jpg (added)
• Pics/levelpreview.jpg (added)
• Pics/robot-13_new.gif (added)
• TheDungeonGame/TheDungeonGame/LevelGenerator.cs (modified) (2 diffs)
• TheDungeonGame/TheDungeonGame/Room.cs (modified) (1 diff)
• TheDungeonGame/TheDungeonGame/TheDungeonGame.cs (modified) (3 diffs)

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

@@ -60 +60 @@
                 if (room == 0)
                 {
-                    lastRoom = new TestRoom(game, VecMath.mul(CenterRoom, new Vector(TheDungeonGame.ROOMWIDTH, -(TheDungeonGame.ROOMHEIGHT))), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS);
+                    lastRoom = new TestRoom(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;
@@ -100 +100 @@
         {
             if (getRoomFromDirection(lastRoom, dir) != null) return false;
-            currentRoom = new TestRoom(game, VecMath.mul(pos, new Vector(TheDungeonGame.ROOMWIDTH, -TheDungeonGame.ROOMHEIGHT)), TheDungeonGame.roomSize, TheDungeonGame.ROOMTHICKNESS);
+            currentRoom = new TestRoom(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

@@ -90 +90 @@
         {
             PhysicsObject wallTop = createWall(Position, width + thickness, thickness);
+            wallTop.Color = Color.Blue;
             PhysicsObject wallLeft = createWall(VecMath.sub(Position, new Vector(0, thickness)), thickness, height);
+            wallLeft.Color = Color.Red;
             PhysicsObject wallDown = createWall(VecMath.sub(Position, new Vector(0, height)), width + thickness, thickness);
             wallDown.Color = Color.Black;

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

@@ -29 +29 @@
 
         generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
-        generator.generateRandomLevel(1, 10);
+        generator.generateRandomLevel(10, 15);
         generator.buildDungeon();
 
         player = new Player(this, Vector.Zero);
         Add(player, 1);
+      //  Camera.Follow(player);
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Lopeta peli");
@@ -43 +44 @@
         generator.destroyDungeon();
         generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
-        generator.generateRandomLevel(1, 10);
+        generator.generateRandomLevel(10, 15);
         generator.buildDungeon();
     }
 
+    int errorAmount = 0;
     protected override void Update(Time time)
     {
@@ -55 +57 @@
         catch (FormatException) // Kaatuu tähän melkein kokoajan kun yrittää luoda tasoa. Mun koodi liian "likainen", tai hidas?
         {
+            if (errorAmount > 50)
+            {
+                regenerateLevel();
+                errorAmount = 0;
+            }
+            errorAmount++;
             return; // Skipataan "virheelisiä" tickea ja huijataan peliä niin kuin pahat merimiehet (dirty pirates, Arr)
         }