Update uk.coffee

app/components/common/BaseModal.vue

@@ -51,7 +51,10 @@
     .modal-header
       font-weight: bold
       font-size: 30px
+      position: relative
 
     .modal-body
       font-size: 20px
+      flex-grow: 1
+      padding-top: 0px
 </style>

app/lib/LevelLoader.coffee

@@ -180,19 +180,41 @@ module.exports = class LevelLoader extends CocoClass
       @opponentSession = @opponentSessionResource.model
 
     if @session.loaded
-      console.debug 'LevelLoader: session already loaded:', @session
+      console.debug 'LevelLoader: session already loaded:', @session if LOG
       @session.setURL '/db/level.session/' + @session.id
       @loadDependenciesForSession @session
     else
-      console.debug 'LevelLoader: loading session:', @session
+      console.debug 'LevelLoader: loading session:', @session if LOG
       @listenToOnce @session, 'sync', ->
         @session.setURL '/db/level.session/' + @session.id
         @loadDependenciesForSession @session
     if @opponentSession
       if @opponentSession.loaded
-        @loadDependenciesForSession @opponentSession
+        console.debug 'LevelLoader: opponent session already loaded:', @opponentSession if LOG
+        @preloadTokenForOpponentSession @opponentSession
       else
-        @listenToOnce @opponentSession, 'sync', @loadDependenciesForSession
+        console.debug 'LevelLoader: loading opponent session:', @opponentSession if LOG
+        @listenToOnce @opponentSession, 'sync', @preloadTokenForOpponentSession
+
+  preloadTokenForOpponentSession: (session) =>
+    language = session.get('codeLanguage')
+    compressed = session.get 'interpret'
+    if language not in ['java', 'cpp'] or not compressed
+      @loadDependenciesForSession session
+    else
+      uncompressed = LZString.decompressFromUTF16 compressed
+      code = session.get 'code'
+
+      headers =  { 'Accept': 'application/json', 'Content-Type': 'application/json' }
+      m = document.cookie.match(/JWT=([a-zA-Z0-9.]+)/)
+      service = window?.localStorage?.kodeKeeperService or "/service/parse-code"
+      fetch service, {method: 'POST', mode:'cors', headers:headers, body:JSON.stringify({code: uncompressed, language: language})}
+      .then (x) => x.json()
+      .then (x) =>
+        code[if session.get('team') is 'humans' then 'hero-placeholder' else 'hero-placeholder-1'].plan = x.token
+        session.set 'code', code
+        session.unset 'interpret'
+        @loadDependenciesForSession session
 
   loadDependenciesForSession: (session) ->
     console.debug "Loading dependencies for session: ", session if LOG
@@ -380,6 +402,7 @@ module.exports = class LevelLoader extends CocoClass
       @worldNecessities.push @maybeLoadURL(url, LevelComponent, 'component')
 
   onWorldNecessityLoaded: (resource) ->
+    # Note: this can also be called when session, opponentSession, or other resources with dedicated load handlers are loaded, before those handlers
     index = @worldNecessities.indexOf(resource)
     if resource.name is 'thang'
       @loadDefaultComponentsForThangType(resource.model)
@@ -396,7 +419,7 @@ module.exports = class LevelLoader extends CocoClass
 
   checkAllWorldNecessitiesRegisteredAndLoaded: ->
     reason = @getReasonForNotYetLoaded()
-    console.debug('LevelLoader: Reason not loaded:', reason)
+    console.debug('LevelLoader: Reason not loaded:', reason) if reason and LOG
     return !reason
 
   getReasonForNotYetLoaded: ->
@@ -405,8 +428,9 @@ module.exports = class LevelLoader extends CocoClass
     return 'not all session dependencies registered' if @sessionDependenciesRegistered and not @sessionDependenciesRegistered[@session.id] and not @sessionless
     return 'not all opponent session dependencies registered' if @sessionDependenciesRegistered and @opponentSession and not @sessionDependenciesRegistered[@opponentSession.id] and not @sessionless
     return 'session is not loaded' unless @session?.loaded or @sessionless
-    return 'opponent session is not loaded' if @opponentSession and not @opponentSession.loaded
+    return 'opponent session is not loaded' if @opponentSession and (not @opponentSession.loaded or @opponentSession.get('interpret'))
     return 'have not published level loaded' unless @publishedLevelLoaded or @sessionless
+    return 'cpp/java token is still fetching' if @opponentSession and @opponentSession.get 'interpret'
     return ''
 
   onWorldNecessitiesLoaded: ->

app/lib/simulator/Simulator.coffee

