Fixed 2.0 program names

smartboyathome · May 21, 2013 · 42b1302 · 42b1302
1 parent 5542787
commit 42b1302
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Haxxit.MonoGame/GameStates/SpawnDialogGameState.cs b/Haxxit.MonoGame/GameStates/SpawnDialogGameState.cs
@@ -69,31 +69,31 @@ public override void SubscribeAll()
 
         private void OnScrollUp(DrawableRectangle rectangle)
         {
-            if (currentScrollLevel < totalPrograms - 4)
+            if (currentScrollLevel > 0)
             {
                 foreach (KeyValuePair<Haxxit.Programs.ProgramFactory, DrawableRectangle> pair in program_rectangles)
                 {
                     DrawableRectangle program_rectangle = pair.Value;
                     Rectangle area = program_rectangle.Area;
-                    area.Y -= 72;
+                    area.Y += 72;
                     program_rectangle.Area = area;
                 }
-                currentScrollLevel++;
+                currentScrollLevel--;
             }
         }
 
         private void OnScrollDown(DrawableRectangle rectangle)
         {
-            if (currentScrollLevel > 0)
+            if (currentScrollLevel < totalPrograms - 4)
             {
                 foreach (KeyValuePair<Haxxit.Programs.ProgramFactory, DrawableRectangle> pair in program_rectangles)
                 {
                     DrawableRectangle program_rectangle = pair.Value;
                     Rectangle area = program_rectangle.Area;
-                    area.Y += 72;
+                    area.Y -= 72;
                     program_rectangle.Area = area;
                 }
-                currentScrollLevel--;
+                currentScrollLevel++;
             }
         }
 
@@ -174,11 +174,11 @@ public override void Draw(SpriteBatch sprite_batch)
             }
             if (currentScrollLevel > 0)
             {
-                sprite_batch.DrawString(arial_16px_regular, "...", new Vector2(popup_window.Area.X + 10, popup_window.Area.Y + popup_window.Area.Height - 30), Color.White);
+                sprite_batch.DrawString(arial_16px_regular, "...", new Vector2(popup_window.Area.X + 10, popup_window.Area.Y + 20), Color.White);
             }
             if (currentScrollLevel < totalPrograms - 4)
             {
-                sprite_batch.DrawString(arial_16px_regular, "...", new Vector2(popup_window.Area.X + 10, popup_window.Area.Y + 20), Color.White);
+                sprite_batch.DrawString(arial_16px_regular, "...", new Vector2(popup_window.Area.X + 10, popup_window.Area.Y + popup_window.Area.Height - 30), Color.White);
             }
         }
     }

diff --git a/Haxxit.MonoGame/Programs/Player/Hacker2.cs b/Haxxit.MonoGame/Programs/Player/Hacker2.cs
@@ -15,7 +15,7 @@ public Hacker2Factory()
             Size = 5;
             SpawnWeight = 30;
             ProgramCost = 1250;
-            TypeName = "Hacker 2.0";
+            TypeName = "Hacker2";
             List<Command> commands = new List<Command>();
             commands.Add(new DamageCommand("Crack 2.0", "Deletes 3 cells from target.", 3, 1));
             Commands = commands;

diff --git a/Haxxit.MonoGame/Programs/Player/Sniper2.cs b/Haxxit.MonoGame/Programs/Player/Sniper2.cs
@@ -15,7 +15,7 @@ public Sniper2Factory()
             Size = 3;
             SpawnWeight = 15;
             ProgramCost = 1000;
-            TypeName = "Sniper 2.0";
+            TypeName = "Sniper2";
             List<Command> commands = new List<Command>();
             commands.Add(new DamageCommand("Snipe 2.0", "Deletes 2 cells from target.", 2, 3));
             Commands = commands;

diff --git a/Haxxit.MonoGame/Programs/Player/Trojan2.0.cs → Haxxit.MonoGame/Programs/Player/Trojan2.cs b/Haxxit.MonoGame/Programs/Player/Trojan2.0.cs → Haxxit.MonoGame/Programs/Player/Trojan2.cs
@@ -15,7 +15,7 @@ public Trojan2Factory()
             Size = 1;
             SpawnWeight = 20;
             ProgramCost = 1500;
-            TypeName = "Trojan 2.0";
+            TypeName = "Trojan2";
             List<Command> commands = new List<Command>();
             commands.Add(new DamageCommand("Breach 2.0", "Deletes 3 cells from target.", 3, 1));
             Commands = commands;