HeyM1ke · dataongit · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021
diff --git a/ValorScrimSource/ValorParty/MainWindow.xaml b/ValorScrimSource/ValorParty/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ValorParty"
         mc:Ignorable="d"
-        Title="ValorScrim | 0.0.0.5 | RUMBLEMIKE" Height="489" Width="813" ResizeMode="NoResize">
+        Title="ValorScrim | 0.0.0.6 | RUMBLEMIKE" Height="489" Width="813" ResizeMode="NoResize">
     <Grid>
         <Canvas HorizontalAlignment="Center" VerticalAlignment="Top" Height="464" Grid.RowSpan="2" Width="0">
         </Canvas>

diff --git a/ValorScrimSource/ValorParty/Menus/CreateMatch/CreateMatch.xaml b/ValorScrimSource/ValorParty/Menus/CreateMatch/CreateMatch.xaml
@@ -12,10 +12,10 @@
 
     <Grid>
         <Canvas Background="#FF0F1923">
-            <Label Content="CREATE A MATCH"  Foreground="White" FontFamily="Bahnschrift" Height="47" Width="280" FontSize="34" Canvas.Top="82" Canvas.Left="260"/>
-            <Image x:Name="mapPreview" Height="75" Canvas.Left="228" Canvas.Top="134" Width="344" Source="/images/undefined.png"/>
-            <ComboBox x:Name="mapComboBox" Canvas.Left="302" Canvas.Top="233" Width="256" SelectionChanged="mapComboBox_SelectionChanged" BorderBrush="Black" Foreground="Black" Background="#FF0F1923" Style="{StaticResource ComboBoxFlatStyle}">
-                
+            <Label Content="CREATE A MATCH"  Foreground="White" FontFamily="Bahnschrift" Height="47" Width="280" FontSize="34" Canvas.Top="10" Canvas.Left="260"/>
+            <Image x:Name="mapPreview" Height="119" Canvas.Left="228" Canvas.Top="89" Width="344" Source="/images/undefined.png"/>
+            <ComboBox x:Name="mapComboBox" Canvas.Left="284" Canvas.Top="233" Width="256" SelectionChanged="mapComboBox_SelectionChanged" BorderBrush="Black" Foreground="Black" Background="#FF0F1923" Style="{StaticResource ComboBoxFlatStyle}">
+
                 <ComboBox.ItemContainerStyle>
                     <Style TargetType="ComboBoxItem">
                         <Setter Property="Background" Value="#FF0F1923"/>
@@ -30,9 +30,9 @@
                 <ComboBoxItem Content="Haven"/>
                 <ComboBoxItem Content="Split"/>
             </ComboBox>
-            <Label Content="MAP:" Canvas.Left="229" Canvas.Top="230" Height="27" Width="55" Foreground="White" FontFamily="Bahnschrift SemiBold" FontSize="14"/>
-            <Button x:Name="createMatchBTN" Content="CREATE" Height="50" Width="164" FontFamily="Bahnschrift SemiBold" FontSize="24" Background="#FFFF4655" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Canvas.Left="318" Canvas.Top="299" Click="createMatchBTN_Click"/>
-            <ComboBox x:Name="serverComboBox" Canvas.Left="302" Canvas.Top="265" Width="256" BorderBrush="Black" Foreground="Black" Background="#FF0F1923" Style="{StaticResource ComboBoxFlatStyle}" SelectionChanged="serverComboBox_SelectionChanged">
+            <Label Content="MAP:" Canvas.Left="241" Canvas.Top="232" Height="27" Width="56" Foreground="White" FontFamily="Bahnschrift SemiBold" FontSize="14"/>
+            <Button x:Name="createMatchBTN" Content="CREATE" Height="50" Width="164" FontFamily="Bahnschrift SemiBold" FontSize="24" Background="#FFFF4655" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Canvas.Left="318" Canvas.Top="317" Click="createMatchBTN_Click"/>
+            <ComboBox x:Name="serverComboBox" Canvas.Left="284" Canvas.Top="264" Width="256" BorderBrush="Black" Foreground="Black" Background="#FF0F1923" Style="{StaticResource ComboBoxFlatStyle}" SelectionChanged="serverComboBox_SelectionChanged">
                 <ComboBox.ItemContainerStyle>
                     <Style TargetType="ComboBoxItem">
                         <Setter Property="Background" Value="#FF0F1923"/>
