Weekly report fix #1032
Weekly report fix #1032
Conversation
The zero values for position/size are to underline the fact that are calculated values
…late the size of the fields depending on the text to show
It takes a GameState and creates a partial copy of it
Some of the logic has been removed (the isWeeklyUpkeek case)
…fore and after the snapshot of the status. The idea is to update the player balance and the economy of human factions. Then create the snapshot (and send it with the GameStatusUpdateEvent) Then update the funding modifiers/current balance/weekly score reset
| <alignment horizontal="left" vertical="centre"/> | ||
| <font>smalfont</font> | ||
| </label> | ||
|
|
||
| <label id="FUNDING_NEW_VALUE"> | ||
| <position x="0" y="0"/> |
There was a problem hiding this comment.
Having an empty position doest seem right here, the goal of the form xml files is that they can be altered to reskin the game, and so just setting the position in code, instead of using a value relative to an anchor in the xml, limits that.
Possibly the same with the zero sized stuff above, I don't think this screen can reflow (ie each line has a set contents and can't flow to a new line and push everything else down anyway, so having a zero size just makes it less clear to whoever's reading the xml expecting it to relate to the final output)
There was a problem hiding this comment.
Agree. It's not the best solution.
What do you suggest?
|
|
||
| menuform->findControlTyped<Label>("TITLE")->setText(tr("WEEKLY FUNDING ASSESSMENT")); | ||
|
|
||
| UString ratingDescription; | ||
| const Colour deepBlueColor = {4, 73, 130, 255}; |
There was a problem hiding this comment.
I need to think of a way to expose things like this to the modding system. Maybe allow named colours in the form files or something? But that's on me not this PR
| const auto player = state->getPlayer(); | ||
| const auto government = state->getGovernment(); | ||
| int currentIncome = player->income; | ||
| int currentIncome = state.playerIncome; |
There was a problem hiding this comment.
This one could change during the execution of the code (e.g: zeroed when funding are cut due to hostile relationships)
FilmBoy84
added
WIP
There are some issues with the weekly report due to racing conditions of the update of the GameState that is used as reference in the weekly report.
The idea is to create a small snapshot of the GameState that can be used to fix this issue.
In order to do that we need to add a new event, update the WeeklyFundingScreen and ScoreScreen, and refactor the GameState handling of the weeklyUpdate event.
Please, double check if what i've done is legit/correct from a c++ point of view (pointers etc...) as I still have a lot to learn.
Ps: in this PR i've added also the label coloring in WeeklyFundingScreen that was depending on.