Changeset 8469 for 2017


Ignore:
Timestamp:
2017-06-09 11:32:04 (2 years ago)
Author:
nupeohje
Message:
 
Location:
2017/23/NinaH/Kebab Run
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab RunContent/kentta1.txt

    r8443 r8469  
    55................................................................................................................................................................................................................................................................................................................................................................................................................ 
    66............................................B................................................................................................................................................................................................................................................................................................................................................................... 
     7............................................................................................................................................................................................................................................................................................................................................................................................................... 
    78................................................................................................................................................................................................................................................................................................................................................................................................................ 
    8 ................................................................................................................................................................................................................................................................................................................................................................................................................ 
    9 ................................................................................................................................................................................................................................................................................................................................................................................................................ 
    10 ................................................................................................................................................................................................................................................................................................................................................................................................................ 
    11 ...L........................................................................................................................................................................................................................................................................................................................................................................................................... 
    12 ................................................................................................................................................................................................................................................................................................................................................................................................................ 
     9...............................................................................................................................................................................................T................................................................................................................................................................................................................ 
     10........K.......................................................................L.......A....................................................................................................................................................................................................................................................................................................................... 
    1311################################################################################################################################################################################################################################################################################################################################################################################################################ 
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab RunContent/obj/x86/Debug/ContentPipeline.xml

    r8443 r8469  
    88      <Processor>TextFileContentProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta1.xnb</Output> 
    11       <Time>2017-06-08T12:42:32.007757+03:00</Time> 
     10      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta1.xnb</Output> 
     11      <Time>2017-06-09T10:52:36.5802138+03:00</Time> 
     12    </Item> 
     13    <Item> 
     14      <Source>kentta2.txt</Source> 
     15      <Name>kentta2</Name> 
     16      <Importer>TextFileImporter</Importer> 
     17      <Processor>TextFileContentProcessor</Processor> 
     18      <Options>None</Options> 
     19      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb</Output> 
     20      <Time>2017-06-08T12:40:51.8587431+03:00</Time> 
    1221    </Item> 
    1322    <Item> 
     
    1726      <Processor>TextureProcessor</Processor> 
    1827      <Options>None</Options> 
    19       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabelainvalkoinentausta.xnb</Output> 
     28      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabelainvalkoinentausta.xnb</Output> 
    2029      <Time>2017-06-07T12:51:58.5813613+03:00</Time> 
    2130    </Item> 
     
    2635      <Processor>TextureProcessor</Processor> 
    2736      <Options>None</Options> 
    28       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\ak47.xnb</Output> 
     37      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\ak47.xnb</Output> 
    2938      <Time>2017-06-07T12:47:36.4238273+03:00</Time> 
    3039    </Item> 
     
    3544      <Processor>TextureProcessor</Processor> 
    3645      <Options>None</Options> 
    37       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabkuolema.xnb</Output> 
     46      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabkuolema.xnb</Output> 
    3847      <Time>2017-06-07T13:08:09.4705162+03:00</Time> 
    3948    </Item> 
     
    4453      <Processor>TextureProcessor</Processor> 
    4554      <Options>None</Options> 
    46       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\paistinpannnu.xnb</Output> 
     55      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\paistinpannnu.xnb</Output> 
    4756      <Time>2017-06-07T13:11:43.1606524+03:00</Time> 
    4857    </Item> 
     
    5362      <Processor>TextureProcessor</Processor> 
    5463      <Options>None</Options> 
    55       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\teu.xnb</Output> 
     64      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\teu.xnb</Output> 
    5665      <Time>2017-06-07T13:20:55.5467025+03:00</Time> 
    5766    </Item> 
     
    6271      <Processor>TextureProcessor</Processor> 
    6372      <Options>None</Options> 
    64       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\beach.xnb</Output> 
    65       <Time>2017-06-08T10:52:27.4749198+03:00</Time> 
     73      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\beach.xnb</Output> 
     74      <Time>2017-06-09T10:11:23.4612189+03:00</Time> 
    6675    </Item> 
    6776    <Item> 
     
    7180      <Processor>TextureProcessor</Processor> 
    7281      <Options>None</Options> 
    73       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb</Output> 
     82      <Output>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb</Output> 
    7483      <Time>2017-06-08T12:35:37.6639193+03:00</Time> 
    75     </Item> 
    76     <Item> 
    77       <Source>kentta2.txt</Source> 
    78       <Name>kentta2</Name> 
    79       <Importer>TextFileImporter</Importer> 
    80       <Processor>TextFileContentProcessor</Processor> 
    81       <Options>None</Options> 
    82       <Output>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb</Output> 
    83       <Time>2017-06-08T12:40:51.8587431+03:00</Time> 
    8484    </Item> 
    8585    <BuildSuccessful>true</BuildSuccessful> 
     
    8989      <BuildConfiguration>Debug</BuildConfiguration> 
    9090      <CompressContent>false</CompressContent> 
    91       <RootDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab RunContent\</RootDirectory> 
    92       <LoggerRootDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\</LoggerRootDirectory> 
    93       <IntermediateDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab RunContent\obj\x86\Debug\</IntermediateDirectory> 
    94       <OutputDirectory>C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\</OutputDirectory> 
     91      <RootDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab RunContent\</RootDirectory> 
     92      <LoggerRootDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\</LoggerRootDirectory> 
     93      <IntermediateDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab RunContent\obj\x86\Debug\</IntermediateDirectory> 
     94      <OutputDirectory>C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\</OutputDirectory> 
    9595    </Settings> 
    9696    <Assemblies> 
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab RunContent/obj/x86/Debug/Kebab RunContent.contentproj.FileListAbsolute.txt

    r8443 r8469  
    11C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab Run\Kebab Run\Kebab RunContent\obj\x86\Debug\Kebab RunContent.contentprojResolveAssemblyReference.cache 
     2C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab RunContent\obj\x86\Debug\Kebab RunContent.contentprojResolveAssemblyReference.cache 
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/Kebab_Run.cs

    r8443 r8469  
    2222    Image kebabelaimenKuva = LoadImage("kebabelainvalkoinentausta"); 
    2323    Image ak47Kuva = LoadImage("ak47"); 
     24    Image karvakasiKuva = LoadImage("karvakasi"); 
    2425    Image paistinpannuKuva = LoadImage("paistinpannu"); 
    2526    Image teurastajaKuva = LoadImage("teu"); 
     27    Image forestKuva = LoadImage("forest"); 
    2628    Image beachKuva = LoadImage("beach"); 
     29    Image hillsKuva = LoadImage("hills"); 
     30    Image kichenKuva = LoadImage("kitchen");  
     31    Image hellKuva = LoadImage("hell"); 
    2732 
    2833    int kenttaNro = 1; 
     
    3035    public override void Begin() 
    3136    { 
    32  
    3337        SeuraavaKentta(); 
    34  
    35          
     38        LisaaTaustakuvat(); 
    3639    } 
    3740 
     
    5457        PhysicsObject karvakasi = PhysicsObject.CreateStaticObject(leveys, korkeus); 
    5558        karvakasi.Position = paikka; 
    56         karvakasi.Image = ak47Kuva; 
     59        karvakasi.CollisionIgnoreGroup = 6; 
     60        karvakasi.Image = karvakasiKuva; 
    5761        karvakasi.Tag = "lassi"; 
    58         karvakasi.Size = new Vector(70.0, 70.0); 
     62         
     63 
     64        karvakasi.Size = new Vector(60.0, 120.0); 
    5965        Add(karvakasi); 
    6066    } 
     
    7278    void LisaaTeurastaja(Vector paikka, double leveys, double korkeus) 
    7379    { 
    74         PhysicsObject Teurastaja = PhysicsObject.CreateStaticObject(leveys, korkeus); 
    75         Teurastaja.Position = paikka; 
    76         Teurastaja.Image = teurastajaKuva; 
    77         Teurastaja.Tag = "lassi"; 
    78         Teurastaja.Size = new Vector(60.0, 100.0); 
    79         Add(Teurastaja); 
     80        PhysicsObject teurastaja = new PhysicsObject(leveys, korkeus); 
     81        teurastaja.Position = paikka; 
     82        teurastaja.CollisionIgnoreGroup = 6; 
     83        teurastaja.Image = teurastajaKuva; 
     84        teurastaja.Tag = "lassi"; 
     85        teurastaja.Size = new Vector(60.0, 100.0); 
     86        teurastaja.CanRotate = false; 
     87 
     88        Timer liikutinajastin = new Timer(); 
     89        liikutinajastin.Interval = 0.1; 
     90        liikutinajastin.Timeout += delegate 
     91        { 
     92            teurastaja.Push(new Vector(-2000.0, 0.0)); 
     93        }; 
     94        liikutinajastin.Start(); 
     95 
     96        Add(teurastaja); 
    8097    } 
    8198 
     
    104121        kebabelain = new PlatformCharacter(leveys, korkeus); 
    105122        kebabelain.Position = paikka; 
    106         kebabelain.Mass = 4.0; 
     123       // kebabelain.Mass = 4.0; 
    107124        kebabelain.Size = new Vector(70.0, 70.0); 
    108125        kebabelain.Image = kebabelaimenKuva; 
    109126        AddCollisionHandler<PlatformCharacter, PhysicsObject>(kebabelain, "ase", TormaaAk); 
    110127        Add(kebabelain); 
     128    } 
     129 
     130    void LisaaNappaimet() 
     131    { 
     132        Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet"); 
     133        Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
     134 
     135        Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "kebu hyppää", kebabelain, hyppyNopeus); 
     136        Keyboard.Listen(Key.Space, ButtonState.Down, Ammuaseella, "kebu ampuu"); 
     137        Keyboard.Listen(Key.E, ButtonState.Pressed, ThrowAwayGun, "heitä ase"); 
     138    } 
     139 
     140    GameObject[] Taustat; 
     141 
     142    void LisaaTaustakuvat() 
     143    { 
     144        PhysicsObject Object = PhysicsObject.CreateStaticObject(Level.Width, 10); 
     145        Object.X = 0.0; 
     146        Object.Y = kebabelain.Y - kebabelain.Height/2.0; 
     147        Object.IsVisible = false; 
     148        Object.Color = Color.HotPink; 
     149        //Add(Object, -2); 
     150        Add(Object); 
     151        Taustat = new GameObject[3]; 
     152         
     153        for (int i = -1, l = 0; i < 2; i++, l++) 
     154        { 
     155            Taustat[l] = new GameObject(beachKuva.Width, Level.Height); 
     156            Taustat[l].Image = beachKuva; 
     157             
     158            Taustat[l].Position = new Vector(i * beachKuva.Width, 0); 
     159            Add(Taustat[l], -3); 
     160        } 
     161    } 
     162 
     163    protected override void Update(Time time) 
     164    { 
     165        base.Update(time); 
     166 
     167        float deltaTime = (float)time.SinceLastUpdate.Milliseconds / 100.0f; 
     168 
     169        foreach (GameObject tausta in Taustat) 
     170            tausta.Position -= new Vector(10 * deltaTime, 0); 
     171 
     172        if (Taustat[0].Right <= Level.Left) 
     173        { 
     174            GameObject temp = Taustat[0]; 
     175            Taustat[0] = Taustat[1]; 
     176            Taustat[1] = Taustat[2]; 
     177            Taustat[2] = temp; 
     178 
     179            Taustat[2].Position = new Vector(Taustat[1].Right + Taustat[2].Width / 2.0, 0); 
     180        } 
    111181    } 
    112182 
     
    127197        Camera.StayInLevel = true; 
    128198    } 
    129     void LisaaNappaimet() 
    130     { 
    131         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet"); 
    132         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli"); 
    133  
    134         Keyboard.Listen(Key.D, ButtonState.Down, Liikuta, "liikkuu vasemmalle", kebabelain, nopeus); 
    135         Keyboard.Listen(Key.A, ButtonState.Down, Liikuta, "liikkuu vasemmalle", kebabelain, -nopeus); 
    136         Keyboard.Listen(Key.W, ButtonState.Pressed, Hyppaa, "kebu hyppää", kebabelain, hyppyNopeus); 
    137         Keyboard.Listen(Key.Space, ButtonState.Down, Ammuaseella, "kebu ampuu"); 
    138     } 
    139199 
    140200    void Liikuta(PlatformCharacter kebabelain, double nopeus) 
     
    146206    { 
    147207        kebabelain.Jump(nopeus); 
    148     }§ 
     208    } 
    149209 
    150210    void TormaaAk(PlatformCharacter kebabelain, PhysicsObject ase) 
     
    154214        ase.Destroy(); 
    155215        kebabelain.Weapon = new AssaultRifle(70.0, 40.0); 
     216        kebabelain.Weapon.MaxAmmoLifetime = TimeSpan.FromSeconds(0.7); 
     217        kebabelain.Weapon.Ammo.Value = 3; 
     218 
    156219    } 
    157220 
    158221    void LiikutaTaustaa() 
    159222{ 
    160    foreach ( GameObject taustakuva in taustakuvat ) 
     223   /*foreach (GameObject taustakuva in taustakuvat) 
    161224   { 
    162225      taustakuva.Y += scrollausnopeus; 
     
    172235         ekaTaustakuva = taustakuva; 
    173236      } 
     237   }*/ 
     238   } 
     239 
     240    void LuoTaustakuvat() 
     241    { 
     242        //taustaAjastin = new Timer(); 
     243        //taustaAjastin.Interval = 0.01; 
     244        //taustaAjastin.Timeout += LiikutaTaustaa; 
     245        //taustaAjastin.Start(); 
     246 
     247        //taustakuvat = new List<GameObject>(); 
     248        //LisaaTaustakuva("forest", 300, 300); 
     249        //LisaaTaustakuva("feald", 300, 300); 
     250        //LisaaTaustakuva("hills", 300, 300); 
     251        //LisaaTaustakuva("kitchen", 300, 300); 
     252        //KisaaTaustakuva("hell", 300, 300); 
     253    } 
     254  
    174255 
    175256    void Ammuaseella() 
     
    178259    } 
    179260 
     261    void ThrowAwayGun() 
     262    { 
     263        kebabelain.Weapon = null; 
     264    } 
    180265 
    181266 
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/Kebab_Run.csproj.Debug.cachefile

    r8443 r8469  
    11Content\kentta1.xnb 
     2Content\kentta2.xnb 
    23Content\kebabelainvalkoinentausta.xnb 
    34Content\ak47.xnb 
     
    78Content\beach.xnb 
    89Content\karvakasi.xnb 
    9 Content\kentta2.xnb 
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/obj/x86/Debug/Kebab_Run.csproj.FileListAbsolute.txt

    r8443 r8469  
    1616C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb 
    1717C:\Users\Peliohjelmointi\Documents\Visual Studio 2013\Projects\Kebab run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb 
     18C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta1.xnb 
     19C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kentta2.xnb 
     20C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabelainvalkoinentausta.xnb 
     21C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\ak47.xnb 
     22C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\kebabkuolema.xnb 
     23C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\paistinpannnu.xnb 
     24C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\teu.xnb 
     25C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\beach.xnb 
     26C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Content\karvakasi.xnb 
     27C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Kebab_Run.exe 
     28C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Kebab_Run.pdb 
     29C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Jypeli.dll 
     30C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\bin\x86\Debug\Jypeli.xml 
     31C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Kebab_Run.csprojResolveAssemblyReference.cache 
     32C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     33C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Kebab_Run.exe 
     34C:\Users\Peliohjelmointi\Documents\NinaH\Kebab Run\Kebab Run\Kebab_Run\obj\x86\Debug\Kebab_Run.pdb 
  • 2017/23/NinaH/Kebab Run/Kebab Run/Kebab_Run/obj/x86/Debug/cachefile-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}-targetpath.txt

    r8443 r8469  
    11Content\kentta1.xnb 
     2Content\kentta2.xnb 
    23Content\kebabelainvalkoinentausta.xnb 
    34Content\ak47.xnb 
     
    78Content\beach.xnb 
    89Content\karvakasi.xnb 
    9 Content\kentta2.xnb 
Note: See TracChangeset for help on using the changeset viewer.