Changeset 3649 for 2012


Ignore:
Timestamp:
2012-07-06 11:53:40 (8 years ago)
Author:
dezhidki
Message:

Talletus.

Location:
2012/27/DenisZ/TheDungeonGame/TheDungeonGame
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • 2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/EntityTemplates.cs

    r3643 r3649  
    340340                turtle.Hit(RandomGen.NextVector(-300, 300)); 
    341341                turtle.Collided += turtleCollided; 
     342                turtle.Tag = "Turtle"; 
    342343                game.Add(turtle, 3); 
    343344            } 
  • 2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/InGameGui.cs

    r3643 r3649  
    9797            healthAmount.TextColor = Color.Red; 
    9898            healthAmount.TextScale = new Vector(1.5, 1.5); 
    99             healthAmount.Right = Right - 100; 
     99            healthAmount.Right = Right - 30; 
    100100 
    101101            Add(healthAmount); 
     
    145145            bossMeterBar.BarColor = Color.Green; 
    146146            bossMeterBar.BorderColor = Color.White; 
    147             bossMeterBar.Right -= 40; 
     147            bossMeterBar.Right -= 150; 
    148148            bossMeterBar.BindTo(bossHealth); 
    149149            Add(bossMeterBar); 
  • 2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Player.cs

    r3633 r3649  
    144144            else if (targetObject.Tag.Equals("Wall") || targetObject.Tag.Equals("ObjectRock") || targetObject.Tag.Equals("Item")) 
    145145                collidingObject.Destroy(); 
     146            else if (targetObject.Tag.Equals("Turtle")) 
     147            { 
     148                targetObject.Destroy(); 
     149                collidingObject.Destroy(); 
     150            } 
    146151        } 
    147152 
  • 2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.cs

    r3643 r3649  
    3232    public List<Image> objectTextures = new List<Image>(); 
    3333    public static List<SoundEffect> soundEffects = new List<SoundEffect>(); 
     34    public Image menuBg = LoadImage("background/menu"); 
    3435    public InGameGui gui; 
    3536    public static MediaPlayer soundPlayer; 
     
    4546    private void showMainMenu() 
    4647    { 
     48        Level.Background.Image = menuBg; 
    4749        MultiSelectWindow menu = new MultiSelectWindow("Welcome to: \nThe Dungeon Game!",new string[]{"Play!", "Exit"}); 
    4850        menu.AddItemHandler(0, initGame); 
     
    5355    private void initGame() 
    5456    { 
     57        Level.Background.Image = null; 
    5558        Level.Width = ROOMWIDTH * 20; 
    5659        Level.Height = ROOMHEIGHT * 20; 
  • 2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGameContent/TheDungeonGameContent.contentproj

    r3643 r3649  
    322322    </Compile> 
    323323  </ItemGroup> 
     324  <ItemGroup> 
     325    <Compile Include="background\menu.png"> 
     326      <Name>menu</Name> 
     327      <Importer>TextureImporter</Importer> 
     328      <Processor>TextureProcessor</Processor> 
     329    </Compile> 
     330  </ItemGroup> 
    324331  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    325332  <!--  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.