Changeset 3640

Timestamp:

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

Author:

dezhidki

Message:

Talletus.

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame

Files:

• TheDungeonGame/Item.cs (modified) (1 diff)
• TheDungeonGame/ItemEntity.cs (modified) (1 diff)
• TheDungeonGame/ItemTemplates.cs (added)
• TheDungeonGame/Room.cs (modified) (2 diffs)
• TheDungeonGame/RoomTemplates.cs (modified) (4 diffs)
• TheDungeonGame/TheDungeonGame.cs (modified) (2 diffs)
• TheDungeonGame/TheDungeonGame.csproj (modified) (1 diff)
• TheDungeonGameContent/TheDungeonGameContent.contentproj (modified) (1 diff)
• TheDungeonGameContent/objects/ammo_damage.png (added)
• TheDungeonGameContent/objects/ammo_speed.png (added)
• TheDungeonGameContent/objects/healthcan.png (added)
• TheDungeonGameContent/sound/item_pickup.wav (added)

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

@@ -28 +28 @@
        public virtual void onPickup(Player picker)
        {
-           picker.ItemInInventory = this;
-           picker.updateGuiImage();
+           //picker.ItemInInventory = this;
+           //picker.updateGuiImage();
        }
 
        public ItemEntity createWorldObject()
        {
-           ItemEntity result = new ItemEntity(this);
+           ItemEntity result = new ItemEntity(this, itemTexture.Width/4, itemTexture.Height/4);
            result.Image = itemTexture;
            result.Tag = "Item";

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

@@ -12 +12 @@
        public Item bindedItem;
 
-       public ItemEntity(Item item)
-           : base(40, 40, Shape.Rectangle)
+       public ItemEntity(Item item, double width, double height)
+           : base(width, height, Shape.Rectangle)
        {
            Tag = "Item";

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

@@ -61 +61 @@
                 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))
-
-            //}
+        }
+
+        public void spawnRandomItems(int itemAmount)
+        {
+            int itemsSpawned = 0;
+            while (itemsSpawned < itemAmount)
+            {
+                ItemEntity item = RoomCreator.getItem(RandomGen.NextInt(1)).createWorldObject();
+                if (!addBlock(item, RandomGen.NextInt(bWidth - 2) + 1, RandomGen.NextInt(bHeight - 2) + 1))
+                    continue;
+                itemsSpawned++;
+            }
         }
 
@@ -191 +197 @@
         }
 
-        public void addBlock(IPhysicsObject obj, int bx, int by)
-        {
-            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0 || insideObjects[bx, by] != null) return;
+        public bool addBlock(IPhysicsObject obj, int bx, int by)
+        {
+            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0 || insideObjects[bx, by] != null) return false;
             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);
+            return true;
+        }
+
+        public bool addBlock(IPhysicsObject obj, int bx, int by, Vector offset)
+        {
             obj.Position += offset;
+            return addBlock(obj, bx, by);
+            
         }
 

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

@@ -7 +7 @@
 using MathHelper;
 using Entity;
+using Items;
 
 namespace Rooms
@@ -20 +21 @@
         {
             createLevelDecorations();
-
-           
+            spawnRandomItems(1);
         }
     }
@@ -221 +221 @@
             if (id == 0)
                 ent = new EntityFly((TheDungeonGame)TheDungeonGame.Instance, Vector.Zero, new Vector(50, 50), Shape.Circle);
-            else if(id == 1)
+            else if (id == 1)
                 ent = new EntityZombie((TheDungeonGame)TheDungeonGame.Instance, Vector.Zero, new Vector(60, 60), Shape.Rectangle);
-            else if(id == 2)
+            else if (id == 2)
                 ent = new EntityDerpFace((TheDungeonGame)TheDungeonGame.Instance, Vector.Zero, new Vector(60, 60), Shape.Circle);
-            else if(id == 3)
+            else if (id == 3)
                 ent = new EntityDerpFly((TheDungeonGame)TheDungeonGame.Instance, Vector.Zero, new Vector(50, 50), Shape.Circle);
             //else if(id == 4)
@@ -231 +231 @@
             return ent;
         }
+
+        public static Item getItem(int id)
+        {
+            Item item = null;
+            if (id == 0)
+                item = new ItemHealth();
+
+            return item;
+        }
     }
 }

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

@@ -87 +87 @@
         soundEffects.Add(LoadSoundEffect("sound/bug_hit"));
         soundEffects.Add(LoadSoundEffect("sound/zombie_hit"));
+        soundEffects.Add(LoadSoundEffect("sound/item_pickup"));
     }
 
@@ -104 +105 @@
         objectTextures.Add(LoadImage("objects/door_opened"));
         objectTextures.Add(LoadImage("objects/bossdoor"));
+        objectTextures.Add(LoadImage("objects/healthcan"));
+        objectTextures.Add(LoadImage("objects/ammo_speed"));
+        objectTextures.Add(LoadImage("objects/ammo_damage"));
     }
 

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

@@ -128 +128 @@
     <Compile Include="Ohjelma.cs" />
     <Compile Include="RoomTemplates.cs" />
-    <Compile Include="TestItem.cs" />
+    <Compile Include="ItemTemplates.cs" />
     <Compile Include="TheDungeonGame.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -291 +291 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="sound\item_pickup.wav">
+      <Name>item_pickup</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SoundEffectProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="objects\ammo_damage.png">
+      <Name>ammo_damage</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="objects\ammo_speed.png">
+      <Name>ammo_speed</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="objects\healthcan.png">
+      <Name>healthcan</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.