codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-01-30 22:06:38 -08:00
commit 61b8636ce5
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/schemas/models/level.coffee
View file

@ -19,6 +19,7 @@ defaultTasks = [
'Publish.' 'Publish.'
'Choose level options like required/restricted gear.' 'Choose level options like required/restricted gear.'
'Create achievements, including unlocking next level.' 'Create achievements, including unlocking next level.'
'Choose leaderboard score types.'
'Playtest with a slow/tough hero.' 'Playtest with a slow/tough hero.'
'Playtest with a fast/weak hero.' 'Playtest with a fast/weak hero.'

2
app/views/play/level/tome/CastButtonView.coffee
View file

@ -73,6 +73,7 @@ module.exports = class CastButtonView extends CocoView
@updateReplayability() @updateReplayability()
onDoneButtonClick: (e) -> onDoneButtonClick: (e) ->
@options.session.recordScores @world.scores, @options.level
Backbone.Mediator.publish 'level:show-victory', showModal: true Backbone.Mediator.publish 'level:show-victory', showModal: true
onSpellChanged: (e) -> onSpellChanged: (e) ->
@ -97,6 +98,7 @@ module.exports = class CastButtonView extends CocoView
@playSound 'cast-end', 0.5 @playSound 'cast-end', 0.5
@hasCastOnce = true @hasCastOnce = true
@updateCastButton() @updateCastButton()
@world = e.world
onNewGoalStates: (e) -> onNewGoalStates: (e) ->
winnable = e.overallStatus is 'success' winnable = e.overallStatus is 'success'