Ux improvements #117
Closed
Ux improvements #117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # agot-bg-game-server/src/messages/ServerMessage.ts
Longwelwind
requested changes
Jan 16, 2020
| @@ -36,6 +41,10 @@ export default class ClashOfKingsGameState extends GameState<WesterosGameState, | |||
|
|
|||
| onServerMessage(message: ServerMessage) { | |||
| this.childGameState.onServerMessage(message); | |||
There was a problem hiding this comment.
This line should be put in the else of the condition after, like it is done in other GameState classes.
| @@ -207,3 +207,9 @@ interface ChangeValyrianSteelBladeUse { | |||
| type: "change-valyrian-steel-blade-use"; | |||
| used: boolean; | |||
| } | |||
|
|
|||
| interface NextTrack { | |||
There was a problem hiding this comment.
A slightly more descriptive name would be better, like BiddingNextTrack.
| @@ -196,6 +196,12 @@ export default class ResolveSingleMarchOrderComponent extends Component<GameStat | |||
| return; | |||
| } | |||
|
|
|||
| if(this.plannedMoves.size == 0) { | |||
| if(!confirm("Do you want to remove your march order?")) { | |||
There was a problem hiding this comment.
I'm really not a fan of confirm prompt but I guess we can keep them for the time being.
In a later PR, we can replace them with native prompts.
| @@ -464,6 +464,16 @@ class GameLogListComponent extends Component<GameLogListComponentProps> { | |||
| return <> | |||
| <strong>Wildling strength</strong> reached <strong>{data.wildlingStrength}</strong>, triggering a <strong>Wildling attack</strong> | |||
| </>; | |||
| case "march-order-removed": | |||
| house = this.game.houses.get(data.house); | |||
| // A "null" for "attacked" means it was an attack against a neutral force | |||
There was a problem hiding this comment.
This comment is not necessary, I think.
|
On top of the remarks I've made, please try to follow the conventions for commit messages by beginning with an upper-case. Once it's done, I'll merge! |
|
Provided a new PR #119 . |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixed part of #89