Changeset 1618


Ignore:
Timestamp:
2010-08-05 13:15:00 (11 years ago)
Author:
hniemi
Message:
 
Location:
2009/santeri_h/Kynari
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • 2009/santeri_h/Kynari/Content/obj/x86/Release/Content.contentproj.FileListAbsolute.txt

    r447 r1618  
    11C:\MyTemp\npo09_pelit\santeri_h\Kynari\Content\obj\x86\Release\ResolveAssemblyReference.cache 
     2C:\MyTemp\2009\santeri_h\Kynari\Content\obj\x86\Release\ResolveAssemblyReference.cache 

  • 2009/santeri_h/Kynari/Content/obj/x86/Release/ContentPipeline.xml

    r447 r1618  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\norsu.xnb</Output> 
    11       <Time>2009-08-08T20:27:57.9936+03:00</Time> 
     10      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\norsu.xnb</Output> 
     11      <Time>2010-08-05T11:00:30.3739612+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
    … …  
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
    19       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\pistol.xnb</Output> 
    20       <Time>2009-08-08T20:27:58.0404+03:00</Time> 
     19      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\pistol.xnb</Output> 
     20      <Time>2010-08-05T11:00:30.3739612+03:00</Time> 
    2121    </Item> 
    2222    <Item> 
    … …  
    2626      <Processor>TextureProcessor</Processor> 
    2727      <Options>None</Options> 
    28       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\shotgun.xnb</Output> 
    29       <Time>2009-08-08T20:27:58.0092+03:00</Time> 
     28      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\shotgun.xnb</Output> 
     29      <Time>2010-08-05T11:00:30.3739612+03:00</Time> 
    3030    </Item> 
    3131    <Item> 
    … …  
    3535      <Processor>TextureProcessor</Processor> 
    3636      <Options>None</Options> 
    37       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\grenade.xnb</Output> 
    38       <Time>2009-08-08T20:27:57.978+03:00</Time> 
     37      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\grenade.xnb</Output> 
     38      <Time>2010-08-05T11:00:30.3739612+03:00</Time> 
    3939    </Item> 
    4040    <Item> 
    … …  
    4444      <Processor>TextureProcessor</Processor> 
    4545      <Options>None</Options> 
    46       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\magnum.xnb</Output> 
    47       <Time>2009-08-08T20:27:57.9624+03:00</Time> 
     46      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\magnum.xnb</Output> 
     47      <Time>2010-08-05T11:00:30.3583364+03:00</Time> 
    4848    </Item> 
    4949    <Item> 
    … …  
    5353      <Processor>SoundEffectProcessor</Processor> 
    5454      <Options>None</Options> 
    55       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\sounds\hyppays.xnb</Output> 
    56       <Time>2009-08-08T20:27:57.6036+03:00</Time> 
     55      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\sounds\hyppays.xnb</Output> 
     56      <Time>2010-08-05T11:00:30.311462+03:00</Time> 
    5757    </Item> 
    5858    <Item> 
    … …  
    6262      <Processor>SoundEffectProcessor</Processor> 
    6363      <Options>None</Options> 
    64       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\sounds\kerays.xnb</Output> 
    65       <Time>2009-08-08T20:27:57.6036+03:00</Time> 
     64      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\sounds\kerays.xnb</Output> 
     65      <Time>2010-08-05T11:00:30.3270868+03:00</Time> 
    6666    </Item> 
    6767    <Item> 
    … …  
    7171      <Processor>SoundEffectProcessor</Processor> 
    7272      <Options>None</Options> 
    73       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\sounds\maali.xnb</Output> 
    74       <Time>2009-08-08T20:27:57.5724+03:00</Time> 
     73      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\sounds\maali.xnb</Output> 
     74      <Time>2010-08-05T11:00:30.311462+03:00</Time> 
    7575    </Item> 
    7676    <Item> 
    … …  
    8080      <Processor>SoundEffectProcessor</Processor> 
    8181      <Options>None</Options> 
    82       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\sounds\tormays.xnb</Output> 
    83       <Time>2009-08-08T20:27:57.6192+03:00</Time> 
     82      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\sounds\tormays.xnb</Output> 
     83      <Time>2010-08-05T11:00:30.3270868+03:00</Time> 
    8484    </Item> 
    8585    <Item> 
    … …  
    8989      <Processor>SoundEffectProcessor</Processor> 
    9090      <Options>None</Options> 
    91       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\sounds\tuuppaus.xnb</Output> 
    92       <Time>2009-08-08T20:27:57.588+03:00</Time> 
     91      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\sounds\tuuppaus.xnb</Output> 
     92      <Time>2010-08-05T11:00:30.311462+03:00</Time> 
    9393    </Item> 
    9494    <Item> 
    … …  
    9898      <Processor>SongProcessor</Processor> 
    9999      <Options>None</Options> 
    100       <Output>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\tausta.xnb</Output> 
    101       <Extra>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\tausta.wma</Extra> 
    102       <Time>2009-08-08T20:27:57.9468+03:00</Time> 
     100      <Output>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\tausta.xnb</Output> 
     101      <Extra>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\tausta.wma</Extra> 
     102      <Time>2010-08-05T11:00:30.3583364+03:00</Time> 
    103103    </Item> 
    104104    <BuildSuccessful>true</BuildSuccessful> 
    … …  
    107107      <BuildConfiguration>Release</BuildConfiguration> 
    108108      <CompressContent>true</CompressContent> 
    109       <RootDirectory>C:\MyTemp\npo09_pelit\santeri_h\Kynari\Content\</RootDirectory> 
    110       <LoggerRootDirectory>C:\MyTemp\npo09_pelit\santeri_h\Kynari\</LoggerRootDirectory> 
    111       <IntermediateDirectory>C:\MyTemp\npo09_pelit\santeri_h\Kynari\Content\obj\x86\Release\</IntermediateDirectory> 
    112       <OutputDirectory>C:\MyTemp\npo09_pelit\santeri_h\Kynari\bin\x86\Release\Content\</OutputDirectory> 
     109      <RootDirectory>C:\MyTemp\2009\santeri_h\Kynari\Content\</RootDirectory> 
     110      <LoggerRootDirectory>C:\MyTemp\2009\santeri_h\Kynari\</LoggerRootDirectory> 
     111      <IntermediateDirectory>C:\MyTemp\2009\santeri_h\Kynari\Content\obj\x86\Release\</IntermediateDirectory> 
     112      <OutputDirectory>C:\MyTemp\2009\santeri_h\Kynari\bin\x86\Release\Content\</OutputDirectory> 
    113113    </Settings> 
    114114    <Assemblies> 
    … …  
    138138      </Assembly> 
    139139      <Assembly> 
    140         <Key>C:\Windows\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\3.1.0.0__6d5c3888ef60e27d\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    141         <Value>2009-08-08T19:16:32.4801214+03:00</Value> 
     140        <Key>C:\WINNT\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\3.1.0.0__6d5c3888ef60e27d\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
     141        <Value>2010-06-02T21:12:40.1135423+03:00</Value> 
    142142      </Assembly> 
    143143    </Assemblies> 

  • 2009/santeri_h/Kynari/Peli.cs

    r422 r1618  
    2222        const double hyppyVoima = 2000; 
    2323 
     24        Grenade kranaatti; 
    2425        PlatformCharacter pelaaja1; 
    2526        PlatformCharacter pelaaja2; 
    26          
     27 
    2728        BarGauge hpNaytto; 
    2829        BarGauge hpNaytto2; 
    29          
     30 
    3031        bool pelaaja1asevaihto = true; 
    3132        bool pelaaja2asevaihto = true; 
    … …  
    3536 
    3637        #endregion 
    37          
     38 
    3839        #region Alustukset 
    3940        protected override void LoadContent() 
    … …  
    7172            lisaaNappaimet(); 
    7273            //Camera.Follow(pelaaja1); 
    73             Camera.Position = new Vector2D(0, 0);             
     74            Camera.Position = new Vector2D(0, 0); 
    7475            return seuraava; 
    7576        } 
    … …  
    133134            hpNaytto.Angle = Angle.Degrees(90); 
    134135            hpNaytto.ValueColor = Color.LightGreen; 
    135             hpNaytto.BackColor = Color.Red;             
     136            hpNaytto.BackColor = Color.Red; 
    136137            hpNaytto.BindTo(pelaaja1.HitPoints); 
    137138            hpNaytto.Position = new Vector2D(Screen.RightSafe - 1000, Screen.TopSafe - 170); 
    … …  
    354355        } 
    355356 
     357        bool OnkoPelaaja(PhysicsObject olio)  
     358        {  
     359            return (olio == pelaaja1 || olio == pelaaja2);  
     360        } 
     361 
    356362        void lisaaKerattavaAse(Level kentta) 
    357363        { 
    … …  
    360366            Bullet luoti2 = new Bullet(); 
    361367            Bullet hauli = new Bullet(); 
    362             Grenade kranaatti = new Grenade(); 
     368             
     369            kranaatti = new Grenade(); 
    363370            kranaatti.Explosion = new Explosion(50, 200, 20, new Damage(10000)); 
     371            kranaatti.ExplodeCondition = OnkoPelaaja;  
    364372 
    365373            Texture2D shotgun = Content.Load<Texture2D>("shotgun"); 
Note: See TracChangeset for help on using the changeset viewer.