Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-08-26 11:05:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update crash messages to new protocol

Browse Source
This commit is contained in:
Guangcong Luo
2013-05-28 02:20:49 -07:00
parent 419496ba58
commit 84fa2443ec
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
battle-engine.js
View File

@@ -1487,10 +1487,10 @@ var Battle = (function() {
Battle.prototype.singleEvent = function(eventid, effect, effectData, target, source, sourceEffect, relayVar) {
if (this.eventDepth >= 5) {
// oh fuck
this.add('message STACK LIMIT EXCEEDED');
this.add('message PLEASE TELL AESOFT');
this.add('message Event: '+eventid);
this.add('message Parent event: '+this.event.id);
this.add('message', 'STACK LIMIT EXCEEDED');
this.add('message', 'PLEASE REPORT IN BUG THREAD');
this.add('message', 'Event: '+eventid);
this.add('message', 'Parent event: '+this.event.id);
return false;
}
//this.add('Event: '+eventid+' (depth '+this.eventDepth+')');
@@ -1642,10 +1642,10 @@ var Battle = (function() {
Battle.prototype.runEvent = function(eventid, target, source, effect, relayVar) {
if (this.eventDepth >= 5) {
// oh fuck
this.add('message STACK LIMIT EXCEEDED');
this.add('message PLEASE REPORT IN BUG THREAD');
this.add('message Event: '+eventid);
this.add('message Parent event: '+this.event.id);
this.add('message', 'STACK LIMIT EXCEEDED');
this.add('message', 'PLEASE REPORT IN BUG THREAD');
this.add('message', 'Event: '+eventid);
this.add('message', 'Parent event: '+this.event.id);
return false;
}
if (!target) target = this;
@@ -1999,11 +1999,11 @@ var Battle = (function() {
if (this.p2.decision && this.p1.decision) {
if (type !== 'move') {
this.add('message Attempting to recover from crash.');
this.add('message', 'Attempting to recover from crash.');
this.makeRequest('move');
return;
}
this.add('message BATTLE CRASHED.');
this.add('message', 'BATTLE CRASHED.');
this.win();
return;
@@ -2189,7 +2189,7 @@ var Battle = (function() {
}
if (!this.p1.pokemon[0] || !this.p2.pokemon[0]) {
this.add('message Battle not started: One of you has an empty team.');
this.add('message', 'Battle not started: One of you has an empty team.');
return;
}