Changeset 2249 for 2011/26/JuhoK


Ignore:
Timestamp:
2011-06-28 23:39:18 (8 years ago)
Author:
jumakall
Message:
 
Location:
2011/26/JuhoK/SFN
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • 2011/26/JuhoK/SFN/SFN/SFN/Peli.cs

    r2240 r2249  
    1515 
    1616        Image MenuBackround = LoadImage("MenuBackround"); 
    17         Label number, malli, moottori, renkaat; 
     17        Label number, malli, moottori, renkaat, moottorin_hinta, renkaiden_hinta; 
    1818 
    1919        public override void Begin() 
     
    2222            autot.Add(new Auto("Model3", 3, 9, 1)); 
    2323            autot.Add(new Auto("Model2", 2, 9, 3)); 
    24  
    25             //Korit[0] = 2; 
    2624            Keyboard.Listen(Key.Escape, ButtonState.Released, Exit, null); 
    2725            Mouse.IsCursorVisible = true; 
     
    4038            Add(quit_game); 
    4139 
    42             //Load game button  
     40            //Load game button 
    4341            PushButton load_game = new PushButton("Load game"); 
    4442            //load_game.Clicked += new Action(load_game_Clicked); 
     
    9290            //Next 
    9391            PushButton nextid = new PushButton("-->"); 
    94             nextid.Position = new Vector(Level.Right + 80, Level.Top + 60); 
     92            nextid.Position = new Vector(Level.Right * 1.15, Level.Top * 1.2); //Level.Right + 80, Level.Top + 60 
    9593            nextid.Clicked += new Action(nextid_Clicked); 
    9694            Add(nextid); 
     
    9896            //Previous 
    9997            PushButton previousid = new PushButton("<--"); 
    100             previousid.Position = new Vector(Level.Right - 80, Level.Top + 60); 
     98            previousid.Position = new Vector(Level.Right * 0.85, Level.Top * 1.2); //Level.Right - 80, Level.Top + 60 
    10199            previousid.Clicked += new Action(previousid_Clicked); 
    102100            Add(previousid); 
    103101 
     102            PushButton update_engine = new PushButton("Update engine"); 
     103            update_engine.Position = new Vector(Level.Right + 65, Level.Top - 20); 
     104            update_engine.Clicked += new Action(update_engine_Clicked); 
     105            Add(update_engine); 
     106 
     107            PushButton update_tiers = new PushButton("Update tiers"); 
     108            update_tiers.Position = new Vector(Level.Right + 65, Level.Top - 140); 
     109            update_tiers.Clicked += new Action(update_tiers_Clicked); 
     110            Add(update_tiers); 
     111 
    104112            //Number 
    105113            number = new Label((ID+1).ToString()+"/"+autot.Count.ToString()); 
    106             number.Position = new Vector(Level.Right, Level.Top + 60); 
     114            number.Position = new Vector(Level.Right, Level.Top * 1.2); //Level.Right, Level.Top + 60 
    107115            Add(number); 
    108116 
    109117            malli = new Label(autot[ID].korinnimi.ToString()); 
    110             malli.Position = new Vector(Level.Left, Level.Top + 60); 
     118            malli.Position = new Vector(Level.Left, Level.Top * 1.2); //Level.Left, Level.Top + 60 
    111119            Add(malli); 
    112120 
    113             moottori = new Label("Moottori: "+autot[ID].moottori.ToString()); 
    114             moottori.Position = new Vector(Level.Left + 250, Level.Top + 60); 
     121            moottori = new Label("Moottori: " + autot[ID].moottori.ToString()); 
     122            moottori.Position = new Vector(Level.Left + 250, Level.Top * 1.2); //Level.Left + 250, Level.Top * 1.2 
    115123            Add(moottori); 
    116124 
    117125            renkaat = new Label("Renkaat: "+autot[ID].renkaat.ToString()); 
    118             renkaat.Position = new Vector(Level.Left + 500, Level.Top + 60); 
     126            renkaat.Position = new Vector(Level.Left + 500, Level.Top * 1.2); //Level.Left + 500, Level.Top + 60 
    119127            Add(renkaat); 
     128 
     129            moottorin_hinta = new Label("Hinta: " + (autot[ID].moottori * 100).ToString()); 
     130            moottorin_hinta.Position = new Vector(Level.Right + 65, Level.Top - 60); 
     131            Add(moottorin_hinta); 
     132 
     133            renkaiden_hinta = new Label("Hinta: " + (autot[ID].renkaat * 100).ToString()); 
     134            renkaiden_hinta.Position = new Vector(Level.Right + 65, Level.Top - 180); 
     135            Add(renkaiden_hinta); 
     136        } 
     137 
     138        void update_tiers_Clicked() 
     139        { 
     140            MessageDisplay.Add("Tiers updated."); 
     141            autot[ID].renkaat += 1; 
     142            UpdateHUD(); 
     143        } 
     144 
     145        void update_engine_Clicked() 
     146        { 
     147            MessageDisplay.Add("Engine updated."); 
     148            autot[ID].moottori += 1; 
     149            UpdateHUD(); 
    120150        } 
    121151 
    122152        void previousid_Clicked() 
    123153        { 
    124             ID = --ID % autot.Count; 
     154            //ID = --ID % autot.Count; 
     155            MessageDisplay.Add("You can't use this button, because it's are broken."); 
    125156            UpdateHUD(); 
    126157        } 
     
    138169            renkaat.Text = "Renkaat: " + autot[ID].renkaat.ToString(); 
    139170            number.Text = (ID + 1).ToString() + "/" + autot.Count.ToString(); 
     171            moottorin_hinta.Text = "Hinta: " + (autot[ID].moottori * 100).ToString(); 
     172            renkaiden_hinta.Text = "Hinta: " + (autot[ID].renkaat * 100).ToString(); 
    140173        } 
    141174    } 
  • 2011/26/JuhoK/SFN/SFN/SFN/obj/x86/Debug/SFN.csproj.FileListAbsolute.txt

    r2198 r2249  
    1818C:\MyTemp\JuhoK\SFN\SFN\SFN\obj\x86\Debug\SFN.pdb 
    1919C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround2.xnb 
     20J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround2.xnb 
     21J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround.xnb 
     22J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\SFN.exe 
     23J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\SFN.pdb 
     24J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Jypeli4.dll 
     25J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Jypeli4.xml 
     26J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\obj\x86\Debug\ResolveAssemblyReference.cache 
     27J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     28J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\obj\x86\Debug\SFN.exe 
     29J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\obj\x86\Debug\SFN.pdb 
  • 2011/26/JuhoK/SFN/SFN/SFNContent/obj/x86/Debug/ContentPipeline.xml

    r2198 r2249  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround2.xnb</Output> 
    11       <Time>2011-06-28T10:09:57.8381342+03:00</Time> 
     10      <Output>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround2.xnb</Output> 
     11      <Time>2011-06-27T19:39:36+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround.xnb</Output> 
    20       <Time>2011-06-28T10:27:54.1975092+03:00</Time> 
     19      <Output>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround.xnb</Output> 
     20      <Time>2011-06-28T17:01:04+03:00</Time> 
    2121    </Item> 
    2222    <BuildSuccessful>true</BuildSuccessful> 
     
    2626      <BuildConfiguration>Debug</BuildConfiguration> 
    2727      <CompressContent>false</CompressContent> 
    28       <RootDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFNContent\</RootDirectory> 
    29       <LoggerRootDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFN\</LoggerRootDirectory> 
    30       <IntermediateDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFNContent\obj\x86\Debug\</IntermediateDirectory> 
    31       <OutputDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\</OutputDirectory> 
     28      <RootDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFNContent\</RootDirectory> 
     29      <LoggerRootDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\</LoggerRootDirectory> 
     30      <IntermediateDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFNContent\obj\x86\Debug\</IntermediateDirectory> 
     31      <OutputDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\</OutputDirectory> 
    3232    </Settings> 
    3333    <Assemblies> 
    3434      <Assembly> 
    35         <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
    36         <Value>2010-08-23T13:41:18+03:00</Value> 
     35        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
     36        <Value>2010-08-23T12:41:18+03:00</Value> 
    3737      </Assembly> 
    3838      <Assembly> 
    39         <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
    40         <Value>2010-08-23T13:41:18+03:00</Value> 
     39        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
     40        <Value>2010-08-23T12:41:18+03:00</Value> 
    4141      </Assembly> 
    4242      <Assembly> 
    43         <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
    44         <Value>2010-08-23T13:41:18+03:00</Value> 
     43        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
     44        <Value>2010-08-23T12:41:18+03:00</Value> 
    4545      </Assembly> 
    4646      <Assembly> 
    47         <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
    48         <Value>2010-08-23T13:41:18+03:00</Value> 
     47        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
     48        <Value>2010-08-23T12:41:18+03:00</Value> 
    4949      </Assembly> 
    5050      <Assembly> 
    51         <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
    52         <Value>2010-08-23T13:41:18+03:00</Value> 
     51        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
     52        <Value>2010-08-23T12:41:18+03:00</Value> 
    5353      </Assembly> 
    5454      <Assembly> 
    55         <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
    56         <Value>2010-08-23T13:41:18+03:00</Value> 
     55        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
     56        <Value>2010-08-23T12:41:18+03:00</Value> 
    5757      </Assembly> 
    5858      <Assembly> 
    59         <Key>C:\WINNT\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    60         <Value>2010-12-30T13:08:47.7865068+02:00</Value> 
     59        <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> 
     60        <Value>2011-06-27T18:29:19.4335733+03:00</Value> 
    6161      </Assembly> 
    6262    </Assemblies> 
  • 2011/26/JuhoK/SFN/SFN/SFNContent/obj/x86/Debug/SFNContent.contentproj.FileListAbsolute.txt

    r2198 r2249  
    11C:\Users\Linus\Ohjelmointi\SFN2\SFN\SFN\SFNContent\obj\x86\Debug\ResolveAssemblyReference.cache 
    22C:\MyTemp\JuhoK\SFN\SFN\SFNContent\obj\x86\Debug\ResolveAssemblyReference.cache 
     3J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFNContent\obj\x86\Debug\ResolveAssemblyReference.cache 
Note: See TracChangeset for help on using the changeset viewer.