Add outcome override for ladder 1v1 games #669
Merged
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
cleborys
commented
Sep 21, 2020
| @@ -34,3 +36,18 @@ def get_army_score(self, army: int) -> int: | |||
| as 1 for win and 0 for anything else. | |||
| """ | |||
| return self._results.victory_only_score(army) | |||
|
|
|||
| def _outcome_override_hook(self) -> Optional[List[GameOutcome]]: | |||
| if not config.LADDER_1V1_OUTCOME_OVERRIDE or len(self.players) > 2: | |||
There was a problem hiding this comment.
Checking the player count isn't actually necessary since max_players is set to two, but with tmm coming up I wanted to be sure, if it adapts this class.
| return None | ||
| team_sets = self.get_team_sets() | ||
| army_scores = [ | ||
| self._results.score(self.get_player_option(team_set.pop().id, "Army")) |
There was a problem hiding this comment.
Cannot use self.get_army_score(...), since that was overridden to use the reported result instead.
I thought the better way was
Suggested change
| self._results.score(self.get_player_option(team_set.pop().id, "Army")) | |
| super().get_army_score(self.get_player_option(team_set.pop().id, "Army")) |
but for some reason the super() call fails, saying that the types aren't related?
super(type, obj): obj must be an instance or subtype of type
Forcing it's hand with super(Game, self) says that it has no method get_army_score, I was very confused and still don't know what was going on.
There was a problem hiding this comment.
I think the right way to explicitly call it would be super(LadderGame, self), the docstring for super says:
super() -> same as super(__class__, <first argument>)
But I'm not gonna worry about investigating it right now :P
|
Ok, I managed to run some test games. Here is the log for a game where I left early and the other player stayed until the end: My client incorrectly reported that my opponent was defeated, but the game was still rated correctly because my opponent reported that he won. It is still possible to have games incorrectly count as draws if the winner of the game also leaves early, since the victory result doesn't get reported until a few seconds after one player looses. But there's nothing we can do about that on the server side. |
Askaholic
approved these changes
Sep 23, 2020
| return None | ||
| team_sets = self.get_team_sets() | ||
| army_scores = [ | ||
| self._results.score(self.get_player_option(team_set.pop().id, "Army")) |
There was a problem hiding this comment.
I think the right way to explicitly call it would be super(LadderGame, self), the docstring for super says:
super() -> same as super(__class__, <first argument>)
But I'm not gonna worry about investigating it right now :P
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.
Gives the possibility to decide the outcome of 1v1 ladder games by score instead of by reported result, as it was a year ago.
I added a config variable, so that this can be turned on and off dynamically (e.g. for testing new game patches on the test server).
I hope that the game still reports scores as it did and that that didn't change with recent patches?
Could make this override for all 1v1 games, but I thought I'd rather have as little scope as possible.
Addresses issue #580 but should be regarded a temporary fix.