codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-01 07:40:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-10-29 10:47:31 -07:00
commit 066fab03a3
3 changed files with 3 additions and 3 deletions
app
lib/scripts
SpriteScriptModule.coffee
schemas/models
level.coffee
views/play/level
PlayLevelView.coffee

2
app/lib/scripts/SpriteScriptModule.coffee
View file

@ -39,7 +39,7 @@ module.exports = class SpritesScriptModule extends ScriptModule
response.text = utils.i18n response, 'text'
text = utils.i18n sprite.say, 'text'
blurb = utils.i18n sprite.say, 'blurb'
sound = sprite.say.sound # TODO support sound i18n
sound = utils.i18n sprite.say, 'sound'
note =
channel: 'level:sprite-dialogue'
event:

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

@ -89,7 +89,7 @@ SpriteCommandSchema = c.object {title: 'Thang Command', description: 'Make a tar
ogg: c.shortString(title: 'OGG', format: 'sound-file')
preload: {title: 'Preload', description: 'Whether to load this sound file before the level can begin (typically for the first dialogue of a level).', type: 'boolean' }
responses: c.array {title: 'Buttons', description: 'An array of buttons to include with the dialogue, with which the user can respond.'}, ResponseSchema
i18n: {type: 'object', format: 'i18n', props: ['blurb', 'text'], description: 'Help translate this message'}
i18n: {type: 'object', format: 'i18n', props: ['blurb', 'text', 'sound'], description: 'Help translate this message'}
move: c.object {title: 'Move', description: 'Tell the Thang to move.', required: ['target'], default: {target: {}, duration: 500}},
target: _.extend _.cloneDeep(PointSchema), {title: 'Target', description: 'Target point to which the Thang will move.', default: {x: 20, y: 20}}
duration: {title: 'Duration', description: 'Number of milliseconds over which to move, or 0 for an instant move.', type: 'integer', minimum: 0, format: 'milliseconds'}

2
app/views/play/level/PlayLevelView.coffee
View file

@ -272,7 +272,7 @@ module.exports = class PlayLevelView extends RootView
onSessionLoaded: (e) ->
# Just the level and session have been loaded by the level loader
if e.level.get('type', true) in ['hero', 'hero-ladder', 'hero-coop'] and not _.size e.session.get('heroConfig')?.inventory ? {}
@openModalView new GameMenuModal level: e.level, session: e.session
@openModalView new GameMenuModal level: e.level, session: e.session, supermodel: @supermodel
onLoaded: ->
_.defer => @onLevelLoaderLoaded()