@@ -67,15 +67,26 @@ module.exports = class Simulator extends CocoClass
         @simulatingPlayerStrings = {}
         for team in ['humans', 'ogres']
           session = _.find(taskData.sessions, {team: team})
+          unless session
+            @trigger 'statusUpdate', "Error simulating game: didn't find both teams' sessions. Trying another game in #{@retryDelayInSeconds} seconds."
+            @simulateAnotherTaskAfterDelay()
+            return
           @simulatingPlayerStrings[team] = "#{session.creatorName or session.creator} #{session.team}"
         @trigger 'statusUpdate', "Setting up #{taskData.sessions[0].levelID} simulation between #{@simulatingPlayerStrings.humans} and #{@simulatingPlayerStrings.ogres}"
         #refactor this
         @task = new SimulationTask(taskData)
+        try
+          levelID = @task.getLevelName()
+        catch err
+          console.error err
+          @trigger 'statusUpdate', "Error simulating game: #{err}. Trying another game in #{@retryDelayInSeconds} seconds."
+          @simulateAnotherTaskAfterDelay()
+          return
 
         @supermodel ?= new SuperModel()
         @supermodel.resetProgress()
         @stopListening @supermodel, 'loaded-all'
-        @levelLoader = new LevelLoader supermodel: @supermodel, levelID: @task.getLevelName(), sessionID: @task.getFirstSessionID(), opponentSessionID: @task.getSecondSessionID(), headless: true
+        @levelLoader = new LevelLoader supermodel: @supermodel, levelID: levelID, sessionID: @task.getFirstSessionID(), opponentSessionID: @task.getSecondSessionID(), headless: true
 
         if @supermodel.finished()
           @simulateSingleGame()
@@ -95,7 +106,8 @@ module.exports = class Simulator extends CocoClass
   commenceSingleSimulation: ->
     @listenToOnce @god, 'infinite-loop', @handleSingleSimulationInfiniteLoop
     @listenToOnce @god, 'goals-calculated', @processSingleGameResults
-    @god.createWorld {spells: @generateSpellsObject()}
+    @generateSpellsObject()
+        .then (spell) => @god.createWorld {spells: spell}
 
   handleSingleSimulationError: (error) ->
     console.error 'There was an error simulating a single game!', error
@@ -253,7 +265,8 @@ module.exports = class Simulator extends CocoClass
   commenceSimulationAndSetupCallback: ->
     @listenToOnce @god, 'infinite-loop', @onInfiniteLoop
     @listenToOnce @god, 'goals-calculated', @processResults
-    @god.createWorld {spells: @generateSpellsObject()}
+    @generateSpellsObject()
+        .then (spell) => @god.createWorld {spells: spell}
 
     # Search for leaks, headless-client only.
     # NOTE: Memwatch currently being ignored by Webpack, because it's only used by the server.
@@ -392,20 +405,40 @@ module.exports = class Simulator extends CocoClass
 
   generateSpellsObject: ->
     spells = {}
+    promises = []
     for {hero, team} in [{hero: 'Hero Placeholder', team: 'humans'}, {hero: 'Hero Placeholder 1', team: 'ogres'}]
       sessionInfo = _.filter(@task.getSessions(), {team: team})[0]
       fullSpellName = _.string.slugify(hero) + '/plan'
       submittedCodeLanguage = sessionInfo?.submittedCodeLanguage ? 'javascript'
       submittedCodeLanguage = 'javascript' if submittedCodeLanguage in ['clojure', 'io']  # No longer supported
       submittedCode = LZString.decompressFromUTF16 sessionInfo?.submittedCode?[_.string.slugify(hero)]?.plan ? ''
       aether = new Aether createAetherOptions functionName: 'plan', codeLanguage: submittedCodeLanguage, skipProtectAPI: false
-      try
-        aether.transpile submittedCode
-      catch e
-        console.log "Couldn't transpile #{fullSpellName}:\n#{submittedCode}\n", e
-        aether.transpile ''
-      spells[fullSpellName] = name: 'plan', team: team, thang: {thang: {id: hero}, aether: aether}
-    spells
+      spl = name: 'plan', team: team, thang: {thang: {id: hero}, aether: aether}, fullSpellName: fullSpellName
+      promises.push(@fetchToken(submittedCode, submittedCodeLanguage, spl))
+    Promise.all(promises)
+      .then((values) =>
+           for res in values
+             spl = res.spell
+             source = res.source
+             fullSpellName = spl.fullSpellName
+             try
+               spl.thang.aether.transpile source
+             catch e
+               console.log "Couldn't transpile #{fullSpellName}:\n#{source}\n", e
+             delete spl.fullSpellName
+             spells[fullSpellName] = spl)
+      .then(() => spells)
+
+  fetchToken: (source, language, spell) =>
+    if language not in ['java', 'cpp'] or /^\u56E7[a-zA-Z0-9+/=]+\f$/.test source
+      return Promise.resolve({source: source, spell: spell})
+
+    headers =  { 'Accept': 'application/json', 'Content-Type': 'application/json' }
+    m = document.cookie.match(/JWT=([a-zA-Z0-9.]+)/)
+    service = window?.localStorage?.kodeKeeperService or "/service/parse-code"
+    fetch service, {method: 'POST', mode:'cors', headers:headers, body:JSON.stringify({code: source, language: language})}
+    .then (x) => x.json()
+    .then (x) => {source: x.token, spell: spell}
 
 
 class SimulationTask

