Changeset 6756 for 2015/27/EemilI

Timestamp:

2015-07-02 14:50:11 (8 years ago)

Author:

eemikone

Message:

peli lähes valmis

Location:

2015/27/EemilI/infected - Copy/infected

Files:

• infected/infected.cs (modified) (6 diffs)
• infected/obj/x86 (added)
• infected/obj/x86/Debug (added)
• infected/obj/x86/Debug/ContentPipeline-{B898C966-80ED-44D3-9FBA-1E981C2850D4}.xml (added)
• infected/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (added)
• infected/obj/x86/Debug/Microsoft.Xna.Framework.RuntimeProfile.txt (added)
• infected/obj/x86/Debug/TempPE (added)
• infected/obj/x86/Debug/cachefile-{B898C966-80ED-44D3-9FBA-1E981C2850D4}-targetpath.txt (added)
• infected/obj/x86/Debug/infected.csproj.FileListAbsolute.txt (added)
• infected/obj/x86/Debug/infected.csprojResolveAssemblyReference.cache (added)
• infected/obj/x86/Debug/infected.exe (added)
• infected/obj/x86/Debug/infected.exe.r6686 (added)
• infected/obj/x86/Debug/infected.exe.r6720 (added)
• infected/obj/x86/Debug/infected.pdb (added)
• infected/obj/x86/Debug/infected.pdb.r6686 (added)
• infected/obj/x86/Debug/infected.pdb.r6720 (added)
• infectedContent/mappi.png (modified) (previous)

2015/27/EemilI/infected - Copy/infected/infected/infected.cs

@@ -40 +40 @@
         mies.CollisionIgnoreGroup = 3;
 
-        ase = new AssaultRifle(1, 1);
+        ase = new AssaultRifle(50,6);
+        ase.Image = asekuva;
+        ase.Position= new Vector(25, 15);
         ase.InfiniteAmmo = true;
         mies.Add(ase);
@@ -86 +88 @@
         Keyboard.Listen(Key.D, ButtonState.Down, LiikutaPelaajaa, null, 3000.0, 3);
         Keyboard.Listen(Key.A, ButtonState.Down, LiikutaPelaajaa, null, 3000.0, 4);
+        Keyboard.Listen(Key.D1, ButtonState.Pressed, VaihdaAse, "Ota pistooli esille", "pistooli");
+        Keyboard.Listen(Key.E, ButtonState.Pressed, kauppa, "Avaa kaupan");
         Mouse.ListenMovement(0.0, Tahtays, null);
         Mouse.IsCursorVisible = true;
@@ -172 +176 @@
         Label kohta1 = new Label("Aloita uusi peli");
         kohta1.Position = new Vector(0, 40);
+        kohta1.Color = Color.White;
         valikonKohdat.Add(kohta1);
 
@@ -178 +183 @@
         Label kohta2 = new Label("Poistu");
         kohta2.Position = new Vector(0, -40);
+        kohta2.Color = Color.White;
         valikonKohdat.Add(kohta2);
 
         Level.Background.Color = Color.Black;
         Level.Background.Image = valikkokuva;
-        Camera.Zoom (1.75);
+        Camera.Zoom (1.65);
 
         foreach (Label valikonKohta in valikonKohdat)
@@ -296 +302 @@
                     if (RandomGen.NextInt(0, 100) > 70)
                     {
+                        pistelaskuri.Value += RandomGen.NextInt(1, 10);
                         b.Destroy();
                     }
@@ -318 +325 @@
         Add(taso);
     }
-
+    void kauppa()
+    {
+        IsPaused = true;
+        MultiSelectWindow kauppa = new MultiSelectWindow("Kauppa", "haulikko 250$", "Exit");
+        kauppa.AddItemHandler(0, delegate
+        {
+            if (pistelaskuri.Value >= 1)
+            {
+                pistelaskuri.Value -= 1;
+                Keyboard.Listen(Key.D2, ButtonState.Pressed, VaihdaAse, "Ota haulikko esille", "haulikko");
+            }
+            IsPaused = false;
+        });
+        
+        kauppa.AddItemHandler(1, delegate
+        {
+            IsPaused = false;
+        });
+        Add(kauppa);
+    }
 }