Changeset 2737


Ignore:
Timestamp:
2012-04-20 12:56:49 (8 years ago)
Author:
anonymous
Message:
 
Location:
2012/JAO/John
Files:
8 added
27 edited

Legend:

Unmodified
Added
Removed
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/bin/x86/Debug/Data/pisteet.xml

    r2729 r2737  
    66        <Item Index="0" Type="Jypeli.ScoreItem, Jypeli4, Version=4.2.1.0, Culture=neutral, PublicKeyToken=null"> 
    77          <Field Name="Name" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    8             <Value>fsdg</Value> 
     8            <Value>k</Value> 
    99          </Field> 
    1010          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    11             <Value>2</Value> 
     11            <Value>15.5166977</Value> 
    1212          </Field> 
    1313        </Item> 
    1414        <Item Index="1" Type="Jypeli.ScoreItem, Jypeli4, Version=4.2.1.0, Culture=neutral, PublicKeyToken=null"> 
    1515          <Field Name="Name" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    16             <Value>fsdg</Value> 
     16            <Value>fhd</Value> 
    1717          </Field> 
    1818          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    19             <Value>2</Value> 
     19            <Value>19.0833714999997</Value> 
    2020          </Field> 
    2121        </Item> 
    2222        <Item Index="2" Type="Jypeli.ScoreItem, Jypeli4, Version=4.2.1.0, Culture=neutral, PublicKeyToken=null"> 
    2323          <Field Name="Name" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    24             <Value>fsdg</Value> 
     24            <Value>-</Value> 
    2525          </Field> 
    2626          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    27             <Value>2</Value> 
     27            <Value>999</Value> 
    2828          </Field> 
    2929        </Item> 
    3030        <Item Index="3" Type="Jypeli.ScoreItem, Jypeli4, Version=4.2.1.0, Culture=neutral, PublicKeyToken=null"> 
    3131          <Field Name="Name" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    32             <Value>fsdg</Value> 
     32            <Value>-</Value> 
    3333          </Field> 
    3434          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    35             <Value>2</Value> 
     35            <Value>999</Value> 
    3636          </Field> 
    3737        </Item> 
    3838        <Item Index="4" Type="Jypeli.ScoreItem, Jypeli4, Version=4.2.1.0, Culture=neutral, PublicKeyToken=null"> 
    3939          <Field Name="Name" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    40             <Value>fsdg</Value> 
     40            <Value>-</Value> 
    4141          </Field> 
    4242          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    43             <Value>2</Value> 
     43            <Value>999</Value> 
    4444          </Field> 
    4545        </Item> 
    4646        <Item Index="5" Type="Jypeli.ScoreItem, Jypeli4, Version=4.2.1.0, Culture=neutral, PublicKeyToken=null"> 
    4747          <Field Name="Name" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    48             <Value>fsdg3</Value> 
     48            <Value>-</Value> 
    4949          </Field> 
    5050          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    51             <Value>2</Value> 
     51            <Value>999</Value> 
    5252          </Field> 
    5353        </Item> 
     
    5757          </Field> 
    5858          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    59             <Value>0</Value> 
     59            <Value>999</Value> 
    6060          </Field> 
    6161        </Item> 
     
    6565          </Field> 
    6666          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    67             <Value>0</Value> 
     67            <Value>999</Value> 
    6868          </Field> 
    6969        </Item> 
     
    7373          </Field> 
    7474          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    75             <Value>0</Value> 
     75            <Value>999</Value> 
    7676          </Field> 
    7777        </Item> 
     
    8181          </Field> 
    8282          <Field Name="Score" Type="System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    83             <Value>0</Value> 
     83            <Value>999</Value> 
    8484          </Field> 
    8585        </Item> 
     
    8787    </Field> 
    8888    <Field Name="LastEnteredName" Type="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    89       <Value>fsdg3</Value> 
     89      <Value>k</Value> 
    9090    </Field> 
    9191  </Object> 
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/bin/x86/Debug/kentta1.txt

    r2729 r2737  
    2222     
    2323 *    *    *    *    *    *    *    *    *    *    *    *    *    *    * 
    24 N##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##  
    25 ######################################################################### 
     24N##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM## 
     25########################################################################## 
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/kentta1.txt

    r2729 r2737  
    2222     
    2323 *    *    *    *    *    *    *    *    *    *    *    *    *    *    * 
    24 N##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##  
    25 ######################################################################### 
     24N##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM##MMM## 
     25########################################################################## 
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/norsupeli.cs

    r2729 r2737  
    1414    const int RUUDUN_KOKO = 35; 
    1515    IntMeter laskuri; 
    16     ScoreList topLista = new ScoreList(10, true, 0); 
     16    ScoreList topLista = new ScoreList(10, true, 999); 
    1717    List<Label> valikonKohdat; 
    1818    Timer aikaLaskuri; 
     
    2727    SoundEffect maaliAani = LoadSoundEffect("maali"); 
    2828    Image mariobro = LoadImage("mariobro"); 
     29    Image supermariobro = LoadImage("supermariobro"); 
    2930 
    3031    public override void Begin() 
     
    3536    { 
    3637        ClearAll(); 
    37         valikonKohdat = new List<Label>(); 
    38  
    39         Label kohta1 = new Label("Aloita uusi peli"); 
    40         kohta1.Position = new Vector(0, 40); 
    41         valikonKohdat.Add(kohta1); 
    42  
    43         Label kohta2 = new Label("Lopeta"); 
    44         kohta2.Position = new Vector(0, -40); 
    45         valikonKohdat.Add(kohta2); 
    46  
    47         foreach (Label valikonKohta in valikonKohdat) 
    48         { 
    49             Add(valikonKohta); 
    50         } 
    51  
    52         Mouse.ListenOn(kohta1, MouseButton.Left, ButtonState.Pressed, AloitaPeli, null); 
    53         Mouse.ListenOn(kohta2, MouseButton.Left, ButtonState.Pressed, Exit, null); 
     38        Level.Width = Screen.Width; 
     39        Level.Height = Screen.Height; 
     40        Level.Background.Image = supermariobro; 
     41        Level.Background.FitToLevel(); 
     42 
     43        MultiSelectWindow valikko = new MultiSelectWindow("", "Aloita peli", "Lopeta"); 
     44        valikko.ActiveColor = Color.Transparent; 
     45        valikko.ItemSelected += PainettiinValikonNappia; 
     46        Add(valikko); 
     47 
     48        //valikonKohdat = new List<Label>(); 
     49 
     50        //Label kohta1 = new Label("Aloita uusi peli"); 
     51        //kohta1.BorderColor = Color.Black; 
     52        //kohta1.Position = new Vector(0, 40); 
     53        //valikonKohdat.Add(kohta1); 
     54 
     55        //Label kohta2 = new Label("Lopeta"); 
     56        //kohta2.Position = new Vector(0, -40); 
     57        //valikonKohdat.Add(kohta2); 
     58 
     59        //foreach (Label valikonKohta in valikonKohdat) 
     60        //{ 
     61        //    Add(valikonKohta); 
     62        //} 
     63 
     64        //Mouse.ListenOn(kohta1, MouseButton.Left, ButtonState.Pressed, AloitaPeli, null); 
     65        //Mouse.ListenOn(kohta2, MouseButton.Left, ButtonState.Pressed, Exit, null); 
    5466 
    5567        Mouse.IsCursorVisible = true; 
    56         Mouse.ListenMovement(1.0, ValikossaLiikkuminen, null); 
     68//        Mouse.ListenMovement(1.0, ValikossaLiikkuminen, null); 
    5769        Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, ""); 
    5870    } 
     
    7587    { 
    7688        ClearAll(); 
     89        lukumaara = 0; 
    7790        Gravity = new Vector(0.0, -900.0); 
    7891 
     
    188201        if (kohde.Tag.ToString() == "M"){ 
    189202            //AloitaPeli(); 
    190             MultiSelectWindow valikko = new MultiSelectWindow("", 
    191 "Aloita uudelleen!"); 
     203            aikaLaskuri.Pause(); 
     204            MultiSelectWindow valikko = new MultiSelectWindow("", "Aloita uudelleen!"); 
    192205            valikko.ItemSelected += PainettiinValikonNappia; 
    193206            Add(valikko); 
     
    231244               AloitaPeli(); 
    232245                break; 
    233              
     246            case 1: 
     247                Exit(); 
     248                break; 
    234249        } 
    235250    }  
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/norsupeli.csproj.Debug.cachefile

    r2729 r2737  
    66Content\supermario.xnb 
    77Content\mariobro.xnb 
     8Content\supermariobro.xnb 
    89kentta1.txt 
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/obj/x86/Debug/cachefile-{FD96ACD3-5DB8-47E3-8612-7F91F792881B}-targetpath.txt

    r2729 r2737  
    66Content\supermario.xnb 
    77Content\mariobro.xnb 
     8Content\supermariobro.xnb 
  • 2012/JAO/John/norsupeli/norsupeli/norsupeli/obj/x86/Debug/norsupeli.csproj.FileListAbsolute.txt

    r2729 r2737  
    1515D:\John\norsupeli\norsupeli\norsupeli\bin\x86\Debug\Content\supermario.xnb 
    1616D:\John\norsupeli\norsupeli\norsupeli\bin\x86\Debug\Content\mariobro.xnb 
     17D:\John\norsupeli\norsupeli\norsupeli\bin\x86\Debug\Content\supermariobro.xnb 
  • 2012/JAO/John/norsupeli/norsupeli/norsupeliContent/norsupeliContent.contentproj

    r2729 r2737  
    9191    </Compile> 
    9292  </ItemGroup> 
     93  <ItemGroup> 
     94    <Compile Include="supermariobro.png"> 
     95      <Name>supermariobro</Name> 
     96      <Importer>TextureImporter</Importer> 
     97      <Processor>TextureProcessor</Processor> 
     98    </Compile> 
     99  </ItemGroup> 
    93100  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    94101  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
  • 2012/JAO/John/norsupeli/norsupeli/norsupeliContent/obj/x86/Debug/ContentPipeline.xml

    r2729 r2737  
    6565      <Time>2012-04-19T14:07:05.15625+03:00</Time> 
    6666    </Item> 
     67    <Item> 
     68      <Source>supermariobro.png</Source> 
     69      <Name>supermariobro</Name> 
     70      <Importer>TextureImporter</Importer> 
     71      <Processor>TextureProcessor</Processor> 
     72      <Options>None</Options> 
     73      <Output>D:\John\norsupeli\norsupeli\norsupeli\bin\x86\Debug\Content\supermariobro.xnb</Output> 
     74      <Time>2012-04-20T12:30:18.0857535+03:00</Time> 
     75    </Item> 
    6776    <BuildSuccessful>true</BuildSuccessful> 
    6877    <Settings> 
  • 2012/JAO/John/rally/rally/rally/obj/x86/Debug/rally.csproj.FileListAbsolute.txt

    r2729 r2737  
    77D:\John\rally\rally\rally\obj\x86\Debug\rally.exe 
    88D:\John\rally\rally\rally\obj\x86\Debug\rally.pdb 
     9D:\John\rally\rally\rally\bin\x86\Debug\Content\auto.xnb 
  • 2012/JAO/John/rally/rally/rally/rally.cs

    r2729 r2737  
    77using Jypeli.Widgets; 
    88 
    9 public class rally : PhysicsGame 
     9public class rally : TopDownPhysicsGame 
    1010{ 
     11    Image olionKuva = LoadImage("auto"); 
     12 
     13    Automobile rally3d; 
    1114    public override void Begin() 
    1215    { 
    1316        // TODO: Kirjoita ohjelmakoodisi tähän 
    14         Automobile rally3d = new Automobile(100,100); 
     17        Gravity = 50.0; 
     18         
     19        rally3d= new Automobile(100, 100); 
     20        //rally3d. 
    1521        Add(rally3d); 
     22        rally3d.Acceleration = 500.0; 
     23        rally3d.Image = Image.Mirror( olionKuva); 
     24        rally3d.MomentOfInertia = 1.0; 
     25        rally3d.Restitution = 0.1; 
     26        rally3d.AngularDamping = 0.9; 
     27      
     28 
     29        asetaohjain(); 
     30        Luorata(); 
     31        Level.CreateBorders(); 
     32       
     33 
    1634        PhoneBackButton.Listen(ConfirmExit, "Lopeta peli"); 
    1735        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
    1836    } 
     37    void asetaohjain() 
     38    { 
     39 
     40        Keyboard.Listen(Key.Up, ButtonState.Down, 
     41            kiihdyttaa, null, 100000000.0); 
     42        Keyboard.Listen(Key.Down, ButtonState.Down, 
     43            jarruta, null, 1.0); 
     44        Keyboard.Listen(Key.Left, ButtonState.Down, 
     45            kaanny, null, 10.0); 
     46        Keyboard.Listen(Key.Right, ButtonState.Down, 
     47            kaanny, null, -10.0); 
     48    } 
     49 
     50    void kaanny(double suunta) 
     51    { 
     52        rally3d.Turn(Angle.FromDegrees(suunta), 0.1); 
     53//        rally3d.Angle += Angle.FromDegrees(suunta); 
     54    } 
     55 
     56    void kiihdyttaa(double nopeus) 
     57    { 
     58        rally3d.Accelerate(); 
     59    } 
     60 
     61    void jarruta(double nopeus) 
     62    { 
     63        rally3d.Brake(); 
     64    } 
     65    void Luorata() 
     66    { 
     67        Vector[] reittiPisteet = new Vector[] 
     68{ 
     69    new Vector( Level.Left, Level.Top ), 
     70    new Vector( Level.Left, Level.Bottom ), 
     71    new Vector( Level.Right, Level.Bottom ), 
     72    new Vector( Level.Right, Level.Top ), 
     73    new Vector( Level.Left-75, Level.Top ), 
     74   
     75    // ... 
     76}; 
     77 
     78        RoadMap tie = new RoadMap(reittiPisteet); 
     79        tie.DefaultWidth = 150.0; 
     80        tie.DefaultFriction = 1.0; 
     81        tie.Insert(); 
     82    } 
    1983} 
  • 2012/JAO/John/rally/rally/rallyContent/obj/x86/Debug/ContentPipeline.xml

    r2729 r2737  
    22<XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline"> 
    33  <Asset Type="Pipeline:BuildItemCollection"> 
     4    <Item> 
     5      <Source>auto.png</Source> 
     6      <Name>auto</Name> 
     7      <Importer>TextureImporter</Importer> 
     8      <Processor>TextureProcessor</Processor> 
     9      <Options>None</Options> 
     10      <Output>D:\John\rally\rally\rally\bin\x86\Debug\Content\auto.xnb</Output> 
     11      <Time>2012-04-20T11:57:44.1913353+03:00</Time> 
     12    </Item> 
    413    <BuildSuccessful>true</BuildSuccessful> 
    514    <Settings> 
     
    1524    <Assemblies> 
    1625      <Assembly> 
     26        <Key>C:\Program Files\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
     27        <Value>2012-03-15T10:46:56+02:00</Value> 
     28      </Assembly> 
     29      <Assembly> 
     30        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
     31        <Value>2010-08-23T12:41:18+03:00</Value> 
     32      </Assembly> 
     33      <Assembly> 
     34        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
     35        <Value>2010-08-23T12:41:18+03:00</Value> 
     36      </Assembly> 
     37      <Assembly> 
     38        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
     39        <Value>2010-08-23T12:41:18+03:00</Value> 
     40      </Assembly> 
     41      <Assembly> 
     42        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
     43        <Value>2010-08-23T12:41:18+03:00</Value> 
     44      </Assembly> 
     45      <Assembly> 
     46        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
     47        <Value>2010-08-23T12:41:18+03:00</Value> 
     48      </Assembly> 
     49      <Assembly> 
     50        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
     51        <Value>2010-08-23T12:41:18+03:00</Value> 
     52      </Assembly> 
     53      <Assembly> 
    1754        <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> 
    1855        <Value>2012-04-02T16:44:17.671875+03:00</Value> 
  • 2012/JAO/John/rally/rally/rallyContent/rallyContent.contentproj

    r2729 r2737  
    4444    <Reference Include="TextFileContentExtension" /> 
    4545  </ItemGroup> 
     46  <ItemGroup> 
     47    <Compile Include="auto.png"> 
     48      <Name>auto</Name> 
     49      <Importer>TextureImporter</Importer> 
     50      <Processor>TextureProcessor</Processor> 
     51    </Compile> 
     52  </ItemGroup> 
    4653  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    4754  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.