');
@@ -74,7 +74,8 @@ var Replays = {
if (rc2) rc2.innerHTML = rc2.innerHTML;
if (window.HTMLAudioElement) $('.soundchooser, .startsoundchooser').show();
- this.reset();
+ this.update();
+ this.battle.subscribe(function (state) { self.update(state); });
},
"$": function (sel) {
return this.$el.find(sel);
@@ -115,11 +116,9 @@ var Replays = {
break;
case 'sound':
- var muteTable = {
- on: false, // this is kind of backwards: sound[on] === muted[false]
- off: true
- };
- this.battle.setMute(muteTable[value]);
+ // remember this is reversed: sound[off] === muted[true]
+ this.muted = (value === 'off');
+ this.battle.setMute(this.muted);
this.$('.startsoundchooser').remove();
break;
@@ -134,59 +133,52 @@ var Replays = {
break;
}
},
- battle: null,
- errorCallback: function () {
- var replayid = this.$('input[name=replayid]').val();
- var m = /^([a-z0-9]+)-[a-z0-9]+-[0-9]+$/.exec(replayid);
- if (m) {
- this.battle.log('
This replay was uploaded from a third-party server (' + BattleLog.escapeHTML(m[1]) + '). It contains errors and cannot be viewed.
Replays uploaded from third-party servers can contain errors if the server is running custom code, or the server operator has otherwise incorrectly configured their server.
', true);
- this.battle.pause();
+ update: function (state) {
+ if (state === 'error') {
+ var m = /^([a-z0-9]+)-[a-z0-9]+-[0-9]+$/.exec(this.battle.id);
+ if (m) {
+ this.battle.log('
This replay was uploaded from a third-party server (' + BattleLog.escapeHTML(m[1]) + '). It contains errors.
Replays uploaded from third-party servers can contain errors if the server is running custom code, or the server operator has otherwise incorrectly configured their server.
');
- // this.$('.battle-log').html('');
- this.$('.replay-controls').html('');
},
ff: function () {
this.battle.skipTurn();
},
rewind: function () {
- if (this.battle.turn) {
- this.battle.fastForwardTo(this.battle.turn - 1);
- }
+ this.battle.seekTurn(this.battle.turn - 1);
},
ffto: function () {
- this.battle.fastForwardTo(prompt('Turn?'));
+ var turn = prompt('Turn?');
+ if (!turn.trim()) return;
+ if (turn === 'e' || turn === 'end' || turn === 'f' || turn === 'finish') turn = Infinity;
+ turn = Number(turn);
+ if (isNaN(turn) || turn < 0) alert("Invalid turn");
+ this.battle.seekTurn(turn);
},
switchSides: function () {
this.battle.switchSides();
},
- start: function () {
- this.battle.reset();
- this.battle.play();
- this.$('.replay-controls').html(' ');
- },
- startMuted: function () {
- this.changeSetting('sound', 'off');
- this.start();
- }
};
window.onload = function () {
- Replays.init((this.$('script.battle-log-data').text() || '').replace(/\\\//g, '/'));
+ Replays.init();
};
diff --git a/replays/js/replay.js b/replays/js/replay.js
index e08112355..e4613e264 100644
--- a/replays/js/replay.js
+++ b/replays/js/replay.js
@@ -99,11 +99,10 @@ var ReplayPanel = Panels.StaticPanel.extend({
break;
case 'sound':
- var muteTable = {
- on: false, // this is kind of backwards: sound[on] === muted[false]
- off: true
- };
- this.battle.setMute(muteTable[value]);
+ // remember this is reversed: sound[off] === muted[true]
+ this.muted = (value === 'off');
+ this.battle.setMute(this.muted);
+ this.$('.startsoundchooser').remove();
break;
case 'speed':
@@ -128,26 +127,24 @@ var ReplayPanel = Panels.StaticPanel.extend({
}
},
battle: null,
- errorCallback: function() {
- var replayid = this.$('input[name=replayid]').val();
- var m = /^([a-z0-9]+)-[a-z0-9]+-[0-9]+$/.exec(replayid);
- if (m && m[1] !== 'smogtours') {
- this.battle.log('
This replay was uploaded from a third-party server (' + BattleLog.escapeHTML(m[1]) + '). It contains errors and cannot be viewed.
Replays uploaded from third-party servers can contain errors if the server is running custom code, or the server operator has otherwise incorrectly configured their server.
');
+ var replayid = this.$('input[name=replayid]').val() || '';
+ var log = (this.$('script.log').text() || '').replace(/\\\//g,'/');
+
+ var self = this;
+ this.battle = new Battle({
+ id: replayid,
+ $frame: $battle,
+ $logFrame: this.$('.battle-log'),
+ log: log.split('\n'),
+ isReplay: true,
+ paused: true
+ })
this.$('.urlbox').css('margin-right', 120).before(' Download');
@@ -156,6 +153,27 @@ var ReplayPanel = Panels.StaticPanel.extend({
if (rc2) rc2.innerHTML = rc2.innerHTML;
if (window.HTMLAudioElement) this.$('.soundchooser, .startsoundchooser').show();
+
+ this.battle.subscribe(function (state) { self.update(state); });
+ this.update();
+ },
+ update: function (state) {
+ if (state === 'error') {
+ var m = /^([a-z0-9]+)-[a-z0-9]+-[0-9]+$/.exec(this.battle.id);
+ if (m) {
+ this.battle.log('
This replay was uploaded from a third-party server (' + BattleLog.escapeHTML(m[1]) + '). It contains errors.
Replays uploaded from third-party servers can contain errors if the server is running custom code, or the server operator has otherwise incorrectly configured their server.
');
$newTurn.css({
@@ -1439,6 +1445,7 @@ class BattleScene {
/////////////////////////////////////////////////////////////////////
setFrameHTML(html: any) {
+ this.customControls = true;
this.$frame.html(html);
}
setControlsHTML(html: any) {
@@ -1538,16 +1545,16 @@ class BattleScene {
}
updateBgm() {
/**
- * - not playing in non-battle RoomGames (Playback.Uninitialized)
- * - not playing at team preview in replays (Playback.Ready)
- * - playing at team preview in games (Playback.Playing)
- * - playing during the game (Playback.Playing)
+ * - not playing in non-battle RoomGames before `|start` (turn -1)
+ * - not playing at team preview in replays (paused)
+ * - playing at team preview in games (turn 0)
+ * - playing during the game (turn 1+)
* - not playing while paused
- * - playing while waiting for players to choose moves (Playback.Finished)
+ * - playing while waiting for players to choose moves (atQueueEnd && !ended)
* - not playing after the game has ended
*/
- const nowPlaying = this.battle.playbackState > Playback.Ready && (
- this.battle.started && !this.battle.ended && !this.battle.paused
+ const nowPlaying = (
+ this.battle.turn >= 0 && !this.battle.ended && !this.battle.paused
);
if (nowPlaying) {
if (!this.bgm) this.rollBgm();
diff --git a/src/battle-log.ts b/src/battle-log.ts
index 3b6d3950e..76ad3f48b 100644
--- a/src/battle-log.ts
+++ b/src/battle-log.ts
@@ -983,7 +983,7 @@ class BattleLog {
// replay panel
replayid = room.fragment;
}
- battle.fastForwardTo(-1);
+ battle.seekTurn(Infinity);
let buf = '\n';
buf += '\n';
buf += '\n';
@@ -995,7 +995,7 @@ class BattleLog {
buf += '\n';
buf += '\n';
buf += `