@@ -42,7 +42,7 @@
                     </Style>
                 </ComboBox.ItemContainerStyle>
             </ComboBox>
-            <Label Content="SERVER:" Canvas.Left="229" Canvas.Top="262" Height="27" Width="68" Foreground="White" FontFamily="Bahnschrift SemiBold" FontSize="14"/>
+            <Label Content="SERVER:" Canvas.Left="216" Canvas.Top="262" Height="27" Width="68" Foreground="White" FontFamily="Bahnschrift SemiBold" FontSize="14"/>
             <Button x:Name="backBTN" Content="BACK" Height="30" Width="80" FontFamily="Bahnschrift SemiBold" FontSize="14" Background="#FFFF4655" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Canvas.Left="10" Canvas.Top="10" Click="backBTN_Click"/>
         </Canvas>
 

diff --git a/ValorScrimSource/ValorParty/Menus/CreateMatch/CreateMatch.xaml.cs b/ValorScrimSource/ValorParty/Menus/CreateMatch/CreateMatch.xaml.cs
@@ -25,6 +25,8 @@ public partial class CreateMatch : Page
     {
         string selectedMap;
         string selectedServer;
+
+
 
         public CreateMatch()
         {
@@ -415,6 +417,8 @@ void KRServerDetermination(string value)
         private void backBTN_Click(object sender, RoutedEventArgs e)
         {
             MainWindow.loaderFrameRef.Content = new Menus.Home.Home();
-        }
+        }
+
+
     }
 }
diff --git a/ValorScrimSource/ValorParty/Menus/ErrorPage/ErrorPage.xaml b/ValorScrimSource/ValorParty/Menus/ErrorPage/ErrorPage.xaml
@@ -10,15 +10,15 @@
 
     <Grid>
         <Canvas Background="#FF0F1923">
-            <Rectangle Height="212" Canvas.Left="294" Canvas.Top="119" Width="212" Fill="#FF1D2F42">
+            <Rectangle Height="112" Canvas.Left="235" Canvas.Top="152" Width="330" Fill="#FF1D2F42">
                 <Rectangle.Effect>
                     <DropShadowEffect Direction="-90" ShadowDepth="20" BlurRadius="100"/>
                 </Rectangle.Effect>
             </Rectangle>
-            <Button x:Name="quitBTN" Content="QUIT" Height="30" Width="80" FontFamily="Bahnschrift SemiBold" FontSize="14" Background="#FFFF4655" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Canvas.Left="360" Canvas.Top="281" Click="quitBTN_Click"/>
-            <Label Content="//ERROR" Canvas.Left="304" Canvas.Top="129" FontFamily="Bahnschrift SemiBold" FontSize="22" Foreground="White"/>
-            <TextBlock Canvas.Left="304" Canvas.Top="170" Text="We have run into an error!" TextWrapping="Wrap" Height="26" Width="190" FontFamily="Bahnschrift Light" Foreground="White"/>
-            <TextBlock x:Name="errorMessage" Canvas.Left="304" Canvas.Top="201" Text="//DETAILS HERE WOOOO POGGERS MOMENT" TextWrapping="Wrap" Height="63" Width="190" FontFamily="Bahnschrift Light" Foreground="White"/>
+            <Button x:Name="quitBTN" Content="QUIT" Height="30" Width="80" FontFamily="Bahnschrift SemiBold" FontSize="14" Background="#FFFF4655" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Canvas.Left="469" Canvas.Top="212" Click="quitBTN_Click"/>
+            <Label Content="//ERROR" Canvas.Left="235" Canvas.Top="160" FontFamily="Bahnschrift SemiBold" FontSize="22" Foreground="White"/>
+            <TextBlock Canvas.Left="359" Canvas.Top="170" Text="We have run into an error!" TextWrapping="Wrap" Height="26" Width="190" FontFamily="Bahnschrift Light" Foreground="White"/>
+            <TextBlock x:Name="errorMessage" Canvas.Left="247" Canvas.Top="212" Text="//DETAILS HERE WOOOO POGGERS MOMENT" TextWrapping="Wrap" Height="63" Width="190" FontFamily="Bahnschrift Light" Foreground="White"/>
         </Canvas>
     </Grid>
 </Page>