app/lib/surface/CoordinateDisplay.coffee

@@ -45,13 +45,20 @@ module.exports = class CoordinateDisplay extends createjs.Container
 
   onMouseMove: (e) ->
     wop = @camera.screenToWorld x: e.x, y: e.y
-    wop.x = Math.round(wop.x)
-    wop.y = Math.round(wop.y)
+    if key.alt
+      wop.x = Math.round(wop.x * 1000) / 1000
+      wop.y = Math.round(wop.y * 1000) / 1000
+    else
+      wop.x = Math.round(wop.x)
+      wop.y = Math.round(wop.y)
     return if wop.x is @lastPos?.x and wop.y is @lastPos?.y
     @lastPos = wop
     @lastScreenPos = x: e.x, y: e.y
-    @hide()
-    @show()  # debounced
+    if key.alt
+      @performShow()
+    else
+      @hide()
+      @show()  # debounced
 
   onMouseDown: (e) ->
     return unless key.shift

app/locale/ar.coffee

@@ -1,4 +1,5 @@
 module.exports = nativeDescription: "العربية", englishDescription: "Arabic", translation:
+
   new_home:
     title: "كودكومبات - العاب برمجة لتعليم بايثون و جافا سكريبت"
     meta_keywords: "كودكومبات, بايثون, جافا سكريبت, العاب برمجة"
@@ -90,7 +91,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    teachers_love_codecombat_blurb2: "Would recommend CodeCombat to other computer science teachers"
 #    teachers_love_codecombat_blurb3: "Say that CodeCombat helps them support students’ problem solving abilities"
 #    teachers_love_codecombat_subblurb: "In partnership with McREL International, a leader in research-based guidance and evaluations of educational technology."
-#    top_banner_blurb: "New: join our mission!"
+#    top_banner_blurb: "Parents, book your child's first live online coding class for free!"
     try_the_game: "جرب اللعبة"
     classroom_edition: "إصدار الفصل الدراسي:"
     learn_to_code: "تعلم البرمجة:"
@@ -356,7 +357,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    complete_subscription: "Complete Subscription"
 #    create_student_header: "Create Student Account"
 #    create_teacher_header: "Create Teacher Account"
-#    create_individual_header: "إنشاء حساب فردي"
+#    create_individual_header: "Create Individual Account"
     email_announcements: "تلقي الإعلانات عن طريق البريد الإلكتروني"
     sign_in_to_continue: "تسجيل الدخول أو إنشاء حساب جديد للمتابعة"
 #    teacher_email_announcements: "Keep me updated on new teacher resources, curriculum, and courses!"
@@ -788,6 +789,14 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    content: "Amazing! We just launched live online classes."
 #    link: "Ready to get ahead on your coding?"
 
+#  code_quest:
+#    great: "Great!"
+#    join_paragraph: "Join the largest international Python AI coding tournament for all ages and compete for the top of the leaderboard! This month-long global battle starts August 1st and includes $5k worth of prizes and a virtual awards ceremony where we'll announce winners and recognize your coding skills."
+#    link: "Click here to register and learn more"
+#    global_tournament: "Global Tournament"
+#    register: "Register"
+#    date: "Aug 1 - Aug 31"
+
 #  play_game_dev_level:
 #    created_by: "Created by {{name}}"
 #    created_during_hoc: "Created during Hour of Code"
@@ -805,7 +814,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 
   game_menu:
     inventory_tab: "المخزن"
-    save_load_tab: "أحفظ\أسترجع"
+    save_load_tab: "أحفظأسترجع"
     options_tab: "خيارات"
     guide_tab: "الدليل"
     guide_video_tutorial: "فيديو تعليمي"
@@ -2973,12 +2982,18 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    small_group_classes_detail_3: "Build projects and give feedback to other students"
 #    small_group_classes_detail_4: "Screen sharing to get live feedback on coding and debugging"
 #    private_classes: "Private Coding Classes"
