mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-26 00:58:00 -05:00
Merge branch 'master' into production
This commit is contained in:
Nick Winter
commit
ea077b227c
35 changed files with 552 additions and 398 deletions
|
|
@ -88,7 +88,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
|
|||
scriptStates: scriptStates
|
||||
timeSinceLastScriptEnded: (if @lastScriptEnded then now - @lastScriptEnded else 0) / 1000
|
||||
|
||||
Backbone.Mediator.publish 'script:tick', stateEvent # Is this even needed?
|
||||
Backbone.Mediator.publish 'script:tick', stateEvent # Used to trigger level scripts.
|
||||
|
||||
loadFromSession: ->
|
||||
# load the queue with note groups to skip through
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ module.exports = class CoordinateGrid extends CocoClass
|
|||
toString: -> '<CoordinateGrid>'
|
||||
|
||||
build: (worldSize) ->
|
||||
worldWidth = worldSize[0] ? 80
|
||||
worldHeight = worldSize[1] ? 68
|
||||
worldWidth = worldSize[0] or 80
|
||||
worldHeight = worldSize[1] or 68
|
||||
@gridContainer = new createjs.Container()
|
||||
@gridShape = new createjs.Shape()
|
||||
@gridContainer.addChild @gridShape
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ module.exports = class SpriteBoss extends CocoClass
|
|||
for slot, itemID of thang.inventoryIDs
|
||||
item = @world.getThangByID itemID
|
||||
unless item.equipped
|
||||
#console.log thang.id, 'equipping', item, 'in', thang.slot, 'Surface-side'
|
||||
console.log thang.id, 'equipping', item, 'in', thang.slot, 'Surface-side, but it cannot equip?' unless item.equip
|
||||
item.equip()
|
||||
itemsJustEquipped.push item
|
||||
return itemsJustEquipped
|
||||
|
|
|
|||
|
|
@ -486,7 +486,6 @@ module.exports = Surface = class Surface extends CocoClass
|
|||
|
||||
onMouseUp: (e) =>
|
||||
return if @disabled
|
||||
console.log 'yo on mouse up', e
|
||||
onBackground = not @stage.hitTest e.stageX, e.stageY
|
||||
Backbone.Mediator.publish 'surface:stage-mouse-up', onBackground: onBackground, x: e.stageX, y: e.stageY, originalEvent: e
|
||||
|
||||
|
|
@ -497,8 +496,8 @@ module.exports = Surface = class Surface extends CocoClass
|
|||
event =
|
||||
deltaX: e.deltaX
|
||||
deltaY: e.deltaY
|
||||
screenPos: @mouseScreenPos
|
||||
canvas: @canvas
|
||||
event.screenPos = @mouseScreenPos if @mouseScreenPos
|
||||
Backbone.Mediator.publish 'surface:mouse-scrolled', event unless @disabled
|
||||
|
||||
hookUpChooseControls: ->
|
||||
|
|
|
|||
|
|
@ -126,6 +126,8 @@
|
|||
level_difficulty: "Difficulty: "
|
||||
play_as: "Play As"
|
||||
spectate: "Spectate"
|
||||
players: "players"
|
||||
hours_played: "hours played"
|
||||
|
||||
contact:
|
||||
contact_us: "Contact CodeCombat"
|
||||
|
|
@ -511,6 +513,7 @@
|
|||
toggle_grid: "Toggle grid overlay."
|
||||
toggle_pathfinding: "Toggle pathfinding overlay."
|
||||
beautify: "Beautify your code by standardizing its formatting."
|
||||
maximize_editor: "Maximize/minimize code editor."
|
||||
move_wizard: "Move your Wizard around the level."
|
||||
|
||||
admin:
|
||||
|
|
@ -948,6 +951,7 @@
|
|||
wizard: "Wizard"
|
||||
achievement: "Achievement"
|
||||
clas: "CLAs"
|
||||
play_counts: "Play Counts"
|
||||
|
||||
delta:
|
||||
added: "Added"
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
|
|||
loading: "Laddar..."
|
||||
saving: "Sparar..."
|
||||
sending: "Skickar..."
|
||||
# send: "Send"
|
||||
send: "Skicka"
|
||||
cancel: "Avbryt"
|
||||
save: "Spara"
|
||||
# publish: "Publish"
|
||||
# create: "Create"
|
||||
publish: "Publisera"
|
||||
create: "Skapa"
|
||||
delay_1_sec: "1 sekund"
|
||||
delay_3_sec: "3 sekunder"
|
||||
delay_5_sec: "5 sekunder"
|
||||
|
|
@ -19,21 +19,21 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
|
|||
# unwatch: "Unwatch"
|
||||
# submit_patch: "Submit Patch"
|
||||
|
||||
# units:
|
||||
# second: "second"
|
||||
# seconds: "seconds"
|
||||
# minute: "minute"
|
||||
# minutes: "minutes"
|
||||
# hour: "hour"
|
||||
# hours: "hours"
|
||||
# day: "day"
|
||||
# days: "days"
|
||||
# week: "week"
|
||||
# weeks: "weeks"
|
||||
# month: "month"
|
||||
# months: "months"
|
||||
# year: "year"
|
||||
# years: "years"
|
||||
units:
|
||||
second: "sekund"
|
||||
seconds: "sekunder"
|
||||
minute: "minut"
|
||||
minutes: "minuter"
|
||||
hour: "timme"
|
||||
hours: "timmar"
|
||||
day: "dag"
|
||||
days: "dagar"
|
||||
week: "vecka"
|
||||
weeks: "veckor"
|
||||
month: "månad"
|
||||
months: "månader"
|
||||
year: "år"
|
||||
years: "år"
|
||||
|
||||
modal:
|
||||
close: "Stäng"
|
||||
|
|
@ -44,14 +44,14 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
|
|||
|
||||
nav:
|
||||
play: "Spela"
|
||||
# community: "Community"
|
||||
community: "Community"
|
||||
editor: "Nivåredigerare"
|
||||
blog: "Blogg"
|
||||
forum: "Forum"
|
||||
# account: "Account"
|
||||
# profile: "Profile"
|
||||
# stats: "Stats"
|
||||
# code: "Code"
|
||||
account: "Konto"
|
||||
profile: "Profil"
|
||||
stats: "Stats"
|
||||
code: "Kod"
|
||||
admin: "Admin"
|
||||
home: "Hem"
|
||||
contribute: "Bidra"
|
||||
|
|
@ -72,9 +72,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
|
|||
login:
|
||||
sign_up: "Skapa konto"
|
||||
log_in: "Logga in"
|
||||
# logging_in: "Logging In"
|
||||
logging_in: "Loggar In"
|
||||
log_out: "Logga ut"
|
||||
recover: "glömt lösenord"
|
||||
recover: "Glömt lösenord"
|
||||
|
||||
recover:
|
||||
recover_account_title: "Återskapa ditt konto"
|
||||
|
|
@ -89,7 +89,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
|
|||
creating: "Skapar konto..."
|
||||
sign_up: "Skapa konto"
|
||||
log_in: "logga in med lösenord"
|
||||
# social_signup: "Or, you can sign up through Facebook or G+:"
|
||||
social_signup: "Eller så kan du logga in genom facebook eller g+:"
|
||||
# required: "You need to log in before you can go that way."
|
||||
|
||||
home:
|
||||
|
|
|
|||
|
|
@ -109,10 +109,6 @@ NoteGroupSchema = c.object {title: 'Note Group', description: 'A group of notes
|
|||
lock: {title: 'Lock', description: 'Whether the interface should be locked so that the player\'s focus is on the script, or specific areas to lock.', type: ['boolean', 'array'], items: {type: 'string', enum: ['surface', 'editor', 'palette', 'hud', 'playback', 'playback-hover', 'level']}}
|
||||
letterbox: {type: 'boolean', title: 'Letterbox', description: 'Turn letterbox mode on or off. Disables surface and playback controls.'}
|
||||
|
||||
goals: c.object {title: 'Goals (Old)', description: 'Deprecated. Goals added here have no effect. Add goals in the level settings instead.'},
|
||||
add: c.array {title: 'Add', description: 'Deprecated. Goals added here have no effect. Add goals in the level settings instead.'}, {}
|
||||
remove: c.array {title: 'Remove', description: 'Deprecated. Goals removed here have no effect. Adjust goals in the level settings instead.'}, {}
|
||||
|
||||
playback: c.object {title: 'Playback', description: 'Control the playback of the level.'},
|
||||
playing: {type: 'boolean', title: 'Set Playing', description: 'Set whether playback is playing or paused.'}
|
||||
scrub: c.object {title: 'Scrub', description: 'Scrub the level playback time to a certain point.', default: {offset: 2, duration: 1000, toRatio: 0.5}},
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@ module.exports =
|
|||
|
||||
'editor:level-thang-done-editing': c.object {}
|
||||
|
||||
'editor:thangs-edited': c.object {required: ['thangs']},
|
||||
thangs: c.array {}, {type: 'object'}
|
||||
|
||||
'editor:level-loaded': c.object {required: ['level']},
|
||||
level: {type: 'object'}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ goalStatesSchema =
|
|||
{type: 'integer', minimum: 0}
|
||||
{type: 'string', enum: ['end']}
|
||||
]
|
||||
team: {type: ['null', 'string']}
|
||||
team: {type: ['null', 'string', 'undefined']}
|
||||
|
||||
worldUpdatedEventSchema = c.object {required: ['world', 'firstWorld', 'goalStates', 'team', 'firstChangedFrame']},
|
||||
world: {type: 'object'}
|
||||
|
|
@ -50,4 +50,4 @@ module.exports =
|
|||
|
||||
'god:debug-value-return': c.object {required: ['key']},
|
||||
key: {type: 'string'}
|
||||
value: {type: 'any'}
|
||||
value: {type: ['any', 'undefined']}
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ module.exports =
|
|||
{type: 'integer', minimum: 0}
|
||||
{type: 'string', enum: ['end']}
|
||||
]
|
||||
team: {type: ['null', 'string']}
|
||||
team: {type: ['null', 'string', 'undefined']}
|
||||
goals: c.array {},
|
||||
{type: 'object'}
|
||||
overallStatus:
|
||||
|
|
|
|||
|
|
@ -38,19 +38,19 @@ module.exports = # /app/lib/surface
|
|||
|
||||
'sprite:speech-updated': c.object {required: ['sprite', 'thang']},
|
||||
sprite: {type: 'object'}
|
||||
thang: {type: 'object'}
|
||||
blurb: {type: 'string'}
|
||||
thang: {type: ['object', 'null']}
|
||||
blurb: {type: ['string', 'null']}
|
||||
message: {type: 'string'}
|
||||
mood: {type: 'string'}
|
||||
responses: {type: 'array'}
|
||||
responses: {type: ['array', 'null', 'undefined']}
|
||||
spriteID: {type: 'string'}
|
||||
sound: {type: ['null', 'undefined', 'object']}
|
||||
|
||||
'level:sprite-dialogue': c.object {required: ['spriteID', 'message']},
|
||||
blurb: {type: 'string'}
|
||||
blurb: {type: ['string', 'null']}
|
||||
message: {type: 'string'}
|
||||
mood: {type: 'string'}
|
||||
responses: {type: 'array'}
|
||||
responses: {type: ['array', 'null', 'undefined']}
|
||||
spriteID: {type: 'string'}
|
||||
sound: {type: ['null', 'undefined', 'object']}
|
||||
|
||||
|
|
@ -141,13 +141,13 @@ module.exports = # /app/lib/surface
|
|||
originalEvent: {type: 'object'}
|
||||
worldPos: {type: ['object', 'null', 'undefined']}
|
||||
|
||||
'surface:stage-mouse-up': c.object {required: ['onBackground', 'x', 'y', 'originalEvent']},
|
||||
'surface:stage-mouse-up': c.object {required: ['onBackground', 'originalEvent']},
|
||||
onBackground: {type: 'boolean'}
|
||||
x: {type: 'number'}
|
||||
y: {type: 'number'}
|
||||
x: {type: ['number', 'undefined']}
|
||||
y: {type: ['number', 'undefined']}
|
||||
originalEvent: {type: 'object'}
|
||||
|
||||
'surface:mouse-scrolled': c.object {required: ['deltaX', 'deltaY', 'screenPos', 'canvas']},
|
||||
'surface:mouse-scrolled': c.object {required: ['deltaX', 'deltaY', 'canvas']},
|
||||
deltaX: {type: 'number'}
|
||||
deltaY: {type: 'number'}
|
||||
screenPos: c.object {required: ['x', 'y']},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
c = require 'schemas/schemas'
|
||||
|
||||
module.exports =
|
||||
'tome:cast-spell': c.object {title: 'Cast Spell', description: 'Published when a spell is cast', required: ['spell', 'thang', 'preload', 'realTime']},
|
||||
'tome:cast-spell': c.object {title: 'Cast Spell', description: 'Published when a spell is cast', required: []},
|
||||
spell: {type: 'object'}
|
||||
thang: {type: 'object'}
|
||||
preload: {type: 'boolean'}
|
||||
|
|
@ -106,4 +106,6 @@ module.exports =
|
|||
|
||||
'tome:focus-editor': c.object {title: 'Focus Editor', description: 'Published whenever we want to give focus back to the editor'}
|
||||
|
||||
'tome:fullscreen-view': c.object {title: 'Fullscreen View', description: 'Published when we want to make the Tome take up most of the screen'}
|
||||
'tome:toggle-maximize': c.object {title: 'Toggle Maximize', description: 'Published when we want to make the Tome take up most of the screen'}
|
||||
|
||||
'tome:maximize-toggled': c.object {title: 'Maximize Toggled', description: 'Published when the Tome has changed maximize/minimize state.'}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,11 @@
|
|||
input[type="file"]
|
||||
display: none
|
||||
|
||||
#thang-type-file-size
|
||||
width: 350px
|
||||
float: left
|
||||
margin: 20px 10px
|
||||
|
||||
.treema-row img
|
||||
max-width: 100%
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
margin-left: 20px
|
||||
|
||||
h3
|
||||
margin-top: 0
|
||||
margin-bottom: 0px
|
||||
|
||||
.level-description
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ body.is-playing
|
|||
right: 0
|
||||
top: 0px
|
||||
bottom: 0
|
||||
transition: width 0.5s ease-in-out
|
||||
@include transition(width 0.5s ease-in-out, right 0.5s ease-in-out)
|
||||
|
||||
#pointer
|
||||
position: absolute
|
||||
|
|
@ -186,9 +186,25 @@ body.is-playing
|
|||
color: white
|
||||
text-decoration: underline
|
||||
|
||||
#fullscreen-editor-background-screen
|
||||
background-color: black
|
||||
opacity: 0.5
|
||||
cursor: pointer
|
||||
display: none
|
||||
position: absolute
|
||||
left: 0
|
||||
right: 0
|
||||
bottom: 0
|
||||
top: 0
|
||||
z-index: 19
|
||||
|
||||
html.fullscreen-editor
|
||||
#level-view
|
||||
#fullscreen-editor-background-screen
|
||||
display: block
|
||||
|
||||
#code-area
|
||||
position: fixed
|
||||
width: 100%
|
||||
width: 95%
|
||||
height: 100%
|
||||
right: 0
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ block outer_content
|
|||
span.glyphicon.glyphicon-remove
|
||||
span.spl Clear Data
|
||||
input#real-upload-button(type="file")
|
||||
#thang-type-file-size= fileSizeString
|
||||
div#thang-type-treema
|
||||
.clearfix
|
||||
div#display-col.well
|
||||
|
|
|
|||
|
|
@ -28,4 +28,11 @@ block content
|
|||
span(data-i18n="play.level_difficulty") Difficulty:
|
||||
each i in Array(level.difficulty)
|
||||
i.icon-star
|
||||
- var playCount = levelPlayCountMap[level.id]
|
||||
if playCount
|
||||
div
|
||||
span.spr #{playCount.sessions}
|
||||
span(data-i18n="play.players") players
|
||||
span.spr , #{Math.round(playCount.playtime / 3600)}
|
||||
span(data-i18n="play.hours_played") hours played
|
||||
|
||||
|
|
|
|||
|
|
@ -19,5 +19,9 @@ block content
|
|||
span(data-i18n="play.level_difficulty") Difficulty:
|
||||
each i in Array(level.difficulty)
|
||||
| ★
|
||||
- var playCount = levelPlayCountMap[level.id]
|
||||
if playCount
|
||||
span.spl.spr - #{playCount.sessions}
|
||||
span(data-i18n="play.players") players
|
||||
.play-text-container
|
||||
.overlay-text.play-text(data-i18n="home.play") Play
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
.level-content
|
||||
#control-bar-view
|
||||
|
||||
#fullscreen-editor-background-screen(title="Click to minimize the code editor")
|
||||
|
||||
#code-area
|
||||
#code-area-gradient.gradient
|
||||
#tome-view
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@ block modal-header-content
|
|||
|
||||
block modal-body-content
|
||||
dl.dl-horizontal
|
||||
dt(title="Shift+" + enter)
|
||||
dt(title=shift + "+" + enter)
|
||||
code ⇧+#{enter}
|
||||
dd(data-i18n="keyboard_shortcuts.cast_spell") Cast current spell.
|
||||
dl.dl-horizontal
|
||||
dt(title=ctrlName + "+Shift+" + enter)
|
||||
dt(title=ctrlName + "+" + shift + "+" + enter)
|
||||
code #{ctrl}+⇧+#{enter}
|
||||
dd(data-i18n="keyboard_shortcuts.run_real_time") Run in real time.
|
||||
dl.dl-horizontal
|
||||
dt(title="Shift+" + space)
|
||||
dt(title=shift + "+" + space)
|
||||
code ⇧+#{space}
|
||||
dd(data-i18n="keyboard_shortcuts.continue_script") Continue past current script.
|
||||
dl.dl-horizontal
|
||||
|
|
@ -55,9 +55,13 @@ block modal-body-content
|
|||
code #{ctrl}+O
|
||||
dd(data-i18n="keyboard_shortcuts.toggle_pathfinding") Toggle pathfinding overlay.
|
||||
dl.dl-horizontal
|
||||
dt(title=ctrlName + "+Shift+B")
|
||||
dt(title=ctrlName + "+" + shift + "+B")
|
||||
code #{ctrl}+⇧+B
|
||||
dd(data-i18n="keyboard_shortcuts.beautify") Beautify your code by standardizing its formatting.
|
||||
dl.dl-horizontal
|
||||
dt(title=ctrlName + "+" + shift + "+M")
|
||||
code #{ctrl}+⇧+M
|
||||
dd(data-i18n="keyboard_shortcuts.maximize_editor") Maximize/minimize code editor.
|
||||
dl.dl-horizontal
|
||||
dt(title="Arrow keys")
|
||||
code ←
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ img(src="/images/level/code_editor_tab_background.png").spell-tab-image-hidden.h
|
|||
code #{methodSignature}
|
||||
|
||||
.spell-tool-buttons
|
||||
.btn.btn-small.fullscreen-code(title="Expand code editor")
|
||||
.btn.btn-small.fullscreen-code(title=maximizeShortcutVerbose)
|
||||
i.icon-fullscreen
|
||||
i.icon-resize-small
|
||||
|
||||
.btn.btn-small.reload-code(title="Reload original code for " + spell.name)
|
||||
i.icon-repeat
|
||||
|
||||
.btn.btn-small.beautify-code(title="Ctrl+Shift+B: Beautify code for " + spell.name)
|
||||
.btn.btn-small.beautify-code(title=beautifyShortcutVerbose)
|
||||
i.icon-magnet
|
||||
|
||||
.clearfix
|
||||
|
|
@ -12,6 +12,7 @@ module.exports = class ScriptsTabView extends CocoView
|
|||
|
||||
subscriptions:
|
||||
'editor:level-loaded': 'onLevelLoaded'
|
||||
'editor:thangs-edited': 'onThangsEdited'
|
||||
|
||||
constructor: (options) ->
|
||||
super options
|
||||
|
|
@ -53,7 +54,7 @@ module.exports = class ScriptsTabView extends CocoView
|
|||
@selectedScriptPath = null
|
||||
return
|
||||
|
||||
thangIDs = @getThangIDs()
|
||||
@thangIDs = @getThangIDs()
|
||||
treemaOptions =
|
||||
world: @world
|
||||
filePath: "db/level/#{@level.get('original')}"
|
||||
|
|
@ -61,7 +62,7 @@ module.exports = class ScriptsTabView extends CocoView
|
|||
view: @
|
||||
schema: Level.schema.properties.scripts.items
|
||||
data: selected.data
|
||||
thangIDs: thangIDs
|
||||
thangIDs: @thangIDs
|
||||
dimensions: @dimensions
|
||||
supermodel: @supermodel
|
||||
readOnly: me.get('anonymous')
|
||||
|
|
@ -88,7 +89,7 @@ module.exports = class ScriptsTabView extends CocoView
|
|||
@selectedScriptPath = newPath
|
||||
|
||||
getThangIDs: ->
|
||||
(t.id for t in @level.get('thangs') when t.id isnt 'Interface')
|
||||
(t.id for t in @level.get('thangs'))
|
||||
|
||||
onNewScriptAdded: (scriptNode) =>
|
||||
return unless scriptNode
|
||||
|
|
@ -110,6 +111,11 @@ module.exports = class ScriptsTabView extends CocoView
|
|||
onScriptChanged: =>
|
||||
@scriptsTreema.set(@selectedScriptPath, @scriptTreema.data)
|
||||
|
||||
onThangsEdited: (e) ->
|
||||
# Update in-place so existing Treema nodes refer to the same array.
|
||||
@thangIDs.splice(0, @thangIDs.length, @getThangIDs()...)
|
||||
|
||||
|
||||
class ScriptsNode extends TreemaArrayNode
|
||||
nodeDescription: 'Script'
|
||||
addNewChild: ->
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ module.exports = class SettingsTabView extends CocoView
|
|||
|
||||
subscriptions:
|
||||
'editor:level-loaded': 'onLevelLoaded'
|
||||
'editor:thangs-edited': 'onThangsEdited'
|
||||
|
||||
constructor: (options) ->
|
||||
super options
|
||||
|
|
@ -29,7 +30,7 @@ module.exports = class SettingsTabView extends CocoView
|
|||
schema = _.cloneDeep Level.schema
|
||||
schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
|
||||
schema.required = _.intersection schema.required, @editableSettings
|
||||
thangIDs = @getThangIDs()
|
||||
@thangIDs = @getThangIDs()
|
||||
treemaOptions =
|
||||
filePath: "db/level/#{@level.get('original')}"
|
||||
supermodel: @supermodel
|
||||
|
|
@ -37,7 +38,7 @@ module.exports = class SettingsTabView extends CocoView
|
|||
data: data
|
||||
readOnly: me.get('anonymous')
|
||||
callbacks: {change: @onSettingsChanged}
|
||||
thangIDs: thangIDs
|
||||
thangIDs: @thangIDs
|
||||
nodeClasses:
|
||||
object: SettingsNode
|
||||
thang: nodes.ThangNode
|
||||
|
|
@ -47,7 +48,7 @@ module.exports = class SettingsTabView extends CocoView
|
|||
@settingsTreema.open()
|
||||
|
||||
getThangIDs: ->
|
||||
(t.id for t in @level.get('thangs') when t.id isnt 'Interface')
|
||||
(t.id for t in @level.get('thangs'))
|
||||
|
||||
onSettingsChanged: (e) =>
|
||||
$('.level-title').text @settingsTreema.data.name
|
||||
|
|
@ -55,5 +56,10 @@ module.exports = class SettingsTabView extends CocoView
|
|||
continue if @settingsTreema.data[key] is undefined
|
||||
@level.set key, @settingsTreema.data[key]
|
||||
|
||||
onThangsEdited: (e) ->
|
||||
# Update in-place so existing Treema nodes refer to the same array.
|
||||
@thangIDs.splice(0, @thangIDs.length, @getThangIDs()...)
|
||||
|
||||
|
||||
class SettingsNode extends TreemaObjectNode
|
||||
nodeDescription: 'Settings'
|
||||
|
|
|
|||
|
|
@ -402,7 +402,7 @@ module.exports = class ThangsTabView extends CocoView
|
|||
thang.isSelectable = not thang.isLand for thang in @world.thangs # let us select walls and such
|
||||
@surface?.setWorld @world
|
||||
@selectAddThangType @addThangType, @cloneSourceThang if @addThangType # make another addThang sprite, since the World just refreshed
|
||||
null
|
||||
Backbone.Mediator.publish 'editor:thangs-edited', thangs: @world.thangs
|
||||
|
||||
onTreemaThangSelected: (e, selectedTreemas) =>
|
||||
selectedThangID = _.last(selectedTreemas)?.data.id
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ module.exports = class ThangTypeEditView extends RootView
|
|||
@thangType.saveBackups = true
|
||||
@listenToOnce @thangType, 'sync', ->
|
||||
@files = @supermodel.loadCollection(new DocumentFiles(@thangType), 'files').model
|
||||
@updateFileSize()
|
||||
@refreshAnimation = _.debounce @refreshAnimation, 500
|
||||
|
||||
getRenderData: (context={}) ->
|
||||
|
|
@ -64,6 +65,7 @@ module.exports = class ThangTypeEditView extends RootView
|
|||
context.animations = @getAnimationNames()
|
||||
context.authorized = not me.get('anonymous')
|
||||
context.recentlyPlayedLevels = storage.load('recently-played-levels') ? ['items']
|
||||
context.fileSizeString = @fileSizeString
|
||||
context
|
||||
|
||||
getAnimationNames: ->
|
||||
|
|
@ -197,6 +199,16 @@ module.exports = class ThangTypeEditView extends RootView
|
|||
@treema.set('raw', @thangType.get('raw'))
|
||||
@updateSelectBox()
|
||||
@refreshAnimation()
|
||||
@updateFileSize()
|
||||
|
||||
updateFileSize: ->
|
||||
file = JSON.stringify(@thangType.attributes)
|
||||
compressed = LZString.compress(file)
|
||||
size = (file.length / 1024).toFixed(1) + "KB"
|
||||
compressedSize = (compressed.length / 1024).toFixed(1) + "KB"
|
||||
gzipCompressedSize = compressedSize * 1.65 # just based on comparing ogre barracks
|
||||
@fileSizeString = "Size: #{size} (~#{compressedSize} gzipped)"
|
||||
@$el.find('#thang-type-file-size').text @fileSizeString
|
||||
|
||||
# animation select
|
||||
|
||||
|
|
|
|||
|
|
@ -18,17 +18,49 @@ module.exports = class MainPlayView extends RootView
|
|||
constructor: (options) ->
|
||||
super options
|
||||
@levelStatusMap = {}
|
||||
@levelPlayCountMap = {}
|
||||
@sessions = @supermodel.loadCollection(new LevelSessionsCollection(), 'your_sessions', null, 0).model
|
||||
@listenToOnce @sessions, 'sync', @onSessionsLoaded
|
||||
@getLevelPlayCounts()
|
||||
|
||||
onSessionsLoaded: (e) ->
|
||||
for session in @sessions.models
|
||||
@levelStatusMap[session.get('levelID')] = if session.get('state')?.complete then 'complete' else 'started'
|
||||
@render()
|
||||
|
||||
getLevelPlayCounts: ->
|
||||
success = (levelPlayCounts) =>
|
||||
return if @destroyed
|
||||
for level in levelPlayCounts
|
||||
@levelPlayCountMap[level._id] = playtime: level.playtime, sessions: level.sessions
|
||||
@render() if @supermodel.finished()
|
||||
|
||||
levelIDs = []
|
||||
for campaign in campaigns
|
||||
for level in campaign.levels
|
||||
levelIDs.push level.id
|
||||
levelPlayCountsRequest = @supermodel.addRequestResource 'play_counts', {
|
||||
url: '/db/level/-/play_counts'
|
||||
data: {ids: levelIDs}
|
||||
method: 'POST'
|
||||
success: success
|
||||
}, 0
|
||||
levelPlayCountsRequest.load()
|
||||
|
||||
getRenderData: (context={}) ->
|
||||
context = super(context)
|
||||
tutorials = [
|
||||
context.campaigns = campaigns
|
||||
context.levelStatusMap = @levelStatusMap
|
||||
context.levelPlayCountMap = @levelPlayCountMap
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
@$el.find('.modal').on 'shown.bs.modal', ->
|
||||
$('input:visible:first', @).focus()
|
||||
|
||||
|
||||
tutorials = [
|
||||
{
|
||||
name: 'Rescue Mission'
|
||||
difficulty: 1
|
||||
|
|
@ -99,9 +131,9 @@ module.exports = class MainPlayView extends RootView
|
|||
image: '/file/db/level/525085419851b83f4b000001/mobile_artillery_icon.png'
|
||||
description: 'Blow ogres up!'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
experienced = [
|
||||
experienced = [
|
||||
{
|
||||
name: 'Hunter Triplets'
|
||||
difficulty: 2
|
||||
|
|
@ -137,9 +169,9 @@ module.exports = class MainPlayView extends RootView
|
|||
image: '/file/db/level/52ae2460ef42c52f13000008/gridmancer_icon.png'
|
||||
description: 'Super algorithm challenge level!'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
arenas = [
|
||||
arenas = [
|
||||
{
|
||||
name: 'Criss-Cross'
|
||||
difficulty: 5
|
||||
|
|
@ -188,9 +220,9 @@ module.exports = class MainPlayView extends RootView
|
|||
description: 'Preview version of an upgraded Dungeon Arena. Help us with hero balance before release!'
|
||||
levelPath: 'ladder'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
classicAlgorithms = [
|
||||
classicAlgorithms = [
|
||||
{
|
||||
name: 'Bubble Sort Bootcamp Battle'
|
||||
difficulty: 3
|
||||
|
|
@ -233,9 +265,9 @@ module.exports = class MainPlayView extends RootView
|
|||
image: '/file/db/level/525ef8ef06e1ab0962000003/commanding_followers_icon.png'
|
||||
description: 'Learn how to make a game AI with the Minimax algorithm. - by Alexandru Caciulescu'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
playerCreated = [
|
||||
playerCreated = [
|
||||
{
|
||||
name: 'Extra Extrapolation'
|
||||
difficulty: 2
|
||||
|
|
@ -292,19 +324,12 @@ module.exports = class MainPlayView extends RootView
|
|||
image: '/file/db/level/526711d9add4f8965f000002/hunter_triplets_icon.png'
|
||||
description: 'There is a horde of ogres marching on your village. Stay out of reach and use your bow to take them out! - by Danny Whittaker'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
context.campaigns = [
|
||||
campaigns = [
|
||||
{id: 'beginner', name: 'Beginner Campaign', description: '... in which you learn the wizardry of programming.', levels: tutorials}
|
||||
{id: 'multiplayer', name: 'Multiplayer Arenas', description: '... in which you code head-to-head against other players.', levels: arenas}
|
||||
{id: 'dev', name: 'Random Harder Levels', description: '... in which you learn the interface while doing something a little harder.', levels: experienced}
|
||||
{id: 'classic' ,name: 'Classic Algorithms', description: '... in which you learn the most popular algorithms in Computer Science.', levels: classicAlgorithms}
|
||||
{id: 'player_created', name: 'Player-Created', description: '... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>.', levels: playerCreated}
|
||||
]
|
||||
context.levelStatusMap = @levelStatusMap
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
@$el.find('.modal').on 'shown.bs.modal', ->
|
||||
$('input:visible:first', @).focus()
|
||||
]
|
||||
|
|
|
|||
|
|
@ -18,17 +18,49 @@ module.exports = class LadderHomeView extends RootView
|
|||
constructor: (options) ->
|
||||
super options
|
||||
@levelStatusMap = {}
|
||||
@levelPlayCountMap = {}
|
||||
@sessions = @supermodel.loadCollection(new LevelSessionsCollection(), 'your_sessions', null, 0).model
|
||||
@listenToOnce @sessions, 'sync', @onSessionsLoaded
|
||||
@getLevelPlayCounts()
|
||||
|
||||
onSessionsLoaded: (e) ->
|
||||
for session in @sessions.models
|
||||
@levelStatusMap[session.get('levelID')] = if session.get('state')?.complete then 'complete' else 'started'
|
||||
@render()
|
||||
|
||||
getLevelPlayCounts: ->
|
||||
success = (levelPlayCounts) =>
|
||||
return if @destroyed
|
||||
for level in levelPlayCounts
|
||||
@levelPlayCountMap[level._id] = playtime: level.playtime, sessions: level.sessions
|
||||
@render() if @supermodel.finished()
|
||||
|
||||
levelIDs = []
|
||||
for campaign in campaigns
|
||||
for level in campaign.levels
|
||||
levelIDs.push level.id
|
||||
levelPlayCountsRequest = @supermodel.addRequestResource 'play_counts', {
|
||||
url: '/db/level/-/play_counts'
|
||||
data: {ids: levelIDs}
|
||||
method: 'POST'
|
||||
success: success
|
||||
}, 0
|
||||
levelPlayCountsRequest.load()
|
||||
|
||||
getRenderData: (context={}) ->
|
||||
context = super(context)
|
||||
arenas = [
|
||||
context.levelStatusMap = @levelStatusMap
|
||||
context.levelPlayCountMap = @levelPlayCountMap
|
||||
context.campaigns = campaigns
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
@$el.find('.modal').on 'shown.bs.modal', ->
|
||||
$('input:visible:first', @).focus()
|
||||
|
||||
|
||||
arenas = [
|
||||
{
|
||||
name: 'Criss-Cross'
|
||||
difficulty: 5
|
||||
|
|
@ -71,15 +103,8 @@ module.exports = class LadderHomeView extends RootView
|
|||
image: '/file/db/level/52d97ecd32362bc86e004e87/Level%20Banner%20Brawlwood.jpg'
|
||||
description: 'Combat the armies of other Wizards in a strategic forest arena! (Fast computer required.)'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
context.campaigns = [
|
||||
campaigns = [
|
||||
{id: 'multiplayer', name: 'Multiplayer Arenas', description: '... in which you code head-to-head against other players.', levels: arenas}
|
||||
]
|
||||
context.levelStatusMap = @levelStatusMap
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
@$el.find('.modal').on 'shown.bs.modal', ->
|
||||
$('input:visible:first', @).focus()
|
||||
]
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ module.exports = class LevelHUDView extends CocoView
|
|||
@$el.addClass 'no-selection'
|
||||
|
||||
onClick: (e) ->
|
||||
Backbone.Mediator.publish 'tome:focus-editor' unless $(e.target).parents('.thang-props').length
|
||||
Backbone.Mediator.publish 'tome:focus-editor', {} unless $(e.target).parents('.thang-props').length
|
||||
|
||||
onFrameChanged: (e) ->
|
||||
@timeProgress = e.progress
|
||||
|
|
@ -207,10 +207,10 @@ module.exports = class LevelHUDView extends CocoView
|
|||
if @lastResponses
|
||||
buttons = $('.enter button')
|
||||
for response, i in @lastResponses
|
||||
f = (r) => => setTimeout((-> Backbone.Mediator.publish(r.channel, r.event)), 10)
|
||||
f = (r) => => setTimeout((-> Backbone.Mediator.publish(r.channel, r.event or {})), 10)
|
||||
$(buttons[i]).click(f(response))
|
||||
else
|
||||
$('.enter', @bubble).click(-> Backbone.Mediator.publish('script:end-current-script'))
|
||||
$('.enter', @bubble).click(-> Backbone.Mediator.publish('script:end-current-script', {}))
|
||||
return
|
||||
@animator.tick()
|
||||
|
||||
|
|
@ -221,7 +221,7 @@ module.exports = class LevelHUDView extends CocoView
|
|||
# If we decide that always having the last one fire is bad, we should make it smarter.
|
||||
return unless @lastResponses?.length
|
||||
r = @lastResponses[@lastResponses.length - 1]
|
||||
_.delay (-> Backbone.Mediator.publish(r.channel, r.event)), 10
|
||||
_.delay (-> Backbone.Mediator.publish(r.channel, r.event or {})), 10
|
||||
|
||||
onEscapePressed: (e) ->
|
||||
@escapePressed = true
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ module.exports = class PlayLevelView extends RootView
|
|||
|
||||
events:
|
||||
'click #level-done-button': 'onDonePressed'
|
||||
'click #fullscreen-editor-background-screen': (e) -> Backbone.Mediator.publish 'tome:toggle-maximize', {}
|
||||
|
||||
shortcuts:
|
||||
'ctrl+s': 'onCtrlS'
|
||||
|
|
|
|||
|
|
@ -14,4 +14,5 @@ module.exports = class KeyboardShortcutsModal extends ModalView
|
|||
c.enter = $.i18n.t 'keyboard_shortcuts.enter'
|
||||
c.space = $.i18n.t 'keyboard_shortcuts.space'
|
||||
c.escapeKey = $.i18n.t 'keyboard_shortcuts.escape'
|
||||
c.shift = $.i18n.t 'keyboard_shortcuts.shift'
|
||||
c
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ module.exports = class SpellDebugView extends CocoView
|
|||
@frameRate = e.world.frameRate
|
||||
|
||||
onFrameChanged: (data) ->
|
||||
@currentFrame = data.frame
|
||||
@currentFrame = Math.round(data.frame)
|
||||
@frameRate = data.world.frameRate
|
||||
|
||||
onSpellChangedCalculation: (data) ->
|
||||
|
|
|
|||
|
|
@ -16,19 +16,23 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
|
|||
'tome:spell-changed': 'onSpellChanged'
|
||||
'god:new-world-created': 'onNewWorld'
|
||||
'tome:spell-changed-language': 'onSpellChangedLanguage'
|
||||
'tome:fullscreen-view': 'onFullscreenClick'
|
||||
'tome:toggle-maximize': 'onToggleMaximize'
|
||||
|
||||
events:
|
||||
'click .spell-list-button': 'onDropdownClick'
|
||||
'click .reload-code': 'onCodeReload'
|
||||
'click .beautify-code': 'onBeautifyClick'
|
||||
'click .fullscreen-code': 'onFullscreenClick'
|
||||
'click .fullscreen-code': 'onToggleMaximize'
|
||||
|
||||
constructor: (options) ->
|
||||
super options
|
||||
|
||||
getRenderData: (context={}) ->
|
||||
context = super context
|
||||
ctrl = if @isMac() then 'Cmd' else 'Ctrl'
|
||||
shift = $.i18n.t 'keyboard_shortcuts.shift'
|
||||
context.beautifyShortcutVerbose = "#{ctrl}+#{shift}+B: #{$.i18n.t 'keyboard_shortcuts.beautify'}"
|
||||
context.maximizeShortcutVerbose = "#{ctrl}+#{shift}+M: #{$.i18n.t 'keyboard_shortcuts.maximize_editor'}"
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
|
|
@ -86,19 +90,20 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
|
|||
return unless @controlsEnabled
|
||||
Backbone.Mediator.publish 'tome:toggle-spell-list', {}
|
||||
|
||||
onCodeReload: ->
|
||||
onCodeReload: (e) ->
|
||||
return unless @controlsEnabled
|
||||
Backbone.Mediator.publish 'tome:reload-code', spell: @spell
|
||||
|
||||
onBeautifyClick: ->
|
||||
onBeautifyClick: (e) ->
|
||||
return unless @controlsEnabled
|
||||
Backbone.Mediator.publish 'tome:spell-beautify', spell: @spell
|
||||
|
||||
onFullscreenClick: ->
|
||||
onToggleMaximize: (e) ->
|
||||
$codearea = $('html')
|
||||
$('#code-area').css 'z-index', 20 unless $codearea.hasClass 'fullscreen-editor'
|
||||
$('html').toggleClass 'fullscreen-editor'
|
||||
$('.fullscreen-code').toggleClass 'maximized'
|
||||
Backbone.Mediator.publish 'tome:maximize-toggled', {}
|
||||
|
||||
updateReloadButton: ->
|
||||
changed = @spell.hasChanged null, @spell.getSource()
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ module.exports = class SpellView extends CocoView
|
|||
'tome:update-snippets': 'addZatannaSnippets'
|
||||
'tome:insert-snippet': 'onInsertSnippet'
|
||||
'tome:spell-beautify': 'onSpellBeautify'
|
||||
'tome:maximize-toggled': 'onMaximizeToggled'
|
||||
'script:state-changed': 'onScriptStateChange'
|
||||
|
||||
events:
|
||||
|
|
@ -181,8 +182,8 @@ module.exports = class SpellView extends CocoView
|
|||
exec: -> # just prevent default ACE go-to-line alert
|
||||
addCommand
|
||||
name: 'open-fullscreen-editor'
|
||||
bindKey: {win: 'Alt-Shift-F', mac: 'Ctrl-Shift-F'}
|
||||
exec: -> Backbone.Mediator.publish 'tome:fullscreen-view', {}
|
||||
bindKey: {win: 'Ctrl-Shift-M', mac: 'Command-Shift-M|Ctrl-Shift-M'}
|
||||
exec: -> Backbone.Mediator.publish 'tome:toggle-maximize', {}
|
||||
|
||||
fillACE: ->
|
||||
@ace.setValue @spell.source
|
||||
|
|
@ -665,6 +666,9 @@ module.exports = class SpellView extends CocoView
|
|||
pretty = @spellThang.aether.beautify ugly
|
||||
@ace.setValue pretty
|
||||
|
||||
onMaximizeToggled: (e) ->
|
||||
@ace.resize true
|
||||
|
||||
onChangeEditorConfig: (e) ->
|
||||
aceConfig = me.get('aceConfig') ? {}
|
||||
@ace.setDisplayIndentGuides aceConfig.indentGuides # default false
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ LevelHandler = class LevelHandler extends Handler
|
|||
return @getLeaderboardGPlusFriends(req, res, args[0]) if args[1] is 'leaderboard_gplus_friends'
|
||||
return @getHistogramData(req, res, args[0]) if args[1] is 'histogram_data'
|
||||
return @checkExistence(req, res, args[0]) if args[1] is 'exists'
|
||||
return @getPlayCountsBySlugs(req, res) if args[1] is 'play_counts'
|
||||
super(arguments...)
|
||||
|
||||
fetchLevelByIDAndHandleErrors: (id, req, res, callback) ->
|
||||
|
|
@ -278,4 +279,27 @@ LevelHandler = class LevelHandler extends Handler
|
|||
return @sendNotFoundError(res) unless doc?
|
||||
@sendSuccess(res, doc)
|
||||
|
||||
getPlayCountsBySlugs: (req, res) ->
|
||||
# This is hella slow (4s on my box), so relying on some dumb caching for it.
|
||||
# If we can't make this faster with indexing or something, we might want to maintain the counts another way.
|
||||
levelIDs = req.query.ids or req.body.ids
|
||||
@playCountCache ?= {}
|
||||
@playCountCachedSince ?= new Date()
|
||||
if (new Date()) - @playCountCachedSince > 86400 * 1000 # Dumb cache expiration
|
||||
@playCountCache = {}
|
||||
@playCountCacheSince = new Date()
|
||||
cacheKey = levelIDs.join ','
|
||||
if playCounts = @playCountCache[cacheKey]
|
||||
return @sendSuccess res, playCounts
|
||||
query = Session.aggregate [
|
||||
{$match: {levelID: {$in: levelIDs}}},
|
||||
{$group: {_id: "$levelID", playtime: {$sum: "$playtime"}, sessions: {$sum: 1}}},
|
||||
{$sort: {sessions: -1}}
|
||||
]
|
||||
query.exec (err, data) =>
|
||||
if err? then return @sendDatabaseError res, err
|
||||
@playCountCache[cacheKey] = data
|
||||
@sendSuccess res, data
|
||||
|
||||
|
||||
module.exports = new LevelHandler()
|
||||
|
|
|
|||
1
vendor/scripts/lz-string-1.3.3-min.js
vendored
Normal file
1
vendor/scripts/lz-string-1.3.3-min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue