Changeset 6260 for 2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher

Timestamp:

2015-06-24 14:53:22 (6 years ago)

Author:

rapelton

Message:

 

Location:

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher

Files:

• DungeonClasher.cs (modified) (11 diffs)
• DungeonClasher.csproj.Debug.cachefile (modified) (1 diff)
• bin/x86/Debug/Content/kentta6.txt (modified) (1 diff)
• bin/x86/Debug/Content/kentta6.xnb (modified) (previous)
• bin/x86/Debug/DungeonClasher.exe (modified) (previous)
• bin/x86/Debug/DungeonClasher.pdb (modified) (previous)
• obj/x86/Debug/ContentPipeline-{9E8A5BF1-0124-4B72-B960-7241168C215B}.xml (modified) (1 diff)
• obj/x86/Debug/DungeonClasher.csproj.FileListAbsolute.txt (modified) (1 diff)
• obj/x86/Debug/DungeonClasher.exe (modified) (previous)
• obj/x86/Debug/DungeonClasher.pdb (modified) (previous)
• obj/x86/Debug/cachefile-{9E8A5BF1-0124-4B72-B960-7241168C215B}-targetpath.txt (modified) (1 diff)

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher/DungeonClasher.cs

@@ -9 +9 @@
 class mob : PhysicsObject
 {
-    private IntMeter elamaLaskuri = new IntMeter(3, 0, 3);
+    private IntMeter elamaLaskuri = new IntMeter(50,0, 50);
     public IntMeter ElamaLaskuri { get { return elamaLaskuri; } }
 
@@ -26 +26 @@
 {
     Image tiiliskivi = LoadImage("Tiiliskivi");
+    Image miekkaKuva = LoadImage("Miekka");
     PlatformCharacter pelaaja;
     PhysicsObject miekka;
-
-    private IntMeter elamaLaskuri = new IntMeter(10, 0, 10);
+    
+    
+
+    private IntMeter elamaLaskuri = new IntMeter(20, 0, 20);
 
     int kenttaNro = 1;
@@ -38 +41 @@
     public override void Begin()
     {
-
+        SmoothTextures = false;
         
         LuoKentta();
@@ -64 +67 @@
         ruudut.SetTileMethod('*', LisaaLattia);
         ruudut.SetTileMethod('P', LuoPelaaja);
+        ruudut.SetTileMethod('B', LuoBossi);
+        ruudut.SetTileMethod('k', LisaaKallio);
         ruudut.Execute(40, 40);
 
@@ -85 +90 @@
         Keyboard.Listen(Key.Right, ButtonState.Released, PysaytaPelaaja, null, new Vector());
         Keyboard.Listen(Key.A, ButtonState.Pressed, IskeMiekalla, null);
-        //Keyboard.Listen(Key.A, ButtonState.Released, TuhoaMiekka, null);
+      
 
     }
@@ -121 +126 @@
         {
             //darkKnight
-            Hirvio = new mob(40, 120);
+            Hirvio = new mob(128, 128);
             Hirvio.Elamat = 3;
             Hirvio.Shape = Shape.Rectangle;
@@ -169 +174 @@
 
     }
+
+    void LisaaKallio(Vector paikka, Double leveys, Double korkeus)
+    {
+        PhysicsObject kallio = PhysicsObject.CreateStaticObject(leveys, korkeus);
+        kallio.Position = paikka;
+        kallio.Color = Color.HotPink;
+        Add(kallio);
+    }
+
+    void LuoBossi(Vector paikka, Double leveys, double korkeus)
+    {
+        mob Boss = new mob(150, 150);
+        Boss.Position = paikka;
+        Boss.Elamat = 75;
+        Boss.Shape = Shape.Rectangle;
+        Boss.Color = Color.Pink;
+        Boss.Y -= 20 - Boss.Height * 0.5;
+        
+        Boss.MaxAngularVelocity = 0;
+        Boss.MaxVelocity = 1000;
+
+        Boss.Tag = "Boss";
+        Boss.Tag = "Enimy";
+
+
+        Add(Boss);
+
+        
+
+        FollowerBrain seuraajaAivo = new FollowerBrain(pelaaja);
+        seuraajaAivo.Speed = 100;
+
+        Boss.Brain = seuraajaAivo;
+        seuraajaAivo.StopWhenTargetClose = true;
+        seuraajaAivo.Active = true;
+
+        
+      
+    
+}
     void LuoPelaaja(Vector paikka, Double leveys, Double korkeus)
     {
@@ -192 +237 @@
 
         AddCollisionHandler(pelaaja, "Enimy", PelaajaOsui);
+        AddCollisionHandler(pelaaja, "Boss", PelaajaOsuiBossiin);
 
     }
@@ -198 +244 @@
         elamaLaskuri.Value -= RandomGen.SelectOne(1, 2, 3, 4);
 
-
-    }
+    }
+    void PelaajaOsuiBossiin(PhysicsObject pelaaja, PhysicsObject kohdde)
+    {
+        elamaLaskuri.Value -= RandomGen.SelectOne(2, 3, 5, 7, 9);
+    
+    }
+
     void IskeMiekalla()
     {
@@ -205 +256 @@
         {
             miekkaEsille = true;
-            miekka = new PhysicsObject(70, 20);
+            miekka = new PhysicsObject(70, 64);
             miekka.X = pelaaja.X + pelaaja.Width / 2;
+            miekka.Image = miekkaKuva;
             miekka.IgnoresCollisionResponse = true;
             miekka.IgnoresGravity = true;
@@ -229 +281 @@
     {
         mob vihu = vihollinen as mob;
-        int pudotus = RandomGen.NextInt(5);
+        int pudotus = RandomGen.NextInt(10);
         vihu.ElamaLaskuri.Value -= pudotus;
     }

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher/DungeonClasher.csproj.Debug.cachefile

@@ -6 +6 @@
 Content\kentta5.xnb
 Content\kentta6.xnb
+Content\Miekka.xnb
+Content\Ritari.xnb
 Content\kentta1.txt
 Content\kentta2.txt

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher/bin/x86/Debug/Content/kentta6.txt

@@ -8 +8 @@
 ...............................................
 ...............................................
-.P....................B........................
+...............................................
+...............................................
+...............................................
+.P............................................B
 ***********************************************

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher/obj/x86/Debug/ContentPipeline-{9E8A5BF1-0124-4B72-B960-7241168C215B}.xml

@@ -63 +63 @@
       <Options>None</Options>
       <Output>C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\kentta6.xnb</Output>
-      <Time>2015-06-24T11:32:26.4526062+03:00</Time>
+      <Time>2015-06-24T13:42:24.3553564+03:00</Time>
+    </Item>
+    <Item>
+      <Source>Miekka.png</Source>
+      <Name>Miekka</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\Miekka.xnb</Output>
+      <Time>2015-06-24T12:32:11.4715564+03:00</Time>
+    </Item>
+    <Item>
+      <Source>Ritari.png</Source>
+      <Name>Ritari</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\Ritari.xnb</Output>
+      <Time>2015-06-24T14:38:31.5025564+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher/obj/x86/Debug/DungeonClasher.csproj.FileListAbsolute.txt

@@ -30 +30 @@
 C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\kentta5.txt
 C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\kentta6.txt
+C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\Miekka.xnb
+C:\MyTemp\RasmusP\Hi\DungeonClasher\DungeonClasher\DungeonClasher\bin\x86\Debug\Content\Ritari.xnb

2015/26/RasmusP/DungeonClasher/DungeonClasher/DungeonClasher/obj/x86/Debug/cachefile-{9E8A5BF1-0124-4B72-B960-7241168C215B}-targetpath.txt

@@ -6 +6 @@
 Content\kentta5.xnb
 Content\kentta6.xnb
+Content\Miekka.xnb
+Content\Ritari.xnb
 Content\kentta1.txt
 Content\kentta2.txt