version 1.4.1

ChrizziDerKek · Aug 24, 2024 · 4abf922 · 4abf922
1 parent dd89a6f
commit 4abf922
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/BSR_Client/Logic.cs b/BSR_Client/Logic.cs
@@ -61,7 +61,7 @@ public void ShowEndscreen()
 
         public void GenerateLives()
         {
-            int maxhealth = RNG.Next(5, 11);
+            int maxhealth = RNG.Next(5, 16);
             foreach (string player in Players)
                 UpdateLives(player, maxhealth, true, false, true);
         }
@@ -85,7 +85,7 @@ public void RemovePlayer(string player)
 
         public void GenerateItems(bool remoteGenerate, int remoteCount)
         {
-            int count = RNG.Next(1, 4);
+            int count = RNG.Next(1, 5);
             if (remoteCount > 0)
                 count = remoteCount;
             string msg = "";
@@ -146,7 +146,8 @@ public void UpdateLives(string player, int lives, bool set, bool lose, bool sync
 
         public void GenerateBullets(bool sync = true)
         {
-            int count = RNG.Next(2, 9);
+            int randomDecision = RNG.Next(0, 100);
+            int count = randomDecision > 60 ? RNG.Next(2, 9) : RNG.Next(1, 3) * 2;  
             int numblank = 0;
             switch (count)
             {

diff --git a/BSR_Client/MainWindow.xaml b/BSR_Client/MainWindow.xaml
@@ -51,23 +51,23 @@
                 <RowDefinition Height="2*"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="1" Grid.Column="0">
-                <ProgressBar Name="Health1"  Margin="5" Minimum="0" Maximum="10" Background="#454545"/>
+                <ProgressBar Name="Health1"  Margin="5" Minimum="0" Maximum="15" Background="#454545"/>
                 <TextBlock Name="HealthText1" Text="{Binding ElementName=Health1, Path=Value}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
             </Grid>
             <Grid Grid.Row="1" Grid.Column="1">
-                <ProgressBar Name="Health2" Margin="5" Minimum="0" Maximum="10" Background="#454545"/>
+                <ProgressBar Name="Health2" Margin="5" Minimum="0" Maximum="15" Background="#454545"/>
                 <TextBlock Name="HealthText2" Text="{Binding ElementName=Health2, Path=Value}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
             </Grid>
             <Grid Grid.Row="1" Grid.Column="2">
-                <ProgressBar Name="Health3" Margin="5" Minimum="0" Maximum="10" Background="#454545"/>
+                <ProgressBar Name="Health3" Margin="5" Minimum="0" Maximum="15" Background="#454545"/>
                 <TextBlock Name="HealthText3" Text="{Binding ElementName=Health3, Path=Value}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
             </Grid>
             <Grid Grid.Row="1" Grid.Column="3">
-                <ProgressBar Name="Health4" Margin="5" Minimum="0" Maximum="10" Background="#454545"/>
+                <ProgressBar Name="Health4" Margin="5" Minimum="0" Maximum="15" Background="#454545"/>
                 <TextBlock Name="HealthText4" Text="{Binding ElementName=Health4, Path=Value}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
             </Grid>
             <Grid Grid.Row="1" Grid.Column="4">
-                <ProgressBar Name="Health5" Margin="5" Minimum="0" Maximum="10" Background="#454545"/>
+                <ProgressBar Name="Health5" Margin="5" Minimum="0" Maximum="15" Background="#454545"/>
                 <TextBlock Name="HealthText5" Text="{Binding ElementName=Health5, Path=Value}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
             </Grid>
             <Button Margin="5" Grid.Row="2" Grid.Column="2" Name="Shoot" Click="Button_Click" IsEnabled="False" BorderBrush="#454545">

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.4.0")]
-[assembly: AssemblyFileVersion("1.4.0")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]