Game updatess

OpenSauce · Feb 18, 2021 · df6e22d · df6e22d
1 parent 2442fdf
commit df6e22d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/MOBA-Manager/MOBA-Manager/Assets/UI/person.png b/MOBA-Manager/MOBA-Manager/Assets/UI/person.png
diff --git a/MOBA-Manager/MOBA-Manager/MOBA-Manager.csproj b/MOBA-Manager/MOBA-Manager/MOBA-Manager.csproj
@@ -414,6 +414,7 @@
     <Resource Include="Assets\Badges\64 Legs.png" />
     <Resource Include="Assets\UI\two-coins %281%29.png" />
     <Resource Include="Assets\UI\two-coins.png" />
+    <Resource Include="Assets\UI\person.png" />
     <Content Include="Sound\Doomsayer.wav" />
   </ItemGroup>
   <ItemGroup>

diff --git a/MOBA-Manager/MOBA-Manager/Source/DataModel/Team.cs b/MOBA-Manager/MOBA-Manager/Source/DataModel/Team.cs
@@ -21,6 +21,16 @@ public String GetTeamName()
             return this.teamName;
         }
 
+        public String GetCash()
+        {
+            return "£" + Math.Floor(Cash);
+        }
+
+        public int GetNumberOfPlayers()
+        {
+            return Roster.Count;
+        }
+
         public void SetTeamName(String name)
         {
             this.teamName = name;

diff --git a/MOBA-Manager/MOBA-Manager/Source/UI/InGame/HomeScreen/HomeScreenPage.xaml b/MOBA-Manager/MOBA-Manager/Source/UI/InGame/HomeScreen/HomeScreenPage.xaml
@@ -14,10 +14,16 @@
             <ColumnDefinition Width="2*" />
         </Grid.ColumnDefinitions>
         <Border Grid.Column="0" Grid.RowSpan="4" BorderBrush="White"
-        BorderThickness="0,0,1,0" Background="{x:Null}" />
+        BorderThickness="0,0,1,0" Background="{x:Null}" >
+        </Border>
+
         <Image Grid.Column="0" x:Name="teamIcon" HorizontalAlignment="Right" Height="100" Margin="0,20,20,0" VerticalAlignment="Top" Width="100" />
-        <Label Grid.Column="0" x:Name="teamName" Content="Label" HorizontalAlignment="Left" Margin="65,81,0,0" VerticalAlignment="Top" Style="{DynamicResource Header}" />
+        <Label Grid.Column="0" x:Name="teamName" Content="Label" HorizontalAlignment="Left" Margin="40,64,0,0" VerticalAlignment="Top" Style="{DynamicResource Header}" FontFamily="/MOBA-Manager;component/Fonts/#monogram" />
         <Label  Grid.Column="0" x:Name="playerName" Content="Label" HorizontalAlignment="Left" Margin="40,20,0,0" VerticalAlignment="Top" Style="{DynamicResource ResourceKey=Header}" />
+        <Image  Grid.Column="0"  x:Name="cashIcon" HorizontalAlignment="Left" Height="64" Margin="40,115,0,0" VerticalAlignment="Top" Width="64" Source="/MOBA-Manager;component/Assets/UI/two-coins.png" />
+        <Label Grid.Column="0" x:Name="cashLabel" Content="Label" HorizontalAlignment="Left" Margin="128,123,0,0" VerticalAlignment="Top" Style="{DynamicResource Header}" FontFamily="/MOBA-Manager;component/Fonts/#monogram" />
+        <Image  Grid.Column="0"  x:Name="playerIcon" HorizontalAlignment="Left" Height="64" Margin="220,115,0,0" VerticalAlignment="Top" Width="64" Source="/MOBA-Manager;component/Assets/UI/person.png" />
+        <Label Grid.Column="0" x:Name="numberOfPlayerLabel" Content="Label" HorizontalAlignment="Left" Margin="300,123,0,0" VerticalAlignment="Top" Style="{DynamicResource Header}" FontFamily="/MOBA-Manager;component/Fonts/#monogram" />
         <Label Content="Team List" Grid.Column="1" HorizontalAlignment="Left" Margin="40,20,0,0" VerticalAlignment="Top" Style="{DynamicResource Header}" />
         <StackPanel x:Name="Squad" Grid.Column="1" Margin="0,100,0,0">
         </StackPanel>

diff --git a/MOBA-Manager/MOBA-Manager/Source/UI/InGame/HomeScreen/HomeScreenPage.xaml.cs b/MOBA-Manager/MOBA-Manager/Source/UI/InGame/HomeScreen/HomeScreenPage.xaml.cs
@@ -25,6 +25,8 @@ private void SetupUI()
             playerName.Content = playerSession.MainPlayer.GetFullName();
             teamName.Content = playerTeam.TeamName;
             teamIcon.Source = playerTeam.TeamBadge;
+            cashLabel.Content = playerTeam.GetCash();
+            numberOfPlayerLabel.Content = playerTeam.GetNumberOfPlayers();
             SetupTeamList();
         }