Merge Integration->Main #186
Open
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
Add loser picks balance algo
This patch allows the `!help` command to show documentation for the following commands: - `!setAllAiBonus` - `!unboss` - `!setratinglevels` The help entries for the first two of these was missing because the permissions configuration was placed in the global `commands.conf` file, instead of the plugin-specific `BarManagerCmd.conf` file. The help entry for the last command was missing because of a copy-paste error (`!resetratinglevels` had two help entries, while `!setratinglevels` had none).
Fix missing `!help` entries for several BarManager commands.
Currently, `getNumUsersInMyBattle()` throws an error if it is called when the battle is closed. One way this can happen is in the `sendTachyonBattle()` timer callback, if the lobby was disconnected between when the timer was started and when the callback runs.
Currently, `sendTachyonBattle()` is called as a timer callback, to provide a form of rate-limiting. The timer is only started when a battle is open, but it is possible that the lobby will disconnect before `sendTachyonBattle()` runs. This patch makes `sendTachyonBattle()` return early if the lobby is no longer connected at the time that it runs.
Currently, the following lobby command handlers log an error if they are called for a user that is not currently known: - hLEFT_pre - hLEFTBATTLE_pre - hREMOVEUSER_pre - hCLIENTSTATUS_pre - hJOINEDBATTLE_pre When it is logged, the current error message states "hXXX_pre cannot be exectuted <...>". This message does not clearly explain what went wrong or what else may be impacted as a result of the error. This patch changes the error message to state "hXXX_pre was called for an unknown user, skipping <...>". This makes it much more clear what went wrong (missing a user), and what may be impacted (anything involving that specific user).
Counterintuitively, SPADS calls the `onLobbyConnected` callback *after* the `onLobbyLogin` callback. By registering all lobby command handlers in `onLobbyLogin`, we ensure that we don't miss any commands that would have been sent before `onLobbyConnected` is run.
Miscellaneous cleanups/fixes
Currently, there is not a reliable way to determine whether a host is running the latest BarManager code. This is particularly annoying when making changes to the Integration server, as for subtle changes it is not easy to tell whether the latest code has been fetched yet. This patch adds a new `selfFileHash` variable (set on plugin init), which calculates a 6-character hash of the currently-running python file. That variable is also added to the output of `!barmanagerprintstate`, so that it is easy to look up.
Add `selfFileHash`, and print it in `!barmanagerprintstate`
Follow-up for #170. Once the `!unboss` command is deployed, and Chobby has been updated to use it, this patch can be used to disable `!boss` (without parameters) so that users are not surprised by its behavior.
|
Converting back to draft, so we can merge another PR and test before this is deployed |
DeviousNull
force-pushed
the
integration
branch
from
e3df4f9
to
1057598
Compare
The Perl code which is currently used to implement the `!unboss` command handler is only valid when the name of the target is alphanumeric. This patch updates that Perl code, so that it also works when the target's name contains whitelisted symbols.
DeviousNull
force-pushed
the
integration
branch
from
5778af0
to
fa9d61a
Compare
Currently, if an arbitrary player runs the command `!joinas USER`, a vote is called among all players in the lobby. As a result, even if the target player does not want someone to be able to control their units, the rest of the lobby can overrule them. This patch makes the following changes, active during any ongoing `!joinas USERNAME` vote: - When a non-target submits a vote, the vote state is checked for whether USERNAME has voted already. If so, the non-target's vote is counted as normal; if not, the non-target's vote is deferred. - If USERNAME submits a "no" vote, then the ongoing vote is immediately ended (as if by `!endVote`) and all deferred votes are discarded. - When USERNAME submits a "yes" or "blank" vote, all deferred votes are counted. This has the practical effect of requiring approval from the `!joinas` target, in order for the vote to succeed; the vote will fail if the target does not explicitly vote "yes" or "blank".
Make `!joinas` require approval from its target player.
|
What's the status of this @DeviousNull ? |
…ires-target-approval Revert "Make `!joinas` require approval from its target player."
|
Its been lingering, since I've not had access to my main computer/dev environment for the past couple of weeks; all but one of the changes are ready though, so I've reverted the patch that still needs more work. @Beherith, with that revert done, this PR is ready to merge whenever you like. |
|
@DeviousNull are you able to merge this yourself? It's been 2 months now. |
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.
We have a fair number of changes this week. User-visible changes:
!balancealgorithmto allowloser_picksas an option (Add loser picks balance algo #179 @jauggy)!helpentries forunboss,setAllAiBonus, andsetratinglevels(Fix missing!helpentries for several BarManager commands. #181 @DeviousNull)!unboss USERNAMEnot working whenUSERNAMEcontained symbols (Fix!unbosssilently failing for usernames containing symbols #184 @DeviousNull)!bosswithout any parameters, and direct users to run!unbossinstead (Disable!bosscommand (without parameters). #171 @DeviousNull)Make(removed from PR for adjustments)!joinas USERNAMErequire approval from the specific player who someone would be joining (Make!joinasrequire approval exclusively from its target player. #185 @DeviousNull)respect_avoidsbalance algorithm, and removeauto(which is now the default) (Add respect_avoids balance algo #187 @jauggy)Cleanups / minor fixes:
getNumUsersInMyBattle()no longer throws an error when the battle is closed. (Miscellaneous cleanups/fixes #182 @DeviousNull)sendTachyonBattle()now aborts early if the battle is closed, instead of attempting to send an update anyway (Miscellaneous cleanups/fixes #182 @DeviousNull)onLobbyConnectedSPADS callback withonLobbyLogin, so we are guaranteed to receive all events (Miscellaneous cleanups/fixes #182 @DeviousNull)barmanager.py's contents to!barmanagerprintstate, which helps quickly identify whether a host is running the latest code (AddselfFileHash, and print it in!barmanagerprintstate#183 @DeviousNull)