diff --git a/ValorScrimSource/ValorParty/Menus/Home/Home.xaml b/ValorScrimSource/ValorParty/Menus/Home/Home.xaml
@@ -1,44 +1,60 @@
-<Page x:Class="ValorParty.Menus.Home.Home"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:ValorParty.Menus.Home"
-      mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Title="Home" Loaded="Page_Loaded" Background="#FF0F1923">
-
-    <Grid>
-        <MediaElement x:Name="videoBackground" Margin="0,0,384,0" Height="462" Volume="0" Loaded="videoBackground_Loaded" MediaEnded="videoBackground_MediaEnded" LoadedBehavior="Manual" VerticalAlignment="Top" OpacityMask="#FFDA1414" Stretch="UniformToFill" >
-            <MediaElement.Triggers>
-                <EventTrigger RoutedEvent="FrameworkElement.Loaded">
-                    <BeginStoryboard>
-                        <Storyboard>
-
-                            <MediaTimeline x:Name="videoContainer" Source="" Storyboard.TargetName="videoBackground"  
-                 RepeatBehavior="Forever" />
-
-                        </Storyboard>
-                    </BeginStoryboard>
-                </EventTrigger>
-            </MediaElement.Triggers>
-        </MediaElement>
-        <Rectangle HorizontalAlignment="Right" Height="225" Margin="400,0,0,0" VerticalAlignment="Top" Width="400" Fill="#FF0F1923"/>
-        <Rectangle HorizontalAlignment="Right" Height="225" Margin="400,225,0,0" VerticalAlignment="Top" Width="400" Fill="#FFFF4655"/>
-        <Button x:Name="CreateNatchHomeBTN" Content="CREATE" HorizontalAlignment="Left" Margin="518,112,0,0" VerticalAlignment="Top" Height="50" Width="164" FontFamily="Bahnschrift SemiBold" FontSize="24" Background="#FFFF4655" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Click="CreateNatchHomeBTN_Click"/>
-        <Label Content="CREATE A MATCH" HorizontalAlignment="Left" Margin="460,60,0,0" VerticalAlignment="Top" Foreground="White" FontFamily="Bahnschrift" Height="47" Width="280" FontSize="34"/>
-        <Label Content="JOIN A MATCH" HorizontalAlignment="Left" Margin="484,286,0,0" VerticalAlignment="Top" Foreground="#FF0F1923" FontFamily="Bahnschrift" Height="47" Width="232" FontSize="34"/>
-        <Button x:Name="joinBTN" Content="JOIN" HorizontalAlignment="Left" Margin="518,338,0,0" VerticalAlignment="Top" Height="50" Width="164" FontFamily="Bahnschrift SemiBold" FontSize="24" Background="#FF0F1923" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Click="joinBTN_Click"/>
-        <Canvas Margin="133,385,517,10" Width="150" Height="55" Background="#FFF4F4F4">
-            <Canvas.Effect>
-                <DropShadowEffect Direction="-90" BlurRadius="10" Opacity=".5"/>
-            </Canvas.Effect>
-            <Image x:Name="playerCardPreview" Height="40" Canvas.Left="9" Canvas.Top="8" Width="40" Source="" Stretch="Fill"/>
-            <Label x:Name="regionLabel" Content="REGION : NA" Canvas.Left="54" Canvas.Top="15" FontFamily="Bahnschrift SemiLight" FontSize="14" FontStyle="Normal"/>
-        </Canvas>
-        <Image x:Name="logoPic" HorizontalAlignment="Left" Height="159" Margin="0,112,0,0" VerticalAlignment="Top" Width="402" Source="/Resources/logo.png" Stretch="Uniform"/>
-        <Label Content="- BETA -" HorizontalAlignment="Left" Margin="218,220,0,0" VerticalAlignment="Top" FontFamily="Bahnschrift SemiLight" FontSize="22" Background="Transparent" Foreground="White"/>
-        <Label Content="ValorScrim has no affiliation with Riot Games" HorizontalAlignment="Left" Margin="631,426,0,0" VerticalAlignment="Top" Height="24" Width="169" FontSize="8" Foreground="White"/>
-
-    </Grid>
-</Page>
+<Page x:Class="ValorParty.Menus.Home.Home"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:ValorParty.Menus.Home"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="Home" Loaded="Page_Loaded" Background="#FF0F1923">
+
+    <Grid>
+        <MediaElement x:Name="videoBackground" Margin="0,0,384,0" Height="462" Volume="0" Loaded="videoBackground_Loaded" MediaEnded="videoBackground_MediaEnded" LoadedBehavior="Manual" VerticalAlignment="Top" OpacityMask="#FFDA1414" Stretch="UniformToFill" >
+            <MediaElement.Triggers>
+                <EventTrigger RoutedEvent="FrameworkElement.Loaded">
+                    <BeginStoryboard>
+                        <Storyboard>
+
+                            <MediaTimeline x:Name="videoContainer" Source="" Storyboard.TargetName="videoBackground"  
+                 RepeatBehavior="Forever" />
+
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+            </MediaElement.Triggers>
+        </MediaElement>
+        <Rectangle HorizontalAlignment="Right" Height="225" Margin="400,0,0,0" VerticalAlignment="Top" Width="400" Fill="#FF0F1923"/>
+        <Rectangle HorizontalAlignment="Right" Height="225" Margin="400,225,0,0" VerticalAlignment="Top" Width="400" Fill="#FFFF4655"/>
+        <Button x:Name="CreateNatchHomeBTN" Content="CREATE" HorizontalAlignment="Left" Margin="518,112,0,0" VerticalAlignment="Top" Height="50" Width="164" FontFamily="Bahnschrift SemiBold" FontSize="24" BorderBrush="#FFF4F4F4" Foreground="Black" Click="CreateNatchHomeBTN_Click" RenderTransformOrigin="0.5,0.5" Background="#FFE44A56">
+            <Button.Effect>
+                <DropShadowEffect Color="#FFFF4655"/>
+            </Button.Effect>
+        </Button>
+        <Label Content="CREATE A MATCH" HorizontalAlignment="Left" Margin="460,60,0,0" VerticalAlignment="Top" Foreground="White" FontFamily="Bahnschrift" Height="47" Width="280" FontSize="34"/>
+        <Label Content="JOIN A MATCH" HorizontalAlignment="Left" Margin="484,286,0,0" VerticalAlignment="Top" Foreground="#FF0F1923" FontFamily="Bahnschrift" Height="47" Width="232" FontSize="34"/>
+        <Button x:Name="joinBTN" Content="JOIN" HorizontalAlignment="Left" Margin="518,338,0,0" VerticalAlignment="Top" Height="50" Width="164" FontFamily="Bahnschrift SemiBold" FontSize="24" Background="Black" BorderBrush="#FFF4F4F4" Foreground="#FFF4F4F4" Click="joinBTN_Click" RenderTransformOrigin="0.5,0.5">
+            <Button.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </Button.RenderTransform>
+            <Button.Effect>
+                <DropShadowEffect/>
+            </Button.Effect>
+        </Button>
+        <Canvas Margin="10,385,640,10" Width="150" Height="55" Background="#FFF4F4F4">
+            <Canvas.Effect>
+                <DropShadowEffect Direction="-90" BlurRadius="10" Opacity=".5"/>
+            </Canvas.Effect>
+            <Image x:Name="playerCardPreview" Height="60" Canvas.Left="0.959" Canvas.Top="-79.918" Width="150" Source="" Stretch="Fill"/>
+            <Label x:Name="regionLabel" Content="REGION : NA" Canvas.Left="30.805" Canvas.Top="14.098" FontFamily="Bahnschrift SemiLight" FontSize="14" FontStyle="Normal"/>
+        </Canvas>
+        <Image x:Name="logoPic" HorizontalAlignment="Left" Height="159" Margin="0,112,0,0" VerticalAlignment="Top" Width="402" Source="/Resources/logo.png" Stretch="Uniform"/>
+        <Label Content="- BETA -" HorizontalAlignment="Left" Margin="218,220,0,0" VerticalAlignment="Top" FontFamily="Bahnschrift SemiLight" FontSize="22" Background="Transparent" Foreground="White"/>
+        <TextBox x:Name="disclaimer" HorizontalAlignment="Left" Height="28" Margin="630,434,0,0" Text="*This app is not approved by Riot" TextWrapping="Wrap" VerticalAlignment="Top" Width="212" SelectionOpacity="0" FontFamily="Bahnschrift" FontWeight="Bold" FontSize="11" Background="{x:Null}" SelectionBrush="{x:Null}" BorderBrush="{x:Null}"/>
+
+    </Grid>
+</Page>
diff --git a/ValorScrimSource/ValorParty/RumbleMike/Endpoints.cs b/ValorScrimSource/ValorParty/RumbleMike/Endpoints.cs
@@ -84,8 +84,10 @@ public static JObject POSTCustomGameSettings(string map, string server)
             Object settings = new
             {
                 map = map,
-                Mode = "/Game/GameModes/Bomb/BombGameMode.BombGameMode_C",
-                GamePod = server
+                Mode = "Game/GameModes/Bomb/BombGameMode.BombGameMode_C",
+                GamePod = server,
+
+
             };
 
             string body = JsonConvert.SerializeObject(settings);
