codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-02 16:21:01 -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-05-15 15:35:08 -07:00
commit c2a7530b62
8 changed files with 36 additions and 8 deletions

1
app/views/play/ladder/my_matches_tab.coffee
View file

@ -205,6 +205,7 @@ module.exports = class MyMatchesTabView extends CocoView
for thang, spells of submittedCode
transpiledCode[thang] = {}
for spellID, spell of spells
unless _.contains(session.get('teamSpells')[session.get('team')], thang + "/" + spellID) then continue
#DRY this
aetherOptions =
problems: {}

1
app/views/play/level/modal/multiplayer_modal.coffee
View file

@ -76,6 +76,7 @@ module.exports = class MultiplayerModal extends View
for thang, spells of submittedCode
transpiledCode[thang] = {}
for spellID, spell of spells
unless _.contains(session.get('teamSpells')[session.get('team')], thang + "/" + spellID) then continue
#DRY this
aetherOptions =
problems: {}

1
app/views/play/level/modal/victory_modal.coffee
View file

@ -85,6 +85,7 @@ module.exports = class VictoryModal extends View
transpiledCode[thang] = {}
for spellID, spell of spells
#DRY this
unless _.contains(session.get('teamSpells')[session.get('team')], thang + "/" + spellID) then continue
aetherOptions =
problems: {}
language: "javascript"

11
app/views/play/level/tome/spell.coffee
View file

@ -14,6 +14,7 @@ module.exports = class Spell
@spellKey = options.spellKey
@pathComponents = options.pathComponents
@session = options.session
@spectateView = options.spectateView
@supermodel = options.supermodel
@skipProtectAPI = options.skipProtectAPI
@worker = options.worker
@ -21,6 +22,7 @@ module.exports = class Spell
@name = p.name
@permissions = read: p.permissions?.read ? [], readwrite: p.permissions?.readwrite ? [] # teams
@useTranspiledCode = @permissions.readwrite.length and ((not _.contains(@session.get('teamSpells')[@session.get('team')],@spellKey)) or (@session.get('creator') isnt me.id) or @spectateView)
@source = @originalSource = p.source
@parameters = p.parameters
if @permissions.readwrite.length and sessionSource = @session.getSourceFor(@spellKey)
@ -64,10 +66,15 @@ module.exports = class Spell
else
source = @getSource()
[pure, problems] = [null, null]
if @useTranspiledCode
transpiledCode = @session.get('code')
for thangID, spellThang of @thangs
unless pure
pure = spellThang.aether.transpile source
problems = spellThang.aether.problems
if @useTranspiledCode and transpiledSpell = transpiledCode[_.string.slugify thangID]?[@name]
spellThang.aether.pure = transpiledSpell
else
pure = spellThang.aether.transpile source
problems = spellThang.aether.problems
#console.log "aether transpiled", source.length, "to", pure.length, "for", thangID, @spellKey
else
spellThang.aether.pure = pure

12
app/views/play/level/tome/tome_view.coffee
View file

@ -121,7 +121,17 @@ module.exports = class TomeView extends View
@thangSpells[thang.id].push spellKey
unless method.cloneOf
skipProtectAPI = @getQueryVariable "skip_protect_api", (@options.levelID in ['gridmancer'])
spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipProtectAPI: skipProtectAPI, worker: @worker, language: language
spell = @spells[spellKey] = new Spell
programmableMethod: method
spellKey: spellKey
pathComponents: pathPrefixComponents.concat(pathComponents)
session: @options.session
supermodel: @supermodel
skipProtectAPI: skipProtectAPI
worker: @worker
language: language
spectateView: @options.spectateView
for thangID, spellKeys of @thangSpells
thang = world.getThangByID thangID
if thang

2
app/views/play/level_view.coffee
View file

@ -199,7 +199,7 @@ module.exports = class PlayLevelView extends View
continue if spellTeam is myTeam or not myTeam
opponentSpells = opponentSpells.concat spells
opponentCode = @otherSession?.get('submittedCode') or {}
opponentCode = @otherSession?.get('transpiledCode') or {}
myCode = @session.get('code') or {}
for spell in opponentSpells
[thang, spell] = spell.split '/'

7
app/views/play/spectate_view.coffee
View file

@ -196,13 +196,14 @@ module.exports = class SpectateLevelView extends View
continue if spellTeam is myTeam or not myTeam
opponentSpells = opponentSpells.concat spells
opponentCode = @otherSession?.get('submittedCode') or {}
myCode = @session.get('submittedCode') or {}
opponentCode = @otherSession?.get('transpiledCode') or {}
myCode = @session.get('transpiledCode') or {}
for spell in opponentSpells
[thang, spell] = spell.split '/'
c = opponentCode[thang]?[spell]
myCode[thang] ?= {}
if c then myCode[thang][spell] = c else delete myCode[thang][spell]
@session.set('code', myCode)
if @session.get('multiplayer') and @otherSession?
# For now, ladderGame will disallow multiplayer, because session code combining doesn't play nice yet.
@ -231,7 +232,7 @@ module.exports = class SpectateLevelView extends View
ctx.fillText("Loaded #{@modelsLoaded} thingies",50,50)
insertSubviews: ->
@insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel
@insertSubView @tome = new TomeView levelID: @levelID, session: @session, thangs: @world.thangs, supermodel: @supermodel, spectateView: true
@insertSubView new PlaybackView {}
@insertSubView new GoldView {}

9
server/levels/sessions/level_session_handler.coffee
View file

@ -14,7 +14,14 @@ class LevelSessionHandler extends Handler
getByRelationship: (req, res, args...) ->
return @getActiveSessions req, res if args.length is 2 and args[1] is 'active'
super(arguments...)
formatEntity: (req, document) ->
documentObject = super(req, document)
if req.user.isAdmin() or req.user.id is document.creator
return documentObject
else
return _.omit documentObject, ['submittedCode','code']
getActiveSessions: (req, res) ->
return @sendUnauthorizedError(res) unless req.user.isAdmin()
start = new Date()