+#    four_sessions_per_month: "4 Private Sessions / Mo."
+#    eight_sessions_per_month: "8 Private Sessions / Mo."
+#    four_private_classes_price: "$219/mo"
+#    eight_private_classes_price: "$399/mo"
 #    private_classes_detail: "4 or 8 Private Sessions / Mo."
 #    private_classes_price: "$219/mo or $399/mo"
 #    private_classes_detail_1: "1:1 student to instructor ratio"
 #    private_classes_detail_2: "60 minute classes"
 #    private_classes_detail_3: "Flexible schedule tailored to your needs"
 #    private_classes_detail_4: "Lesson plans and live feedback tailored to students' learning style, pace, and ability level"
+#    best_seller: "Best Seller"
+#    best_value: "Best Value"
 #    codecombat_premium: "CodeCombat Premium"
 #    monthly_sub: "Monthly Subscription"
 #    buy_now: "Buy now"
@@ -3045,6 +3060,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    start_free_trial_today: "Start free trial today"
 #    live_classes_title: "Live coding classes from CodeCombat!"
 #    live_class_booked_thank_you: "Your live class has been booked, thank you!"
+#    book_your_class: "Book Your Class"
 
 #  parent_modal:
 #    refer_teacher: "Refer Teacher"

app/locale/az.coffee

@@ -91,7 +91,7 @@ module.exports = nativeDescription: "azərbaycan dili", englishDescription: "Aze
 #    teachers_love_codecombat_blurb2: "Would recommend CodeCombat to other computer science teachers"
 #    teachers_love_codecombat_blurb3: "Say that CodeCombat helps them support students’ problem solving abilities"
 #    teachers_love_codecombat_subblurb: "In partnership with McREL International, a leader in research-based guidance and evaluations of educational technology."
-#    top_banner_blurb: "New: join our mission!"
+#    top_banner_blurb: "Parents, book your child's first live online coding class for free!"
 #    try_the_game: "Try the game"
     classroom_edition: "Sinif  Nəşri:"
     learn_to_code: "Kodlaşdırmağı öyrən:"
@@ -789,6 +789,14 @@ module.exports = nativeDescription: "azərbaycan dili", englishDescription: "Aze
 #    content: "Amazing! We just launched live online classes."
 #    link: "Ready to get ahead on your coding?"
 
+#  code_quest:
+#    great: "Great!"
+#    join_paragraph: "Join the largest international Python AI coding tournament for all ages and compete for the top of the leaderboard! This month-long global battle starts August 1st and includes $5k worth of prizes and a virtual awards ceremony where we'll announce winners and recognize your coding skills."
+#    link: "Click here to register and learn more"
+#    global_tournament: "Global Tournament"
+#    register: "Register"
+#    date: "Aug 1 - Aug 31"
+
 #  play_game_dev_level:
 #    created_by: "Created by {{name}}"
 #    created_during_hoc: "Created during Hour of Code"
@@ -2974,12 +2982,18 @@ module.exports = nativeDescription: "azərbaycan dili", englishDescription: "Aze
 #    small_group_classes_detail_3: "Build projects and give feedback to other students"
 #    small_group_classes_detail_4: "Screen sharing to get live feedback on coding and debugging"
 #    private_classes: "Private Coding Classes"
+#    four_sessions_per_month: "4 Private Sessions / Mo."
+#    eight_sessions_per_month: "8 Private Sessions / Mo."
+#    four_private_classes_price: "$219/mo"
+#    eight_private_classes_price: "$399/mo"
 #    private_classes_detail: "4 or 8 Private Sessions / Mo."
 #    private_classes_price: "$219/mo or $399/mo"
 #    private_classes_detail_1: "1:1 student to instructor ratio"
 #    private_classes_detail_2: "60 minute classes"
 #    private_classes_detail_3: "Flexible schedule tailored to your needs"
 #    private_classes_detail_4: "Lesson plans and live feedback tailored to students' learning style, pace, and ability level"
+#    best_seller: "Best Seller"
+#    best_value: "Best Value"
 #    codecombat_premium: "CodeCombat Premium"
 #    monthly_sub: "Monthly Subscription"
 #    buy_now: "Buy now"
@@ -3046,6 +3060,7 @@ module.exports = nativeDescription: "azərbaycan dili", englishDescription: "Aze
 #    start_free_trial_today: "Start free trial today"
 #    live_classes_title: "Live coding classes from CodeCombat!"
 #    live_class_booked_thank_you: "Your live class has been booked, thank you!"
+#    book_your_class: "Book Your Class"
 
 #  parent_modal:
 #    refer_teacher: "Refer Teacher"