Changeset 6417 for 2015

Timestamp:

2015-06-26 04:45:55 (8 years ago)

Author:

mijoliim

Message:

 

Location:

2015/26/MikkoL/JRPG

Files:

• JRPG.suo (modified) (previous)
• JRPG/JRPG/Battle/BattleView.cs (modified) (3 diffs)
• JRPG/JRPG/Battle/Characters/CharacterList.cs (modified) (1 diff)
• JRPG/JRPG/Battle/EnemyBase/EnemyBase.cs (modified) (1 diff)
• JRPG/JRPG/MainGame.cs (modified) (2 diffs)
• JRPG/JRPG/bin/x86/Debug/JRPG.exe (modified) (previous)
• JRPG/JRPG/bin/x86/Debug/JRPG.pdb (modified) (previous)
• JRPG/JRPG/obj/x86/Debug/JRPG.csprojResolveAssemblyReference.cache (modified) (previous)
• JRPG/JRPG/obj/x86/Debug/JRPG.exe (modified) (previous)
• JRPG/JRPG/obj/x86/Debug/JRPG.pdb (modified) (previous)
• JRPG/Jypeli/obj/x86/Debug/Jypeli2.0.csprojResolveAssemblyReference.cache (modified) (previous)

2015/26/MikkoL/JRPG/JRPG/JRPG/Battle/BattleView.cs

@@ -431 +431 @@
     void EndBattle()
     {
-
+        Flags.InBattle = false;
+
+        IsTimerActive = false;
+        IsAttackAnimationPlaying = true;
+        IsInMenu = true;
+
+        JRPG.Game.FadeMusicOut();
+
+        int totalExp = _EnemyGroup.Sum(E => E.ExperiencePoints);
+
+        DialogBox DialogBox = new DialogBox();
+        DialogBox.SetTextBase(JRPG.Game.MainFont, TextAlignment.Center);
+        DialogBox.TextPosition = new Vector(0, 224 + 100);
+        DialogBox.TextBox.Y += 550;
+        DialogBox.DrawIconBox = false;
+        DialogBox.WriteRow(" ");
+        DialogBox.WriteRow("You got " + totalExp.ToString() + " experience points!");
+        DialogBox.DrawDialogBox();
+
+        DialogBox.OnExiting += delegate
+        {
+            JRPG.Game.FadeOut();
+            Timer.SingleShot(1, DestroyAndLeaveBattle);
+        };
+    }
+
+    void DestroyAndLeaveBattle()
+    {
         Flags.InBattle = false;
 
@@ -451 +478 @@
 
         JRPG.Game.ClearControls();
-        
+
 
         JRPG.Game.LoadOWControlsKeyboard();
@@ -459 +486 @@
 
         JRPG.Game.FadeMusicOut();
+        JRPG.Game.FadeIn();
         Timer.SingleShot(0.5, delegate { JRPG.Game.FadeMusicIn("Music//WildArms"); });
     }

2015/26/MikkoL/JRPG/JRPG/JRPG/Battle/Characters/CharacterList.cs

@@ -13 +13 @@
         Sonic.Name = "Sonic";
         Sonic.CurrentStats.HP = 82;
-        Sonic.CurrentStats.Str = 20;
+        Sonic.CurrentStats.Str = 200;
         Sonic.CurrentStats.Def = 10;
         Sonic.CurrentStats.Luck = 20;
+        Sonic.CurrentStats.Spd = 500;
 
         Sonic.ResetHPMeter();

2015/26/MikkoL/JRPG/JRPG/JRPG/Battle/EnemyBase/EnemyBase.cs

@@ -14 +14 @@
     public List<SkillBase> Skills = new List<SkillBase>();
     public int FleePercent { get; set; }
+    public int ExperiencePoints = 10;
 
     public double BaseWaitTimeInSeconds = 1.5;

2015/26/MikkoL/JRPG/JRPG/JRPG/MainGame.cs

@@ -154 +154 @@
         Player.Color = Jypeli.Color.Blue;
         Add(Player);