@@ -192,7 +194,7 @@ public static string GetPlayerCard()
                 var resp = JObject.Parse(getResp.Content);
                 playercardID = (string)resp["PlayerCard"]["ID"];
                 Debug.WriteLine(playercardID);
-                return $"https://media.valorant-api.com/playercards/{playercardID}/smallart.png";
+                return $"https://media.valorant-api.com/playercards/{playercardID}/wideart.png";
             }
 
             else

diff --git a/ValorScrimSource/ValorParty/ValorScrim.csproj b/ValorScrimSource/ValorParty/ValorScrim.csproj
@@ -7,11 +7,12 @@
     <AssemblyName>ValorScrim</AssemblyName>
     <RootNamespace>ValorParty</RootNamespace>
     <ApplicationIcon>vslogo.ico</ApplicationIcon>
-    <AssemblyVersion>0.0.0.5</AssemblyVersion>
-    <FileVersion>0.0.0.5</FileVersion>
+    <AssemblyVersion>0.0.0.6</AssemblyVersion>
+    <FileVersion>0.0.0.6</FileVersion>
     <Authors>RumbleMike</Authors>
-    <Version>0.0.0.5</Version>
+    <Version>0.0.0.6</Version>
     <PackageIcon>vslogo.png</PackageIcon>
+    <Copyright>RumbleMike</Copyright>
   </PropertyGroup>
 
   <ItemGroup>