codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-06-19 18:17:14 -07:00
commit 0d53e603fd
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/Angel.coffee
View file

@ -9,7 +9,7 @@ module.exports = class Angel extends CocoClass
@nicks: ['Archer', 'Lana', 'Cyril', 'Pam', 'Cheryl', 'Woodhouse', 'Ray', 'Krieger']
infiniteLoopIntervalDuration: 7500 # check this often
infiniteLoopTimeoutDuration: 5000 # wait this long for a response when checking
infiniteLoopTimeoutDuration: 10000 # wait this long for a response when checking
abortTimeoutDuration: 500 # give in-process or dying workers this long to give up
constructor: (@shared) ->

2
app/lib/simulator/Simulator.coffee
View file

@ -400,7 +400,7 @@ module.exports = class Simulator extends CocoClass
executionLimit: 1 * 1000 * 1000
if methodName is 'hear'
aetherOptions.functionParameters = ['speaker', 'message', 'data']
if methodName is 'bid'
if methodName is 'makeBid'
aetherOptions.functionParameters = ['blockNumber']
#console.log "creating aether with options", aetherOptions
return new Aether aetherOptions

2
app/lib/world/world.coffee
View file

@ -96,7 +96,7 @@ module.exports = class World
for thang in @thangs when thang.isProgrammable
userCode = @userCodeMap[thang.id] ? {}
for methodName, aether of userCode
framesToLoadFlowBefore = if methodName is 'plan' then 200 else 1 # Adjust if plan() is taking even longer
framesToLoadFlowBefore = if methodName is 'plan' or methodName is 'makeBid' then 200 else 1 # Adjust if plan() is taking even longer
aether._shouldSkipFlow = i < loadUntilFrame - framesToLoadFlowBefore
try
@getFrame(i)

2
app/views/play/common/ladder_submission_view.coffee
View file

@ -92,7 +92,7 @@ module.exports = class LadderSubmissionView extends CocoView
includeFlow: false
executionLimit: 1 * 1000 * 1000
if spellID is "hear" then aetherOptions["functionParameters"] = ["speaker","message","data"]
if spellID is "bid" then aetherOptions["functionParameters"] = ["blockNumber"]
if spellID is "makeBid" then aetherOptions["functionParameters"] = ["blockNumber"]
aether = new Aether aetherOptions
transpiledCode[thang][spellID] = aether.transpile spell

2
scripts/transpile.coffee
View file

@ -41,7 +41,7 @@ transpileLevelSession = (sessionID, cb) ->
includeFlow: false
executionLimit: 1 * 1000 * 1000
if spellID is "hear" then aetherOptions["functionParameters"] = ["speaker","message","data"]
if spellID is "bid" then aetherOptions["functionParameters"] = ["blockNumber"]
if spellID is "makeBid" then aetherOptions["functionParameters"] = ["blockNumber"]
aether = new Aether aetherOptions
transpiledCode[thang][spellID] = aether.transpile spell