diff --git a/app/assets/javascripts/workers/worker_world.js b/app/assets/javascripts/workers/worker_world.js index eb99b8c6a..40af1eeae 100644 --- a/app/assets/javascripts/workers/worker_world.js +++ b/app/assets/javascripts/workers/worker_world.js @@ -290,6 +290,8 @@ self.setupDebugWorldToRunUntilFrame = function (args) { try { self.debugWorld = new World(args.userCodeMap); self.debugWorld.levelSessionIDs = args.levelSessionIDs; + self.debugWorld.submissionCount = args.submissionCount; + self.debugWorld.flagHistory = args.flagHistory; if (args.level) self.debugWorld.loadFromLevel(args.level, true); self.debugWorld.debugging = true; @@ -347,6 +349,8 @@ self.runWorld = function runWorld(args) { try { self.world = new World(args.userCodeMap); self.world.levelSessionIDs = args.levelSessionIDs; + self.world.submissionCount = args.submissionCount; + self.world.flagHistory = args.flagHistory || []; if(args.level) self.world.loadFromLevel(args.level, true); self.world.preloading = args.preload; diff --git a/app/lib/God.coffee b/app/lib/God.coffee index cf1631689..c6b9deb01 100644 --- a/app/lib/God.coffee +++ b/app/lib/God.coffee @@ -54,9 +54,11 @@ module.exports = class God extends CocoClass setWorldClassMap: (worldClassMap) -> @angelsShare.worldClassMap = worldClassMap onTomeCast: (e) -> + @lastSubmissionCount = e.submissionCount + @lastFlagHistory = e.flagHistory @createWorld e.spells, e.preload, e.realTime - createWorld: (spells, preload=false, realTime=false) -> + createWorld: (spells, preload, realTime) -> console.log "#{@nick}: Let there be light upon #{@level.name}! (preload: #{preload})" userCodeMap = @getUserCodeMap spells @@ -81,6 +83,8 @@ module.exports = class God extends CocoClass userCodeMap: userCodeMap level: @level levelSessionIDs: @levelSessionIDs + submissionCount: @lastSubmissionCount + flagHistory: @lastFlagHistory goals: @angelsShare.goalManager?.getGoals() headless: @angelsShare.headless preload: preload @@ -110,6 +114,8 @@ module.exports = class God extends CocoClass userCodeMap: @currentUserCodeMap level: @level levelSessionIDs: @levelSessionIDs + submissionCount: @lastSubmissionCount + flagHistory: @lastFlagHistory goals: @goalManager?.getGoals() frame: args.frame currentThangID: args.thangID diff --git a/app/lib/LevelBus.coffee b/app/lib/LevelBus.coffee index 11e2232aa..11f1f447e 100644 --- a/app/lib/LevelBus.coffee +++ b/app/lib/LevelBus.coffee @@ -23,8 +23,10 @@ module.exports = class LevelBus extends Bus 'level:show-victory': 'onVictory' 'tome:spell-changed': 'onSpellChanged' 'tome:spell-created': 'onSpellCreated' + 'tome:cast-spells': 'onCastSpells' 'application:idle-changed': 'onIdleChanged' 'goal-manager:new-goal-states': 'onNewGoalStates' + 'god:new-world-created': 'onNewWorldCreated' constructor: -> super(arguments...) @@ -126,6 +128,22 @@ module.exports = class LevelBus extends Bus # https://github.com/codecombat/codecombat/issues/81 @onSpellChanged e # Save the new spell to the session, too. + onCastSpells: (e) -> + return unless @onPoint() and e.realTime + # We have incremented state.submissionCount and reset state.flagHistory. + @changedSessionProperties.state = true + @saveSession() + + onNewWorldCreated: (e) -> + return unless @onPoint() + # Record the flag history. + state = @session.get('state') + return if _.isEqual state.flagHistory, e.world.flagHistory + state.flagHistory = e.world.flagHistory + @changedSessionProperties.state = true + @session.set('state', state) + @saveSession() + onScriptStateChanged: (e) -> return unless @onPoint() @fireScriptsRef?.update(e) diff --git a/app/lib/LevelLoader.coffee b/app/lib/LevelLoader.coffee index 8f69b2229..bf5de9c6e 100644 --- a/app/lib/LevelLoader.coffee +++ b/app/lib/LevelLoader.coffee @@ -91,6 +91,9 @@ module.exports = class LevelLoader extends CocoClass loadDependenciesForSession: (session) -> if session is @session Backbone.Mediator.publish 'level:session-loaded', level: @level, session: @session + @consolidateFlagHistory() if @opponentSession?.loaded + else + @consolidateFlagHistory() if @session.loaded return unless @level.get('type', true) in ['hero', 'hero-ladder', 'hero-coop'] heroConfig = session.get('heroConfig') heroConfig ?= me.get('heroConfig') if session is @session @@ -113,6 +116,13 @@ module.exports = class LevelLoader extends CocoClass @loadDefaultComponentsForThangType itemThangType @loadThangsRequiredByThangType itemThangType + consolidateFlagHistory: -> + state = @session.get('state') ? {} + myFlagHistory = _.filter state.flagHistory ? [], team: @session.get('team') + opponentFlagHistory = _.filter @opponentSession.get('state')?.flagHistory ? [], team: @opponentSession.get('team') + state.flagHistory = myFlagHistory.concat opponentFlagHistory + @session.set 'state', state + # Grabbing the rest of the required data for the level populateLevel: -> @@ -334,6 +344,8 @@ module.exports = class LevelLoader extends CocoClass @initialized = true @world = new World() @world.levelSessionIDs = if @opponentSessionID then [@sessionID, @opponentSessionID] else [@sessionID] + @world.submissionCount = @session?.get('state')?.submissionCount ? 0 + @world.flagHistory = @session?.get('state')?.flagHistory ? [] serializedLevel = @level.serialize(@supermodel, @session, @opponentSession) @world.loadFromLevel serializedLevel, false console.log 'World has been initialized from level loader.' diff --git a/app/lib/surface/LayerAdapter.coffee b/app/lib/surface/LayerAdapter.coffee index c4baacdac..3b074034f 100644 --- a/app/lib/surface/LayerAdapter.coffee +++ b/app/lib/surface/LayerAdapter.coffee @@ -500,8 +500,8 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass renderGroupingKey: (thangType, grouping, colorConfig) -> key = thangType.get('slug') - if colorConfig?.team - key += "(#{colorConfig.team.hue},#{colorConfig.team.saturation},#{colorConfig.team.lightness})" + for colorKey, colorValue of colorConfig ? {} + key += "(#{colorKey}:#{colorValue.hue},#{colorValue.saturation},#{colorValue.lightness})" key += '.'+grouping if grouping key diff --git a/app/lib/world/world.coffee b/app/lib/world/world.coffee index 523f706e4..34f24153a 100644 --- a/app/lib/world/world.coffee +++ b/app/lib/world/world.coffee @@ -39,7 +39,6 @@ module.exports = class World @systems = [] @systemMap = {} @scriptNotes = [] - @flagHistory = [] @rand = new Rand 0 # Existence System may change this seed @frames = [new WorldFrame(@, 0)] @@ -349,7 +348,8 @@ module.exports = class World endFrame = @frames.length #console.log "... world serializing frames from", startFrame, "to", endFrame, "of", @totalFrames [transferableObjects, nontransferableObjects] = [0, 0] - o = {totalFrames: @totalFrames, maxTotalFrames: @maxTotalFrames, frameRate: @frameRate, dt: @dt, victory: @victory, userCodeMap: {}, trackedProperties: {}} + delete flag.processed for flag in @flagHistory + o = {totalFrames: @totalFrames, maxTotalFrames: @maxTotalFrames, frameRate: @frameRate, dt: @dt, victory: @victory, userCodeMap: {}, trackedProperties: {}, flagHistory: @flagHistory} o.trackedProperties[prop] = @[prop] for prop in @trackedProperties or [] for thangID, methods of @userCodeMap @@ -455,7 +455,7 @@ module.exports = class World w.userCodeMap[thangID][methodName][aetherStateKey] = serializedAether[aetherStateKey] else w = new World o.userCodeMap, classMap - [w.totalFrames, w.maxTotalFrames, w.frameRate, w.dt, w.scriptNotes, w.victory] = [o.totalFrames, o.maxTotalFrames, o.frameRate, o.dt, o.scriptNotes ? [], o.victory] + [w.totalFrames, w.maxTotalFrames, w.frameRate, w.dt, w.scriptNotes, w.victory, w.flagHistory] = [o.totalFrames, o.maxTotalFrames, o.frameRate, o.dt, o.scriptNotes ? [], o.victory, o.flagHistory] w[prop] = val for prop, val of o.trackedProperties perf.t1 = now() diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index 45f2b1605..91e87b156 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi adventurer_forum: "منتدى المغامر" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... فيها تتعلم سحر البرمجة." + campaign_old_beginner_description: "... فيها تتعلم سحر البرمجة." campaign_dev: "مستويات أصعب عشوائية" campaign_dev_description: "... فيها تتعلم واجهة بينما تفعل شيئا أصعب قليلا." campaign_multiplayer: "ساحات متعددة اللاّعبين" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index 3824c4923..2ee7384a4 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "български език", englishDescri # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "български език", englishDescri # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "български език", englishDescri # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index 114622cdc..de79233fd 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr adventurer_forum: "El fòrum de l'aventurer" adventurer_suffix: "." campaign_old_beginner: "Antiga campanya del principiant" - campaign_beginner_description: "... on aprens la bruixeria de la programació." + campaign_old_beginner_description: "... on aprens la bruixeria de la programació." campaign_dev: "Nivells difícils aleatoris" campaign_dev_description: "... on aprens a interactuar amb la interfície tot fent coses un pèl més difícils." campaign_multiplayer: "Arenes Multijugador" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr armor: "Armadura" hands: "Mans" accessories: "Accessoris" - books: "Llibres" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Jugar el següent nivell" # Only in old-style levels. victory_play_continue: "Continuar" +# victory_saving_progress: "Saving Progress" victory_go_home: "Tornar a l'inici" # Only in old-style levels. victory_review: "Diguens més!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index 696cfe40e..5c6a23be7 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr adventurer_forum: "fóru Dobrodruhů" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "...ve které se naučíte kouzla programování." + campaign_old_beginner_description: "...ve které se naučíte kouzla programování." campaign_dev: "Náhodné težší úrovně" campaign_dev_description: "...ve kterých se dozvíte více o prostředí při plnění těžších úkolů." campaign_multiplayer: "Multiplayer Aréna" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Hrát další úroveň" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Přejít domů" # Only in old-style levels. victory_review: "Připomínky!" # Only in old-style levels. victory_hour_of_code_done: "Skončili jste?" diff --git a/app/locale/da.coffee b/app/locale/da.coffee index 4f7cad262..302712571 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans adventurer_forum: "Eventyrer-forummet" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... hvor du lærer programmeringens kunst." + campaign_old_beginner_description: "... hvor du lærer programmeringens kunst." campaign_dev: "Tilfældige Sværere Niveauer" campaign_dev_description: "... hvor du lærer grænsefladen imens du udfører lidt sværere opgaver." campaign_multiplayer: "Multiplayer Arenaer" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Spil næste bane" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Gå hjem" # Only in old-style levels. victory_review: "Fortæl os mere!" # Only in old-style levels. victory_hour_of_code_done: "Er du færdig?" diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index 22bad597b..e0020b744 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: adventurer_forum: "im Abenteurerforum" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... in der Du die Zauberei der Programmierung lernst." + campaign_old_beginner_description: "... in der Du die Zauberei der Programmierung lernst." campaign_dev: "Beliebiges schwierigeres Level" campaign_dev_description: "... in welchem Du die Bedienung erlernst, indem Du etwas schwierigeres machst." campaign_multiplayer: "Multiplayerarena" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: armor: "Rüstung" hands: "Hände" accessories: "Zubehör" - books: "Bücher" minions: "Minions" misc: "Sonstiges" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: victory_return_to_ladder: "Zurück zur Rangliste" victory_play_next_level: "Spiel das nächste Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Geh auf die Startseite" # Only in old-style levels. victory_review: "Erzähl uns davon!" # Only in old-style levels. victory_hour_of_code_done: "Bist Du fertig?" diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index eb6af2dce..3c1b41dec 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge adventurer_forum: "Abentürer-Forum" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... i dere du d Zauberkunst vom Programmiere lernsch." + campaign_old_beginner_description: "... i dere du d Zauberkunst vom Programmiere lernsch." campaign_dev: "Zuefälligi schwierigeri Level" campaign_dev_description: "... i dene du s Interface kenne lernsch, während du öppis chli Schwierigers machsch." campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge victory_return_to_ladder: "Zrugg zum letzte Level" victory_play_next_level: "Spiel s nögste Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. victory_review: "Verzell üs meh!" # Only in old-style levels. victory_hour_of_code_done: "Bisch fertig?" diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 603b5439b..9eed5d516 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: adventurer_forum: "im Abenteurerforum" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... in der Du die Zauberei der Programmierung lernst." + campaign_old_beginner_description: "... in der Du die Zauberei der Programmierung lernst." campaign_dev: "Beliebiges schwierigeres Level" campaign_dev_description: "... in welchem Du die Bedienung erlernst, indem Du etwas schwierigeres machst." campaign_multiplayer: "Multiplayerarena" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: armor: "Rüstung" hands: "Hände" accessories: "Zubehör" - books: "Bücher" minions: "Minions" misc: "Sonstiges" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: victory_return_to_ladder: "Zurück zur Rangliste" victory_play_next_level: "Spiel das nächste Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Geh auf die Startseite" # Only in old-style levels. victory_review: "Erzähl uns davon!" # Only in old-style levels. victory_hour_of_code_done: "Bist Du fertig?" diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 9ffbeb92d..98c51dcf1 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre adventurer_forum: "Φόρουμ του Adventurer" adventurer_suffix: "." campaign_old_beginner: "Παλαιότερη Εκστρατεία Αρχαρίων" - campaign_beginner_description: "... στην οποία μαθαίνετε τη μαγεία του προγραμματισμού." + campaign_old_beginner_description: "... στην οποία μαθαίνετε τη μαγεία του προγραμματισμού." campaign_dev: "Τυχαία Δυσκολότερα Επίπεδα" campaign_dev_description: "... στα οποία μπορείτε να μάθετε το περιβάλλον, ενώ κάνετε κάτι λίγο δυσκολότερο." campaign_multiplayer: "Αρένες Πολλαπλών Παικτών" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre armor: "Πανοπλία" hands: "Χέρια" accessories: "Εξαρτήματα" - books: "Βιβλία" minions: "Minions" misc: "Διάφορα" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Παίξε το επόμενο επίπεδο" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Πηγαίνετε στην Αρχική" # Only in old-style levels. victory_review: "Πείτε μας περισσότερα!" # Only in old-style levels. victory_hour_of_code_done: "Τελείωσες;" diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index 909a24e8d..c6dc7371d 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index 023abda26..9520b5200 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index 0f2920ee0..3b3fe7a47 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/en.coffee b/app/locale/en.coffee index f2c9f83a7..ad2a61431 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -73,7 +73,7 @@ adventurer_forum: "the Adventurer forum" adventurer_suffix: "." campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... in which you learn the wizardry of programming." + campaign_old_beginner_description: "... in which you learn the wizardry of programming." campaign_dev: "Random Harder Levels" campaign_dev_description: "... in which you learn the interface while doing something a little harder." campaign_multiplayer: "Multiplayer Arenas" diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index 5669aa6ac..861f38017 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip adventurer_forum: "el foro del aventurero" adventurer_suffix: "." campaign_old_beginner: "Campaña anterior de principiante" - campaign_beginner_description: "... en la que aprendes la hechicería de la programación." + campaign_old_beginner_description: "... en la que aprendes la hechicería de la programación." campaign_dev: "Niveles aleatorios más difíciles" campaign_dev_description: "... en los que aprendes sobre la interfaz mientras haces algo un poco más difícil." campaign_multiplayer: "Arenas Multijugador" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip armor: "Armadura" hands: "Manos" accessories: "Accesorios" - books: "Libros" minions: "Seguidores" misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip victory_return_to_ladder: "Volver a la escalera" victory_play_next_level: "Jugar Próximo Nivel" # Only in old-style levels. victory_play_continue: "Continuar" +# victory_saving_progress: "Saving Progress" victory_go_home: "Ir al Inicio" # Only in old-style levels. victory_review: "¡Cuéntanos más!" # Only in old-style levels. victory_hour_of_code_done: "¿Has acabado?" diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index a2d08c635..e70fe83c1 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis adventurer_forum: "el foro del aventurero " adventurer_suffix: "sobre ello." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... en la que aprenderás la magia de la programación." + campaign_old_beginner_description: "... en la que aprenderás la magia de la programación." campaign_dev: "Niveles aleatorios más dificiles" campaign_dev_description: "... en los que aprenderás sobre la interfaz mientras haces algo más difícil." campaign_multiplayer: "Arenas Multijugador" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis victory_return_to_ladder: "Volver a Clasificación" victory_play_next_level: "Jugar el siguiente nivel" # Only in old-style levels. victory_play_continue: "Continuar" +# victory_saving_progress: "Saving Progress" victory_go_home: "Ir a Inicio" # Only in old-style levels. victory_review: "¡Cuéntanos más!" # Only in old-style levels. victory_hour_of_code_done: "¿Ya terminaste?" diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index c5b63805a..8682128a4 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", adventurer_forum: "انجمن ماجراجو ها" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: ".که شما در آن می توانید جادوگری به وسیله برنامه نویسی را یادبگیرید..." + campaign_old_beginner_description: ".که شما در آن می توانید جادوگری به وسیله برنامه نویسی را یادبگیرید..." campaign_dev: "مراحل سخت تصادفی" campaign_dev_description: "... جایی که میتونید طراحی ظاهر رو یاد بگیرید درحالی که فعالیت سخت تری انجام میدید" campaign_multiplayer: "مسابقات چند نفره" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index 252a572d7..6ea8016e0 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 4b264e527..b3ba5175d 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t adventurer_forum: "le forum de l'Aventurier" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... dans laquelle vous apprendrez la magie de la programmation." + campaign_old_beginner_description: "... dans laquelle vous apprendrez la magie de la programmation." campaign_dev: "Niveaux aléatoires plus difficiles" campaign_dev_description: "... dans lesquels vous apprendrez à utiliser l'interface en faisant quelque chose d'un petit peu plus dur." campaign_multiplayer: "Campagne multi-joueurs" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Jouer au prochain niveau" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Retourner à l'accueil" # Only in old-style levels. victory_review: "Dites-nous en plus!" # Only in old-style levels. victory_hour_of_code_done: "Déjà fini ?" diff --git a/app/locale/he.coffee b/app/locale/he.coffee index 51cdc3551..946e6f80f 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", adventurer_forum: "פורום ההרפתקנים" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "...שבו תלמד את קסם התכנות." + campaign_old_beginner_description: "...שבו תלמד את קסם התכנות." campaign_dev: "שלבים אקראים קשים יותר" campaign_dev_description: "...שבהם תלמד על הממשק בזמן שתעשה משהו קצת קשה יותר." campaign_multiplayer: "זירות רב-המשתתפים" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index bb69699dd..c77631423 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index bee46a6ca..299106b2f 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t adventurer_forum: "a Kalandozók Fórumán" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... amelyben megtanulhatod a programozás varázslatait." + campaign_old_beginner_description: "... amelyben megtanulhatod a programozás varázslatait." campaign_dev: "Véletlenszerű Nehezebb Pályák" campaign_dev_description: "... amelyekben kicsit nehezebb dolgokkal nézhetsz szembe." campaign_multiplayer: "Multiplayer Arénák" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Következő pálya" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Vissza a kezdőoldalra" # Only in old-style levels. victory_review: "Mondd el a véleményedet!" # Only in old-style levels. victory_hour_of_code_done: "Készen vagy?" diff --git a/app/locale/id.coffee b/app/locale/id.coffee index e0f299366..c7c399d0b 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/it.coffee b/app/locale/it.coffee index f85233a5a..2cf126cfd 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t adventurer_forum: "forum degli Avventurieri" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... nelle quali imparerai i trucchi della programmazione." + campaign_old_beginner_description: "... nelle quali imparerai i trucchi della programmazione." campaign_dev: "Livelli difficili casuali" campaign_dev_description: "... nei quali imparerai a usare l'interfaccia facendo qualcosa di un po' più difficile." campaign_multiplayer: "Arene multigiocatore" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Gioca il prossimo livello" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Torna alla pagina iniziale" # Only in old-style levels. victory_review: "Dicci di più!" # Only in old-style levels. victory_hour_of_code_done: "Finito?" diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index 9a4175e50..88fa14564 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", adventurer_forum: "冒険者の掲示板" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "プログラミングの魔法を学びましょう" + campaign_old_beginner_description: "プログラミングの魔法を学びましょう" campaign_dev: "いろんな難しいレベル" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." campaign_multiplayer: "マルチプレイ・アリーナ" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "次のレベル" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "ホームに戻る" # Only in old-style levels. victory_review: "フィードバック" # Only in old-style levels. victory_hour_of_code_done: "完了してよろしいですか?" diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index 534b77bd8..1f65c4454 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t adventurer_forum: "모험가들의 포럼" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... 이곳에서 당신은 프로그래밍의 마법을 배우게 될 것입니다." + campaign_old_beginner_description: "... 이곳에서 당신은 프로그래밍의 마법을 배우게 될 것입니다." campaign_dev: "상급 레벨 랜덤 선택" campaign_dev_description: "... 이곳에서 당신은 조금 더 어려운 레벨에 도전할때 필요한 조작 방법을 배울 것입니다." campaign_multiplayer: "멀티 플레이어 전투장" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t victory_return_to_ladder: "레더로 돌아가기" victory_play_next_level: "다음 레벨 플레이 하기" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "홈으로" # Only in old-style levels. victory_review: "리뷰를 남겨주세요" # Only in old-style levels. victory_hour_of_code_done: "정말 종료합니까?" diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 23cbe5ae7..185c802d8 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 4f89c5e2b..7d0797d6e 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index cd7f540e0..0d6e09675 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg adventurer_forum: "Adventurer forumet" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... hvor du lærer trolldommen bak programmering." + campaign_old_beginner_description: "... hvor du lærer trolldommen bak programmering." campaign_dev: "Tilfeldig Vanskeligere Nivåer" campaign_dev_description: "... hvor du lærer grensesnittet mens du stadig gjør mer vanskeligere utfordringer." campaign_multiplayer: "Multispiller Arenaer" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Spill Neste Nivå" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Gå Hjem" # Only in old-style levels. victory_review: "Fortell oss mer!" # Only in old-style levels. victory_hour_of_code_done: "Er du ferdig?" diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index 83bee04e7..356244785 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: adventurer_forum: "het Avonturiersforum" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... waarin je de toverkunst van het programmeren leert." + campaign_old_beginner_description: "... waarin je de toverkunst van het programmeren leert." campaign_dev: "Willekeurige moeilijkere levels" campaign_dev_description: "... waarin je de interface leert kennen terwijl je wat moeilijkers doet." campaign_multiplayer: "Multiplayer Arena's" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: victory_return_to_ladder: "Keer terug naar de ladder" victory_play_next_level: "Speel Volgend Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Ga naar Home" # Only in old-style levels. victory_review: "Vertel ons meer!" # Only in old-style levels. victory_hour_of_code_done: "Ben Je Klaar?" diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index ba1429f28..c541c1424 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription adventurer_forum: "het Avonturiersforum" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... waarin je de toverkunst van het programmeren leert." + campaign_old_beginner_description: "... waarin je de toverkunst van het programmeren leert." campaign_dev: "Willekeurige moeilijkere levels" campaign_dev_description: "... waarin je de interface leert kennen terwijl je wat moeilijkers doet." campaign_multiplayer: "Multiplayer Arena's" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription victory_return_to_ladder: "Keer terug naar de ladder" victory_play_next_level: "Speel Volgend Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Ga naar Home" # Only in old-style levels. victory_review: "Vertel ons meer!" # Only in old-style levels. victory_hour_of_code_done: "Ben Je Klaar?" diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index 88b810783..4c40d8a1b 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/no.coffee b/app/locale/no.coffee index e2af61cbe..93ed924cc 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr adventurer_forum: "Eventyrerforumet" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... hvor du lærer trolldommen bak programmering." + campaign_old_beginner_description: "... hvor du lærer trolldommen bak programmering." campaign_dev: "Vanskeligere brett (tilfeldige)" campaign_dev_description: "... hvor du lærer hvordan du bruker skjermbildene mens du stadig løser mer vanskelige utfordringer." campaign_multiplayer: "Flerspiller brett (arenaer)" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Spill neste nivå" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Gå til Hovedsiden" # Only in old-style levels. victory_review: "Fortell oss mer!" # Only in old-style levels. victory_hour_of_code_done: "Er du ferdig?" diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index 33aebc652..ee27aaf04 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish adventurer_forum: "forum Podróżników" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... w której nauczysz się magii programowania" + campaign_old_beginner_description: "... w której nauczysz się magii programowania" campaign_dev: "Losowe trudniejsze poziomy" campaign_dev_description: "... w których nauczysz się interfejsu robiąc coś trudniejszego." campaign_multiplayer: "Pola walki dla wielu graczy" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish victory_return_to_ladder: "Powrót do drabinki" victory_play_next_level: "Przejdź na następny poziom" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Powrót do strony głównej" # Only in old-style levels. victory_review: "Powiedz nam coś więcej!" # Only in old-style levels. victory_hour_of_code_done: "Skończyłeś już?" diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index 92b306952..dc020e36d 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: adventurer_forum: "Fórum do Aventureiro" adventurer_suffix: "." campaign_old_beginner: "Campanha antiga para Iniciantes" - campaign_beginner_description: "... na qual você aprenderá a magia da programação." + campaign_old_beginner_description: "... na qual você aprenderá a magia da programação." campaign_dev: "Fases Difíceis Aleatórias" campaign_dev_description: "... nas quais você aprenderá a interface enquanto faz algo um pouco mais difícil." campaign_multiplayer: "Arenas Multijogador" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: armor: "Armadura" hands: "Mãos" accessories: "Accessórios" - books: "Livross" minions: "Minions" misc: "Diversos" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: victory_return_to_ladder: "Retornar para a Ladder" victory_play_next_level: "Jogar o próximo estágio" # Only in old-style levels. victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Ir à página inicial" # Only in old-style levels. victory_review: "Diga-nos mais!" # Only in old-style levels. victory_hour_of_code_done: "Terminou?" @@ -339,14 +339,14 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: press_paragraph_1_suffix: ". Todas as logomarcas e imagens podem ser usadas sem nos contactar previamente." team: "Time" george_title: "CEO" - george_blurb: "Administrador" # Businesser + george_blurb: "Administrador" scott_title: "Programador" scott_blurb: "O Sensato" nick_title: "Programador" nick_blurb: "Guru Motivacional" michael_title: "Programador" michael_blurb: "Administrador de Sistemas" - matt_title: "PProgramador" + matt_title: "Programador" matt_blurb: "O Ciclista" versions: @@ -436,8 +436,8 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: introduction: "Verifique abaixo de que maneires você pode se envolver e decida qual lhe parece mais divertida. Esperamos trabalhar com você em breve!" level_editor_prefix: "Use o CodeCombat" level_editor_suffix: "para criar e editar níveis. Usuários criaram níveis para suas classes, amigos, hackathons, estudantes e parentes. Se criar um novo nível soa intimidador, você pode iniciar fazendo um fork de um dos nossos." -# thang_editor_prefix: "We call units within the game 'thangs'. Use the" -# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." + thang_editor_prefix: "Nós chamamos as unidades do jogo de 'thangs'. Utilize o" + thang_editor_suffix: "para modificar o fonte das artes. Permita que lancem projéteis, modifique a direção das animações, modifique os pontos de vida da unidade ou envie seu próprio vetor de sprites." article_editor_prefix: "Encontrou algo errado na nossa documentação? Gostaria de criar algumas instruções para suas próprias criações? Dê uma olhada em" article_editor_suffix: "e ajude os jogadores do CodeCombat a aproveitar o máximo de seu jogo." find_us: "Encontre-nos nestes sites" @@ -738,21 +738,21 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: systems: "Sistemas" component: "Componente" components: "Componentes" -# thang: "Thang" -# thangs: "Thangs" + thang: "Thang" + thangs: "Thangs" level_session: "Sua Sessão" opponent_session: "Sessão do Oponente" article: "Artigo" user_names: "Nomes de Usuários" -# thang_names: "Thang Names" + thang_names: "Nome do Thang" files: "Arquivos" top_simulators: "Top Simuladores" source_document: "Documento da Fonte" document: "Documento" -# sprite_sheet: "Sprite Sheet" + sprite_sheet: "Folha de Sprites" employers: "Empregadores" candidates: "Candidatos" -# candidate_sessions: "Candidate Sessions" + candidate_sessions: "Sessão do Candidato" user_remark: "Observação do Usuário" user_remarks: "Observações do Usuário" versions: "Versões" @@ -1050,4 +1050,4 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: av_other_debug_base_url: "Base (para debugar base.jade)" u_title: "Lista de Usuários" lg_title: "Últimos Jogos" -# clas: "CLAs" + clas: "CLAs" diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 66ec658ff..961cc1b38 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: adventurer_forum: "fórum do Aventureiro" adventurer_suffix: "." campaign_old_beginner: "Campanha para Iniciantes Antiga" - campaign_beginner_description: "... onde aprendes a magia da programação." + campaign_old_beginner_description: "... onde aprendes a magia da programação." campaign_dev: "Níveis mais Difíceis Aleatórios" campaign_dev_description: "... onde aprendes a interface enquanto fazes coisas um bocadinho mais difíceis." campaign_multiplayer: "Arenas Multijogador" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: armor: "Armadura" hands: "Mãos" accessories: "Acessórios" - books: "Livros" minions: "Minions" misc: "Vários" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: victory_return_to_ladder: "Voltar à Classificação" victory_play_next_level: "Jogar Próximo Nível" # Only in old-style levels. victory_play_continue: "Continuar" + victory_saving_progress: "A Guardar o Progresso" victory_go_home: "Ir para o Início" # Only in old-style levels. victory_review: "Conta-nos mais!" # Only in old-style levels. victory_hour_of_code_done: "Terminaste?" diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index ca16adcae..e5f4d64ec 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman adventurer_forum: "forumul Aventurierului" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... în care se învață tainele programării." + campaign_old_beginner_description: "... în care se învață tainele programării." campaign_dev: "Nivele aleatoare mai grele" campaign_dev_description: "... în care se învață interfața, cu o dificultate puțin mai mare." campaign_multiplayer: "Arene Multiplayer" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman victory_return_to_ladder: "Înapoi la jocurile de clasament" victory_play_next_level: "Joacă nivelul următor" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Acasă" # Only in old-style levels. victory_review: "Spune-ne mai multe!" # Only in old-style levels. victory_hour_of_code_done: "Ai terminat?" diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 5561dff76..002f0952d 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi adventurer_forum: "форуме Искателей приключений" adventurer_suffix: "." campaign_old_beginner: "Старые компании для новичков" - campaign_beginner_description: "... в которой вы познакомитесь с магией программирования." + campaign_old_beginner_description: "... в которой вы познакомитесь с магией программирования." campaign_dev: "Случайные уровни потруднее" campaign_dev_description: "... в которых вы изучите интерфейс и научитесь делать кое-что посложнее." campaign_multiplayer: "Арены для мультиплеера" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi armor: "Броня" hands: "Руки" accessories: "Аксессуары" - books: "Книги" # minions: "Minions" misc: "Разное" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi victory_return_to_ladder: "Вернуться к ладдеру" victory_play_next_level: "Следующий уровень" # Only in old-style levels. victory_play_continue: "Продолжить" +# victory_saving_progress: "Saving Progress" victory_go_home: "На главную" # Only in old-style levels. victory_review: "Расскажите нам больше!" # Only in old-style levels. victory_hour_of_code_done: "Вы закончили?" diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index 2d36d1aee..a1d761310 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", adventurer_forum: "fóre pre dobrodruhov" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... v ktorom sa naučíš mágiu programovania." + campaign_old_beginner_description: "... v ktorom sa naučíš mágiu programovania." campaign_dev: "Náhodné ťažšie úrovne" campaign_dev_description: "... v ktorych sa naučíš používať rozhranie a čeliť väčším výzvam." campaign_multiplayer: "Aréna pre viacerých hráčov" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index c8bc34f58..8d58ccce4 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index c19a5e80b..e05088c3e 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian adventurer_forum: "форуму Авантуриста" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... у којој учиш магију програмирања." + campaign_old_beginner_description: "... у којој учиш магију програмирања." campaign_dev: "Насумични тежи нивои" campaign_dev_description: "... у којима учиш о интерфејсу док радиш нешто теже." campaign_multiplayer: "Арене за више играча" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Играј следећи ниво" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Иди на почетну" # Only in old-style levels. victory_review: "Реци нам више!" # Only in old-style levels. victory_hour_of_code_done: "Јеси ли завршио?" diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index 8aa5fb51e..a725e344d 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr adventurer_forum: "Äventyrarforumet" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... i vilken du lär dig programmerandets magi." + campaign_old_beginner_description: "... i vilken du lär dig programmerandets magi." campaign_dev: "Slumpad svårare nivå" campaign_dev_description: "... där du lär dig att hantera gränssnittet medan du gör något lite svårare." campaign_multiplayer: "Flerspelararenor" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr victory_return_to_ladder: "Gå tillbaka till stegen" victory_play_next_level: "Spela nästa nivå" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Gå hem" # Only in old-style levels. victory_review: "Berätta mer!" # Only in old-style levels. victory_hour_of_code_done: "Är du klar?" diff --git a/app/locale/th.coffee b/app/locale/th.coffee index aec3df531..f06b7a39e 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "เล่นด่านถัดไป" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "ไปหน้าแรก" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. victory_hour_of_code_done: "เสร็จหรือยัง?" diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index 7149938c3..076f18cd0 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t adventurer_forum: "Maceracı forumunda" adventurer_suffix: " tartışabilirsiniz." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "Programlama büyüsünü öğrenmek için..." + campaign_old_beginner_description: "Programlama büyüsünü öğrenmek için..." campaign_dev: "Rastgele Daha Zor Seviyeler" campaign_dev_description: "Biraz daha zor işlerle uğraşırken arayüzü öğrenmek için..." campaign_multiplayer: "Çok Oyunculu Meydanlar" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Sonraki Seviyeyi Oyna: " # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "Anasayfaya Git" # Only in old-style levels. victory_review: "Daha detaylı bilgi verebilirsiniz!" # Only in old-style levels. victory_hour_of_code_done: "Bitirdiniz mi?" diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index 90bf0fc54..a19f6dccd 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "українська мова", englishDesc adventurer_forum: "форумі Шукачів пригод" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "... у якій ви навчитеся магії програмування." + campaign_old_beginner_description: "... у якій ви навчитеся магії програмування." campaign_dev: "Випадкові складніші рівні" campaign_dev_description: "... в яких ви вивчите інтерфейс, одночасно роблячи щось складніше." campaign_multiplayer: "Арени для мультиплеєра" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "українська мова", englishDesc # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "українська мова", englishDesc victory_return_to_ladder: "Повернутись до таблиці рівнів" victory_play_next_level: "Наступний рівень" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "На головну" # Only in old-style levels. victory_review: "Розкажіть нам більше!" # Only in old-style levels. victory_hour_of_code_done: "Ви закінчили?" diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index ce3904144..67f2749e5 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 54c9c0b2b..17d5c0e86 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn adventurer_forum: "diễn đàn Adventurer" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." campaign_dev: "Các cấp độ khó hơn ngẫu nhiên" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." campaign_multiplayer: "Khu vực đa người chơi" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index 44a5fcc9a..c03974f5a 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -34,7 +34,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese about: "关于" contact: "联系我们" twitter_follow: "关注" -# teachers: "Teachers" + teachers: "教师" modal: close: "关闭" @@ -52,16 +52,16 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese subscribe_as_diplomat: "提交翻译人员申请" play: - play_as: "Play As" # Ladder page +# play_as: "Play As" # Ladder page spectate: "旁观他人的游戏" # Ladder page # players: "players" # Hover over a level on /play # hours_played: "hours played" # Hover over a level on /play -# items: "Items" # Tooltip on item shop button from /play -# heroes: "Heroes" # Tooltip on hero shop button from /play + items: "道具" # Tooltip on item shop button from /play + heroes: "英雄" # Tooltip on hero shop button from /play achievements: "成就" # Tooltip on achievement list button from /play account: "账户" # Tooltip on account button from /play settings: "设置" # Tooltip on settings button from /play -# next: "Next" # Go from choose hero to choose inventory before playing a level + next: "下一步" # Go from choose hero to choose inventory before playing a level change_hero: "重新选择英雄" # Go back from choose inventory to choose hero choose_inventory: "装备道具" older_campaigns: "旧的战役" @@ -73,7 +73,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese adventurer_forum: "冒险者论坛" adventurer_suffix: "。" campaign_old_beginner: "旧的新手战役" - campaign_beginner_description: "……在这里你可以学习到编程技巧。" + campaign_old_beginner_description: "……在这里你可以学习到编程技巧。" campaign_dev: "随机困难关卡" campaign_dev_description: "……在这里你可以学到做一些复杂功能的接口。" campaign_multiplayer: "多人竞技场" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese armor: "盔甲" hands: "手持" accessories: "配饰" - books: "图书" minions: "部下" misc: "辅助道具" @@ -204,7 +203,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese victory_rate_the_level: "评估关卡：" # Only in old-style levels. victory_return_to_ladder: "返回" victory_play_next_level: "下一关" # Only in old-style levels. -# victory_play_continue: "Continue" + victory_play_continue: "继续" +# victory_saving_progress: "Saving Progress" victory_go_home: "返回主页" # Only in old-style levels. victory_review: "给我们反馈！" # Only in old-style levels. victory_hour_of_code_done: "你完成了吗?" @@ -283,8 +283,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # guide_caption: "Docs and tips" # multiplayer_caption: "Play with friends!" -# inventory: -# choose_inventory: "Equip Items" + inventory: + choose_inventory: "装备道具" choose_hero: choose_hero: "请选择您的英雄" @@ -334,9 +334,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese why_paragraph_2_suffix: "这就是为什么 CodeCombat 是个多人游戏，而不是一个游戏化的编程课。你不停，我们就不停——但这次这是件好事。" why_paragraph_3: "如果你一定要对游戏上瘾，那就对这个游戏上瘾，然后成为科技时代的法师吧。" press_title: "博客/媒体" -# press_paragraph_1_prefix: "Want to write about us? Feel free to download and use all of the resources included in our" -# press_paragraph_1_link: "press packet" -# press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly." + press_paragraph_1_prefix: "想要报道我们？ 您可以自由下载和使用" + press_paragraph_1_link: "成套宣传包" + press_paragraph_1_suffix: "里的所有材料. 所有商标和图像的使用都不必事先联系我们。" team: "团队" # george_title: "CEO" # george_blurb: "Businesser" @@ -541,7 +541,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese introduction_desc_ending: "我们希望你也能一起加入进来！" introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy 以及 Matt" alert_account_message_intro: "你好！" -# alert_account_message: "To subscribe for class emails, you'll need to be logged in first." + alert_account_message: "想要订阅邮件？ 您必须先登录" archmage_summary: "你对游戏图像、界面设计、数据库和服务器运营、多人在线、物理、声音、游戏引擎性能感兴趣吗？想做一个教别人编程的游戏吗？如果你有编程经验，想要开发 CodeCombat ，那就选择这个职业吧。我们会非常高兴在制作史上最棒编程游戏的过程中得到你的帮助。" archmage_introduction: "制作游戏时，最令人激动的事莫过于整合诸多东西。图像、音响、实时网络交流、社交网络，从底层数据库管理到服务器运维，再到用户界面的设计和实现。制作游戏有很多事情要做，所以如果你有编程经验, 那么你应该选择这个职业。我们会很高兴在制作史上最好编程游戏的路上有你的陪伴." class_attributes: "职业说明" @@ -670,25 +670,25 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # rules: "Rules" # winners: "Winners" -# user: -# stats: "Stats" -# singleplayer_title: "Singleplayer Levels" -# multiplayer_title: "Multiplayer Levels" -# achievements_title: "Achievements" -# last_played: "Last Played" -# status: "Status" -# status_completed: "Completed" -# status_unfinished: "Unfinished" -# no_singleplayer: "No Singleplayer games played yet." -# no_multiplayer: "No Multiplayer games played yet." -# no_achievements: "No Achievements earned yet." -# favorite_prefix: "Favorite language is " -# favorite_postfix: "." + user: + stats: "成就" + singleplayer_title: "单人关卡" + multiplayer_title: "多人关卡" + achievements_title: "成就" + last_played: "最近玩的时间" + status: "状态" + status_completed: "完成" + status_unfinished: "未完成" + no_singleplayer: "还未玩过任何单人关卡。" + no_multiplayer: "还未玩过任何多人关卡。" + no_achievements: "还未得到任何成就" + favorite_prefix: "最喜爱的语言是 " + favorite_postfix: "." -# achievements: -# last_earned: "Last Earned" -# amount_achieved: "Amount" -# achievement: "Achievement" + achievements: + last_earned: "最近取得的时间" + amount_achieved: "数量" + achievement: "成就" # category_contributor: "Contributor" # category_miscellaneous: "Miscellaneous" # category_levels: "Levels" @@ -701,9 +701,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # left_xp_infix: " until level " # left_xp_postfix: "" -# account: -# recently_played: "Recently Played" -# no_recent_games: "No games played during the past two weeks." + account: + recently_played: "最近玩过的关卡" + no_recent_games: "最近两个星期没有玩过游戏。" loading_error: could_not_load: "载入失败" @@ -730,7 +730,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # gplus_friend_sessions: "G+ Friend Sessions" leaderboard: "排行榜" user_schema: "用户模式" - user_profile: "User Profile" + user_profile: "用户信息" patches: "补丁" # patched_model: "Source Document" # model: "Model" diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index e23b33394..5204e1cdd 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese adventurer_forum: "冒險家論壇" adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "...在這裡可以學到編程技巧。" + campaign_old_beginner_description: "...在這裡可以學到編程技巧。" campaign_dev: "隨機關卡" campaign_dev_description: "...在這裡你可以學到做一些較複雜的程式技巧。" campaign_multiplayer: "多人競技場" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "下一關" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "返回首頁" # Only in old-style levels. victory_review: "給我們回饋！" # Only in old-style levels. victory_hour_of_code_done: "你完成了嗎？" diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index d26ade695..9b5dc793a 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # adventurer_forum: "the Adventurer forum" # adventurer_suffix: "." # campaign_old_beginner: "Old Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." +# campaign_old_beginner_description: "... in which you learn the wizardry of programming." # campaign_dev: "Random Harder Levels" # campaign_dev_description: "... in which you learn the interface while doing something a little harder." # campaign_multiplayer: "Multiplayer Arenas" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # victory_return_to_ladder: "Return to Ladder" # victory_play_next_level: "Play Next Level" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" # victory_go_home: "Go Home" # Only in old-style levels. # victory_review: "Tell us more!" # Only in old-style levels. # victory_hour_of_code_done: "Are You Done?" diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index e3a721444..685337b5e 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -73,7 +73,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio adventurer_forum: "冒險者論壇" adventurer_suffix: "。" # campaign_old_beginner: "Old Beginner Campaign" - campaign_beginner_description: "……徠箇裏爾學得到編程手法。" + campaign_old_beginner_description: "……徠箇裏爾學得到編程手法。" campaign_dev: "照摸難關" campaign_dev_description: "……徠箇搭爾學得到做一許囉唆功能個接口。" campaign_multiplayer: "多人競賽場" @@ -111,7 +111,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # armor: "Armor" # hands: "Hands" # accessories: "Accessories" -# books: "Books" # minions: "Minions" # misc: "Misc" @@ -205,6 +204,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio victory_return_to_ladder: "走轉" victory_play_next_level: "下關" # Only in old-style levels. # victory_play_continue: "Continue" +# victory_saving_progress: "Saving Progress" victory_go_home: "轉到主頁" # Only in old-style levels. victory_review: "搭我裏反應！" # Only in old-style levels. victory_hour_of_code_done: "爾妝下落爻噃？" diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index 2042d5545..37ba7d5b6 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -43,7 +43,7 @@ module.exports = class ThangType extends CocoModel isFullyLoaded: -> # TODO: Come up with a better way to identify when the model doesn't have everything needed to build the sprite. ie when it's a projection without all the required data. return @get('actions') or @get('raster') # needs one of these two things - + loadRasterImage: -> return if @loadingRaster or @loadedRaster return unless raster = @get('raster') @@ -57,7 +57,7 @@ module.exports = class ThangType extends CocoModel @loadingRaster = false @trigger('raster-image-load-errored', @) ) - + getActions: -> return {} unless @isFullyLoaded() return @actions or @buildActions() @@ -72,11 +72,6 @@ module.exports = class ThangType extends CocoModel @actions[relatedAction.name] = relatedAction @actions - getSpriteSheet: (options) -> - options = @fillOptions options - key = @spriteSheetKey(options) - return @spriteSheets[key] or @buildSpriteSheet(options) - fillOptions: (options) -> options ?= {} options = _.clone options diff --git a/app/schemas/models/level_session.coffee b/app/schemas/models/level_session.coffee index 3545c3a1f..980a1e5e6 100644 --- a/app/schemas/models/level_session.coffee +++ b/app/schemas/models/level_session.coffee @@ -110,6 +110,22 @@ _.extend LevelSessionSchema.properties, type: 'object' properties: status: enum: ['failure', 'incomplete', 'success'] + submissionCount: + description: 'How many times the session has been submitted for real-time playback (can affect the random seed).' + type: 'integer' + minimum: 0 + flagHistory: + description: 'The history of flag events during the last real-time playback submission.' + type: 'array' + items: c.object {required: ['player', 'color', 'time', 'active']}, + player: {type: 'string'} + team: {type: 'string'} + color: {type: 'string', enum: ['green', 'black', 'violet']} + time: {type: 'number', minimum: 0} + active: {type: 'boolean'} + pos: c.object {required: ['x', 'y']}, + x: {type: 'number'} + y: {type: 'number'} code: type: 'object' diff --git a/app/schemas/subscriptions/tome.coffee b/app/schemas/subscriptions/tome.coffee index 573cd5dd3..ad5d0ac42 100644 --- a/app/schemas/subscriptions/tome.coffee +++ b/app/schemas/subscriptions/tome.coffee @@ -7,10 +7,12 @@ module.exports = preload: {type: 'boolean'} realTime: {type: 'boolean'} - 'tome:cast-spells': c.object {title: 'Cast Spells', description: 'Published when spells are cast', required: ['spells', 'preload', 'realTime']}, + 'tome:cast-spells': c.object {title: 'Cast Spells', description: 'Published when spells are cast', required: ['spells', 'preload', 'realTime', 'submissionCount', 'flagHistory']}, spells: [type: 'object'] preload: [type: 'boolean'] realTime: [type: 'boolean'] + submissionCount: [type: 'integer'] + flagHistory: [type: 'array'] 'tome:manual-cast': c.object {title: 'Manually Cast Spells', description: 'Published when you wish to manually recast all spells', required: []}, realTime: {type: 'boolean'} diff --git a/app/views/play/MainPlayView.coffee b/app/views/play/MainPlayView.coffee index 98e886dca..0c2301a86 100644 --- a/app/views/play/MainPlayView.coffee +++ b/app/views/play/MainPlayView.coffee @@ -325,6 +325,6 @@ campaigns = [ {id: 'old_beginner', name: 'Old 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: 'classic_algorithms' ,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 Artisan Wizards.', levels: playerCreated} ] diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index 2968c9884..e1588fe0c 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -781,7 +781,7 @@ campaigns = [ #{id: 'beginner', name: 'Beginner Campaign', description: '... in which you learn the wizardry of programming.', levels: tutorials, color: "rgb(255, 80, 60)"} #{id: 'multiplayer', name: 'Multiplayer Arenas', description: '... in which you code head-to-head against other players.', levels: arenas, color: "rgb(80, 5, 60)"} #{id: 'dev', name: 'Random Harder Levels', description: '... in which you learn the interface while doing something a little harder.', levels: experienced, color: "rgb(80, 60, 255)"} - #{id: 'classic' ,name: 'Classic Algorithms', description: '... in which you learn the most popular algorithms in Computer Science.', levels: classicAlgorithms, color: "rgb(110, 80, 120)"} + #{id: 'classic_algorithms' ,name: 'Classic Algorithms', description: '... in which you learn the most popular algorithms in Computer Science.', levels: classicAlgorithms, color: "rgb(110, 80, 120)"} #{id: 'player_created', name: 'Player-Created', description: '... in which you battle against the creativity of your fellow Artisan Wizards.', levels: playerCreated, color: "rgb(160, 160, 180)"} {id: 'beginner', name: 'Beginner Campaign', levels: hero, color: 'rgb(255, 80, 60)'} ] diff --git a/app/views/play/level/modal/VictoryModal.coffee b/app/views/play/level/modal/VictoryModal.coffee index 4fa83402c..741ce558b 100644 --- a/app/views/play/level/modal/VictoryModal.coffee +++ b/app/views/play/level/modal/VictoryModal.coffee @@ -29,7 +29,7 @@ module.exports = class VictoryModal extends ModalView constructor: (options) -> application.router.initializeSocialMediaServices() - victory = options.level.get('victory') + victory = options.level.get('victory', true) body = utils.i18n(victory, 'body') or 'Sorry, this level has no victory message yet.' @body = marked(body) @level = options.level diff --git a/app/views/play/level/tome/TomeView.coffee b/app/views/play/level/tome/TomeView.coffee index 528ebfa77..d8335993b 100644 --- a/app/views/play/level/tome/TomeView.coffee +++ b/app/views/play/level/tome/TomeView.coffee @@ -157,11 +157,15 @@ module.exports = class TomeView extends CocoView onCastSpell: (e) -> # A single spell is cast. - # Hmm; do we need to make sure other spells are all cast here? @cast e?.preload, e?.realTime cast: (preload=false, realTime=false) -> - Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: preload, realTime: realTime + sessionState = @options.session.get('state') ? {} + if realTime + sessionState.submissionCount = (sessionState.submissionCount ? 0) + 1 + sessionState.flagHistory = _.filter sessionState.flagHistory ? [], (event) => event.team isnt @options.session.get('team') + @options.session.set 'state', sessionState + Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: preload, realTime: realTime, submissionCount: sessionState.submissionCount ? 0, flagHistory: sessionState.flagHistory ? [] onToggleSpellList: (e) -> @spellList.rerenderEntries() @@ -230,7 +234,7 @@ module.exports = class TomeView extends CocoView reloadAllCode: -> spell.view.reloadCode false for spellKey, spell of @spells when spell.view and (spell.team is me.team or (spell.team in ['common', 'neutral', null])) - Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: false, realTime: false + @cast false, false updateLanguageForAllSpells: (e) -> spell.updateLanguageAether e.language for spellKey, spell of @spells when spell.canWrite() diff --git a/config.coffee b/config.coffee index f6ebd484e..ff02150a1 100644 --- a/config.coffee +++ b/config.coffee @@ -4,7 +4,8 @@ startsWith = (string, substring) -> exports.config = paths: - 'public': 'public' + public: 'public' + watched: ['app', 'vendor', 'test/app', 'test/demo'] conventions: ignored: (path) -> startsWith(sysPath.basename(path), '_') sourceMaps: true diff --git a/headless_client/worker_world.coffee b/headless_client/worker_world.coffee index fadfc9519..9406cec63 100644 --- a/headless_client/worker_world.coffee +++ b/headless_client/worker_world.coffee @@ -78,6 +78,8 @@ work = () -> try self.world = new World(args.userCodeMap) self.world.levelSessionIDs = args.levelSessionIDs + self.world.submissionCount = args.submissionCount + self.world.flagHistory = args.flagHistory self.world.loadFromLevel args.level, true if args.level self.world.headless = args.headless self.goalManager = new GoalManager(self.world)