Changeset 4421 for 2013/27


Ignore:
Timestamp:
2013-07-04 07:51:23 (6 years ago)
Author:
janiemit
Message:
 
Location:
2013/27/TeemuM/Game
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 2013/27/TeemuM/Game/Game/Game/Game.cs

    r4420 r4421  
    1313    public Player player { get; private set; } 
    1414    private List<Zombie> enemies = new List<Zombie>(); 
     15    //DoubleMeter LifeMeter; <-- Huono yritykseni tehdä elämä laskuria, aika loppui niin en kerennyt viimeistellä ja en ois osannukkaan, loput tohon liittyvä löytyy tiedoston pohjalta. -Aqua 
    1516 
    1617    public override void Begin() 
     
    1819        game = this; 
    1920        Mouse.IsCursorVisible = true; 
    20  
    21         MultiSelectWindow menu = new MultiSelectWindow("TESTMODE", "Developer tools", "Start this thing", "Get me out of here"); 
    22         menu.DefaultCancel = 2; 
     21        MainMenu(); 
     22    } 
     23 
     24    public void MainMenu() 
     25    { 
     26        MultiSelectWindow menu = new MultiSelectWindow("TESTMODE", "Developer tools", "Start this thing", "Perks", "Get me out of here"); 
     27        menu.DefaultCancel = -0; 
    2328        menu.AddItemHandler(0, delegate() { MessageDisplay.Add("Starting game..."); StartGame(); DeveloperCommand(); }); 
    24         menu.AddItemHandler(1, StartGame); 
    25         menu.AddItemHandler(2, Exit); 
    26         Add(menu); 
     29        menu.AddItemHandler(1, CharacterMenu); 
     30        menu.AddItemHandler(2, PerkMenu); 
     31        menu.AddItemHandler(3, Exit); 
     32        Add(menu); 
     33 
    2734    } 
    2835 
     
    122129    { 
    123130        Keyboard.Listen(Key.Escape, ButtonState.Pressed, delegate() { PauseMenu(); }, null); 
     131        Keyboard.Listen(Key.E, ButtonState.Pressed, delegate() { Inventory(); }, null); 
    124132        Keyboard.Listen(Key.Tab, ButtonState.Pressed, DeveloperCommand, null); 
    125133        AddScoreMeter(); 
     
    166174        ClearAll(); 
    167175        MessageDisplay.Add("Saved!"); 
    168         Begin(); 
     176        MainMenu(); 
    169177    } 
    170178 
     
    179187        IsPaused = true; 
    180188    } 
     189     
     190    public void Inventory() //ToDo Inventory and funktionality 
     191    { 
     192        MultiSelectWindow menu = new MultiSelectWindow("Inventory", "Back to Game"); 
     193        menu.DefaultCancel = 0; 
     194        menu.AddItemHandler(0, delegate { IsPaused = false; }); 
     195        Add(menu); 
     196        IsPaused = true; 
     197    } 
     198 
     199    public void CharacterMenu() //ToDo Character variations 
     200    { 
     201        MultiSelectWindow menu = new MultiSelectWindow("Select Character", "Char NRO1", "Char NRO2", "Char NRO3", "Char NRO4", "Back to Main Menu"); 
     202        menu.DefaultCancel = 0; 
     203        menu.AddItemHandler(0, StartGame); 
     204        menu.AddItemHandler(1, StartGame); 
     205        menu.AddItemHandler(2, StartGame); 
     206        menu.AddItemHandler(3, StartGame); 
     207        menu.AddItemHandler(4, MainMenu); 
     208        Add(menu); 
     209    } 
     210 
     211    public void PerkMenu() //ToDo Perks, Perk selecting system, Save system, and return to main menu button. 
     212    { 
     213        MultiSelectWindow menu = new MultiSelectWindow("Select Perks", "Perk NRO1", "Perk NRO2", "Perk NRO3", "Perk NRO4", "Back to Main Menu"); 
     214        menu.DefaultCancel = 0; 
     215        menu.AddItemHandler(0, MainMenu); 
     216        menu.AddItemHandler(1, MainMenu); 
     217        menu.AddItemHandler(2, MainMenu); 
     218        menu.AddItemHandler(3, MainMenu); 
     219        menu.AddItemHandler(4, MainMenu); 
     220        Add(menu); 
     221    } 
     222 
     223    /*void CreateLifeMeter() 
     224    { 
     225        LifeMeter = new DoubleMeter(10); 
     226        LifeMeter.MaxValue = 10; 
     227        LifeMeter.LowerLimit += HealthDepleated; 
     228 
     229        ProgressBar LifeBar = new ProgressBar(150, 20); 
     230        LifeBar.X = Screen.Left + 150; 
     231        LifeBar.Y = Screen.Top - 20; 
     232        LifeBar.BindTo(LifeMeter); 
     233        Add(LifeBar); 
     234    } 
     235 
     236    void HealthDepleated() 
     237    { 
     238        MessageDisplay.Add("Elämät loppuivat, voi voi."); 
     239    } */ 
    181240} 
  • 2013/27/TeemuM/Game/Game/GameContent/obj/x86/Debug/ContentPipeline.xml

    r4420 r4421  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Player.xnb</Output> 
    11       <Time>2013-07-02T22:31:25.0744006+03:00</Time> 
     10      <Output>D:\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Player.xnb</Output> 
     11      <Time>2013-07-03T01:58:25.5821591+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie1.xnb</Output> 
    20       <Time>2013-07-02T22:59:50.6059514+03:00</Time> 
     19      <Output>D:\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie1.xnb</Output> 
     20      <Time>2013-07-03T01:58:28.0001852+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie2.xnb</Output> 
    29       <Time>2013-07-02T22:59:50.5969509+03:00</Time> 
     28      <Output>D:\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie2.xnb</Output> 
     29      <Time>2013-07-03T01:58:28.0031853+03:00</Time> 
    3030    </Item> 
    3131    <Item> 
     
    3535      <Processor>TextureProcessor</Processor> 
    3636      <Options>None</Options> 
    37       <Output>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie3.xnb</Output> 
    38       <Time>2013-07-02T22:59:50.6009511+03:00</Time> 
     37      <Output>D:\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie3.xnb</Output> 
     38      <Time>2013-07-03T01:58:28.0481857+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    4444      <Processor>TextureProcessor</Processor> 
    4545      <Options>None</Options> 
    46       <Output>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie4.xnb</Output> 
    47       <Time>2013-07-02T22:59:50.6029512+03:00</Time> 
     46      <Output>D:\TeemuM\Game\Game\Game\bin\x86\Debug\Content\Zombie4.xnb</Output> 
     47      <Time>2013-07-03T01:58:28.0501858+03:00</Time> 
    4848    </Item> 
    4949    <BuildSuccessful>true</BuildSuccessful> 
     
    5353      <BuildConfiguration>Debug</BuildConfiguration> 
    5454      <CompressContent>false</CompressContent> 
    55       <RootDirectory>C:\Users\Juho\Desktop\TeemuM\Game\Game\GameContent\</RootDirectory> 
    56       <LoggerRootDirectory>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\</LoggerRootDirectory> 
    57       <IntermediateDirectory>C:\Users\Juho\Desktop\TeemuM\Game\Game\GameContent\obj\x86\Debug\</IntermediateDirectory> 
    58       <OutputDirectory>C:\Users\Juho\Desktop\TeemuM\Game\Game\Game\bin\x86\Debug\Content\</OutputDirectory> 
     55      <RootDirectory>D:\TeemuM\Game\Game\GameContent\</RootDirectory> 
     56      <LoggerRootDirectory>D:\TeemuM\Game\Game\Game\</LoggerRootDirectory> 
     57      <IntermediateDirectory>D:\TeemuM\Game\Game\GameContent\obj\x86\Debug\</IntermediateDirectory> 
     58      <OutputDirectory>D:\TeemuM\Game\Game\Game\bin\x86\Debug\Content\</OutputDirectory> 
    5959    </Settings> 
    6060    <Assemblies> 
    6161      <Assembly> 
    62         <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
    63         <Value>2013-01-29T09:47:36+02:00</Value> 
     62        <Key>P:\Program Files (x86)\Microsoft Visual Studio 10.0\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
     63        <Value>2013-06-10T21:54:20+03:00</Value> 
    6464      </Assembly> 
    6565      <Assembly> 
    66         <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
     66        <Key>P:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
    6767        <Value>2010-08-23T12:41:18+03:00</Value> 
    6868      </Assembly> 
    6969      <Assembly> 
    70         <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
     70        <Key>P:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
    7171        <Value>2010-08-23T12:41:18+03:00</Value> 
    7272      </Assembly> 
    7373      <Assembly> 
    74         <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
     74        <Key>P:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
    7575        <Value>2010-08-23T12:41:18+03:00</Value> 
    7676      </Assembly> 
    7777      <Assembly> 
    78         <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
     78        <Key>P:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
    7979        <Value>2010-08-23T12:41:18+03:00</Value> 
    8080      </Assembly> 
    8181      <Assembly> 
    82         <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
     82        <Key>P:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
    8383        <Value>2010-08-23T12:41:18+03:00</Value> 
    8484      </Assembly> 
    8585      <Assembly> 
    86         <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
     86        <Key>P:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
    8787        <Value>2010-08-23T12:41:18+03:00</Value> 
    8888      </Assembly> 
    8989      <Assembly> 
    90         <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
    91         <Value>2013-01-29T09:47:38+02:00</Value> 
     90        <Key>P:\Program Files (x86)\Microsoft Visual Studio 10.0\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
     91        <Value>2013-06-10T21:54:20+03:00</Value> 
    9292      </Assembly> 
    9393      <Assembly> 
    9494        <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    95         <Value>2011-06-27T18:29:19.4335733+03:00</Value> 
     95        <Value>2013-06-28T10:05:36.7114153+03:00</Value> 
    9696      </Assembly> 
    9797    </Assemblies> 
Note: See TracChangeset for help on using the changeset viewer.