Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-30 14:52:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Incremental work towards per-Pokémon decisions

Browse Source 
- Added support for resuming actions on move and switch requests.
Work on Team Preview is on wait for a few server commits.
This commit is contained in:
Ivo Julca
2016-06-15 08:50:58 -05:00
parent 5fbe434798
commit 1f57fbf842
2 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.js
View File

@@ -28,7 +28,7 @@ module.exports = {
// Generic global variables
"Config": false, "BattleSearch": false, "soundManager": false, "Storage": false, "Tools": false,
"app": false, "toId": false, "toRoomid": false, "toUserid": false, "toName": false, "hashColor": false, "MD5": false,
"app": false, "toId": false, "toRoomid": false, "toUserid": false, "toName": false, "getString": false, "hashColor": false, "MD5": false,
"ChatHistory": false, "Topbar": false, "UserList": false,
// Rooms

87
js/client-battle.js
View File

@@ -121,13 +121,23 @@
return this.init(data);
}
if (data.substr(0, 9) === '|request|') {
var choiceOffset = 0;
data = data.substr(9);
var choiceData = {offset: 0};
var requestData = null;
data = data.slice(9);
if (!isNaN(data.substr(0, 1)) && data.substr(1, 1) === '|') {
choiceOffset = +data.substr(0, 1);
data = data.substr(2);
var nlIndex = data.indexOf('\n');
if (nlIndex >= 0) {
choiceData.offset = +data.substr(0, 1);
try {
$.extend(choiceData, $.parseJSON(data.slice(2, nlIndex)));
} catch (err) {}
data = data.slice(nlIndex + 1);
}
}
return this.receiveRequest($.parseJSON(data), choiceOffset);
try {
requestData = $.parseJSON(data);
} catch (err) {}
return this.receiveRequest(requestData, choiceData);
}
var log = data.split('\n');
@@ -301,8 +311,17 @@
if (!this.finalDecision) this.finalDecision = !!this.request.noCancel;
}
var choiceOffset = this.choiceData.offset && this.choiceData.offset <= 3 ? this.choiceData.offset : 0;
var preDecided = _.map(getString(this.choiceData.done).split(''), Number);
var preSwitchFlags = _.map(getString(this.choiceData.leave).split(''), Number);
var preSwitchOutFlags = _.map(getString(this.choiceData.leave).split(''), Number);
var preTeamOrder = _.map(getString(this.choiceData.team).split(''), Number);
var type = '';
var moveTarget = '';
if (choiceOffset >= switchables.length) {
this.choice = {waiting: true};
}
if (this.choice) {
type = this.choice.type;
moveTarget = this.choice.moveTarget;
@@ -317,12 +336,15 @@
case 'move':
if (!this.choice) {
this.choice = {
choices: [],
preDecided: preDecided,
choices: new Array(choiceOffset),
switchFlags: {},
switchOutFlags: {}
};
while (switchables[this.choice.choices.length] && switchables[this.choice.choices.length].fainted && this.choice.choices.length + 1 < this.battle.mySide.active.length) {
this.choice.choices.push('pass');
for (var i = 0; i < preSwitchFlags.length; i++) this.choice.switchFlags[preSwitchFlags[i]] = 1;
for (var i = 0; i < preSwitchOutFlags.length; i++) this.choice.switchOutFlags[preSwitchOutFlags[i]] = 1;
while (preDecided.indexOf(this.choice.choices.length) >= 0 || switchables[this.choice.choices.length] && switchables[this.choice.choices.length].fainted && this.choice.choices.length + 1 < this.battle.mySide.active.length) {
this.choice.choices.push(preDecided.indexOf(this.choice.choices.length) >= 0 ? 'skip' : 'pass');
}
}
var pos = this.choice.choices.length - (type === 'movetarget' ? 1 : 0);
@@ -478,21 +500,26 @@
case 'switch':
if (!this.choice) {
this.choice = {
choices: [],
preDecided: preDecided,
choices: new Array(choiceOffset),
switchFlags: {},
switchOutFlags: {},
freedomDegrees: 0,
freedomDegrees: 0, // Fancy term for the amount of Pokémon that won't be able to switch out.
canSwitch: 0
};
for (var i = 0; i < preSwitchFlags.length; i++) this.choice.switchFlags[preSwitchFlags[i]] = 1;
for (var i = 0; i < preSwitchOutFlags.length; i++) this.choice.switchOutFlags[preSwitchOutFlags[i]] = 1;
}
if (this.request.forceSwitch !== true) {
var faintedLength = this.request.forceSwitch.filter(function (fainted) {return fainted;}).length;
this.choice.freedomDegrees = faintedLength - switchables.slice(this.battle.mySide.active.length).filter(function (mon) {return !mon.zerohp;}).length;
var faintedLength = _.filter(this.request.forceSwitch.slice(choiceOffset), function (fainted) {return fainted;}).length;
this.choice.freedomDegrees = faintedLength - _.filter(switchables.slice(this.battle.mySide.active.length), function (mon) {return !mon.zerohp;}).length;
if (this.choice.freedomDegrees < 0) this.choice.freedomDegrees = 0;
this.choice.canSwitch = faintedLength - this.choice.freedomDegrees;
if (!this.choice.freedomDegrees) {
while (!this.request.forceSwitch[this.choice.choices.length] && this.choice.choices.length < 6) this.choice.choices.push('pass');
while (preDecided.indexOf(this.choice.choices.length) >= 0 || !this.request.forceSwitch[this.choice.choices.length] && this.choice.choices.length < 6) {
this.choice.choices.push(preDecided.indexOf(this.choice.choices.length) >= 0 ? 'skip' : 'pass');
}
}
}
var pos = this.choice.choices.length;
@@ -550,6 +577,8 @@
var controls = '<div class="controls"><div class="whatdo">';
if (!this.choice || !this.choice.done) {
this.choice = {
preDecided: preDecided,
preTeamOrder: preTeamOrder,
teamPreview: [1, 2, 3, 4, 5, 6].slice(0, switchables.length),
done: 0,
count: 0
@@ -614,10 +643,15 @@
// Same as send, but appends the rqid to the message so that the server
// can verify that the decision is sent in response to the correct request.
sendDecision: function (message) {
this.send(message + '|' + this.request.rqid);
if (!$.isArray(message)) return this.send('/' + message + '|' + this.request.rqid);
var buf = '/choose ';
for (var i = 0; i < message.length; i++) {
if (message[i]) buf += message[i] + ',';
}
this.send(buf.substr(0, buf.length - 1) + '|' + this.request.rqid);
},
request: null,
receiveRequest: function (request, choiceOffset) {
receiveRequest: function (request, choiceData) {
if (!request) {
this.side = '';
return;
@@ -633,6 +667,7 @@
}
this.choice = null;
this.choiceData = choiceData;
this.finalDecision = this.finalDecisionMove = this.finalDecisionSwitch = false;
this.request = request;
if (request.side) {
@@ -767,8 +802,8 @@
return false;
}
}
while (myActive.length > this.choice.choices.length && !myActive[this.choice.choices.length]) {
this.choice.choices.push('pass');
while (this.choice.preDecided.indexOf(this.choice.choices.length) >= 0 || myActive.length > this.choice.choices.length && !myActive[this.choice.choices.length]) {
this.choice.choices.push(this.choice.preDecided.indexOf(this.choice.choices.length) >= 0 ? 'skip' : 'pass');
}
if (myActive.length > this.choice.choices.length) {
this.choice.type = 'move2';
@@ -776,7 +811,7 @@
return false;
}
this.sendDecision('/choose ' + this.choice.choices.join(','));
this.sendDecision(this.choice.choices);
this.closeNotification('choice');
if (!this.finalDecision) this.finalDecision = !!this.finalDecisionMove;
@@ -792,8 +827,8 @@
this.tooltips.hideTooltip();
this.choice.choices.push('shift');
while (myActive.length > this.choice.choices.length && !myActive[this.choice.choices.length]) {
this.choice.choices.push('pass');
while (this.choice.preDecided.indexOf(this.choice.choices.length) >= 0 || myActive.length > this.choice.choices.length && !myActive[this.choice.choices.length]) {
this.choice.choices.push(this.choice.preDecided.indexOf(this.choice.choices.length) >= 0 ? 'skip' : 'pass');
}
if (myActive.length > this.choice.choices.length) {
this.choice.type = 'move2';
@@ -801,7 +836,7 @@
return false;
}
this.sendDecision('/choose ' + this.choice.choices.join(','));
this.sendDecision(this.choice.choices);
this.closeNotification('choice');
this.choice = {waiting: true};
@@ -827,7 +862,9 @@
}
if (this.request && this.request.requestType === 'switch') {
if (this.request.forceSwitch !== true) {
while (this.battle.mySide.active.length > this.choice.choices.length && !this.request.forceSwitch[this.choice.choices.length]) this.choice.choices.push('pass');
while (this.choice.preDecided.indexOf(this.choice.choices.length) >= 0 || this.battle.mySide.active.length > this.choice.choices.length && !this.request.forceSwitch[this.choice.choices.length]) {
this.choice.choices.push(this.choice.preDecided.indexOf(this.choice.choices.length) >= 0 ? 'skip' : 'pass');
}
}
if (this.battle.mySide.active.length > this.choice.choices.length) {
this.choice.type = 'switch2';
@@ -835,7 +872,7 @@
return false;
}
}
this.sendDecision('/choose ' + this.choice.choices.join(','));
this.sendDecision(this.choice.choices);
this.closeNotification('choice');
if (!this.finalDecision) this.finalDecision = !!this.finalDecisionSwitch;
@@ -855,7 +892,7 @@
if (!this.choice.choices[i]) this.choice.choices[i] = 'pass';
}
this.sendDecision('/choose ' + this.choice.choices.join(','));
this.sendDecision(this.choice.choices);
this.closeNotification('choice');
if (!this.finalDecision) this.finalDecision = !!this.finalDecisionSwitch;
@@ -894,7 +931,7 @@
pos = pos + 1;
}
this.sendDecision('/team ' + (pos));
this.sendDecision('team ' + (pos));
this.closeNotification('choice');
this.choice = {waiting: true};