Changeset 7324 for 2016/24


Ignore:
Timestamp:
2016-06-15 14:33:11 (3 years ago)
Author:
jijaolri
Message:
 
Location:
2016/24/JimiR
Files:
298 added
13 edited

Legend:

Unmodified
Added
Removed
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuse/MultiFuse.cs

    r7299 r7324  
    3030    DoubleMeter healthlvl = new DoubleMeter(10, 0, 10); 
    3131    DoubleMeter ranged = new DoubleMeter(1); 
     32    DoubleMeter tuliskillimittari = new DoubleMeter(100, 0, 100); 
    3233    GameObject cursor; 
    3334    Image alkuvalikonKuva = LoadImage("grass"); 
    3435    Image cursorinKuva = LoadImage("cursor"); 
    3536    Image puunKuva = LoadImage("tree"); 
    36     Image miekanKuva = LoadImage(""); 
     37    Image tuliskillinKuva = LoadImage("ultikuva"); 
     38    Image miekanKuva = LoadImage("miekka"); 
     39    Image healthinKuva = LoadImage("sydän"); 
     40    Image paperinKuva = LoadImage("paper"); 
    3741    Image marketinKuva = LoadImage("lattia"); 
    38     Image dungeoninlattia = LoadImage("dungeoninlattia"); 
     42    Image dungeoninlattia = LoadImage("dungeonladdi"); 
    3943    Image fireballinKuva = LoadImage("fireball"); 
    4044    private Image[] destroyerinKavely = LoadImages("anim1", "anim2", "anim3", "anim4", "anim5"); 
     
    117121        Add(elamaPalkki); 
    118122 
    119         LuoSkill(puunKuva, attacklvl, new Vector(Screen.Right - 200, Screen.Bottom + 750)); 
    120         Label healthLabel = LuoSkill(puunKuva, null, new Vector(Screen.Right - 200, Screen.Bottom + 700)); 
     123        LuoPaper(); 
     124 
     125        LuoSkill(miekanKuva, attacklvl, new Vector(Screen.Right - 200, Screen.Bottom + 750)); 
     126        Label healthLabel = LuoSkill(healthinKuva, null, new Vector(Screen.Right - 200, Screen.Bottom + 700)); 
     127 
     128        Label tuliskilll = new Label(); 
     129        tuliskilll.Image = tuliskillinKuva; 
     130        tuliskilll.Size = new Vector(30, 30); 
     131        tuliskilll.Position = new Vector(Screen.Right - 200, Screen.Bottom + 600); 
     132        Add(tuliskilll); 
     133        ProgressBar tulipalkki = new ProgressBar(100, 20); 
     134        tulipalkki.X = Screen.Right - 120; 
     135        tulipalkki.Y = Screen.Bottom + 600; 
     136        tulipalkki.BindTo(tuliskillimittari); 
     137        Add(tulipalkki); 
    121138 
    122139        Timer ajastin = new Timer(); 
     
    126143            nimilabel.Position = Camera.WorldToScreen(pelaaja.Position + new Vector(0, 50)); 
    127144            healthLabel.Text = "" + healthlvl.MaxValue; 
     145            tuliskillimittari.Value += 0.1; 
    128146        }; 
    129147        ajastin.Start(); 
     
    419437        IsFullScreen = true; 
    420438        Level.Background.Image = dungeoninlattia; 
    421         Level.Background.FitToLevel(); 
     439        Level.Background.TileToLevel(); 
    422440        LuoCursor(); 
    423441        Camera.ZoomToLevel(); 
     
    504522    void FireBall() 
    505523    { 
     524        if (tuliskillimittari.Value == tuliskillimittari.MaxValue) 
     525        { 
    506526        PhysicsObject fireball = new PhysicsObject(500, 100); 
    507527        Vector suunta = (cursor.Position - pelaaja.Position).Normalize(); 
     
    512532        fireball.Tag = "ase1"; 
    513533        Add(fireball); 
     534 
     535            tuliskillimittari.Value = 0; 
     536 
     537        } 
    514538    } 
    515539    //void ElectricBolt() 
     
    550574        Add(destroyer); 
    551575 
     576        AddCollisionHandler(destroyer, pelaaja, Destroyertekeedamagia); 
     577 
    552578        RandomMoverBrain satunnaisAivotboss = new RandomMoverBrain(200); 
    553579 
     
    558584        destroyer.Brain = satunnaisAivotboss; 
    559585 
    560         satunnaisAivotboss.Speed = 500; 
     586        satunnaisAivotboss.Speed = 800; 
    561587 
    562588        satunnaisAivotboss.Active = true; 
     589 
     590         
    563591    } 
    564592 
     
    566594    { 
    567595        healthlvl.Value += 1; 
     596    } 
     597 
     598    void Destroyertekeedamagia(PhysicsObject tormaaja, PhysicsObject kohde) 
     599    { 
     600        healthlvl.Value -= 1; 
     601    } 
     602 
     603    void LuoPaper() 
     604    { 
     605        GameObject paperi = new GameObject(245,400); 
     606        paperi.Position = new Vector(Screen.Right - 335, Screen.Bottom + 680); 
     607        paperi.Image = paperinKuva; 
     608        Add(paperi); 
    568609    } 
    569610} 
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuse/MultiFuse.csproj.Debug.cachefile

    r7299 r7324  
    3030Content\hearth.xnb 
    3131Content\sword.xnb 
     32Content\Dungeonladdi.xnb 
     33Content\ultikuva.xnb 
     34Content\paper.xnb 
     35Content\sydÀn.xnb 
     36Content\miekka.xnb 
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuse/obj/x86/Debug/ContentPipeline-{5D343048-8B72-4D84-BCD9-BE783E0016F2}.xml

    r7299 r7324  
    6363      <Options>None</Options> 
    6464      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\dungeon1.xnb</Output> 
    65       <Time>2016-06-13T14:44:50.4857272+03:00</Time> 
     65      <Time>2016-06-15T10:02:02.2265286+03:00</Time> 
    6666    </Item> 
    6767    <Item> 
     
    280280      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\sword.xnb</Output> 
    281281      <Time>2016-06-14T14:27:22.1821412+03:00</Time> 
     282    </Item> 
     283    <Item> 
     284      <Source>Dungeonladdi.jpg</Source> 
     285      <Name>Dungeonladdi</Name> 
     286      <Importer>TextureImporter</Importer> 
     287      <Processor>TextureProcessor</Processor> 
     288      <Options>None</Options> 
     289      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\Dungeonladdi.xnb</Output> 
     290      <Time>2016-06-15T09:10:39.0053138+03:00</Time> 
     291    </Item> 
     292    <Item> 
     293      <Source>ultikuva.png</Source> 
     294      <Name>ultikuva</Name> 
     295      <Importer>TextureImporter</Importer> 
     296      <Processor>TextureProcessor</Processor> 
     297      <Options>None</Options> 
     298      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\ultikuva.xnb</Output> 
     299      <Time>2016-06-15T14:02:37.9248623+03:00</Time> 
     300    </Item> 
     301    <Item> 
     302      <Source>paper.png</Source> 
     303      <Name>paper</Name> 
     304      <Importer>TextureImporter</Importer> 
     305      <Processor>TextureProcessor</Processor> 
     306      <Options>None</Options> 
     307      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\paper.xnb</Output> 
     308      <Time>2016-06-15T14:07:52.0548114+03:00</Time> 
     309    </Item> 
     310    <Item> 
     311      <Source>sydän.png</Source> 
     312      <Name>sydän</Name> 
     313      <Importer>TextureImporter</Importer> 
     314      <Processor>TextureProcessor</Processor> 
     315      <Options>None</Options> 
     316      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\sydän.xnb</Output> 
     317      <Time>2016-06-15T14:24:48.2729924+03:00</Time> 
     318    </Item> 
     319    <Item> 
     320      <Source>miekka.png</Source> 
     321      <Name>miekka</Name> 
     322      <Importer>TextureImporter</Importer> 
     323      <Processor>TextureProcessor</Processor> 
     324      <Options>None</Options> 
     325      <Output>C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\miekka.xnb</Output> 
     326      <Time>2016-06-15T14:25:02.3734023+03:00</Time> 
    282327    </Item> 
    283328    <BuildSuccessful>true</BuildSuccessful> 
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuse/obj/x86/Debug/MultiFuse.csproj.FileListAbsolute.txt

    r7299 r7324  
    6666C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\hearth.xnb 
    6767C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\sword.xnb 
     68C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\Dungeonladdi.xnb 
     69C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\ultikuva.xnb 
     70C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\paper.xnb 
     71C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\sydÀn.xnb 
     72C:\MyTemp\JimiR\MultiFuse\MultiFuse\MultiFuse\bin\x86\Debug\Content\miekka.xnb 
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuse/obj/x86/Debug/cachefile-{5D343048-8B72-4D84-BCD9-BE783E0016F2}-targetpath.txt

    r7299 r7324  
    3030Content\hearth.xnb 
    3131Content\sword.xnb 
     32Content\Dungeonladdi.xnb 
     33Content\ultikuva.xnb 
     34Content\paper.xnb 
     35Content\sydÀn.xnb 
     36Content\miekka.xnb 
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuseContent/MultiFuseContent.contentproj

    r7299 r7324  
    230230    </Compile> 
    231231  </ItemGroup> 
     232  <ItemGroup> 
     233    <Compile Include="Dungeonladdi.jpg"> 
     234      <Name>Dungeonladdi</Name> 
     235      <Importer>TextureImporter</Importer> 
     236      <Processor>TextureProcessor</Processor> 
     237    </Compile> 
     238  </ItemGroup> 
     239  <ItemGroup> 
     240    <Compile Include="ultikuva.png"> 
     241      <Name>ultikuva</Name> 
     242      <Importer>TextureImporter</Importer> 
     243      <Processor>TextureProcessor</Processor> 
     244    </Compile> 
     245  </ItemGroup> 
     246  <ItemGroup> 
     247    <Compile Include="paper.png"> 
     248      <Name>paper</Name> 
     249      <Importer>TextureImporter</Importer> 
     250      <Processor>TextureProcessor</Processor> 
     251    </Compile> 
     252  </ItemGroup> 
     253  <ItemGroup> 
     254    <Compile Include="sydän.png"> 
     255      <Name>sydän</Name> 
     256      <Importer>TextureImporter</Importer> 
     257      <Processor>TextureProcessor</Processor> 
     258    </Compile> 
     259  </ItemGroup> 
     260  <ItemGroup> 
     261    <Compile Include="miekka.png"> 
     262      <Name>miekka</Name> 
     263      <Importer>TextureImporter</Importer> 
     264      <Processor>TextureProcessor</Processor> 
     265    </Compile> 
     266  </ItemGroup> 
    232267  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    233268  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
  • 2016/24/JimiR/MultiFuse/MultiFuse/MultiFuseContent/dungeon1.txt

    r7256 r7324  
    1313#                  # 
    1414#                  # 
    15 #                  # 
     15#         T        # 
    1616#                  # 
    1717#################### 
Note: See TracChangeset for help on using the changeset viewer.