Changeset 4643 for 2013/27

Timestamp:

2013-07-24 16:06:17 (6 years ago)

Author:

janiemit

Message:

 

Location:

2013/27/TeemuM

Files:

• Game/Game/Game/Game.cs (modified) (10 diffs)
• Game/Game/Game/Game.csproj.Debug.cachefile (modified) (1 diff)
• Game/Game/GameContent/GameContent.contentproj (modified) (1 diff)
• Game/Game/GameContent/MenuBackground0.png (added)
• Game/Game/GameContent/MenuBackground1.png (added)
• Game/Game/GameContent/buttonHighLight.png (added)
• Game/Game/GameContent/buttonNormal.png (added)
• Game/Game/GameContent/buttonPressed.png (added)
• Kingthings Spike.ttf (added)
• MenuBackground0.png (added)
• MenuBackground1.png (added)
• buttonHighLight.png (added)
• buttonNormal.png (added)
• buttonPressed.png (added)

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -18 +18 @@
     public static G game;
     Image Background = LoadImage("Ground0");
+    Image NormalButton = LoadImage("buttonNormal");
+    Image PressedButton = LoadImage("buttonPressed");
+    Image HoverButton = LoadImage("buttonHighLight");
+    Image MenuBG0 = LoadImage("MenuBackground0");
+    Image MenuBG1 = LoadImage("MenuBackground1");
+
     private IntMeter scoreboard;
     public Player player { get; private set; }
@@ -32 +38 @@
     {
         ClearAll();
-        MultiSelectWindow menu = new MultiSelectWindow("TESTMODE", "Developer tools", "Start this thing", /*"Perks",*/ "Get me out of here");
-        menu.DefaultCancel = 0;
+        MultiSelectWindow menu = new MultiSelectWindow("TESTMODE", "Developer tools", "Start this thing", "Perks", "Get me out of here");
+        menu.DefaultCancel = 3;
         menu.AddItemHandler(0, delegate() { MessageDisplay.Add("Starting game..."); StartGame(); DeveloperCommand(); });
         menu.AddItemHandler(1, StartGame);
-        //menu.AddItemHandler(2, PerkMenu);
-        menu.AddItemHandler(2, Exit);
+        menu.AddItemHandler(2, PerkMenu);
+        menu.AddItemHandler(3, Exit);  
+        
+        foreach (var button in menu.Buttons)
+        {
+            button.Image = NormalButton;
+            button.ImageHover = HoverButton;
+            button.ImagePressed = PressedButton;
+            button.ImageReleased = NormalButton;
+        }
+
         Add(menu);
     }
@@ -262 +277 @@
         menu.AddItemHandler(1, SaveAndBackToMenu);
         menu.AddItemHandler(2, Exit);
+
+        foreach (var button in menu.Buttons)
+        {
+            button.Image = NormalButton;
+            button.ImageHover = HoverButton;
+            button.ImagePressed = PressedButton;
+            button.ImageReleased = NormalButton;
+        }
+
         Add(menu);
         IsPaused = true;
@@ -271 +295 @@
         menu.DefaultCancel = 0;
         menu.AddItemHandler(0, delegate { IsPaused = false; });
+
+        foreach (var button in menu.Buttons)
+        {
+            button.Image = NormalButton;
+            button.ImageHover = HoverButton;
+            button.ImagePressed = PressedButton;
+            button.ImageReleased = NormalButton;
+        }
+
         Add(menu);
         IsPaused = true;
@@ -284 +317 @@
         menu.AddItemHandler(3, StartGame);
         menu.AddItemHandler(4, MainMenu);
+
+        foreach (var button in menu.Buttons)
+        {
+            button.Image = NormalButton;
+            button.ImageHover = HoverButton;
+            button.ImagePressed = PressedButton;
+            button.ImageReleased = NormalButton;
+        }
+
         Add(menu);
     }
@@ -296 +338 @@
         menu.AddItemHandler(3, MainMenu);
         menu.AddItemHandler(4, MainMenu);
+
+        foreach (var button in menu.Buttons)
+        {
+            button.Image = NormalButton;
+            button.ImageHover = HoverButton;
+            button.ImagePressed = PressedButton;
+            button.ImageReleased = NormalButton;
+        }
+
+
         Add(menu);
     }
 
     public void Map()
-    {    
+    {
         Level.Width = Screen.Width;
         Level.Height = Screen.Height;
@@ -313 +365 @@
         levelBorders.Right.Color = Color.Aqua;
         levelBorders.Right.IgnoresCollisionResponse = true;
-        
+
 
         Level.Background.Image = Background;
@@ -327 +379 @@
         LifeBar.BorderColor = Color.Black;
         LifeBar.BindTo(player.health);
-        Add(LifeBar);
+        Add(LifeBar, 0);
     }
 
@@ -336 +388 @@
         ClearControls();
         Keyboard.Listen(Key.Enter, ButtonState.Pressed, delegate() { MainMenu(); }, null);
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed, delegate() { Exit(); }, null);
+
         GameObject layer = new GameObject(Game.Screen.Width + 100, Game.Screen.Height + 100);
         layer.Color = Color.Transparent;
@@ -350 +404 @@
         r.X = Level.Center.X;
         r.Y = Level.Center.Y - Screen.Height / 4;
-        r.Clicked += delegate() {  MainMenu(); };
+        r.Clicked += delegate() { MainMenu(); };
+        r.Image = NormalButton;
+        r.ImageHover = HoverButton;
+        r.ImagePressed = PressedButton;
         Add(r, 1);
+
+        PushButton e = new PushButton("Exit Game");
+        e.X = Level.Center.X;
+        e.Y = Level.Center.Y - Screen.Height / 3;
+        e.Clicked += delegate() { Exit(); };
+        e.Image = NormalButton;
+        e.ImageHover = HoverButton;
+        e.ImagePressed = PressedButton;
+
+        Add(e, 1);
 
         Timer.SingleShot(1, delegate { IsPaused = true; });

2013/27/TeemuM/Game/Game/Game/Game.csproj.Debug.cachefile

@@ -25 +25 @@
 Content\Slime3.xnb
 Content\Slime4.xnb
+Content\buttonHighLight.xnb
+Content\buttonNormal.xnb
+Content\buttonPressed.xnb
+Content\MenuBackground0.xnb
+Content\MenuBackground1.xnb
 Content\Background0.wma
 Content\Background1.wma

2013/27/TeemuM/Game/Game/GameContent/GameContent.contentproj

@@ -189 +189 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="buttonHighLight.png">
+      <Name>buttonHighLight</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="buttonNormal.png">
+      <Name>buttonNormal</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="buttonPressed.png">
+      <Name>buttonPressed</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MenuBackground0.png">
+      <Name>MenuBackground0</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="MenuBackground1.png">
+      <Name>MenuBackground1</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.