Jay reich sprint1

Project/Fall2020_CSC403_Project/Fall2020_CSC403_Project.csproj

@@ -113,13 +113,18 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="code\" />
-    <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyGameLibrary\MyGameLibrary.csproj">
       <Project>{F1E60F80-1868-4FE5-991B-FDDCFAF9B16B}</Project>
       <Name>MyGameLibrary</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="data\dialogueBox.jpg" />
+    <None Include="Resources\dialogue_box.bmp" />
+    <Content Include="data\battle_music.wav" />
+    <Content Include="data\overworld_music.wav" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Project/Fall2020_CSC403_Project/FrmBattle.cs

@@ -3,90 +3,120 @@
 using System;
 using System.Drawing;
 using System.Media;
+using System.Security.Principal;
 using System.Windows.Forms;
-
-namespace Fall2020_CSC403_Project {
-  public partial class FrmBattle : Form {
-    public static FrmBattle instance = null;
-    private Enemy enemy;
-    private Player player;
-
-    private FrmBattle() {
-      InitializeComponent();
-      player = Game.player;
-    }
-
-    public void Setup() {
-      // update for this enemy
-      picEnemy.BackgroundImage = enemy.Img;
-      picEnemy.Refresh();
-      BackColor = enemy.Color;
-      picBossBattle.Visible = false;
-
-      // Observer pattern
-      enemy.AttackEvent += PlayerDamage;
-      player.AttackEvent += EnemyDamage;
-
-      // show health
-      UpdateHealthBars();
-    }
-
-    public void SetupForBossBattle() {
-      picBossBattle.Location = Point.Empty;
-      picBossBattle.Size = ClientSize;
-      picBossBattle.Visible = true;
-
-      SoundPlayer simpleSound = new SoundPlayer(Resources.final_battle);
-      simpleSound.Play();
-
-      tmrFinalBattle.Enabled = true;
-    }
-
-    public static FrmBattle GetInstance(Enemy enemy) {
-      if (instance == null) {
-        instance = new FrmBattle();
-        instance.enemy = enemy;
-        instance.Setup();
-      }
-      return instance;
-    }
-
-    private void UpdateHealthBars() {
-      float playerHealthPer = player.Health / (float)player.MaxHealth;
-      float enemyHealthPer = enemy.Health / (float)enemy.MaxHealth;
-
-      const int MAX_HEALTHBAR_WIDTH = 226;
-      lblPlayerHealthFull.Width = (int)(MAX_HEALTHBAR_WIDTH * playerHealthPer);
-      lblEnemyHealthFull.Width = (int)(MAX_HEALTHBAR_WIDTH * enemyHealthPer);
-
-      lblPlayerHealthFull.Text = player.Health.ToString();
-      lblEnemyHealthFull.Text = enemy.Health.ToString();
-    }
-
-    private void btnAttack_Click(object sender, EventArgs e) {
-      player.OnAttack(-4);
-      if (enemy.Health > 0) {
-        enemy.OnAttack(-2);
-      }
-
-      UpdateHealthBars();
-      if (player.Health <= 0 || enemy.Health <= 0) {
-        instance = null;
-        Close();
-      }
-    }
-
-    private void EnemyDamage(int amount) {
-      enemy.AlterHealth(amount);
-    }
-
-    private void PlayerDamage(int amount) {
-      player.AlterHealth(amount);
-    }
-
-    private void tmrFinalBattle_Tick(object sender, EventArgs e) {
-      picBossBattle.Visible = false;
-      tmrFinalBattle.Enabled = false;
+using System.Xml.Schema;
+
+namespace Fall2020_CSC403_Project
+{
+    public partial class FrmBattle : Form
+    {
+        public static FrmBattle instance = null;
+        private Enemy enemy;
+        private AudioManager audioManager;
+        private Player player;
+
+        private FrmBattle()
+        {
+            InitializeComponent();
+            player = Game.player;
+            audioManager = AudioManager.Instance;
+            audioManager.AddSound("final_battle", new SoundPlayer(Resources.final_battle));
+            audioManager.AddSound("battle_music", new SoundPlayer(Resources.battle_music));
+            audioManager.AddSound("overworld_music", new SoundPlayer(Resources.overworld_music));
+        }
+
+        public void Setup()
+        {
+            audioManager.PlaySoundLoop("battle_music");
+            // update for this enemy
+            picEnemy.BackgroundImage = enemy.Img;
+            picEnemy.Refresh();
+            BackColor = enemy.Color;
+            picBossBattle.Visible = false;
+
+            // Observer pattern
+            enemy.AttackEvent += PlayerDamage;
+            player.AttackEvent += EnemyDamage;
+
+            // show health
+            UpdateHealthBars();
+        }
+
+        public void SetupForBossBattle()
+        {
+            picBossBattle.Location = Point.Empty;
+            picBossBattle.Size = ClientSize;
+            picBossBattle.Visible = true;
+            tmrFinalBattle.Enabled = true;
+            audioManager.PlaySound("battle_music");
+        }
+
+        public static FrmBattle GetInstance(Enemy enemy)
+        {
+            if (instance == null)
+            {
+                instance = new FrmBattle();
+                instance.enemy = enemy;
+                instance.Setup();
+            }
+            return instance;
+        }
+
+        private void UpdateHealthBars()
+        {
+            float playerHealthPer = player.Health / (float)player.MaxHealth;
+            float enemyHealthPer = enemy.Health / (float)enemy.MaxHealth;
+
+            const int MAX_HEALTHBAR_WIDTH = 226;
+            lblPlayerHealthFull.Width = (int)(MAX_HEALTHBAR_WIDTH * playerHealthPer);
+            lblEnemyHealthFull.Width = (int)(MAX_HEALTHBAR_WIDTH * enemyHealthPer);
+
+            lblPlayerHealthFull.Text = player.Health.ToString();
+            lblEnemyHealthFull.Text = enemy.Health.ToString();
+        }
+
+        private void btnAttack_Click(object sender, EventArgs e)
+        {
+            player.OnAttack(-4);
+            if (enemy.Health > 0)
+            {
+                enemy.OnAttack(-2);
+            }
+
+            UpdateHealthBars();
+            if (enemy.Health <= 0)
+            {
+                enemy.Die();
+                instance = null;
+                audioManager.StopSound("battle_music");
+                Close();
+                audioManager.PlaySoundLoop("overworld_music");
+            }
+            else if (player.Health <= 0)
+            {
+                player.Die();
+                instance = null;
+                audioManager.StopSound("battle_music");
+                Close();
+                audioManager.PlaySoundLoop("overworld_music");
+            }
+        }
+
+        private void EnemyDamage(int amount)
+        {
+            enemy.AlterHealth(amount);
+        }
+
+        private void PlayerDamage(int amount)
+        {
+            player.AlterHealth(amount);
+        }
+
+        private void tmrFinalBattle_Tick(object sender, EventArgs e)
+        {
+            picBossBattle.Visible = false;
+            tmrFinalBattle.Enabled = false;
+        }
     }
-  }
 }