Changeset 6467


Ignore:
Timestamp:
2015-06-26 12:22:47 (4 years ago)
Author:
mijoliim
Message:
 
Location:
2015/26/MikkoL/JRPG
Files:
4 added
1 deleted
17 edited

Legend:

Unmodified
Added
Removed
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/Battle/BattleView.cs

    r6450 r6467  
    2626    public bool IsTimerActive { get; set; } 
    2727    public bool IsInMenu { get; set; } 
     28    public bool InBoss { get; set; } 
    2829 
    2930    private SpecialQueue<CharacterBase> _AllyQueue = new SpecialQueue<CharacterBase>(); 
     
    4748    { } 
    4849 
     50    public BattleView(bool boss) 
     51        : base(0, 0) 
     52    { 
     53        InBoss = boss; 
     54    } 
     55 
    4956    public void LoadBattle(EnemyGroup _Enemies) 
    5057    { 
     
    6370            Background = new _Background(JRPG.Game.Content.Load<Texture2D>("BG//BG_Cave")); 
    6471        } 
     72        else if (OverworldView.CurrentMapData.CurrentMapIndex == "03") 
     73        { 
     74            Background = new _Background(JRPG.Game.Content.Load<Texture2D>("BG//BG_Cave")); 
     75        } 
     76 
    6577        JRPG.Game.Add(Background, 1); 
    6678 
     
    576588                    int Index = i; 
    577589 
     590                    if (Enemies[Index] != null) 
     591                    { 
    578592                    ActionQueue.Enqueue(delegate 
    579593                    { 
     
    581595                        Enemies[Index].PickRandomAttack().OnUse(); 
    582596                    }); 
     597                    } 
    583598                } 
    584599            } 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/Battle/Characters/CharacterList.cs

    r6450 r6467  
    1313        Sonic.Name = "Sonic"; 
    1414        Sonic.CurrentStats.HP = 82; 
    15         Sonic.CurrentStats.Str = 20; 
    16         Sonic.CurrentStats.Def = 10; 
     15        Sonic.CurrentStats.Str = 25; 
     16        Sonic.CurrentStats.Def = 15; 
    1717        Sonic.CurrentStats.Luck = 20; 
    1818 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/Battle/EnemyBase/EnemyList.cs

    r6450 r6467  
    9494        } 
    9595 
    96         Tele.BaseWaitTimeInSeconds = 6; 
     96        Tele.BaseWaitTimeInSeconds = 4; 
    9797 
    9898        Tele.Attacks.Add(AttackList.SpookyAttack()); 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/JRPG.csproj

    r6415 r6467  
    125125    <Compile Include="SoundEffects.cs" /> 
    126126    <Compile Include="SpecialQueue.cs" /> 
    127     <Compile Include="HUD\TextMenu.cs" /> 
     127    <Compile Include="Overworld\TextMenu.cs" /> 
    128128    <Compile Include="Images.cs" /> 
    129129    <Compile Include="MainGame.cs" /> 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/JRPG.csproj.Debug.cachefile

    r6450 r6467  
    7070Content\Maps\03\03_Map.xnb 
    7171Content\Maps\03\03_CMap.xnb 
     72Content\Music\Hunt.xnb 
    7273Content\Music\PresentingV.wma 
    7374Content\Music\Song12.wma 
     
    7576Content\Music\Sensual.wma 
    7677Content\Music\Mines.wma 
     78Content\Music\Hunt.wma 
    7779Content\MainFont.xnb 
    7880Content\AsRifle.xnb 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/MainGame.cs

    r6450 r6467  
    260260 
    261261 
    262         Keyboard.Listen(Key.PageDown, ButtonState.Pressed, FadeOut, null); 
    263         Keyboard.Listen(Key.PageUp, ButtonState.Pressed, FadeIn, null); 
     262        Keyboard.Listen(Key.PageDown, ButtonState.Pressed, RandomEncounter.Boss, null); 
     263        Keyboard.Listen(Key.PageUp, ButtonState.Pressed, Ending, null); 
    264264    } 
    265265    public void LoadOWControlsXboxController() 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/Overworld/RandomEncounter.cs

    r6450 r6467  
    99    public static int StepsToAnEncounter = 5; 
    1010    public static int StepsTaken { get; set; } 
    11     public static int Probability = 0; 
     11    public static int Probability = 25; 
    1212 
    1313    public static List<EnemyGroup> CurrentEnemies = new List<EnemyGroup>(); 
     
    5151            CurrentEnemyGroup = OverworldView.CurrentMapData.PickRandomWeightedGroup(CurrentEnemies, r); 
    5252 
    53             Image Background; 
    54             //Background = OverworldView.CurrentMapData.BackgroundImages()[r.Next(OverworldView.CurrentMapData.BackgroundImages().Count)]; 
    55  
    56  
    5753            JRPG.Game.UseShaders = true; 
    5854 
     
    7470 
    7571    } 
     72 
     73    public static void Boss() 
     74    { 
     75        EnemyBase Tele1 = EnemyList.Tele(1); 
     76        EnemyBase Tele2 = EnemyList.Tele(2); 
     77        EnemyBase Tele3 = EnemyList.Tele(3); 
     78        EnemyBase Tele4 = EnemyList.Tele(4); 
     79 
     80        EnemyGroup Group = new EnemyGroup(); 
     81        Group.Add(Tele1); 
     82        Group.Add(Tele2); 
     83        Group.Add(Tele3); 
     84        Group.Add(Tele4); 
     85 
     86        CurrentEnemyGroup = Group; 
     87 
     88        JRPG.Game.UseShaders = true; 
     89 
     90            JRPG.Game.RandomEncounterAnimation( 
     91                delegate 
     92                { 
     93                    JRPG.BattleView = new BattleView(true); 
     94                    JRPG.BattleView.LoadBattle(CurrentEnemyGroup); 
     95                }, 
     96                delegate 
     97                { 
     98                    JRPG.Game.MediaPlayer.Play("Music//Hunt"); 
     99                }); 
     100    } 
    76101} 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/Values.cs

    r6450 r6467  
    1010    public const int SCREEN_HEIGHT = 719; 
    1111    public const int TILE_SIZE = 40; 
    12     public static double MOVE_SPEED = 400; 
     12    public static double MOVE_SPEED = 200; 
    1313} 
    1414 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/obj/x86/Debug/ContentPipeline-{D60BC67C-D86B-426A-A33D-CA5138E0FDF3}.xml

    r6450 r6467  
    645645      <Output>C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Maps\03\03_CMap.xnb</Output> 
    646646      <Time>2015-06-26T11:03:56.40777+03:00</Time> 
     647    </Item> 
     648    <Item> 
     649      <Source>Music\Hunt.mp3</Source> 
     650      <Name>Music\Hunt</Name> 
     651      <Importer>Mp3Importer</Importer> 
     652      <Processor>SongProcessor</Processor> 
     653      <Options>None</Options> 
     654      <Output>C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Music\Hunt.xnb</Output> 
     655      <Extra>C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Music\Hunt.wma</Extra> 
     656      <Time>2015-06-26T12:08:08.6595107+03:00</Time> 
    647657    </Item> 
    648658    <BuildSuccessful>true</BuildSuccessful> 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/obj/x86/Debug/JRPG.csproj.FileListAbsolute.txt

    r6450 r6467  
    357357C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Maps\03\03_Map.xnb 
    358358C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Maps\03\03_CMap.xnb 
     359C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Music\Hunt.xnb 
     360C:\Users\user\Desktop\MikkoL\MikkoL\JRPG\JRPG\JRPG\bin\x86\Debug\Content\Music\Hunt.wma 
  • 2015/26/MikkoL/JRPG/JRPG/JRPG/obj/x86/Debug/cachefile-{D60BC67C-D86B-426A-A33D-CA5138E0FDF3}-targetpath.txt

    r6450 r6467  
    7575Content\Maps\03\03_Map.xnb 
    7676Content\Maps\03\03_CMap.xnb 
     77Content\Music\Hunt.xnb 
     78Content\Music\Hunt.wma 
    7779Content\MainFont.xnb 
  • 2015/26/MikkoL/JRPG/JRPG/JRPGContent/JRPGContent.contentproj

    r6450 r6467  
    473473      <Processor>TextureProcessor</Processor> 
    474474    </Compile> 
     475    <Compile Include="Music\Hunt.mp3"> 
     476      <Name>Hunt</Name> 
     477      <Importer>Mp3Importer</Importer> 
     478      <Processor>SongProcessor</Processor> 
     479    </Compile> 
    475480  </ItemGroup> 
    476481  <ItemGroup /> 
Note: See TracChangeset for help on using the changeset viewer.