mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 08:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

next level and id refactor

Browse source
This commit is contained in:
Peter Cottle 2013-01-09 13:38:13 -08:00
parent d406317788
commit f0a9c66056
8 changed files with 416 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

442
build/bundle.js
View file

@ -4673,8 +4673,18 @@ var Sandbox = Backbone.View.extend({
}); });
}, },
resetSolved: function(command, deferred) {
Main.getLevelArbiter().resetSolvedMap();
command.addWarning(
"Solved map was reset, you are starting from a clean slate!"
);
deferred.resolve();
},
processSandboxCommand: function(command, deferred) { processSandboxCommand: function(command, deferred) {
var commandMap = { var commandMap = {
'reset solved': this.resetSolved,
'general help': this.helpDialog,
'help': this.helpDialog, 'help': this.helpDialog,
'reset': this.reset, 'reset': this.reset,
'delay': this.delay, 'delay': this.delay,
@ -6532,6 +6542,8 @@ var LevelToolbar = require('../views').LevelToolbar;
var TreeCompare = require('../git/treeCompare').TreeCompare; var TreeCompare = require('../git/treeCompare').TreeCompare;
var regexMap = { var regexMap = {
'level help': /^level help$/,
'start dialog': /^start dialog$/,
'show goal': /^show goal$/, 'show goal': /^show goal$/,
'hide goal': /^hide goal$/, 'hide goal': /^hide goal$/,
'show solution': /^show solution$/ 'show solution': /^show solution$/
@ -6559,11 +6571,11 @@ var Level = Sandbox.extend({
Level.__super__.initialize.apply(this, [options]); Level.__super__.initialize.apply(this, [options]);
this.startOffCommand(); this.startOffCommand();
this.handleOpen(); this.handleOpen(options.deferred);
}, },
handleOpen: function() { handleOpen: function(deferred) {
this.options.deferred = this.options.deferred || Q.defer(); deferred = deferred || Q.defer();
// if there is a multiview in the beginning, open that // if there is a multiview in the beginning, open that
// and let it resolve our deferred // and let it resolve our deferred
@ -6571,15 +6583,28 @@ var Level = Sandbox.extend({
new MultiView(_.extend( new MultiView(_.extend(
{}, {},
this.level.startDialog, this.level.startDialog,
{ deferred: this.options.deferred } { deferred: deferred }
)); ));
return; return;
} }
// otherwise, resolve after a 700 second delay // otherwise, resolve after a 700 second delay to allow
setTimeout(_.bind(function() { // for us to animate easily
this.options.deferred.resolve(); setTimeout(function() {
}, this), this.getAnimationTime() * 1.2); deferred.resolve();
}, this.getAnimationTime() * 1.2);
},
startDialog: function(command, deferred) {
if (!this.level.startDialog) {
command.set('error', new Errors.GitError({
msg: 'There is no start dialog to show for this level!'
}));
deferred.resolve();
return;
}
this.handleOpen(deferred);
}, },
initName: function() { initName: function() {
@ -6799,11 +6824,10 @@ var Level = Sandbox.extend({
this.mainVis.gitVisuals.finishAnimation() this.mainVis.gitVisuals.finishAnimation()
.then(function() { .then(function() {
// TODO if there is no future level... // we want to ask if they will move onto the next level
// while giving them their results...
// we want to ask if they will move onto the next level...
var nextDialog = new NextLevelConfirm({ var nextDialog = new NextLevelConfirm({
nextLevelName: nextLevel.name, nextLevel: nextLevel,
numCommands: numCommands, numCommands: numCommands,
best: best best: best
}); });
@ -6811,10 +6835,12 @@ var Level = Sandbox.extend({
return nextDialog.getPromise(); return nextDialog.getPromise();
}) })
.then(function() { .then(function() {
Main.getEventBaton().trigger( if (nextLevel) {
'commandSubmitted', Main.getEventBaton().trigger(
'level ' + nextLevel.id 'commandSubmitted',
); 'level ' + nextLevel.id
);
}
}) })
.fail(function() { .fail(function() {
// nothing to do, we will just close // nothing to do, we will just close
@ -6850,6 +6876,12 @@ var Level = Sandbox.extend({
"Hmm, there doesn't seem to be a hint for this level :-/"; "Hmm, there doesn't seem to be a hint for this level :-/";
return [ return [
[/^help$/, function() {
throw new Errors.CommandResult({
msg: 'You are in a level, so multiple forms of help are available. Please select either ' +
'"level help" or "general help"'
});
}],
[/^hint$/, function() { [/^hint$/, function() {
throw new Errors.CommandResult({ throw new Errors.CommandResult({
msg: hintMsg msg: hintMsg
@ -6897,7 +6929,9 @@ var Level = Sandbox.extend({
var methodMap = { var methodMap = {
'show goal': this.showGoal, 'show goal': this.showGoal,
'hide goal': this.hideGoal, 'hide goal': this.hideGoal,
'show solution': this.showSolution 'show solution': this.showSolution,
'start dialog': this.startDialog,
'level help': this.startDialog
}; };
var method = methodMap[command.get('method')]; var method = methodMap[command.get('method')];
if (!method) { if (!method) {
@ -9997,7 +10031,7 @@ var ConfirmCancelTerminal = Backbone.View.extend({
var NextLevelConfirm = ConfirmCancelTerminal.extend({ var NextLevelConfirm = ConfirmCancelTerminal.extend({
initialize: function(options) { initialize: function(options) {
options = options || {}; options = options || {};
this.nextLevelName = options.nextLevelName || 'The mysterious next level'; var nextLevelName = (options.nextLevel) ? options.nextLevel.name : '';
var markdowns = [ var markdowns = [
'## Great Job!!', '## Great Job!!',
@ -10016,11 +10050,18 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({
); );
} }
markdowns = markdowns.concat([ if (options.nextLevel) {
'', markdowns = markdowns.concat([
'Would you like to move onto "', '',
this.nextLevelName + '", the next level?' 'Would you like to move onto "',
]); nextLevelName + '", the next level?'
]);
} else {
markdowns = markdowns.concat([
'',
'Wow!!! You finished the last level, congratulations!'
]);
}
options.modalAlert = { options.modalAlert = {
markdowns: markdowns markdowns: markdowns
@ -12951,6 +12992,8 @@ var instantCommands = [
]; ];
var regexMap = { var regexMap = {
'reset solved': /^reset solved($|\s)/,
'general help': /^general help($|\s)/,
'help': /^help($|\s)|\?/, 'help': /^help($|\s)|\?/,
'reset': /^reset($|\s)/, 'reset': /^reset($|\s)/,
'delay': /^delay (\d+)$/, 'delay': /^delay (\d+)$/,
@ -15537,6 +15580,8 @@ var Main = require('../app');
function LevelArbiter() { function LevelArbiter() {
this.levelMap = {}; this.levelMap = {};
this.levelSequences = levelSequences;
this.sequences = [];
this.init(); this.init();
var solvedMap; var solvedMap;
@ -15553,21 +15598,30 @@ function LevelArbiter() {
LevelArbiter.prototype.init = function() { LevelArbiter.prototype.init = function() {
var previousLevelID; var previousLevelID;
_.each(levelSequences, function(levels, levelSequenceName) { _.each(this.levelSequences, function(levels, levelSequenceName) {
this.sequences.push(levelSequenceName);
if (!levels || !levels.length) {
throw new Error('no empty sequences allowed');
}
// for this particular sequence... // for this particular sequence...
_.each(levels, function(level, index) { _.each(levels, function(level, index) {
this.validateLevel(level); this.validateLevel(level);
this.levelMap[level.id] = _.extend(
var id = levelSequenceName + String(index);
var compiledLevel = _.extend(
{}, {},
{ index: index }, level,
level {
index: index,
id: levelSequenceName + String(index),
sequenceName: levelSequenceName
}
); );
// build up the chaining between levels // update our internal data
if (previousLevelID) { this.levelMap[id] = compiledLevel;
this.levelMap[previousLevelID]['nextLevelID'] = level.id; this.levelSequences[levelSequenceName][index] = compiledLevel;
}
previousLevelID = level.id;
}, this); }, this);
}, this); }, this);
}; };
@ -15580,10 +15634,18 @@ LevelArbiter.prototype.isLevelSolved = function(id) {
}; };
LevelArbiter.prototype.levelSolved = function(id) { LevelArbiter.prototype.levelSolved = function(id) {
// called without an id when we reset solved status
if (!id) { return; }
this.solvedMap[id] = true; this.solvedMap[id] = true;
this.syncToStorage(); this.syncToStorage();
}; };
LevelArbiter.prototype.resetSolvedMap = function() {
this.solvedMap = {};
this.syncToStorage();
};
LevelArbiter.prototype.syncToStorage = function() { LevelArbiter.prototype.syncToStorage = function() {
try { try {
localStorage.setItem('solvedMap', JSON.stringify(this.solvedMap)); localStorage.setItem('solvedMap', JSON.stringify(this.solvedMap));
@ -15595,7 +15657,6 @@ LevelArbiter.prototype.syncToStorage = function() {
LevelArbiter.prototype.validateLevel = function(level) { LevelArbiter.prototype.validateLevel = function(level) {
level = level || {}; level = level || {};
var requiredFields = [ var requiredFields = [
'id',
'name', 'name',
'goalTreeString', 'goalTreeString',
'solutionCommand' 'solutionCommand'
@ -15612,24 +15673,21 @@ LevelArbiter.prototype.validateLevel = function(level) {
throw new Error('I need this field for a level: ' + field); throw new Error('I need this field for a level: ' + field);
} }
}); });
if (this.levelMap[level.id]) {
throw new Error('woah that level already exists!');
}
}; };
LevelArbiter.prototype.getSequenceToLevels = function() { LevelArbiter.prototype.getSequenceToLevels = function() {
return levelSequences; return this.levelSequences;
}; };
LevelArbiter.prototype.getSequences = function() { LevelArbiter.prototype.getSequences = function() {
return _.keys(levelSequences); return _.keys(this.levelSequences);
}; };
LevelArbiter.prototype.getLevelsInSequence = function(sequenceName) { LevelArbiter.prototype.getLevelsInSequence = function(sequenceName) {
if (!levelSequences[sequenceName]) { if (!this.levelSequences[sequenceName]) {
throw new Error('that sequecne name ' + sequenceName + 'does not exist'); throw new Error('that sequecne name ' + sequenceName + 'does not exist');
} }
return levelSequences[sequenceName]; return this.levelSequences[sequenceName];
}; };
LevelArbiter.prototype.getSequenceInfo = function(sequenceName) { LevelArbiter.prototype.getSequenceInfo = function(sequenceName) {
@ -15644,12 +15702,28 @@ LevelArbiter.prototype.getNextLevel = function(id) {
if (!this.levelMap[id]) { if (!this.levelMap[id]) {
throw new Error('that level doesnt exist!'); throw new Error('that level doesnt exist!');
} }
var nextID = this.levelMap[id]['nextLevelID'];
return this.levelMap[nextID];
};
LevelArbiter.prototype.getNextLevelID = function(id) { // meh, this method could be better. It's a tradeoff between
return this.getNextLevel(id)['id']; // having the sequence structure be really simple JSON
// and having no connectivity information between levels, which means
// you have to build that up yourself on every query
var level = this.levelMap[id];
var sequenceName = level.sequenceName;
var sequence = this.levelSequences[sequenceName];
var nextIndex = level.index + 1;
if (nextIndex < sequence.length) {
return sequence[nextIndex];
}
var nextSequenceIndex = this.sequences.indexOf(sequenceName) + 1;
if (nextSequenceIndex < this.sequences.length) {
var nextSequenceName = this.sequences[nextSequenceIndex];
return this.levelSequences[nextSequenceName][0];
}
// they finished the last level!
return null;
}; };
exports.LevelArbiter = LevelArbiter; exports.LevelArbiter = LevelArbiter;
@ -15687,7 +15761,6 @@ exports.sequenceInfo = {
}); });
require.define("/src/levels/intro/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/intro/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'intro1',
name: 'Introduction #1', name: 'Introduction #1',
startDialog: { startDialog: {
childViews: [{ childViews: [{
@ -15711,7 +15784,6 @@ require.define("/src/levels/intro/1.js",function(require,module,exports,__dirnam
}); });
require.define("/src/levels/intro/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/intro/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'intro2',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -15722,7 +15794,6 @@ require.define("/src/levels/intro/2.js",function(require,module,exports,__dirnam
}); });
require.define("/src/levels/rebase/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/rebase/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'rebase1',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -15733,7 +15804,6 @@ require.define("/src/levels/rebase/1.js",function(require,module,exports,__dirna
}); });
require.define("/src/levels/rebase/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/rebase/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'rebase2',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -15744,7 +15814,6 @@ require.define("/src/levels/rebase/2.js",function(require,module,exports,__dirna
}); });
require.define("/src/levels/rebase/3.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/rebase/3.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'rebase3',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -15906,25 +15975,13 @@ var LevelDropdownView = ContainedBase.extend({
}, },
getSequenceIndex: function(name) { getSequenceIndex: function(name) {
var index; var index = this.sequences.indexOf(name);
_.each(this.sequences, function(_name, _index) { if (index < 0) { throw new Error('didnt find'); }
if (_name == name) {
index = _index;
}
});
if (index === undefined) { throw new Error('didnt find'); }
return index; return index;
}, },
getIndexForID: function(id) { getIndexForID: function(id) {
var index; return Main.getLevelArbiter().getLevel(id).index;
var levels = this.sequenceToLevels[this.selectedSequence];
_.each(levels, function(level, _index) {
if (level.id == id) {
index = _index;
}
});
return index;
}, },
selectFirst: function() { selectFirst: function() {
@ -16520,6 +16577,7 @@ var regexMap = {
'define start': /^define start$/, 'define start': /^define start$/,
'show start': /^show start$/, 'show start': /^show start$/,
'hide start': /^hide start$/, 'hide start': /^hide start$/,
'define hint': /^define hint$/,
'finish': /^finish$/ 'finish': /^finish$/
}; };
@ -16542,6 +16600,7 @@ var LevelBuilder = Level.extend({
' * Define the starting tree with ```define start```', ' * Define the starting tree with ```define start```',
' * Enter the series of git commands that compose the (optimal) solution', ' * Enter the series of git commands that compose the (optimal) solution',
' * Define the goal tree with ```define goal```. Defining the goal also defines the solution', ' * Define the goal tree with ```define goal```. Defining the goal also defines the solution',
' * Optionally define a hint with ```define hint```',
' * Enter the command ```finish``` to output your level JSON!' ' * Enter the command ```finish``` to output your level JSON!'
] ]
} }
@ -16550,7 +16609,8 @@ var LevelBuilder = Level.extend({
LevelBuilder.__super__.initialize.apply(this, [options]); LevelBuilder.__super__.initialize.apply(this, [options]);
this.initStartVisualization(); this.startDialog = undefined;
this.initStartDialog();
// we wont be using this stuff, and its to delete to ensure we overwrite all functions that // we wont be using this stuff, and its to delete to ensure we overwrite all functions that
// include that functionality // include that functionality
@ -16693,21 +16753,11 @@ var LevelBuilder = Level.extend({
this.showGoal(command, deferred); this.showGoal(command, deferred);
}, },
setHint: function(command, deferred) { defineHint: function(command, deferred) {
this.level.hint = prompt('Enter a hint! Or blank if you dont want one'); this.level.hint = prompt('Enter a hint! Or blank if you dont want one');
if (command) { command.finishWith(deferred); } if (command) { command.finishWith(deferred); }
}, },
setID: function(command, deferred) {
var id = prompt('Enter an ID');
while (!id || !id.length) {
id = prompt('Enter an ID... really this time');
}
this.level.id = id;
if (command) { command.finishWith(deferred); }
},
finish: function(command, deferred) { finish: function(command, deferred) {
if (!this.gitCommandsIssued.length) { if (!this.gitCommandsIssued.length) {
command.set('error', new Errors.GitError({ command.set('error', new Errors.GitError({
@ -16720,7 +16770,19 @@ var LevelBuilder = Level.extend({
if (this.level.hint === undefined) { if (this.level.hint === undefined) {
this.setHint(); this.setHint();
} }
console.log(this.level);
var compiledLevel = _.extend(
{},
this.level
);
// the start dialog now is just our help intro thing
delete compiledLevel.startDialog;
if (this.startDialog) {
compiledLevel.startDialog = this.startDialog;
}
console.log(compiledLevel);
command.finishWith(deferred); command.finishWith(deferred);
}, },
@ -16731,7 +16793,8 @@ var LevelBuilder = Level.extend({
'define start': this.defineStart, 'define start': this.defineStart,
'show start': this.showStart, 'show start': this.showStart,
'hide start': this.hideStart, 'hide start': this.hideStart,
'finish': this.finish 'finish': this.finish,
'define hint': this.defineHint
}; };
methodMap[command.get('method')].apply(this, arguments); methodMap[command.get('method')].apply(this, arguments);
@ -19254,6 +19317,8 @@ var Main = require('../app');
function LevelArbiter() { function LevelArbiter() {
this.levelMap = {}; this.levelMap = {};
this.levelSequences = levelSequences;
this.sequences = [];
this.init(); this.init();
var solvedMap; var solvedMap;
@ -19270,21 +19335,30 @@ function LevelArbiter() {
LevelArbiter.prototype.init = function() { LevelArbiter.prototype.init = function() {
var previousLevelID; var previousLevelID;
_.each(levelSequences, function(levels, levelSequenceName) { _.each(this.levelSequences, function(levels, levelSequenceName) {
this.sequences.push(levelSequenceName);
if (!levels || !levels.length) {
throw new Error('no empty sequences allowed');
}
// for this particular sequence... // for this particular sequence...
_.each(levels, function(level, index) { _.each(levels, function(level, index) {
this.validateLevel(level); this.validateLevel(level);
this.levelMap[level.id] = _.extend(
var id = levelSequenceName + String(index);
var compiledLevel = _.extend(
{}, {},
{ index: index }, level,
level {
index: index,
id: levelSequenceName + String(index),
sequenceName: levelSequenceName
}
); );
// build up the chaining between levels // update our internal data
if (previousLevelID) { this.levelMap[id] = compiledLevel;
this.levelMap[previousLevelID]['nextLevelID'] = level.id; this.levelSequences[levelSequenceName][index] = compiledLevel;
}
previousLevelID = level.id;
}, this); }, this);
}, this); }, this);
}; };
@ -19297,10 +19371,18 @@ LevelArbiter.prototype.isLevelSolved = function(id) {
}; };
LevelArbiter.prototype.levelSolved = function(id) { LevelArbiter.prototype.levelSolved = function(id) {
// called without an id when we reset solved status
if (!id) { return; }
this.solvedMap[id] = true; this.solvedMap[id] = true;
this.syncToStorage(); this.syncToStorage();
}; };
LevelArbiter.prototype.resetSolvedMap = function() {
this.solvedMap = {};
this.syncToStorage();
};
LevelArbiter.prototype.syncToStorage = function() { LevelArbiter.prototype.syncToStorage = function() {
try { try {
localStorage.setItem('solvedMap', JSON.stringify(this.solvedMap)); localStorage.setItem('solvedMap', JSON.stringify(this.solvedMap));
@ -19312,7 +19394,6 @@ LevelArbiter.prototype.syncToStorage = function() {
LevelArbiter.prototype.validateLevel = function(level) { LevelArbiter.prototype.validateLevel = function(level) {
level = level || {}; level = level || {};
var requiredFields = [ var requiredFields = [
'id',
'name', 'name',
'goalTreeString', 'goalTreeString',
'solutionCommand' 'solutionCommand'
@ -19329,24 +19410,21 @@ LevelArbiter.prototype.validateLevel = function(level) {
throw new Error('I need this field for a level: ' + field); throw new Error('I need this field for a level: ' + field);
} }
}); });
if (this.levelMap[level.id]) {
throw new Error('woah that level already exists!');
}
}; };
LevelArbiter.prototype.getSequenceToLevels = function() { LevelArbiter.prototype.getSequenceToLevels = function() {
return levelSequences; return this.levelSequences;
}; };
LevelArbiter.prototype.getSequences = function() { LevelArbiter.prototype.getSequences = function() {
return _.keys(levelSequences); return _.keys(this.levelSequences);
}; };
LevelArbiter.prototype.getLevelsInSequence = function(sequenceName) { LevelArbiter.prototype.getLevelsInSequence = function(sequenceName) {
if (!levelSequences[sequenceName]) { if (!this.levelSequences[sequenceName]) {
throw new Error('that sequecne name ' + sequenceName + 'does not exist'); throw new Error('that sequecne name ' + sequenceName + 'does not exist');
} }
return levelSequences[sequenceName]; return this.levelSequences[sequenceName];
}; };
LevelArbiter.prototype.getSequenceInfo = function(sequenceName) { LevelArbiter.prototype.getSequenceInfo = function(sequenceName) {
@ -19361,12 +19439,28 @@ LevelArbiter.prototype.getNextLevel = function(id) {
if (!this.levelMap[id]) { if (!this.levelMap[id]) {
throw new Error('that level doesnt exist!'); throw new Error('that level doesnt exist!');
} }
var nextID = this.levelMap[id]['nextLevelID'];
return this.levelMap[nextID];
};
LevelArbiter.prototype.getNextLevelID = function(id) { // meh, this method could be better. It's a tradeoff between
return this.getNextLevel(id)['id']; // having the sequence structure be really simple JSON
// and having no connectivity information between levels, which means
// you have to build that up yourself on every query
var level = this.levelMap[id];
var sequenceName = level.sequenceName;
var sequence = this.levelSequences[sequenceName];
var nextIndex = level.index + 1;
if (nextIndex < sequence.length) {
return sequence[nextIndex];
}
var nextSequenceIndex = this.sequences.indexOf(sequenceName) + 1;
if (nextSequenceIndex < this.sequences.length) {
var nextSequenceName = this.sequences[nextSequenceIndex];
return this.levelSequences[nextSequenceName][0];
}
// they finished the last level!
return null;
}; };
exports.LevelArbiter = LevelArbiter; exports.LevelArbiter = LevelArbiter;
@ -19401,6 +19495,7 @@ var regexMap = {
'define start': /^define start$/, 'define start': /^define start$/,
'show start': /^show start$/, 'show start': /^show start$/,
'hide start': /^hide start$/, 'hide start': /^hide start$/,
'define hint': /^define hint$/,
'finish': /^finish$/ 'finish': /^finish$/
}; };
@ -19423,6 +19518,7 @@ var LevelBuilder = Level.extend({
' * Define the starting tree with ```define start```', ' * Define the starting tree with ```define start```',
' * Enter the series of git commands that compose the (optimal) solution', ' * Enter the series of git commands that compose the (optimal) solution',
' * Define the goal tree with ```define goal```. Defining the goal also defines the solution', ' * Define the goal tree with ```define goal```. Defining the goal also defines the solution',
' * Optionally define a hint with ```define hint```',
' * Enter the command ```finish``` to output your level JSON!' ' * Enter the command ```finish``` to output your level JSON!'
] ]
} }
@ -19431,7 +19527,8 @@ var LevelBuilder = Level.extend({
LevelBuilder.__super__.initialize.apply(this, [options]); LevelBuilder.__super__.initialize.apply(this, [options]);
this.initStartVisualization(); this.startDialog = undefined;
this.initStartDialog();
// we wont be using this stuff, and its to delete to ensure we overwrite all functions that // we wont be using this stuff, and its to delete to ensure we overwrite all functions that
// include that functionality // include that functionality
@ -19574,21 +19671,11 @@ var LevelBuilder = Level.extend({
this.showGoal(command, deferred); this.showGoal(command, deferred);
}, },
setHint: function(command, deferred) { defineHint: function(command, deferred) {
this.level.hint = prompt('Enter a hint! Or blank if you dont want one'); this.level.hint = prompt('Enter a hint! Or blank if you dont want one');
if (command) { command.finishWith(deferred); } if (command) { command.finishWith(deferred); }
}, },
setID: function(command, deferred) {
var id = prompt('Enter an ID');
while (!id || !id.length) {
id = prompt('Enter an ID... really this time');
}
this.level.id = id;
if (command) { command.finishWith(deferred); }
},
finish: function(command, deferred) { finish: function(command, deferred) {
if (!this.gitCommandsIssued.length) { if (!this.gitCommandsIssued.length) {
command.set('error', new Errors.GitError({ command.set('error', new Errors.GitError({
@ -19601,7 +19688,19 @@ var LevelBuilder = Level.extend({
if (this.level.hint === undefined) { if (this.level.hint === undefined) {
this.setHint(); this.setHint();
} }
console.log(this.level);
var compiledLevel = _.extend(
{},
this.level
);
// the start dialog now is just our help intro thing
delete compiledLevel.startDialog;
if (this.startDialog) {
compiledLevel.startDialog = this.startDialog;
}
console.log(compiledLevel);
command.finishWith(deferred); command.finishWith(deferred);
}, },
@ -19612,7 +19711,8 @@ var LevelBuilder = Level.extend({
'define start': this.defineStart, 'define start': this.defineStart,
'show start': this.showStart, 'show start': this.showStart,
'hide start': this.hideStart, 'hide start': this.hideStart,
'finish': this.finish 'finish': this.finish,
'define hint': this.defineHint
}; };
methodMap[command.get('method')].apply(this, arguments); methodMap[command.get('method')].apply(this, arguments);
@ -19706,6 +19806,8 @@ var LevelToolbar = require('../views').LevelToolbar;
var TreeCompare = require('../git/treeCompare').TreeCompare; var TreeCompare = require('../git/treeCompare').TreeCompare;
var regexMap = { var regexMap = {
'level help': /^level help$/,
'start dialog': /^start dialog$/,
'show goal': /^show goal$/, 'show goal': /^show goal$/,
'hide goal': /^hide goal$/, 'hide goal': /^hide goal$/,
'show solution': /^show solution$/ 'show solution': /^show solution$/
@ -19733,11 +19835,11 @@ var Level = Sandbox.extend({
Level.__super__.initialize.apply(this, [options]); Level.__super__.initialize.apply(this, [options]);
this.startOffCommand(); this.startOffCommand();
this.handleOpen(); this.handleOpen(options.deferred);
}, },
handleOpen: function() { handleOpen: function(deferred) {
this.options.deferred = this.options.deferred || Q.defer(); deferred = deferred || Q.defer();
// if there is a multiview in the beginning, open that // if there is a multiview in the beginning, open that
// and let it resolve our deferred // and let it resolve our deferred
@ -19745,15 +19847,28 @@ var Level = Sandbox.extend({
new MultiView(_.extend( new MultiView(_.extend(
{}, {},
this.level.startDialog, this.level.startDialog,
{ deferred: this.options.deferred } { deferred: deferred }
)); ));
return; return;
} }
// otherwise, resolve after a 700 second delay // otherwise, resolve after a 700 second delay to allow
setTimeout(_.bind(function() { // for us to animate easily
this.options.deferred.resolve(); setTimeout(function() {
}, this), this.getAnimationTime() * 1.2); deferred.resolve();
}, this.getAnimationTime() * 1.2);
},
startDialog: function(command, deferred) {
if (!this.level.startDialog) {
command.set('error', new Errors.GitError({
msg: 'There is no start dialog to show for this level!'
}));
deferred.resolve();
return;
}
this.handleOpen(deferred);
}, },
initName: function() { initName: function() {
@ -19973,11 +20088,10 @@ var Level = Sandbox.extend({
this.mainVis.gitVisuals.finishAnimation() this.mainVis.gitVisuals.finishAnimation()
.then(function() { .then(function() {
// TODO if there is no future level... // we want to ask if they will move onto the next level
// while giving them their results...
// we want to ask if they will move onto the next level...
var nextDialog = new NextLevelConfirm({ var nextDialog = new NextLevelConfirm({
nextLevelName: nextLevel.name, nextLevel: nextLevel,
numCommands: numCommands, numCommands: numCommands,
best: best best: best
}); });
@ -19985,10 +20099,12 @@ var Level = Sandbox.extend({
return nextDialog.getPromise(); return nextDialog.getPromise();
}) })
.then(function() { .then(function() {
Main.getEventBaton().trigger( if (nextLevel) {
'commandSubmitted', Main.getEventBaton().trigger(
'level ' + nextLevel.id 'commandSubmitted',
); 'level ' + nextLevel.id
);
}
}) })
.fail(function() { .fail(function() {
// nothing to do, we will just close // nothing to do, we will just close
@ -20024,6 +20140,12 @@ var Level = Sandbox.extend({
"Hmm, there doesn't seem to be a hint for this level :-/"; "Hmm, there doesn't seem to be a hint for this level :-/";
return [ return [
[/^help$/, function() {
throw new Errors.CommandResult({
msg: 'You are in a level, so multiple forms of help are available. Please select either ' +
'"level help" or "general help"'
});
}],
[/^hint$/, function() { [/^hint$/, function() {
throw new Errors.CommandResult({ throw new Errors.CommandResult({
msg: hintMsg msg: hintMsg
@ -20071,7 +20193,9 @@ var Level = Sandbox.extend({
var methodMap = { var methodMap = {
'show goal': this.showGoal, 'show goal': this.showGoal,
'hide goal': this.hideGoal, 'hide goal': this.hideGoal,
'show solution': this.showSolution 'show solution': this.showSolution,
'start dialog': this.startDialog,
'level help': this.startDialog
}; };
var method = methodMap[command.get('method')]; var method = methodMap[command.get('method')];
if (!method) { if (!method) {
@ -20372,8 +20496,18 @@ var Sandbox = Backbone.View.extend({
}); });
}, },
resetSolved: function(command, deferred) {
Main.getLevelArbiter().resetSolvedMap();
command.addWarning(
"Solved map was reset, you are starting from a clean slate!"
);
deferred.resolve();
},
processSandboxCommand: function(command, deferred) { processSandboxCommand: function(command, deferred) {
var commandMap = { var commandMap = {
'reset solved': this.resetSolved,
'general help': this.helpDialog,
'help': this.helpDialog, 'help': this.helpDialog,
'reset': this.reset, 'reset': this.reset,
'delay': this.delay, 'delay': this.delay,
@ -20497,6 +20631,8 @@ var instantCommands = [
]; ];
var regexMap = { var regexMap = {
'reset solved': /^reset solved($|\s)/,
'general help': /^general help($|\s)/,
'help': /^help($|\s)|\?/, 'help': /^help($|\s)|\?/,
'reset': /^reset($|\s)/, 'reset': /^reset($|\s)/,
'delay': /^delay (\d+)$/, 'delay': /^delay (\d+)$/,
@ -22239,7 +22375,7 @@ var ConfirmCancelTerminal = Backbone.View.extend({
var NextLevelConfirm = ConfirmCancelTerminal.extend({ var NextLevelConfirm = ConfirmCancelTerminal.extend({
initialize: function(options) { initialize: function(options) {
options = options || {}; options = options || {};
this.nextLevelName = options.nextLevelName || 'The mysterious next level'; var nextLevelName = (options.nextLevel) ? options.nextLevel.name : '';
var markdowns = [ var markdowns = [
'## Great Job!!', '## Great Job!!',
@ -22258,11 +22394,18 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({
); );
} }
markdowns = markdowns.concat([ if (options.nextLevel) {
'', markdowns = markdowns.concat([
'Would you like to move onto "', '',
this.nextLevelName + '", the next level?' 'Would you like to move onto "',
]); nextLevelName + '", the next level?'
]);
} else {
markdowns = markdowns.concat([
'',
'Wow!!! You finished the last level, congratulations!'
]);
}
options.modalAlert = { options.modalAlert = {
markdowns: markdowns markdowns: markdowns
@ -22605,25 +22748,13 @@ var LevelDropdownView = ContainedBase.extend({
}, },
getSequenceIndex: function(name) { getSequenceIndex: function(name) {
var index; var index = this.sequences.indexOf(name);
_.each(this.sequences, function(_name, _index) { if (index < 0) { throw new Error('didnt find'); }
if (_name == name) {
index = _index;
}
});
if (index === undefined) { throw new Error('didnt find'); }
return index; return index;
}, },
getIndexForID: function(id) { getIndexForID: function(id) {
var index; return Main.getLevelArbiter().getLevel(id).index;
var levels = this.sequenceToLevels[this.selectedSequence];
_.each(levels, function(level, _index) {
if (level.id == id) {
index = _index;
}
});
return index;
}, },
selectFirst: function() { selectFirst: function() {
@ -25609,7 +25740,6 @@ exports.sequenceInfo = {
require("/src/levels/index.js"); require("/src/levels/index.js");
require.define("/src/levels/intro/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/intro/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'intro1',
name: 'Introduction #1', name: 'Introduction #1',
startDialog: { startDialog: {
childViews: [{ childViews: [{
@ -25634,7 +25764,6 @@ require.define("/src/levels/intro/1.js",function(require,module,exports,__dirnam
require("/src/levels/intro/1.js"); require("/src/levels/intro/1.js");
require.define("/src/levels/intro/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/intro/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'intro2',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -25646,7 +25775,6 @@ require.define("/src/levels/intro/2.js",function(require,module,exports,__dirnam
require("/src/levels/intro/2.js"); require("/src/levels/intro/2.js");
require.define("/src/levels/rebase/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/rebase/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'rebase1',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -25658,7 +25786,6 @@ require.define("/src/levels/rebase/1.js",function(require,module,exports,__dirna
require("/src/levels/rebase/1.js"); require("/src/levels/rebase/1.js");
require.define("/src/levels/rebase/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/rebase/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'rebase2',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',
@ -25670,7 +25797,6 @@ require.define("/src/levels/rebase/2.js",function(require,module,exports,__dirna
require("/src/levels/rebase/2.js"); require("/src/levels/rebase/2.js");
require.define("/src/levels/rebase/3.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/src/levels/rebase/3.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
id: 'rebase3',
name: 'Introduction #1', name: 'Introduction #1',
goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}', goalTreeString: '{"branches":{"master":{"target":"C1","id":"master"},"win":{"target":"C2","id":"win"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"win","id":"HEAD"}}',
solutionCommand: 'git checkout -b win; git commit', solutionCommand: 'git checkout -b win; git commit',

69
src/js/level/arbiter.js
View file

@ -10,6 +10,8 @@ var Main = require('../app');
function LevelArbiter() { function LevelArbiter() {
this.levelMap = {}; this.levelMap = {};
this.levelSequences = levelSequences;
this.sequences = [];
this.init(); this.init();
var solvedMap; var solvedMap;
@ -26,24 +28,30 @@ function LevelArbiter() {
LevelArbiter.prototype.init = function() { LevelArbiter.prototype.init = function() {
var previousLevelID; var previousLevelID;
_.each(levelSequences, function(levels, levelSequenceName) { _.each(this.levelSequences, function(levels, levelSequenceName) {
this.sequences.push(levelSequenceName);
if (!levels || !levels.length) {
throw new Error('no empty sequences allowed');
}
// for this particular sequence... // for this particular sequence...
_.each(levels, function(level, index) { _.each(levels, function(level, index) {
this.validateLevel(level); this.validateLevel(level);
this.levelMap[level.id] = _.extend(
var id = levelSequenceName + String(index);
var compiledLevel = _.extend(
{}, {},
level, level,
{ {
index: index, index: index,
id: levelSequenceName + String(index) id: levelSequenceName + String(index),
sequenceName: levelSequenceName
} }
); );
// build up the chaining between levels // update our internal data
if (previousLevelID) { this.levelMap[id] = compiledLevel;
this.levelMap[previousLevelID]['nextLevelID'] = level.id; this.levelSequences[levelSequenceName][index] = compiledLevel;
}
previousLevelID = level.id;
}, this); }, this);
}, this); }, this);
}; };
@ -56,10 +64,18 @@ LevelArbiter.prototype.isLevelSolved = function(id) {
}; };
LevelArbiter.prototype.levelSolved = function(id) { LevelArbiter.prototype.levelSolved = function(id) {
// called without an id when we reset solved status
if (!id) { return; }
this.solvedMap[id] = true; this.solvedMap[id] = true;
this.syncToStorage(); this.syncToStorage();
}; };
LevelArbiter.prototype.resetSolvedMap = function() {
this.solvedMap = {};
this.syncToStorage();
};
LevelArbiter.prototype.syncToStorage = function() { LevelArbiter.prototype.syncToStorage = function() {
try { try {
localStorage.setItem('solvedMap', JSON.stringify(this.solvedMap)); localStorage.setItem('solvedMap', JSON.stringify(this.solvedMap));
@ -87,24 +103,21 @@ LevelArbiter.prototype.validateLevel = function(level) {
throw new Error('I need this field for a level: ' + field); throw new Error('I need this field for a level: ' + field);
} }
}); });
if (this.levelMap[level.id]) {
throw new Error('woah that level already exists!');
}
}; };
LevelArbiter.prototype.getSequenceToLevels = function() { LevelArbiter.prototype.getSequenceToLevels = function() {
return levelSequences; return this.levelSequences;
}; };
LevelArbiter.prototype.getSequences = function() { LevelArbiter.prototype.getSequences = function() {
return _.keys(levelSequences); return _.keys(this.levelSequences);
}; };
LevelArbiter.prototype.getLevelsInSequence = function(sequenceName) { LevelArbiter.prototype.getLevelsInSequence = function(sequenceName) {
if (!levelSequences[sequenceName]) { if (!this.levelSequences[sequenceName]) {
throw new Error('that sequecne name ' + sequenceName + 'does not exist'); throw new Error('that sequecne name ' + sequenceName + 'does not exist');
} }
return levelSequences[sequenceName]; return this.levelSequences[sequenceName];
}; };
LevelArbiter.prototype.getSequenceInfo = function(sequenceName) { LevelArbiter.prototype.getSequenceInfo = function(sequenceName) {
@ -119,12 +132,28 @@ LevelArbiter.prototype.getNextLevel = function(id) {
if (!this.levelMap[id]) { if (!this.levelMap[id]) {
throw new Error('that level doesnt exist!'); throw new Error('that level doesnt exist!');
} }
var nextID = this.levelMap[id]['nextLevelID'];
return this.levelMap[nextID];
};
LevelArbiter.prototype.getNextLevelID = function(id) { // meh, this method could be better. It's a tradeoff between
return this.getNextLevel(id)['id']; // having the sequence structure be really simple JSON
// and having no connectivity information between levels, which means
// you have to build that up yourself on every query
var level = this.levelMap[id];
var sequenceName = level.sequenceName;
var sequence = this.levelSequences[sequenceName];
var nextIndex = level.index + 1;
if (nextIndex < sequence.length) {
return sequence[nextIndex];
}
var nextSequenceIndex = this.sequences.indexOf(sequenceName) + 1;
if (nextSequenceIndex < this.sequences.length) {
var nextSequenceName = this.sequences[nextSequenceIndex];
return this.levelSequences[nextSequenceName][0];
}
// they finished the last level!
return null;
}; };
exports.LevelArbiter = LevelArbiter; exports.LevelArbiter = LevelArbiter;

17
src/js/level/builder.js
View file

@ -56,7 +56,8 @@ var LevelBuilder = Level.extend({
LevelBuilder.__super__.initialize.apply(this, [options]); LevelBuilder.__super__.initialize.apply(this, [options]);
this.initStartVisualization(); this.startDialog = undefined;
this.initStartDialog();
// we wont be using this stuff, and its to delete to ensure we overwrite all functions that // we wont be using this stuff, and its to delete to ensure we overwrite all functions that
// include that functionality // include that functionality
@ -216,7 +217,19 @@ var LevelBuilder = Level.extend({
if (this.level.hint === undefined) { if (this.level.hint === undefined) {
this.setHint(); this.setHint();
} }
console.log(this.level);
var compiledLevel = _.extend(
{},
this.level
);
// the start dialog now is just our help intro thing
delete compiledLevel.startDialog;
if (this.startDialog) {
compiledLevel.startDialog = this.startDialog;
}
console.log(compiledLevel);
command.finishWith(deferred); command.finishWith(deferred);
}, },

58
src/js/level/index.js
View file

@ -23,6 +23,8 @@ var LevelToolbar = require('../views').LevelToolbar;
var TreeCompare = require('../git/treeCompare').TreeCompare; var TreeCompare = require('../git/treeCompare').TreeCompare;
var regexMap = { var regexMap = {
'level help': /^level help$/,
'start dialog': /^start dialog$/,
'show goal': /^show goal$/, 'show goal': /^show goal$/,
'hide goal': /^hide goal$/, 'hide goal': /^hide goal$/,
'show solution': /^show solution$/ 'show solution': /^show solution$/
@ -50,11 +52,11 @@ var Level = Sandbox.extend({
Level.__super__.initialize.apply(this, [options]); Level.__super__.initialize.apply(this, [options]);
this.startOffCommand(); this.startOffCommand();
this.handleOpen(); this.handleOpen(options.deferred);
}, },
handleOpen: function() { handleOpen: function(deferred) {
this.options.deferred = this.options.deferred || Q.defer(); deferred = deferred || Q.defer();
// if there is a multiview in the beginning, open that // if there is a multiview in the beginning, open that
// and let it resolve our deferred // and let it resolve our deferred
@ -62,15 +64,28 @@ var Level = Sandbox.extend({
new MultiView(_.extend( new MultiView(_.extend(
{}, {},
this.level.startDialog, this.level.startDialog,
{ deferred: this.options.deferred } { deferred: deferred }
)); ));
return; return;
} }
// otherwise, resolve after a 700 second delay // otherwise, resolve after a 700 second delay to allow
setTimeout(_.bind(function() { // for us to animate easily
this.options.deferred.resolve(); setTimeout(function() {
}, this), this.getAnimationTime() * 1.2); deferred.resolve();
}, this.getAnimationTime() * 1.2);
},
startDialog: function(command, deferred) {
if (!this.level.startDialog) {
command.set('error', new Errors.GitError({
msg: 'There is no start dialog to show for this level!'
}));
deferred.resolve();
return;
}
this.handleOpen(deferred);
}, },
initName: function() { initName: function() {
@ -290,11 +305,10 @@ var Level = Sandbox.extend({
this.mainVis.gitVisuals.finishAnimation() this.mainVis.gitVisuals.finishAnimation()
.then(function() { .then(function() {
// TODO if there is no future level... // we want to ask if they will move onto the next level
// while giving them their results...
// we want to ask if they will move onto the next level...
var nextDialog = new NextLevelConfirm({ var nextDialog = new NextLevelConfirm({
nextLevelName: nextLevel.name, nextLevel: nextLevel,
numCommands: numCommands, numCommands: numCommands,
best: best best: best
}); });
@ -302,10 +316,12 @@ var Level = Sandbox.extend({
return nextDialog.getPromise(); return nextDialog.getPromise();
}) })
.then(function() { .then(function() {
Main.getEventBaton().trigger( if (nextLevel) {
'commandSubmitted', Main.getEventBaton().trigger(
'level ' + nextLevel.id 'commandSubmitted',
); 'level ' + nextLevel.id
);
}
}) })
.fail(function() { .fail(function() {
// nothing to do, we will just close // nothing to do, we will just close
@ -341,6 +357,12 @@ var Level = Sandbox.extend({
"Hmm, there doesn't seem to be a hint for this level :-/"; "Hmm, there doesn't seem to be a hint for this level :-/";
return [ return [
[/^help$/, function() {
throw new Errors.CommandResult({
msg: 'You are in a level, so multiple forms of help are available. Please select either ' +
'"level help" or "general help"'
});
}],
[/^hint$/, function() { [/^hint$/, function() {
throw new Errors.CommandResult({ throw new Errors.CommandResult({
msg: hintMsg msg: hintMsg
@ -388,7 +410,9 @@ var Level = Sandbox.extend({
var methodMap = { var methodMap = {
'show goal': this.showGoal, 'show goal': this.showGoal,
'hide goal': this.hideGoal, 'hide goal': this.hideGoal,
'show solution': this.showSolution 'show solution': this.showSolution,
'start dialog': this.startDialog,
'level help': this.startDialog
}; };
var method = methodMap[command.get('method')]; var method = methodMap[command.get('method')];
if (!method) { if (!method) {

10
src/js/level/sandbox.js
View file

@ -180,8 +180,18 @@ var Sandbox = Backbone.View.extend({
}); });
}, },
resetSolved: function(command, deferred) {
Main.getLevelArbiter().resetSolvedMap();
command.addWarning(
"Solved map was reset, you are starting from a clean slate!"
);
deferred.resolve();
},
processSandboxCommand: function(command, deferred) { processSandboxCommand: function(command, deferred) {
var commandMap = { var commandMap = {
'reset solved': this.resetSolved,
'general help': this.helpDialog,
'help': this.helpDialog, 'help': this.helpDialog,
'reset': this.reset, 'reset': this.reset,
'delay': this.delay, 'delay': this.delay,

2
src/js/level/sandboxCommands.js
View file

@ -45,6 +45,8 @@ var instantCommands = [
]; ];
var regexMap = { var regexMap = {
'reset solved': /^reset solved($|\s)/,
'general help': /^general help($|\s)/,
'help': /^help($|\s)|\?/, 'help': /^help($|\s)|\?/,
'reset': /^reset($|\s)/, 'reset': /^reset($|\s)/,
'delay': /^delay (\d+)$/, 'delay': /^delay (\d+)$/,

19
src/js/views/index.js
View file

@ -367,7 +367,7 @@ var ConfirmCancelTerminal = Backbone.View.extend({
var NextLevelConfirm = ConfirmCancelTerminal.extend({ var NextLevelConfirm = ConfirmCancelTerminal.extend({
initialize: function(options) { initialize: function(options) {
options = options || {}; options = options || {};
this.nextLevelName = options.nextLevelName || 'The mysterious next level'; var nextLevelName = (options.nextLevel) ? options.nextLevel.name : '';
var markdowns = [ var markdowns = [
'## Great Job!!', '## Great Job!!',
@ -386,11 +386,18 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({
); );
} }
markdowns = markdowns.concat([ if (options.nextLevel) {
'', markdowns = markdowns.concat([
'Would you like to move onto "', '',
this.nextLevelName + '", the next level?' 'Would you like to move onto "',
]); nextLevelName + '", the next level?'
]);
} else {
markdowns = markdowns.concat([
'',
'Wow!!! You finished the last level, congratulations!'
]);
}
options.modalAlert = { options.modalAlert = {
markdowns: markdowns markdowns: markdowns

9
src/js/views/levelDropdownView.js
View file

@ -150,13 +150,8 @@ var LevelDropdownView = ContainedBase.extend({
}, },
getSequenceIndex: function(name) { getSequenceIndex: function(name) {
var index; var index = this.sequences.indexOf(name);
_.each(this.sequences, function(_name, _index) { if (index < 0) { throw new Error('didnt find'); }
if (_name == name) {
index = _index;
}
});
if (index === undefined) { throw new Error('didnt find'); }
return index; return index;
}, },