Score screen #1209

GregoryGhost · 2021-06-23T15:12:48Z

Part of #1120
Part of #1121

Changes

...

Checklist

Read the contribution guide and accept the code of conduct
Readme and The Rulebook (updated or not needed)
Tests (added, updated or not needed)

codecov · 2021-06-23T15:14:03Z

Codecov Report

Merging #1209 (c957cac) into feature-1121-score-screen (1fcec6e) will increase coverage by 0.15%.
The diff coverage is n/a.

❗ Current head c957cac differs from pull request most recent head 3ba5fec. Consider uploading reports for the commit 3ba5fec to get more accurate results

@@                      Coverage Diff                      @@
##           feature-1121-score-screen    #1209      +/-   ##
=============================================================
+ Coverage                      63.20%   63.35%   +0.15%     
=============================================================
  Files                            345      347       +2     
  Lines                           7866     7901      +35     
=============================================================
+ Hits                            4972     5006      +34     
- Misses                          2894     2895       +1

Flag	Coverage Δ
Zilon.Core.FunctionalTests	`39.89% <ø> (-0.12%)`	⬇️
Zilon.Core.UnitTests	`48.64% <ø> (+1.12%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
Zilon.Core/Zilon.Core/PerkHelper.cs	`80.30% <0.00%> (-13.04%)`	⬇️
...ilon.Core/Zilon.Core/Tactics/HumanSectorFowData.cs	`79.16% <0.00%> (-9.21%)`	⬇️
...llularAutomatonStyle/InteriorObjectRandomSource.cs	`81.25% <0.00%> (-4.72%)`	⬇️
...ore/Zilon.Core/World/ResourceMaterializationMap.cs	`96.82% <0.00%> (-1.66%)`	⬇️
Zilon.Core/Zilon.Core/World/BiomeSchemeRoller.cs	`100.00% <0.00%> (ø)`
...on.Core/Zilon.Bot.Players/Logics/ExitLogicState.cs	`0.00% <0.00%> (ø)`
...on.Core/Zilon.Core/Tactics/MonsterSectorFowData.cs	`0.00% <0.00%> (ø)`
...on.Core/Zilon.Core/World/GlobeTransitionHandler.cs	`73.07% <0.00%> (ø)`
...Core/Zilon.Core/PersonModules/IPersonExtensions.cs	`72.72% <0.00%> (ø)`
...Core/MapGenerators/SwitchMapFactorySelectorBase.cs	`0.00% <0.00%> (ø)`
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1fcec6e...3ba5fec. Read the comment docs.

coveralls · 2021-06-23T15:18:09Z

Pull Request Test Coverage Report for Build 964811730

0 of 0 changed or added relevant lines in 0 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 59.811%

Totals
Change from base Build 962717650:	0.0%
Covered Lines:	5006
Relevant Lines:	7901

💛 - Coveralls

Zilon.Core/CDT.LAST.MonoGameClient/Resources/UiResources.Designer.cs

kreghek · 2021-06-23T16:45:01Z

Zilon.Core/CDT.LAST.MonoGameClient/Screens/LeaderBoardScreen.cs

+            _spriteBatch = spriteBatch;
+
+            var buttonTexture = game.Content.Load<Texture2D>("Sprites/ui/button");
+            var font = Game.Content.Load<SpriteFont>("Fonts/Main");


You should get main font and button texture from IUiContentStorage to prevent multiple loading of same resources.

kreghek · 2021-06-23T16:47:17Z

Zilon.Core/CDT.LAST.MonoGameClient/Screens/ScoresScreen.cs

+                title: UiResources.NextScreenButtonTitle,
+                texture: buttonTexture,
+                font: font,
+                rect: new Rectangle(x: 550, y: 150, width: 100, height: 20));


Do not use magic numbers. Instead use named constants.

What are magic numbers? It's just a position of the button and other parameters.

const int BUTTON_WIDTH = 100; const int BUTTON_HEIGHT = 20; const int BUTTON_STACK_X = 150; const int BUTTON_STACK_Y = 150; _goToNextScreen = new TextButton( title: UiResources.NextScreenButtonTitle, texture: buttonTexture, font: font, rect: new Rectangle( x: BUTTON_STACK_X + BUTTON_WIDTH * 2 , y: BUTTON_STACK_Y , width: BUTTON_WIDTH, height: BUTTON_HEIGHT));

It's better to maintain and understand that just x: 550, y: 150, width: 100, height: 20

kreghek · 2021-06-23T16:49:07Z

Zilon.Core/CDT.LAST.MonoGameClient/Screens/ScoresScreen.cs

+            var state = Keyboard.GetState();
+
+            // If they hit esc, exit
+            if (state.IsKeyDown(Keys.Escape))
+            {
+                Game.Exit();
+            }


Looks like copy-pasta. We should exit game the Keys.Escape.

kreghek · 2021-06-23T16:50:44Z

Zilon.Core/CDT.LAST.MonoGameClient/Screens/ScoresScreen.cs

+
+            _spriteBatch.DrawString(
+                spriteFont: font,
+                text: "Score menu",


Localize all output strings via UiResources. The easiest way to manage resources is ResX extension described in README.md

…Roguelike into score-screen

kreghek · 2021-06-25T06:51:33Z

Zilon.Core/CDT.LAST.MonoGameClient/Screens/ScoresScreen.cs

+                title: UiResources.NextScreenButtonTitle,
+                texture: buttonTexture,
+                font: font,
+                rect: new Rectangle(x: 550, y: 150, width: 100, height: 20));


const int BUTTON_WIDTH = 100; const int BUTTON_HEIGHT = 20; const int BUTTON_STACK_X = 150; const int BUTTON_STACK_Y = 150; _goToNextScreen = new TextButton( title: UiResources.NextScreenButtonTitle, texture: buttonTexture, font: font, rect: new Rectangle( x: BUTTON_STACK_X + BUTTON_WIDTH * 2 , y: BUTTON_STACK_Y , width: BUTTON_WIDTH, height: BUTTON_HEIGHT));

It's better to maintain and understand that just x: 550, y: 150, width: 100, height: 20

kreghek · 2021-06-25T08:03:22Z

Zilon.Core/Zilon.Core/PersonModules/SurvivalModuleBase.cs

@@ -54,7 +54,7 @@ private void ProcessIfHealth(SurvivalStat stat, int valueDiff)
                return;
            }

-            var hp = stat.Value;
+            var hp = 0; //stat.Value;


??
I thing this is test changes. This is not for master branch.
it's better to test via cheat input component. There is no way to manipulate person attributes. But you can add wanted cheat easely.

Zilon.Core/CDT.LAST.MonoGameClient/Resources/UiResources.Designer.cs

…Roguelike into score-screen � Conflicts: � Zilon.Core/CDT.LAST.MonoGameClient/Screens/LeaderBoardScreen.cs � Zilon.Core/CDT.LAST.MonoGameClient/Screens/ScoresScreen.cs

GregoryGhost added 4 commits June 22, 2021 01:12

Added draft a scores screen

1a7be2c

Added UI buttons titles definitions to UI resources

10782e0

Fixed references of button titles in screens.

356eb03

[Bot] Automated dotnet-format update

c957cac

[Bot] Automated ReSharper CLT update

e3b22cf

kreghek changed the base branch from master to feature-1121-score-screen June 23, 2021 16:04

kreghek requested changes Jun 23, 2021

View reviewed changes

kreghek self-assigned this Jun 23, 2021

kreghek added the client Works on client label Jun 23, 2021

GregoryGhost added 4 commits June 25, 2021 00:08

Fixed codereview issues

8a94038

Merge branch 'score-screen' of https://github.com/GregoryGhost/Zilon_…

3a5463e

…Roguelike into score-screen

[Bot] Automated dotnet-format update

31db409

[Bot] Automated ReSharper CLT update

f394da4

kreghek requested changes Jun 26, 2021

View reviewed changes

GregoryGhost added 4 commits June 26, 2021 18:13

Extracted magic numbers (UI element parameters) to constants

ea5588a

Merge branch 'score-screen' of https://github.com/GregoryGhost/Zilon_…

c8ee579

…Roguelike into score-screen � Conflicts: � Zilon.Core/CDT.LAST.MonoGameClient/Screens/LeaderBoardScreen.cs � Zilon.Core/CDT.LAST.MonoGameClient/Screens/ScoresScreen.cs

Revert changes

284b23d

[Bot] Automated ReSharper CLT update

3ba5fec

kreghek merged commit 534e2f7 into kreghek:feature-1121-score-screen Jul 1, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Score screen #1209

Score screen #1209

GregoryGhost commented Jun 23, 2021 •

edited by kreghek

Loading

codecov bot commented Jun 23, 2021 •

edited

Loading

coveralls commented Jun 23, 2021 •

edited

Loading

kreghek Jun 23, 2021

kreghek Jun 23, 2021

GregoryGhost Jun 24, 2021

kreghek Jun 25, 2021

kreghek Jun 23, 2021

kreghek Jun 23, 2021

kreghek Jun 25, 2021

kreghek Jun 25, 2021

Score screen #1209

Score screen #1209

Conversation

GregoryGhost commented Jun 23, 2021 • edited by kreghek Loading

codecov bot commented Jun 23, 2021 • edited Loading

Codecov Report

coveralls commented Jun 23, 2021 • edited Loading

Pull Request Test Coverage Report for Build 964811730

💛 - Coveralls

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GregoryGhost commented Jun 23, 2021 •

edited by kreghek

Loading

codecov bot commented Jun 23, 2021 •

edited

Loading

coveralls commented Jun 23, 2021 •

edited

Loading