Changeset 8999

Timestamp:

2017-07-07 11:51:53 (6 years ago)

Author:

npo17_40

Message:

 

Location:

2017/27/EeliN/Selviytyja

Files:

• .vs/Selviytyja/v14/.suo (modified) (previous)
• Selviytyja/Selviytyja/Selviytyja.cs (modified) (17 diffs)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/Apple_0.xnb (added)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/PlayerHitRight_0.xnb (added)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/PlayerHitRight_1.xnb (added)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/StatsBar_0.xnb (added)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/StoneItem_0.xnb (added)
• Selviytyja/Selviytyja/bin/x86/Debug/Content/ToolBar_0.xnb (modified) (previous)
• Selviytyja/Selviytyja/bin/x86/Debug/Selviytyja.exe (modified) (previous)
• Selviytyja/Selviytyja/bin/x86/Debug/Selviytyja.pdb (modified) (previous)
• Selviytyja/Selviytyja/obj/x86/Debug/ContentPipeline-{3B3FCF0A-DF81-4674-AF8D-360E80F14224}.xml (modified) (1 diff)
• Selviytyja/Selviytyja/obj/x86/Debug/Selviytyja.exe (modified) (previous)
• Selviytyja/Selviytyja/obj/x86/Debug/Selviytyja.pdb (modified) (previous)
• Selviytyja/SelviytyjaContent/Apple_0.png (added)
• Selviytyja/SelviytyjaContent/PlayerHitRight_0.png (added)
• Selviytyja/SelviytyjaContent/PlayerHitRight_1.png (added)
• Selviytyja/SelviytyjaContent/StatsBar_0.png (added)
• Selviytyja/SelviytyjaContent/StoneItem_0.png (added)
• Selviytyja/SelviytyjaContent/ToolBar_0.png (modified) (previous)

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/Selviytyja.cs

@@ -21 +21 @@
     public Image stoneimg = LoadImage("Stone_0");
     public Image appleimg = LoadImage("Apple_0");
+    Drop valittuEsine = null;
 
     public Image stoneitemimg = LoadImage("StoneItem_0");
@@ -64 +65 @@
         ukko.PlayerImageLeft = Image.Mirror(idleRight.Clone());
         ukko.PlayerImage = ukko.PlayerImageRight;
-        ukko.Tag = "";
+        ukko.Tag = "ukko";
+        AddCollisionHandler(ukko, "drop", PelaajatTormaavat);
         //idleLeft = Image.Mirror(idleRight);
         //playerWalkL = playerWalkR;
@@ -98 +100 @@
         stone.Image = stoneitemimg;
         apple.Image = appleimg;
+        wood.Tag = "wood";
         //-------------------------------//
 
@@ -146 +149 @@
             menu.IsVisible = false;
             menuopened = false;
-            Mouse.IsCursorVisible = false;
+            //Mouse.IsCursorVisible = false;
             foreach (GameObject nappi in menubuttonit) nappi.Color = Color.Transparent;
             FadeRuutu(false);
@@ -252 +255 @@
     void KuunteleLiiketta(AnalogState hiirentila)
     {
+        if (valittuEsine != null )
+                {
+            valittuEsine.Position = Mouse.PositionOnWorld;
+            return;
+        }
+
         if (menuopened == false)
         {
+            foreach (Slot slotti in tavaraluettelo.ruudut)
+            {
+                if (Mouse.IsCursorOn(slotti))
+                {
+                    slotti.Valittu = true;
+                }
+                else
+                {
+                    slotti.Valittu = false;
+                }
+            }
             return;
         }
@@ -307 +327 @@
         }
 
