Changeset 7358 for 2016/24


Ignore:
Timestamp:
2016-06-16 10:52:39 (7 years ago)
Author:
armahiek
Message:
 
Location:
2016/24/ArttuH
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • 2016/24/ArttuH/anythin/anythin/anythin/anythin.cs

    r7323 r7358  
    1313    LaserGun Zapper1; 
    1414    LaserGun Zapper2; 
    15     LaserGun Zapper3; 
    1615    PlasmaCannon Sidecannon1; 
    1716    PlasmaCannon Sidecannon2; 
    18     Image playerim = LoadImage("Rocket"); 
     17    Image playerim = LoadImage("rocket2"); 
    1918    Image Asteroid10 = LoadImage("asteroid"); 
    2019    Image Asteroid20 = LoadImage("aasteroid"); 
    … …  
    2928        Things(); //Players n stuff 
    3029        Controll(); //Controls 
    31         //Plasmatimer(); 
    32         //PlasmaGo(); //Plasmameter 
     30        Plasmatimer(); 
     31        PlasmaGo(); 
    3332 
    3433        Level.Background.CreateStars(30000); 
    3534        IsFullScreen = false; 
     35         
    3636 
    3737    } 
    … …  
    3939    { 
    4040        //Creating Player 
    41         Player1 = new PhysicsObject(50.0, 50.0); 
     41        Player1 = new PhysicsObject(50.0, 30.0); 
    4242        Player1.Mass = 0.10; 
    4343        Player1.MomentOfInertia = 50; 
    4444        Player1.IgnoresGravity = true; 
    4545        Player1.MaxAngularVelocity = 10; 
    46         Player1.LinearDamping = 0.96; 
     46        Player1.LinearDamping = 0.97; 
     47        Player1.AngularDamping = 0.97; 
    4748        Player1.Image = playerim; 
     49        Player1.Shape = Shape.Circle; 
    4850        Add(Player1); 
    4951 
    … …  
    8183        Sidecannon1.CanHitOwner = false; 
    8284        Sidecannon1.Image = null; 
    83         Sidecannon1.FireRate = 0.3; 
     85        Sidecannon1.FireRate = 0.333333333333334; 
    8486        Sidecannon1.Angle += Angle.FromDegrees(90); 
    8587        Player1.Add(Sidecannon1); 
    … …  
    9092        Sidecannon2.CanHitOwner = false; 
    9193        Sidecannon2.Image = null; 
    92         Sidecannon2.FireRate = 0.3; 
     94        Sidecannon2.FireRate = 0.3333333333333334; 
    9395        Sidecannon2.Angle += Angle.FromDegrees(-90); 
    9496        Player1.Add(Sidecannon2); 
    … …  
    141143        Keyboard.Listen(Key.Space, ButtonState.Down, Shoot1, null, Zapper1); 
    142144        Keyboard.Listen(Key.Space, ButtonState.Down, Shoot1, null, Zapper2); 
    143         Keyboard.Listen(Key.Space, ButtonState.Down, Shoot1, null, Zapper3); 
    144145        Keyboard.Listen(Key.C, ButtonState.Down, Shoot2, null, Sidecannon1); 
    145146        Keyboard.Listen(Key.C, ButtonState.Down, Shoot2, null, Sidecannon2); 
    146147        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
    147148    } 
    148     void Shoot1(LaserGun Gun) 
     149    void Shoot1(LaserGun Gun)  
    149150    { 
    150151        PhysicsObject Laser = Gun.Shoot(); 
    … …  
    161162    void MoveSomewhere2() 
    162163    { 
    163         Vector Backwards = Vector.FromLengthAndAngle(-100.0, Player1.Angle); 
     164        Vector Backwards = Vector.FromLengthAndAngle(-75.0, Player1.Angle); 
    164165        Player1.Push(Backwards); 
    165166    } 

  • 2016/24/ArttuH/anythin/anythin/anythin/anythin.csproj.Debug.cachefile

    r7323 r7358  
    55Content\Aaasteroid.xnb 
    66Content\aaaasteroid.xnb 
     7Content\Rocket2.xnb 

  • 2016/24/ArttuH/anythin/anythin/anythin/obj/x86/Debug/ContentPipeline-{2BA92B91-4288-46A0-A639-6267FE61C00B}.xml

    r7323 r7358  
    99      <Options>None</Options> 
    1010      <Output>C:\MyTemp\ArttuH\anythin\anythin\anythin\bin\x86\Debug\Content\rocket.xnb</Output> 
    11       <Time>2016-06-14T11:55:51.8048797+03:00</Time> 
     11      <Time>2016-06-16T09:59:44.313561+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
    … …  
    5555      <Output>C:\MyTemp\ArttuH\anythin\anythin\anythin\bin\x86\Debug\Content\aaaasteroid.xnb</Output> 
    5656      <Time>2016-06-15T10:14:29.0241911+03:00</Time> 
     57    </Item> 
     58    <Item> 
     59      <Source>Rocket2.png</Source> 
     60      <Name>Rocket2</Name> 
     61      <Importer>TextureImporter</Importer> 
     62      <Processor>TextureProcessor</Processor> 
     63      <Options>None</Options> 
     64      <Output>C:\MyTemp\ArttuH\anythin\anythin\anythin\bin\x86\Debug\Content\Rocket2.xnb</Output> 
     65      <Time>2016-06-16T10:47:35.069761+03:00</Time> 
    5766    </Item> 
    5867    <BuildSuccessful>true</BuildSuccessful> 

  • 2016/24/ArttuH/anythin/anythin/anythin/obj/x86/Debug/anythin.csproj.FileListAbsolute.txt

    r7323 r7358  
    1313C:\MyTemp\ArttuH\anythin\anythin\anythin\bin\x86\Debug\Content\Aaasteroid.xnb 
    1414C:\MyTemp\ArttuH\anythin\anythin\anythin\bin\x86\Debug\Content\aaaasteroid.xnb 
     15C:\MyTemp\ArttuH\anythin\anythin\anythin\bin\x86\Debug\Content\Rocket2.xnb 

  • 2016/24/ArttuH/anythin/anythin/anythin/obj/x86/Debug/cachefile-{2BA92B91-4288-46A0-A639-6267FE61C00B}-targetpath.txt

    r7323 r7358  
    55Content\Aaasteroid.xnb 
    66Content\aaaasteroid.xnb 
     7Content\Rocket2.xnb 

  • 2016/24/ArttuH/anythin/anythin/anythinContent/anythinContent.contentproj

    r7323 r7358  
    5353  </ItemGroup> 
    5454  <ItemGroup> 
    55     <Compile Include="rocket.png"> 
    56       <Name>rocket</Name> 
    57       <Importer>TextureImporter</Importer> 
    58       <Processor>TextureProcessor</Processor> 
    59     </Compile> 
    60   </ItemGroup> 
    61   <ItemGroup> 
    6255    <Compile Include="asteroid.png"> 
    6356      <Name>asteroid</Name> 
    … …  
    8780    </Compile> 
    8881  </ItemGroup> 
     82  <ItemGroup> 
     83    <Compile Include="rocket.png"> 
     84      <Name>rocket</Name> 
     85      <Importer>TextureImporter</Importer> 
     86      <Processor>TextureProcessor</Processor> 
     87    </Compile> 
     88  </ItemGroup> 
     89  <ItemGroup> 
     90    <Compile Include="Rocket2.png"> 
     91      <Name>Rocket2</Name> 
     92      <Importer>TextureImporter</Importer> 
     93      <Processor>TextureProcessor</Processor> 
     94    </Compile> 
     95  </ItemGroup> 
    8996  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    9097  <!--  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.