Changeset 4382 for 2012

Timestamp:

2013-07-03 10:21:10 (10 years ago)

Author:

nivikinn

Message:

Talletus.

Location:

2012/27/NikoKi/EpicTankBattle/EpicTankBattle

Files:

• EpicTankBattle/EpicTankBattle.cs (modified) (5 diffs)
• EpicTankBattleContent/Maapera.png (modified) (previous)

2012/27/NikoKi/EpicTankBattle/EpicTankBattle/EpicTankBattle/EpicTankBattle.cs

@@ -141 +141 @@
         LuoTankit();
         MultiSelectWindow P1VariValikko = new MultiSelectWindow("Valitse Pelaaja 1 väri",
-        "Punainen", "Vihreä", "Sininen", "Keltainen", "Valkoinen", "Musta");
+        "Vihreä", "Punainen", "Sininen", "Keltainen", "Valkoinen", "Musta");
         Add(P1VariValikko);
         P1VariValikko.ItemSelected += PainettiinP1VariValikonNappia;
@@ -150 +150 @@
         {
             case 0:
-                P1.Image = LoadImage("Punainentankki");
+                P1.Image = LoadImage("Vihreatankki");
                 P1tykki.Image = LoadImage("Tykki");
                 Tankki2VariValikko();
                 break;
             case 1:
-                P1.Image = LoadImage("Vihreatankki");
+                P1.Image = LoadImage("Punainentankki");
                 P1tykki.Image = LoadImage("Tykki");
                 Tankki2VariValikko();
@@ -185 +185 @@
     {
         MultiSelectWindow P2VariValikko = new MultiSelectWindow("Valitse Pelaaja 2 väri",
-        "Punainen", "Vihreä", "Sininen", "Keltainen", "Valkoinen", "Musta");
+        "Vihreä", "Punainen", "Sininen", "Keltainen", "Valkoinen", "Musta");
         Add(P2VariValikko);
         P2VariValikko.ItemSelected += PainettiinP2VariValikonNappia;
@@ -194 +194 @@
         {
             case 0:
+                P2.Image = LoadImage("Vihreatankki");
+                P2tykki.Image = LoadImage("Tykki");
+                break;
+            case 1:
                 P2.Image = LoadImage("Punainentankki");
-                P2tykki.Image = LoadImage("Tykki");
-                break;
-            case 1:
-                P2.Image = LoadImage("Vihreatankki");
                 P2tykki.Image = LoadImage("Tykki");
                 break;
@@ -595 +595 @@
     void Nappaimisto()
     {
-        Vector vasemmalle = new Vector(-1400, 1500);
-        Vector oikealle = new Vector(1400, 1500);
-        Vector hyppy = new Vector(0, 20000);
+        Vector vasemmalle = new Vector(-1400, 1400);
+        Vector oikealle = new Vector(1400, 1400);
+        Vector hyppy = new Vector(0, 25000);
 
         Keyboard.Listen(Key.A, ButtonState.Down, LiikutaP1, null, P1, vasemmalle);