+        if (menuopened == false)
+        {
+            foreach (Slot slotti in tavaraluettelo.ruudut)
+            {
+                if (slotti.Valittu && slotti.Resurssit.Count > 0)
+                {
+                    Raahaa(slotti);
+                    return;
+                }
+
+            }
+        }
+
         if (pausegame == false)
         {
@@ -314 +347 @@
 
             List<GameObject> resurssit;
+            double verticalAttackDistance = 1.5;
+            double horizontalAttackDistance = 1.5;
+
+            
+
 
             if (ukko.PlayerRight)
             {
-                resurssit = GetObjectsBetween((ukko.Position + new Vector(ukko.Width * 0.5, ukko.Height * 0.1)), (ukko.Position + new Vector(ukko.Width * 1, ukko.Height + 10)));
+                resurssit = GetObjectsBetween((ukko.Position + new Vector(ukko.Width * 0.8, ukko.Height * 0.2)), (ukko.Position + new Vector(ukko.Width * horizontalAttackDistance, ukko.Height + verticalAttackDistance)));
                 ukko.Animation = ukko.PlayerHitR;
                 
@@ -323 +361 @@
             else
             {
-                resurssit = GetObjectsBetween((ukko.Position - new Vector(ukko.Width * 0.5, ukko.Height * 0.1)), (ukko.Position - new Vector(ukko.Width * 1, -ukko.Height - 10)));
+                resurssit = GetObjectsBetween((ukko.Position - new Vector(ukko.Width * 0.8, ukko.Height * 0.2)), (ukko.Position - new Vector(ukko.Width * horizontalAttackDistance, -ukko.Height - verticalAttackDistance)));
                 ukko.Animation = ukko.PlayerHitL;
 
@@ -346 +384 @@
 
                         Slot slotti2 = null;
-                        const int OMENAMAHDOLLISUUS = 10;
+                        const int OMENAMAHDOLLISUUS = 20;
                         if (RandomGen.NextInt(OMENAMAHDOLLISUUS+1) >= OMENAMAHDOLLISUUS) slotti2 = tavaraluettelo.LisaaResurssi(apple, 1);
                         
@@ -359 +397 @@
                     {
                         PlaySound("Hit");
-                        MessageDisplay.Add("kivi!");
+                        Stone stone = (Stone)resurssi;
 
                         Slot slotti = tavaraluettelo.LisaaResurssi(stone, RandomGen.SelectOne(1, 2));
+                        stone.ElamaLaskuri.Value -= 2;
+                        if (slotti != null) slotti.Image = stoneitemimg;
+
                         
-                        if (slotti != null) slotti.Image = stoneitemimg;
-
-                        
 
                         //inventory.AddItem(wood, woodItem, RandomGen.SelectOne(5,6,7,8,9,10));
@@ -377 +415 @@
     }
 
+    void Raahaa(Slot slotti)
+    {
+        valittuEsine = new Drop(20,40);
+        valittuEsine.Tag = "drop";
+        valittuEsine.luku = slotti.Maara;
+        valittuEsine.Resurssit = new List<GameObject>(slotti.Resurssit);
+        slotti.Maara = 0;
+        slotti.Teksti.Text = "";
+        valittuEsine.Image = slotti.Image;
+        slotti.Image = null;
+        Add(valittuEsine,3);
+        valittuEsine.Position = Mouse.PositionOnWorld;
+        slotti.Resurssit.Clear();
+        slotti.Maara = 0;
+    }
+
+    void PelaajatTormaavat(PhysicsObject tormaaja, PhysicsObject kohde)
+    {
+        Drop maatavara = (Drop)kohde;
+        Slot slotti = tavaraluettelo.LisaaResurssi(maatavara.Resurssit[0], maatavara.luku);
+        slotti.Image = kohde.Image;
+        kohde.Destroy();
+        MessageDisplay.Add("Bump!");
+    }
+
     public void HakkaaminenLoppuu(Player player)
     {
+        if (valittuEsine != null)
+        {
+            foreach(Slot slotti in tavaraluettelo.ruudut)
+            {
+                double etaisyys = (slotti.AbsolutePosition - valittuEsine.Position).Magnitude;
+                if (etaisyys < 100)
+                {
+                    slotti.Image = valittuEsine.Image;
+                    
+                    MessageDisplay.Add("slotin " + tavaraluettelo.ruudut.IndexOf(slotti) + " etäisyys hiireen " + etaisyys);
+                    
+                    slotti.Resurssit = new List<GameObject>(valittuEsine.Resurssit);
+                    slotti.Teksti.Text = slotti.Resurssit.Count.ToString();
+                    valittuEsine.luku = 0;
+                    valittuEsine.Resurssit.Clear();
+                    valittuEsine.Destroy();
+                    valittuEsine = null;
+                    foreach (Slot slotti2 in tavaraluettelo.ruudut)
+                    {
+                        if (slotti2.Resurssit.Count > 0) { 
+                        MessageDisplay.Add("slotin " + tavaraluettelo.ruudut.IndexOf(slotti2) + " tavaroita " + slotti2.Resurssit[0].Tag.ToString() + " määrä " + slotti2.Resurssit.Count);
+                    }
+                    }
+                    return;
+                }
+            }
+            valittuEsine = null;
+        }
+
         ukko.PelaajaHakkaamassa = false;
         ukko.Animation.Stop();
@@ -563 +655 @@
 
 
+
+public class Drop : PhysicsObject
+{
+    public int luku = 10;
+    public List<GameObject> Resurssit = new List<GameObject>();
+
+    public Drop(double leveys, double korkeus)
+        : base(leveys, korkeus * 0.5)
+    {
+
+    }
+
+}
 public class Tree : PhysicsObject
 {
@@ -593 +698 @@
     GameObject stonetop;
     PhysicsObject stonebottom;
+    private IntMeter elamaLaskuri = new IntMeter(15, 0, 15);
+    public IntMeter ElamaLaskuri { get { return elamaLaskuri; } }
 
     public Image TopImage
@@ -604 +711 @@
         : base(leveys, korkeus * 0.5)
     {
+        elamaLaskuri.LowerLimit += delegate { this.Destroy(); };
         stonetop = new GameObject(leveys, korkeus * 0.5);
         stonetop.Bottom = this.Top;
@@ -653 +761 @@
 {
     GameObject ruutu;
-    List<GameObject> ruudut = new List<GameObject>();
+    public List<GameObject> ruudut = new List<GameObject>();
 
 
@@ -709 +817 @@
             if (slotti.Resurssit.Count == 0)
             {
-                slotti.Resurssit.Add(resurssi);
-                slotti.Maara++;
-                slotti.Teksti.Text = slotti.Maara.ToString();
-                slotti.Image = resurssi.Image;
+                for (int i = 0; i < count; i++)
+                {
+                    slotti.Resurssit.Add(resurssi);
+                    slotti.Maara = slotti.Resurssit.Count;
+                    if (slotti.Maara > slotti.MaxMaara) slotti.Maara = slotti.MaxMaara;
+                    slotti.Teksti.Text = slotti.Maara.ToString();
+                   
+                }
                 return slotti;
             }
@@ -725 +837 @@
     public Vector initialpos;
     public int Maara = 0;
-    public int MaxMaara = 20;
+    public int MaxMaara = 255;
     public List<GameObject> Resurssit = new List<GameObject>();
+    public bool Valittu = false;
     public Slot(double leveys, double korkeus)
         : base(leveys, korkeus)

2017/27/EeliN/Selviytyja/Selviytyja/Selviytyja/obj/x86/Debug/ContentPipeline-{3B3FCF0A-DF81-4674-AF8D-360E80F14224}.xml

@@ -117 +117 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EeliN\Selviytyja\Selviytyja\Selviytyja\bin\x86\Debug\Content\ToolBar_0.xnb</Output>
-      <Time>2017-07-06T09:20:53.9465722+03:00</Time>
+      <Time>2017-07-07T09:48:34.7120975+03:00</Time>
     </Item>
     <Item>