version 1.5.2

ChrizziDerKek · Aug 29, 2024 · 29c187f · 29c187f
1 parent d1a30b1
commit 29c187f
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/BSR_Client/Constants.cs b/BSR_Client/Constants.cs
@@ -102,6 +102,12 @@ public partial class MainWindow
         private bool LockedItems = false;
         private EDebugMode DebugMode = EDebugMode.None;
         private string ItemCloneTarget = "";
+        private int NCigs = 0;
+        private int NBeers = 0;
+        private int NHeros = 0;
+        private int NMags = 0;
+        private int NTrash = 0;
+        private int NDamage = 0;
         private string GameVersion = "";
 
         public string GetGameVersion() => GameVersion;
@@ -169,6 +175,8 @@ private class SoundLib
             public MediaPlayer Gunpowder = new MediaPlayer() { Volume = 1.0 };
             public MediaPlayer Bullet = new MediaPlayer() { Volume = 1.0 };
             public MediaPlayer Trashbin = new MediaPlayer() { Volume = 1.0 };
+            public MediaPlayer Heroine = new MediaPlayer() { Volume = 1.0 };
+            public MediaPlayer Katana = new MediaPlayer() { Volume = 1.0 };
 
             public void Media_Ended(object sender, EventArgs e)
             {
@@ -198,6 +206,8 @@ public SoundLib()
                 Gunpowder.Open(new Uri("sounds/bsr_gunpowder.wav", UriKind.Relative));
                 Bullet.Open(new Uri("sounds/bsr_bullet.wav", UriKind.Relative));
                 Trashbin.Open(new Uri("sounds/bsr_trashbin.wav", UriKind.Relative));
+                Heroine.Open(new Uri("sounds/bsr_heroine.wav", UriKind.Relative));
+                Katana.Open(new Uri("sounds/bsr_katana.wav", UriKind.Relative));
 
                 Title.MediaEnded += Media_Ended;
                 Background1.MediaEnded += Media_Ended;

diff --git a/BSR_Client/Logic.cs b/BSR_Client/Logic.cs
@@ -145,6 +145,8 @@ public void UpdateLives(string player, int lives, bool set, bool lose, bool sync
                 }
                 it++;
             }
+            if (player == MyName && lose)
+                NDamage += lives;
             if (player == MyName && GetHealth() <= 0)
             {
                 Dead();
@@ -497,6 +499,24 @@ public EItem UseItem(string slot, bool sync)
                 return EItem.Nothing;
             if (Enum.TryParse(GetItemType(it), out EItem item))
             {
+                switch (item)
+                {
+                    case EItem.Cigarettes:
+                        NCigs++;
+                        break;
+                    case EItem.Beer:
+                        NBeers++;
+                        break;
+                    case EItem.Heroine:
+                        NHeros++;
+                        break;
+                    case EItem.Magazine:
+                        NMags++;
+                        break;
+                    case EItem.Trashbin:
+                        NTrash++;
+                        break;
+                }
                 if (sync)
                 {
                     Announce("You used " + item.ToString());
@@ -651,6 +671,14 @@ public void PlaySfx(EItem item)
                     Sound.Trashbin.Position = TimeSpan.Zero;
                     Sound.Trashbin.Play();
                     break;
+                case EItem.Heroine:
+                    Sound.Heroine.Position = TimeSpan.Zero;
+                    Sound.Heroine.Play();
+                    break;
+                case EItem.Katana:
+                    Sound.Katana.Position = TimeSpan.Zero;
+                    Sound.Katana.Play();
+                    break;
             }
         }
 
@@ -735,5 +763,17 @@ public string GetPlayerFromSlot(int slotId)
                 return null;
             return (text as TextBlock).Text;
         }
+
+        public int GetScore()
+        {
+            int score = 70000;
+            score -= (NDamage / 5) * 2000;
+            score -= NCigs * 220;
+            score -= NBeers * 495;
+            score -= NHeros * 445;
+            score -= NMags * 350;
+            score -= NTrash * 380;
+            return score;
+        }
     }
 }
diff --git a/BSR_Client/Properties/AssemblyInfo.cs b/BSR_Client/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1")]
-[assembly: AssemblyFileVersion("1.5.1")]
+[assembly: AssemblyVersion("1.5.2")]
+[assembly: AssemblyFileVersion("1.5.2")]