+        SetAnimations();
+    }
+    public void SetAnimations()
+    {
+        if (Movement.FacingDir == Movement.Direction.Up && JRPG.Game.Keyboard.GetKeyState(Key.Up) == ButtonState.Pressed && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingUp);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Down && JRPG.Game.Keyboard.GetKeyState(Key.Down) == ButtonState.Pressed && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingDown);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Left && JRPG.Game.Keyboard.GetKeyState(Key.Left) == ButtonState.Pressed && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingLeft);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Right && JRPG.Game.Keyboard.GetKeyState(Key.Right) == ButtonState.Pressed && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingRight);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Up && JRPG.Game.Keyboard.GetKeyState(Key.Up) == ButtonState.Down && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingUp);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Down && JRPG.Game.Keyboard.GetKeyState(Key.Down) == ButtonState.Down && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingDown);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Left && JRPG.Game.Keyboard.GetKeyState(Key.Left) == ButtonState.Down && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingLeft);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Right && JRPG.Game.Keyboard.GetKeyState(Key.Right) == ButtonState.Down && !Movement.IsMoving)
+        {
+            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingRight);
+            Player.Animation.FPS = 10;
+            Player.Animation.Start();
+        }
+        else if (Movement.FacingDir == Movement.Direction.Up && !Movement.IsMoving)
+        {
+            Player.Animation = null;
+            Player.Image = Images.Characters.Overworld.Sonic_Standing_Up;
+        }
+        else if (Movement.FacingDir == Movement.Direction.Down && !Movement.IsMoving)
+        {
+            Player.Animation = null;
+            Player.Image = Images.Characters.Overworld.Sonic_Standing_Down;
+        }
+        else if (Movement.FacingDir == Movement.Direction.Left && !Movement.IsMoving)
+        {
+            Player.Animation = null;
+            Player.Image = Images.Characters.Overworld.Sonic_Standing_Left;
+        }
+        else if (Movement.FacingDir == Movement.Direction.Right && !Movement.IsMoving)
+        {
+            Player.Animation = null;
+            Player.Image = Images.Characters.Overworld.Sonic_Standing_Right;
+        }
     }
 
@@ -317 +389 @@
     #endregion
 
-    public void SetAnimations()
-    {
-        if (Movement.FacingDir == Movement.Direction.Up && JRPG.Game.Keyboard.GetKeyState(Key.Up) == ButtonState.Pressed && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingUp);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Down && JRPG.Game.Keyboard.GetKeyState(Key.Down) == ButtonState.Pressed && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingDown);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Left && JRPG.Game.Keyboard.GetKeyState(Key.Left) == ButtonState.Pressed && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingLeft);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Right && JRPG.Game.Keyboard.GetKeyState(Key.Right) == ButtonState.Pressed && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingRight);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Up && JRPG.Game.Keyboard.GetKeyState(Key.Up) == ButtonState.Down && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingUp);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Down && JRPG.Game.Keyboard.GetKeyState(Key.Down) == ButtonState.Down && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingDown);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Left && JRPG.Game.Keyboard.GetKeyState(Key.Left) == ButtonState.Down && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingLeft);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Right && JRPG.Game.Keyboard.GetKeyState(Key.Right) == ButtonState.Down && !Movement.IsMoving)
-        {
-            Player.Animation = new Animation(Images.Characters.Overworld.Sonic_WalkingRight);
-            Player.Animation.Start();
-        }
-        else if (Movement.FacingDir == Movement.Direction.Up && !Movement.IsMoving)
-        {
-            Player.Animation = null;
-            Player.Image = Images.Characters.Overworld.Sonic_Standing_Up;
-        }
-        else if (Movement.FacingDir == Movement.Direction.Down && !Movement.IsMoving)
-        {
-            Player.Animation = null;
-            Player.Image = Images.Characters.Overworld.Sonic_Standing_Down;
-        }
-        else if (Movement.FacingDir == Movement.Direction.Left && !Movement.IsMoving)
-        {
-            Player.Animation = null;
-            Player.Image = Images.Characters.Overworld.Sonic_Standing_Left;
-        }
-        else if (Movement.FacingDir == Movement.Direction.Right && !Movement.IsMoving)
-        {
-            Player.Animation = null;
-            Player.Image = Images.Characters.Overworld.Sonic_Standing_Right;
-        }
-        /*
-        if (Player.Animation.FPS != 5)
-        {
-            Player.Animation.FPS = 5;
-        }*/
-    }
+
 
     public void FadeOut()