Server Side for Multi Battles (New) #7929
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
Spandamn
requested review from
HoeenCoder,
Marty-D and
TheImmortal
as code owners
|
This should do it |
|
oh yeah babyyy |
Spandamn
requested review from
AnnikaCodes,
KrisXV,
mia-pi-git and
KamilaBorowska
as code owners
|
halp Mac |
Zarel
force-pushed
the
multi-dec13
branch
2 times, most recently
from
4fe29da
to
8786094
Compare
Zarel
reviewed
Mar 31, 2021
| } | ||
|
|
||
| this.add('gametype', this.gameType); |
Zarel
force-pushed
the
multi-dec13
branch
5 times, most recently
from
a273708
to
2daca92
Compare
Zarel
reviewed
Apr 1, 2021
server/ladders.ts
Outdated
| @@ -511,19 +563,37 @@ class Ladder extends LadderStore { | |||
| Ladders.searches.set(formatid, formatTable); | |||
| } | |||
| if (formatTable.has(user.id)) { | |||
| user.popup(`Couldn't search: You are already searching for a ${formatid} battle.`); | |||
| // user.popup(`Couldn't search: You are already searching for a ${formatid} battle.`); | |||
(Reverting changes obsoleted by smogon#8152) Co-authored-by: Spandamn <spandan.punwatkar@gmail.com> Co-authored-by: MacChaeger <msaimrkon@gmail.com>
(I'd prefer to rewrite this myself.)
AnnikaCodes
reviewed
Apr 9, 2021
| if (this.format.gameType === 'multi') { | ||
| // Random Multi Battle uses doubles move pools, but Ally Switch fails in multi battles | ||
| const allySwitch = movePool.indexOf('allyswitch'); | ||
| if (allySwitch !== undefined) { |
There was a problem hiding this comment.
This doesn't work. Array#indexOf never returns undefined; if the value is not in the array, it returns -1. I fixed this in 2baca93.
Closed
Zarel
reviewed
May 4, 2021
Comment on lines
-1528
to
+1555
| this.add('teamsize', side.id, side.pokemon.length); | ||
| let teamsize = side.pokemon.length; | ||
| if (format.teamLength && format.teamLength.battle) { | ||
| teamsize = format.teamLength.battle <= teamsize ? format.teamLength.battle : teamsize; | ||
| } | ||
| this.add('teamsize', side.id, teamsize); |
There was a problem hiding this comment.
Wait wtf what does this mean? Why was this done?
Zarel
added a commit
that referenced
this pull request
May 4, 2021
`maxTeamSize` is a bad variable name (not that `teamLength.battle` is any better, but that'll get fixed in a future refactor). - Rename `maxTeamSize` to `chosenTeamSize`, to better indicate that this is the size after Team Preview, and that it is also the minimum size after Team Preview. - Don't limit team sizes to 6 if `teamLength.battle` isn't specified. This removes an unnecessary `teamLength.battle` requirement in all Custom Game formats. - Stop requiring `maxTeamSize` as a parameter for `battle.getRequests`. It's not even used except as a hint to the Preact client, and was never state in the first place. - Stop supporting partial `side.chooseTeam`. This is an unused feature and removing it massively simplifies the code and fixes a bug in `cupLevelLimit` which definitely was not written with the understanding that `chooseTeam` could be partial. - Fix a bug in #7929 which seemed to misunderstand what `teamsize` was for.
Zarel
added a commit
that referenced
this pull request
May 4, 2021
`maxTeamSize` is a bad variable name (not that `teamLength.battle` is any better, but that'll get fixed in a future refactor). - Rename `maxTeamSize` to `chosenTeamSize`, to better indicate that this is the size after Team Preview, and that it is also the minimum size after Team Preview. - Don't limit team sizes to 6 if `teamLength.battle` isn't specified. This removes an unnecessary `teamLength.battle` requirement in all Custom Game formats. - Stop requiring `maxTeamSize` as a parameter for `battle.getRequests`. It's not even used except as a hint to the Preact client, and was never state in the first place. - Stop supporting partial `side.chooseTeam`. This is an unused feature and removing it massively simplifies the code and fixes a bug in `cupLevelLimit` which definitely was not written with the understanding that `chooseTeam` could be partial. - Fix a bug in #7929 which seemed to misunderstand what `teamsize` was for.
urkerab
reviewed
Apr 24, 2022
Comment on lines
-2056
to
+2094
| const foeActives = pokemon.side.foe.active; | ||
| const frontPosition = foeActives.length - 1 - pokemon.position; | ||
| let adjacentFoes = foeActives.slice(frontPosition < 1 ? 0 : frontPosition - 1, frontPosition + 2); | ||
| adjacentFoes = adjacentFoes.filter(active => active && !active.fainted); | ||
| const adjacentFoes = pokemon.adjacentFoes(); | ||
| if (adjacentFoes.length) return this.sample(adjacentFoes); | ||
| // no valid target at all, return a foe for any possible redirection | ||
| return foeActives[frontPosition]; | ||
| // no valid target at all, return a possibly-fainted foe for any possible redirection | ||
| return pokemon.side.foe.active[0]; |
There was a problem hiding this comment.
This change broke redirection in Triples.
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.
Old: #7607
Client: smogon/pokemon-showdown-client#1649
Last SS: