Changeset 6305 for 2015/26/MikkoL/JRPG/JRPG/JRPG/Battle

Timestamp:

2015-06-25 03:34:50 (6 years ago)

Author:

mijoliim

Message:

 

Location:

2015/26/MikkoL/JRPG/JRPG/JRPG/Battle

Files:

• AttackList.cs (modified) (1 diff)
• BattleView.cs (modified) (4 diffs)

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

@@ -37 +37 @@
             character.CurrentHP.Value -= TrueDamage;
 
+            if(SoundEffects.Battle.Hit_01.IsPlaying)
+            {
+                SoundEffects.Battle.Hit_01.Stop();
+            }
+            SoundEffects.Battle.Hit_01.Play();
+
             BattleView.CurrentBattleView.IsAttackAnimationPlaying = false;
             BattleView.CurrentBattleView.IsTimerActive = true;

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

@@ -32 +32 @@
     public Queue<Action> ActionQueue = new Queue<Action>();
 
+    private BetterLabel EnemyName;
+    private Pointer Pointer;
+
     private Widget BattleHUD { get; set; }
     private List<GameObject> ToDeleteOnExit = new List<GameObject>();
     private ScrollingTextMenu BattleMenu { get; set; }
+
+    private int SelectedAllyIndex;
 
     private float WaitTimeBetweenActions = 1f;
@@ -173 +178 @@
                 if (Allies[Index].CurrentHP.Value == 0)
                 {
+                    if (SelectedAllyIndex == Allies[Index].Index)
+                    {
+                        JRPG.Game.ClearControls();
+
+                        IsInMenu = false;
+                        AllyNames[SelectedAllyIndex].IsFlashing = false;
+                        BattleMenu.Destroy();
+                        EnemyName.Destroy();
+                        Pointer.Destroy();
+                    }
+
                     Name.TextColor = Microsoft.Xna.Framework.Color.Gray;
                     HPMeter.TextColor = Microsoft.Xna.Framework.Color.Gray;
@@ -196 +212 @@
         SelectedEnemy = PrevSelectedEnemy;
 
-        BetterLabel EnemyName = new BetterLabel(JRPG.Game.MainFont, Vector.Zero, Enemies[SelectedEnemy].Name);
+        EnemyName = new BetterLabel(JRPG.Game.MainFont, Vector.Zero, Enemies[SelectedEnemy].Name);
         EnemyName.IsFlashing = true;
-        Pointer Pointer = new Pointer(Vector.Zero);
+        Pointer = new Pointer(Vector.Zero);
         Pointer.IsFlashing = true;
 
@@ -415 +431 @@
             if (!character.IsDead)
             {
+                SelectedAllyIndex = character.Index;
 
                 IsInMenu = true;