Changeset 3547

Timestamp:

2012-07-04 14:58:39 (11 years ago)

Author:

dezhidki

Message:

Added new Entity things

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame

Files:

• Room.cs (modified) (4 diffs)
• TheDungeonGame.cs (modified) (4 diffs)
• TheDungeonGame.csproj (modified) (2 diffs)

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

@@ -5 +5 @@
 using Jypeli;
 using MathHelper;
+using Entity;
 
 namespace Rooms
@@ -24 +25 @@
         public Vector PosOnGrid { get; set; }
         public PhysicsObject wall;
+        public int EntityAmount { get; set; }
 
         public Room(TheDungeonGame game, Vector pos, Vector size, double thickness)
@@ -96 +98 @@
         }
 
+        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++;
+            ent.Left = insidePos.X + (bx * blockWidth);
+            ent.Top = insidePos.Y * (by * blockHeight);
+            insideObjects[bx, by] = ent;
+        }
+
 
         // En vitsinyt käyttää enempää aikaa tämän parantamiseksi. Helppo ja toimiva
         public void addDoors()
         {
-         //   if (directions.Length > 4) throw new ArgumentException("Argument's length must be 4!");
-
             for (int i = 0; i < 4; i++)
             {
@@ -142 +151 @@
                     doors[i] = door;
                 }
-                   
+
             }
         }

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

@@ -36 +36 @@
         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);
-      //  Camera.Zoom(0.5);
 
         player = new Player(this, Vector.Zero);
@@ -57 +56 @@
     {
         cameraPosMission = pos;
-        cameraVelocity = pos * 1.5 ;
+        cameraVelocity = pos * 1.5;
         moveCamera = true;
     }
@@ -65 +64 @@
         Camera.Velocity = cameraVelocity;
         Vector remainingLenght = Camera.Position - newPos;
-        Console.WriteLine(Math.Abs(remainingLenght.X)+", " + Math.Abs(remainingLenght.Y));
+        // Console.WriteLine(Math.Abs(remainingLenght.X)+", " + Math.Abs(remainingLenght.Y));
         if (Math.Abs((int)remainingLenght.X) < 20 && Math.Abs((int)remainingLenght.Y) < 20)
         {
@@ -74 +73 @@
             moveCamera = false;
         }
-        
+
     }
 

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

@@ -113 +113 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Entity.cs" />
+    <Compile Include="EntityTemplates.cs" />
     <Compile Include="LevelGenerator.cs" />
     <Compile Include="Room.cs" />
@@ -118 +120 @@
     <Compile Include="MathHelper.cs" />
     <Compile Include="Ohjelma.cs" />
-    <Compile Include="TestRoom.cs" />
+    <Compile Include="RoomTemplates.cs" />
     <Compile Include="TheDungeonGame.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />