Merge pull request #4 from codecombat/master

Update

.gitignore

@@ -28,6 +28,9 @@ Thumbs.db
 *.sublime-project
 *.sublime-workspace
 
+# IntelliJ/WebStorm
+*.iml
+
 # NPM packages folder.
 node_modules/
 bower_components/
@@ -77,4 +80,10 @@ bin/mongo/
 # windows
 /SCOCODE.bat
 
+# local settings
+login.coffee
+
+# debugging
+*.heapsnapshot
+
 ### If you add something here, copy it to the end of .npmignore, too. ###

.npmignore

@@ -53,6 +53,9 @@ Thumbs.db
 *.sublime-project
 *.sublime-workspace
 
+# IntelliJ/WebStorm
+*.iml
+
 # NPM packages folder.
 node_modules/
 
@@ -89,6 +92,12 @@ mongo/
 bin/node/
 bin/mongo/
 
-
 # Karma coverage
 coverage/
+
+# local settings
+login.coffee
+
+# debugging
+*.heapsnapshot
+

app/application.coffee

@@ -1,10 +1,16 @@
 FacebookHandler = require 'lib/FacebookHandler'
 GPlusHandler = require 'lib/GPlusHandler'
+LinkedInHandler = require 'lib/LinkedInHandler'
 locale = require 'locale/locale'
 {me} = require 'lib/auth'
 Tracker = require 'lib/Tracker'
 CocoView = require 'views/kinds/CocoView'
 
+marked.setOptions {gfm: true, sanitize: true, smartLists: true, breaks: false}
+
+# TODO, add C-style macro constants like this?
+window.SPRITE_RESOLUTION_FACTOR = 4
+
 # Prevent Ctrl/Cmd + [ / ], P, S
 ctrlDefaultPrevented = [219, 221, 80, 83]
 preventBackspace = (event) ->
@@ -22,7 +28,7 @@ elementAcceptsKeystrokes = (el) ->
   # not radio, checkbox, range, or color
   return (tag is 'textarea' or (tag is 'input' and type in textInputTypes) or el.contentEditable in ["", "true"]) and not (el.readOnly or el.disabled)
 
-COMMON_FILES = ['/images/pages/base/modal_background.png', '/images/level/code_palette_background.png']
+COMMON_FILES = ['/images/pages/base/modal_background.png', '/images/level/code_palette_background.png', '/images/level/popover_background.png', '/images/level/code_editor_background.png']
 preload = (arrayOfImages) ->
   $(arrayOfImages).each ->
     $('<img/>')[0].src = @
@@ -33,7 +39,7 @@ Application = initialize: ->
   @facebookHandler = new FacebookHandler()
   @gplusHandler = new GPlusHandler()
   $(document).bind 'keydown', preventBackspace
-
+  @linkedinHandler = new LinkedInHandler()
   preload(COMMON_FILES)
   $.i18n.init {
     lng: me?.lang() ? 'en'

app/assets/fonts/glyphicons-halflings-regular.svg

@@ -0,0 +1,229 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph />
+<glyph />
+<glyph unicode="&#xd;" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
+<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#x2000;" horiz-adv-x="652" />
+<glyph unicode="&#x2001;" horiz-adv-x="1304" />
+<glyph unicode="&#x2002;" horiz-adv-x="652" />
+<glyph unicode="&#x2003;" horiz-adv-x="1304" />
+<glyph unicode="&#x2004;" horiz-adv-x="434" />
+<glyph unicode="&#x2005;" horiz-adv-x="326" />
+<glyph unicode="&#x2006;" horiz-adv-x="217" />
+<glyph unicode="&#x2007;" horiz-adv-x="217" />
+<glyph unicode="&#x2008;" horiz-adv-x="163" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="326" />
+<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
+<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
+<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
+<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
+<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
+<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
+<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
+<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
+<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
+<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
+<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
+<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
+<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
+<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
+<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
+<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
+<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
+<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
+<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
+<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
+<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
+<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
+<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
+<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
+<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
+<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
+<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
+<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
+<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
+<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
+<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
+<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
+<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
+<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
+<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
+<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
+<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
+<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
+<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
+<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
+<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
+<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
+<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
+<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
+<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
+<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
+<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
+<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
+<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
+<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
+<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
+<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
+<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
+<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
+<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
+<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
+<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
+<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
+<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
+<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
+<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
+<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
+<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
+<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
+<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
+<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
+<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
+<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
+<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
+<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
+<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
+<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
+<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
+<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
+<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
+<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
+<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
+<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
+<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
+<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
+<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
+<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
+<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
+<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
+<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
+<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
+<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
+<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
+<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
+<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
+<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
+<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
+<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
+<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
+<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
+<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
+<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
+<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
+<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
+<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
+<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
+<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
+<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
+<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
+<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
+<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
+<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
+<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
+<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
+<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
+<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
+<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
+<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
+<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
+<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
+<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
+<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
+<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
+<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
+<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
+<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
+<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
+<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
+<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
+<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
+<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
+<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
+<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
+<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
+<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
+<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
+<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
+<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
+<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
+<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
+<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
+<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
+<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
+<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
+<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
+<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
+<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
+<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
+<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
+<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
+<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
+<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
+<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
+<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
+<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
+<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
+<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
+<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
+<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
+<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
+<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
+<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
+<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
+<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
+<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
+<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
+<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
+<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
+<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
+<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+</font>
+</defs></svg> 

app/assets/javascripts/workers/aether_worker.js

@@ -0,0 +1,99 @@
+var window = self;
+var Global = self;
+
+importScripts("/javascripts/lodash.js", "/javascripts/aether.js");
+console.log("Aether Tome worker has finished importing scripts.");
+var aethers = {};
+
+var createAether = function (spellKey, options) 
+{
+    aethers[spellKey] = new Aether(options);
+    return JSON.stringify({
+        "message": "Created aether for " + spellKey,
+        "function": "createAether"
+    });
+};
+
+var hasChangedSignificantly = function(spellKey, a,b,careAboutLineNumbers,careAboutLint) {
+    
+    var hasChanged = aethers[spellKey].hasChangedSignificantly(a,b,careAboutLineNumbers,careAboutLint);
+    var functionName = "hasChangedSignificantly";
+    var returnObject = {
+        "function":functionName,
+        "hasChanged": hasChanged,
+        "spellKey": spellKey
+    };
+    return JSON.stringify(returnObject);
+};
+
+var updateLanguageAether = function(newLanguage) 
+{
+    for (var spellKey in aethers)
+    {
+        if (aethers.hasOwnProperty(spellKey))
+        {
+            aethers[spellKey].setLanguage(newLanguage);
+        }
+        
+    }
+};
+
+var lint = function(spellKey, source)
+{
+    var currentAether = aethers[spellKey];
+    var lintMessages = currentAether.lint(source);
+    var functionName = "lint";
+    var returnObject = {
+        "lintMessages": lintMessages,
+        "function": functionName
+    };
+    return JSON.stringify(returnObject);
+};
+
+var transpile = function(spellKey, source)
+{
+    var currentAether = aethers[spellKey];
+    currentAether.transpile(source);
+    var functionName = "transpile";
+    var returnObject = {
+        "problems": currentAether.problems,
+        "function": functionName,
+        "spellKey": spellKey
+    };
+    return JSON.stringify(returnObject);
+};
+self.addEventListener('message', function(e) {
+    var data = JSON.parse(e.data);
+    if (data.function == "createAether")
+    {
+        self.postMessage(createAether(data.spellKey, data.options));
+    }
+    else if (data.function == "updateLanguageAether")
+    {
+        updateLanguageAether(data.newLanguage)
+    }
+    else if (data.function == "hasChangedSignificantly")
+    {
+        self.postMessage(hasChangedSignificantly(
+            data.spellKey,
+            data.a,
+            data.b,
+            data.careAboutLineNumbers,
+            data.careAboutLint
+        ));
+    }
+    else if (data.function == "lint")
+    {
+        self.postMessage(lint(data.spellKey, data.source));
+    }
+    else if (data.function == "transpile")
+    {
+        self.postMessage(transpile(data.spellKey, data.source));
+    }
+    else
+    {
+        var message = "Didn't execute any function...";
+        var returnObject = {"message":message, "function":"none"};
+        self.postMessage(JSON.stringify(returnObject));
+    }
+}, false); 

app/assets/javascripts/workers/worker_world.js

@@ -1,7 +1,5 @@
-// There's no reason that this file is in JavaScript instead of CoffeeScript.
+// This file is in JavaScript because we can't figure out how to get brunch to compile it bare.
-// We should convert it and update the brunch config.
 
-// If we wanted to be more robust, we could use this: https://github.com/padolsey/operative/blob/master/src/operative.js
 if(typeof window !== 'undefined' || !self.importScripts)
   throw "Attempt to load worker_world into main window instead of web worker.";
 
@@ -31,7 +29,7 @@ if (!Function.prototype.bind) {
   };
 }
 
-// assign global window so that Brunch's require (in world.js) can go into it
+// Assign global window so that Brunch's require (in world.js) can go into it
 self.window = self;
 self.workerID = "Worker";
 
@@ -42,7 +40,7 @@ var console = {
     if(self.logsLogged++ == self.logLimit)
       self.postMessage({type: 'console-log', args: ["Log limit " + self.logLimit + " reached; shutting up."], id: self.workerID});
     else if(self.logsLogged < self.logLimit) {
-      args = [].slice.call(arguments);
+      var args = [].slice.call(arguments);
       for(var i = 0; i < args.length; ++i) {
         if(args[i] && args[i].constructor) {
           if(args[i].constructor.className === "Thang" || args[i].isComponent)
@@ -57,10 +55,10 @@ var console = {
       }
     }
   }};  // so that we don't crash when debugging statements happen
-console.error = console.info = console.log;
+console.error = console.warn = console.info = console.debug = console.log;
 self.console = console;
 
-importScripts('/javascripts/world.js');
+self.importScripts('/javascripts/world.js', '/javascripts/lodash.js', '/javascripts/aether.js');
 
 // We could do way more from this: http://stackoverflow.com/questions/10653809/making-webworkers-a-safe-environment
 Object.defineProperty(self, "XMLHttpRequest", {
@@ -69,31 +67,273 @@ Object.defineProperty(self, "XMLHttpRequest", {
 });
 
 self.transferableSupported = function transferableSupported() {
+  if (typeof self._transferableSupported !== 'undefined') return self._transferableSupported;
   // Not in IE, even in IE 11
   try {
     var ab = new ArrayBuffer(1);
     worker.postMessage(ab, [ab]);
-    return ab.byteLength == 0;
+    return self._transferableSupported = ab.byteLength == 0;
   } catch(error) {
-    return false;
+    return self._transferableSupported = false;
   }
-  return false;
+  return self._transferableSupported = false;
-}
+};
 
 var World = self.require('lib/world/world');
 var GoalManager = self.require('lib/world/GoalManager');
 
+Aether.addGlobal('Vector', require('lib/world/vector'));
+Aether.addGlobal('_', _);
+
+var serializedClasses = {
+    "Thang": self.require('lib/world/thang'),
+    "Vector": self.require('lib/world/vector'),
+    "Rectangle": self.require('lib/world/rectangle')
+};
+self.currentUserCodeMapCopy = "";
+self.currentDebugWorldFrame = 0;
+
+self.stringifyValue = function(value, depth) {
+    var brackets, i, isArray, isObject, key, prefix, s, sep, size, v, values, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3;
+    if (!value || _.isString(value)) {
+        return value;
+    }
+    if (_.isFunction(value)) {
+        if (depth === 2) {
+            return void 0;
+        } else {
+            return "<Function>";
+        }
+    }
+    if (value === this.thang && depth) {
+        return "<this " + value.id + ">";
+    }
+    if (depth === 2) {
+        if (((_ref = value.constructor) != null ? _ref.className : void 0) === "Thang") {
+            value = "<" + (value.type || value.spriteName) + " - " + value.id + ", " + (value.pos ? value.pos.toString() : 'non-physical') + ">";
+        } else {
+            value = value.toString();
+        }
+        return value;
+    }
+    isArray = _.isArray(value);
+    isObject = _.isObject(value);
+    if (!(isArray || isObject)) {
+        return value.toString();
+    }
+    brackets = isArray ? ["[", "]"] : ["{", "}"];
+    size = _.size(value);
+    if (!size) {
+        return brackets.join("");
+    }
+    values = [];
+    if (isArray) {
+        for (_i = 0, _len = value.length; _i < _len; _i++) {
+            v = value[_i];
+            s = this.stringifyValue(v, depth + 1);
+            if (s !== void 0) {
+                values.push("" + s);
+            }
+        }
+    } else {
+        _ref2 = (_ref1 = value.apiProperties) != null ? _ref1 : _.keys(value);
+        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
+            key = _ref2[_j];
+            if (key[0] === "_") continue;
+            s = this.stringifyValue(value[key], depth + 1);
+            if (s !== void 0) {
+                values.push(key + ": " + s);
+            }
+        }
+    }
+    sep = '\n' + ((function() {
+        var _k, _results;
+        _results = [];
+        for (i = _k = 0; 0 <= depth ? _k < depth : _k > depth; i = 0 <= depth ? ++_k : --_k) {
+            _results.push("  ");
+        }
+        return _results;
+    })()).join('');
+    prefix = (_ref3 = value.constructor) != null ? _ref3.className : void 0;
+    if (isArray) {
+        if (prefix == null) {
+            prefix = "Array";
+        }
+    }
+    if (isObject) {
+        if (prefix == null) {
+            prefix = "Object";
+        }
+    }
+    prefix = prefix ? prefix + " " : "";
+    return "" + prefix + brackets[0] + sep + "  " + (values.join(sep + '  ')) + sep + brackets[1];
+};
+
+
+self.retrieveValueFromFrame = function retrieveValueFromFrame(args) {
+
+    var retrieveProperty = function retrieveProperty(currentThangID, currentSpellID, variableChain)
+    {
+        var prop;
+        var value;
+        var keys = [];
+        for (var i = 0, len = variableChain.length; i < len; i++) {
+            prop = variableChain[i];
+            if (prop === "this")
+            {
+                value = self.debugWorld.thangMap[currentThangID];
+
+            }
+            else if (i === 0)
+            {
+                try
+                {
+                    if (Aether.globals[prop])
+                    {
+                        value = Aether.globals[prop];
+                    }
+                    else
+                    {
+                        var flowStates = self.debugWorld.userCodeMap[currentThangID][currentSpellID].flow.states;
+                        //we have to go to the second last flowState as we run the world for one additional frame
+                        //to collect the flow
+                        value = _.last(flowStates[flowStates.length - 1].statements).variables[prop];
+                    }
+                }
+                catch (e)
+                {
+                    value = undefined;
+                }
+
+            }
+            else
+            {
+                value = value[prop];
+            }
+            keys.push(prop);
+            if (!value) break;
+            var classOfValue;
+            if (classOfValue = serializedClasses[value.CN])
+            {
+                if (value.CN === "Thang")
+                {
+                    var thang = self.debugWorld.thangMap[value.id];
+                    value = thang || "<Thang " + value.id + " (non-existent)>";
+                }
+                else
+                {
+                    value = classOfValue.deserializeFromAether(value);
+                }
+            }
+        }
+        var serializedProperty = {
+            "key": keys.join("."),
+            "value": self.stringifyValue(value,0)
+        };
+        self.postMessage({type: 'debug-value-return', serialized: serializedProperty});
+    };
+    self.enableFlowOnThangSpell(args.currentThangID, args.currentSpellID, args.userCodeMap);
+    self.setupDebugWorldToRunUntilFrame(args);
+    self.debugWorld.loadFrames(
+        retrieveProperty.bind({}, args.currentThangID, args.currentSpellID, args.variableChain),
+        self.onDebugWorldError,
+        self.onDebugWorldProgress,
+        false,
+        args.frame
+    );
+};
+
+self.enableFlowOnThangSpell = function (thangID, spellID, userCodeMap) {
+    try {
+        var options = userCodeMap[thangID][spellID].originalOptions;
+        if (options.includeFlow === true && options.noSerializationInFlow === true)
+            return;
+        else
+        {
+            options.includeFlow = true;
+            options.noSerializationInFlow = true;
+            var temporaryAether = Aether.deserialize(userCodeMap[thangID][spellID]);
+            temporaryAether.transpile(temporaryAether.raw);
+            userCodeMap[thangID][spellID] = temporaryAether.serialize();
+        }
+
+    }
+    catch (error) {
+        console.log("Debug error enabling flow on", thangID, spellID + ":", error.toString() + "\n" + error.stack || error.stackTrace);
+    }
+};
+
+self.setupDebugWorldToRunUntilFrame = function (args) {
+    self.debugPostedErrors = {};
+    self.debugt0 = new Date();
+    self.debugPostedErrors = false;
+    self.logsLogged = 0;
+
+    var stringifiedUserCodeMap = JSON.stringify(args.userCodeMap);
+    var userCodeMapHasChanged = ! _.isEqual(self.currentUserCodeMapCopy, stringifiedUserCodeMap);
+    self.currentUserCodeMapCopy = stringifiedUserCodeMap;
+    if (!self.debugWorld || userCodeMapHasChanged || args.frame < self.currentDebugWorldFrame) {
+        try {
+            self.debugWorld = new World(args.userCodeMap);
+            self.debugWorld.levelSessionIDs = args.levelSessionIDs;
+            if (args.level)
+                self.debugWorld.loadFromLevel(args.level, true);
+            self.debugWorld.debugging = true;
+            self.debugGoalManager = new GoalManager(self.debugWorld);
+            self.debugGoalManager.setGoals(args.goals);
+            self.debugGoalManager.setCode(args.userCodeMap);
+            self.debugGoalManager.worldGenerationWillBegin();
+            self.debugWorld.setGoalManager(self.debugGoalManager);
+        }
+        catch (error) {
+            self.onDebugWorldError(error);
+            return;
+        }
+        Math.random = self.debugWorld.rand.randf;  // so user code is predictable
+    }
+    self.debugWorld.totalFrames = args.frame; //hack to work around error checking
+    self.currentDebugWorldFrame = args.frame;
+};
+
+
+self.onDebugWorldLoaded = function onDebugWorldLoaded() {
+    self.postMessage({type: 'debug-world-loaded'});
+};
+
+self.onDebugWorldError = function onDebugWorldError(error) {
+
+    if(!error.isUserCodeProblem) {
+        console.log("Debug Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace);
+    }
+    return true;
+};
+
+self.onDebugWorldProgress = function onDebugWorldProgress(progress) {
+    self.postMessage({type: 'debug-world-load-progress-changed', progress: progress});
+};
+
+self.debugAbort = function () {
+    if(self.debugWorld) {
+        self.debugWorld.abort();
+        self.debugWorld.destroy();
+        self.debugWorld = null;
+    }
+    self.postMessage({type: 'debug-abort'});
+};
+
 self.runWorld = function runWorld(args) {
   self.postedErrors = {};
   self.t0 = new Date();
-  self.firstWorld = args.firstWorld;
   self.postedErrors = false;
   self.logsLogged = 0;
 
   try {
-    self.world = new World(args.worldName, args.userCodeMap);
+    self.world = new World(args.userCodeMap);
+    self.world.levelSessionIDs = args.levelSessionIDs;
     if(args.level)
       self.world.loadFromLevel(args.level, true);
+    self.world.preloading = args.preload;
+    self.world.headless = args.headless;
     self.goalManager = new GoalManager(self.world);
     self.goalManager.setGoals(args.goals);
     self.goalManager.setCode(args.userCodeMap);
@@ -105,13 +345,19 @@ self.runWorld = function runWorld(args) {
     return;
   }
   Math.random = self.world.rand.randf;  // so user code is predictable
+  self.postMessage({type: 'start-load-frames'});
   self.world.loadFrames(self.onWorldLoaded, self.onWorldError, self.onWorldLoadProgress);
 };
 
 self.onWorldLoaded = function onWorldLoaded() {
   self.goalManager.worldGenerationEnded();
+  var goalStates = self.goalManager.getGoalStates();
+  self.postMessage({type: 'end-load-frames', goalStates: goalStates});
   var t1 = new Date();
   var diff = t1 - self.t0;
+  if (self.world.headless)
+    return console.log('Headless simulation completed in ' + diff + 'ms.');
+
   var transferableSupported = self.transferableSupported();
   try {
     var serialized = self.world.serialize();
@@ -122,32 +368,35 @@ self.onWorldLoaded = function onWorldLoaded() {
   var t2 = new Date();
   //console.log("About to transfer", serialized.serializedWorld.trackedPropertiesPerThangValues, serialized.transferableObjects);
   try {
+    var message = {type: 'new-world', serialized: serialized.serializedWorld, goalStates: goalStates};
     if(transferableSupported)
-      self.postMessage({type: 'new-world', serialized: serialized.serializedWorld, goalStates: self.goalManager.getGoalStates()}, serialized.transferableObjects);
+      self.postMessage(message, serialized.transferableObjects);
     else
-      self.postMessage({type: 'new-world', serialized: serialized.serializedWorld, goalStates: self.goalManager.getGoalStates()});
+      self.postMessage(message);
   }
   catch(error) {
     console.log("World delivery error:", error.toString() + "\n" + error.stack || error.stackTrace);
   }
   var t3 = new Date();
   console.log("And it was so: (" + (diff / self.world.totalFrames).toFixed(3) + "ms per frame,", self.world.totalFrames, "frames)\nSimulation   :", diff + "ms \nSerialization:", (t2 - t1) + "ms\nDelivery     :", (t3 - t2) + "ms");
+  self.world.goalManager.destroy();
+  self.world.destroy();
   self.world = null;
 };
 
 self.onWorldError = function onWorldError(error) {
-  if(error instanceof Aether.problems.UserCodeProblem) {
+  if(error.isUserCodeProblem) {
-    if(!self.postedErrors[error.key]) {
+    var errorKey = error.userInfo.key;
-      var problem = error.serialize();
+    if(!errorKey || !self.postedErrors[errorKey]) {
-      self.postMessage({type: 'user-code-problem', problem: problem});
+      self.postMessage({type: 'user-code-problem', problem: error});
-      self.postedErrors[error.key] = problem;
+      self.postedErrors[errorKey] = error;
     }
   }
   else {
     console.log("Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace);
   }
   /*  We don't actually have the recoverable property any more; hmm
-  if(!self.firstWorld && !error.recoverable) {
+  if(!error.recoverable) {
     self.abort();
     return false;
   }
@@ -160,18 +409,22 @@ self.onWorldLoadProgress = function onWorldLoadProgress(progress) {
 };
 
 self.abort = function abort() {
-  if(self.world && self.world.name) {
+  if(self.world) {
-    console.log("About to abort:", self.world.name, typeof self.world.abort);
-    if(typeof self.world !== "undefined")
     self.world.abort();
+    self.world.goalManager.destroy();
+    self.world.destroy();
     self.world = null;
   }
   self.postMessage({type: 'abort'});
 };
 
 self.reportIn = function reportIn() {
-  self.postMessage({type: 'reportIn'});
+  self.postMessage({type: 'report-in'});
-}
+};
+
+self.finalizePreload = function finalizePreload() {
+  self.world.finalizePreload(self.onWorldLoaded);
+};
 
 self.addEventListener('message', function(event) {
   self[event.data.func](event.data.args);

app/assets/lib/ace/mode-python.js

@@ -0,0 +1 @@
+ace.define("ace/mode/python",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/python_highlight_rules","ace/mode/folding/pythonic","ace/range"],function(e,t,n){var r=e("../lib/oop"),i=e("./text").Mode,s=e("./python_highlight_rules").PythonHighlightRules,o=e("./folding/pythonic").FoldMode,u=e("../range").Range,a=function(){this.HighlightRules=s,this.foldingRules=new o("\\:")};r.inherits(a,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[\:]\s*$/);o&&(r+=n)}return r};var e={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(t,n,r){if(r!=="\r\n"&&r!=="\r"&&r!=="\n")return!1;var i=this.getTokenizer().getLineTokens(n.trim(),t).tokens;if(!i)return!1;do var s=i.pop();while(s&&(s.type=="comment"||s.type=="text"&&s.value.match(/^\s+$/)));return s?s.type=="keyword"&&e[s.value]:!1},this.autoOutdent=function(e,t,n){n+=1;var r=this.$getIndent(t.getLine(n)),i=t.getTabString();r.slice(-i.length)==i&&t.remove(new u(n,r.length-i.length,n,r.length))},this.$id="ace/mode/python"}.call(a.prototype),t.Mode=a}),ace.define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){var e="and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield",t="True|False|None|NotImplemented|Ellipsis|__debug__",n="abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern",r=this.createKeywordMapper({"invalid.deprecated":"debugger","support.function":n,"constant.language":t,keyword:e},"identifier"),i="(?:r|u|ur|R|U|UR|Ur|uR)?",s="(?:(?:[1-9]\\d*)|(?:0))",o="(?:0[oO]?[0-7]+)",u="(?:0[xX][\\dA-Fa-f]+)",a="(?:0[bB][01]+)",f="(?:"+s+"|"+o+"|"+u+"|"+a+")",l="(?:[eE][+-]?\\d+)",c="(?:\\.\\d+)",h="(?:\\d+)",p="(?:(?:"+h+"?"+c+")|(?:"+h+"\\.))",d="(?:(?:"+p+"|"+h+")"+l+")",v="(?:"+d+"|"+p+")",m="\\\\(x[0-9A-Fa-f]{2}|[0-7]{3}|[\\\\abfnrtv'\"]|U[0-9A-Fa-f]{8}|u[0-9A-Fa-f]{4})";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:i+'"{3}',next:"qqstring3"},{token:"string",regex:i+'"(?=.)',next:"qqstring"},{token:"string",regex:i+"'{3}",next:"qstring3"},{token:"string",regex:i+"'(?=.)",next:"qstring"},{token:"constant.numeric",regex:"(?:"+v+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:v},{token:"constant.numeric",regex:f+"[lL]\\b"},{token:"constant.numeric",regex:f+"\\b"},{token:r,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"paren.lparen",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring3:[{token:"constant.language.escape",regex:m},{token:"string",regex:'"{3}',next:"start"},{defaultToken:"string"}],qstring3:[{token:"constant.language.escape",regex:m},{token:"string",regex:"'{3}",next:"start"},{defaultToken:"string"}],qqstring:[{token:"constant.language.escape",regex:m},{token:"string",regex:"\\\\$",next:"qqstring"},{token:"string",regex:'"|$',next:"start"},{defaultToken:"string"}],qstring:[{token:"constant.language.escape",regex:m},{token:"string",regex:"\\\\$",next:"qstring"},{token:"string",regex:"'|$",next:"start"},{defaultToken:"string"}]}};r.inherits(s,i),t.PythonHighlightRules=s}),ace.define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(e,t,n){var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=t.FoldMode=function(e){this.foldingStartMarker=new RegExp("([\\[{])(?:\\s*)$|("+e+")(?:\\s*)(?:#.*)?$")};r.inherits(s,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=e.getLine(n),i=r.match(this.foldingStartMarker);if(i)return i[1]?this.openingBracketBlock(e,i[1],n,i.index):i[2]?this.indentationBlock(e,n,i.index+i[2].length):this.indentationBlock(e,n)}}.call(s.prototype)})

app/assets/main.html

@@ -34,6 +34,7 @@
   <script src="/lib/ace/ace.js"></script>  
   <!--[if IE 9]>     <script src="/javascripts/vendor_with_box2d.js"></script> <![endif]-->
   <!--[if !IE]><!--> <script src="/javascripts/vendor.js"></script>            <!--<![endif]-->
+  <script src="/javascripts/aether.js"></script>
   <script src="/javascripts/app.js"></script> <!-- it's all Backbone! -->
   
   <script>
@@ -42,7 +43,18 @@
   
   <script>require('initialize');</script>
 
-
+  <!-- begin LinkedIn code -->
+  <script>
+    window.linkedInAsyncInit = function() {
+      Backbone.Mediator.publish('linkedin-loaded');
+    };
+  </script>
+  <script type="text/javascript" src="http://platform.linkedin.com/in.js">
+    api_key: 75v8mv4ictvmx6
+    onLoad: linkedInAsyncInit
+    authorize: true
+  </script>
+  <!-- end LinkedIn code -->
   <!-- begin segment.io code -->
   <script type="text/javascript">
   var analytics=analytics||[];(function(){var e=["identify","track","trackLink","trackForm","trackClick","trackSubmit","page","pageview","ab","alias","ready","group"],t=function(e){return function(){analytics.push([e].concat(Array.prototype.slice.call(arguments,0)))}};for(var n=0;n<e.length;n++)analytics[e[n]]=t(e[n])})(),analytics.load=function(e){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=("https:"===document.location.protocol?"https://":"http://")+"d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/"+e+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n)};
@@ -71,8 +83,9 @@
     olark.identify('1451-787-10-5544');/*]]>*/</script>
   <!-- end olark code -->
     
+
 </head>
-<body>
+<body class="nano clearfix">
   <div id="fb-root"></div>
 
 <!-- begin facebook code -->
@@ -117,16 +130,9 @@
 
   <header class="header-container" id="header-container"></header>
   
-  <div id="page-container"></div>
+  <div id="page-container" class="nano-content"></div>
-  <!--
-  <div class="antiscroll-wrap">
-    <div class="antiscroll-inner">
-      <div id="page-container"></div>
-    </div>
-  </div>
-  -->
 
-  <div id="modal-wrapper"></div>
+  <div id="modal-wrapper" class="modal-content"></div>
 
   <!-- begin google api/plus code -->
   <script type="text/javascript">

app/collections/CocoCollection.coffee

@@ -0,0 +1,16 @@
+module.exports = class CocoCollection extends Backbone.Collection
+  loaded: false
+
+  initialize: ->
+    super()
+    @once 'sync', =>
+      @loaded = true
+      model.loaded = true for model in @models
+
+  getURL: ->
+    return if _.isString @url then @url else @url()
+
+  fetch: ->
+    @jqxhr = super(arguments...)
+    @loading = true
+    @jqxhr

app/collections/ComponentsCollection.coffee

@@ -1,5 +1,5 @@
 LevelComponent = require 'models/LevelComponent'
-CocoCollection = require 'models/CocoCollection'
+CocoCollection = require 'collections/CocoCollection'
 
 module.exports = class ComponentsCollection extends CocoCollection
   url: '/db/level.component/search'

app/collections/DocumentFiles.coffee

@@ -1,6 +1,9 @@
-CocoCollection = require 'models/CocoCollection'
+CocoCollection = require 'collections/CocoCollection'
+File = require 'models/File'
 
 module.exports = class ModelFiles extends CocoCollection
+  model: File
+  
   constructor: (model) ->
     super()
     url = model.constructor.prototype.urlRoot

app/collections/LeaderboardCollection.coffee

@@ -1,4 +1,4 @@
-CocoCollection = require 'models/CocoCollection'
+CocoCollection = require 'collections/CocoCollection'
 LevelSession = require 'models/LevelSession'
 
 module.exports = class LeaderboardCollection extends CocoCollection

app/collections/PatchesCollection.coffee

@@ -0,0 +1,10 @@
+PatchModel = require 'models/Patch'
+CocoCollection = require 'collections/CocoCollection'
+
+module.exports = class PatchesCollection extends CocoCollection
+  model: PatchModel
+  
+  initialize: (models, options, forModel, @status='pending') ->
+    super(arguments...)
+    @url = "#{forModel.urlRoot}/#{forModel.get('original')}/patches?status=#{@status}"
+    

app/collections/SimulatorsLeaderboardCollection.coffee

@@ -0,0 +1,11 @@
+CocoCollection = require 'collections/CocoCollection'
+User = require 'models/User'
+
+module.exports = class SimulatorsLeaderboardCollection extends CocoCollection
+  url: ''
+  model: User
+
+  constructor: (options) ->
+    super()
+    options ?= {}
+    @url = "/db/user/me/simulatorLeaderboard?#{$.param(options)}"

app/collections/ThangNamesCollection.coffee

@@ -0,0 +1,14 @@
+ThangType = require 'models/ThangType'
+CocoCollection = require 'collections/CocoCollection'
+
+module.exports = class ThangNamesCollection extends CocoCollection
+  url: '/db/thang.type/names'
+  model: ThangType
+  isCachable: false
+
+  constructor: (@ids) -> super()
+    
+  fetch: (options) ->
+    options ?= {}
+    _.extend options, {type:'POST', data:{ids:@ids}}
+    super(options)

app/initialize.coffee

@@ -1,6 +1,27 @@
+Backbone.Mediator.setValidationEnabled false
 app = require 'application'
 
+channelSchemas =
+  'app': require './schemas/subscriptions/app'
+  'bus': require './schemas/subscriptions/bus'
+  'editor': require './schemas/subscriptions/editor'
+  'errors': require './schemas/subscriptions/errors'
+  'misc': require './schemas/subscriptions/misc'
+  'play': require './schemas/subscriptions/play'
+  'surface': require './schemas/subscriptions/surface'
+  'tome': require './schemas/subscriptions/tome'
+  'user': require './schemas/subscriptions/user'
+  'world': require './schemas/subscriptions/world'
+
+definitionSchemas =
+  'bus': require './schemas/definitions/bus'
+  'misc': require './schemas/definitions/misc'
+
 init = ->
+  # Set up Backbone.Mediator schemas
+  setUpDefinitions()
+  setUpChannels()
+  Backbone.Mediator.setValidationEnabled document.location.href.search(/codecombat.com/) is -1
   app.initialize()
   Backbone.history.start({ pushState: true })
   handleNormalUrls()
@@ -32,3 +53,10 @@ handleNormalUrls = ->
 
       return false
 
+setUpChannels = ->
+  for channel of channelSchemas
+    Backbone.Mediator.addChannelSchemas channelSchemas[channel]
+
+setUpDefinitions = ->
+  for definition of definitionSchemas
+    Backbone.Mediator.addDefSchemas definitionSchemas[definition]

app/lib/Angel.coffee

@@ -0,0 +1,211 @@
+# Every Angel has one web worker attached to it. It will call methods inside the worker and kill it if it times out.
+# God is the public API; Angels are an implementation detail. Each God can have one or more Angels.
+
+{now} = require 'lib/world/world_utils'
+World = require 'lib/world/world'
+CocoClass = require 'lib/CocoClass'
+
+module.exports = class Angel extends CocoClass
+  @nicks: ['Archer', 'Lana', 'Cyril', 'Pam', 'Cheryl', 'Woodhouse', 'Ray', 'Krieger']
+
+  infiniteLoopIntervalDuration: 5000  # check this often
+  infiniteLoopTimeoutDuration: 2500  # wait this long for a response when checking
+  abortTimeoutDuration: 500  # give in-process or dying workers this long to give up
+
+  constructor: (@shared) ->
+    super()
+    @say 'Got my wings.'
+    if window.navigator and (window.navigator.userAgent.search("MSIE") isnt -1 or window.navigator.appName is 'Microsoft Internet Explorer')
+      @infiniteLoopIntervalDuration *= 10  # since it's so slow to serialize without transferable objects, we can't trust it
+      @infiniteLoopTimeoutDuration *= 10
+      @abortTimeoutDuration *= 10
+    @initialized = false
+    @running = false
+    @hireWorker()
+    @shared.angels.push @
+
+  destroy: ->
+    @fireWorker false
+    _.remove @shared.angels, @
+    super()
+
+  workIfIdle: ->
+    @doWork() unless @running
+
+  # say: debugging stuff, usually off; log: important performance indicators, keep on
+  say: (args...) -> #@log args...
+  log: (args...) -> console.log "|#{@shared.godNick}'s #{@nick}|", args...
+
+  testWorker: =>
+    return if @destroyed
+    clearTimeout @condemnTimeout
+    @condemnTimeout = _.delay @infinitelyLooped, @infiniteLoopTimeoutDuration
+    @say "Let's give it", @infiniteLoopTimeoutDuration, "to not loop."
+    @worker.postMessage func: 'reportIn'
+
+  onWorkerMessage: (event) =>
+    return @say 'Currently aborting old work.' if @aborting and event.data.type isnt 'abort'
+
+    switch event.data.type
+      # First step: worker has to load the scripts.
+      when 'worker-initialized'
+        unless @initialized
+          @log "Worker initialized after #{(new Date()) - @worker.creationTime}ms"
+          @initialized = true
+          @doWork()
+
+      # We watch over the worker as it loads the world frames to make sure it doesn't infinitely loop.
+      when 'start-load-frames'
+        clearTimeout @condemnTimeout
+      when 'report-in'
+        clearTimeout @condemnTimeout
+      when 'end-load-frames'
+        clearTimeout @condemnTimeout
+        @beholdGoalStates event.data.goalStates  # Work ends here if we're headless.
+
+      # We pay attention to certain progress indicators as the world loads.
+      when 'world-load-progress-changed'
+        Backbone.Mediator.publish 'god:world-load-progress-changed', event.data
+      when 'console-log'
+        @log event.data.args...
+      when 'user-code-problem'
+        Backbone.Mediator.publish 'god:user-code-problem', problem: event.data.problem
+
+      # Either the world finished simulating successfully, or we abort the worker.
+      when 'new-world'
+        @beholdWorld event.data.serialized, event.data.goalStates
+      when 'abort'
+        @say "Aborted.", event.data
+        clearTimeout @abortTimeout
+        @aborting = false
+        @running = false
+        _.remove @shared.busyAngels, @
+        @doWork()
+
+      else
+        @log "Received unsupported message:", event.data
+
+  beholdGoalStates: (goalStates) ->
+    return if @aborting
+    Backbone.Mediator.publish 'god:goals-calculated', goalStates: goalStates
+    @finishWork() if @shared.headless
+
+  beholdWorld: (serialized, goalStates) ->
+    return if @aborting
+    # Toggle BOX2D_ENABLED during deserialization so that if we have box2d in the namespace, the Collides Components still don't try to create bodies for deserialized Thangs upon attachment.
+    window.BOX2D_ENABLED = false
+    World.deserialize serialized, @shared.worldClassMap, @shared.lastSerializedWorldFrames, @finishBeholdingWorld(goalStates)
+    window.BOX2D_ENABLED = true
+    @shared.lastSerializedWorldFrames = serialized.frames
+
+  finishBeholdingWorld: (goalStates) -> (world) =>
+    return if @aborting
+    world.findFirstChangedFrame @shared.world
+    @shared.world = world
+    errorCount = (t for t in @shared.world.thangs when t.errorsOut).length
+    Backbone.Mediator.publish 'god:new-world-created', world: world, firstWorld: @shared.firstWorld, errorCount: errorCount, goalStates: goalStates, team: me.team
+    for scriptNote in @shared.world.scriptNotes
+      Backbone.Mediator.publish scriptNote.channel, scriptNote.event
+    @shared.goalManager?.world = world
+    @finishWork()
+
+  finishWork: ->
+    @shared.firstWorld = false
+    @running = false
+    _.remove @shared.busyAngels, @
+    @doWork()
+
+  finalizePreload: ->
+    @say "Finalize preload."
+    @worker.postMessage func: 'finalizePreload'
+
+  infinitelyLooped: =>
+    @say "On infinitely looped! Aborting?", @aborting
+    return if @aborting
+    problem = type: "runtime", level: "error", id: "runtime_InfiniteLoop", message: "Code never finished. It's either really slow or has an infinite loop."
+    Backbone.Mediator.publish 'god:user-code-problem', problem: problem
+    Backbone.Mediator.publish 'god:infinite-loop', firstWorld: @shared.firstWorld
+    @fireWorker()
+
+  doWork: ->
+    return if @aborting
+    return @say "Not initialized for work yet." unless @initialized
+    if @shared.workQueue.length
+      @work = @shared.workQueue.shift()
+      return _.defer @simulateSync, @work if @work.synchronous
+      @say "Running world..."
+      @running = true
+      @shared.busyAngels.push @
+      @worker.postMessage func: 'runWorld', args: @work
+      clearTimeout @purgatoryTimer
+      @say "Infinite loop timer started at interval of", @infiniteLoopIntervalDuration
+      @purgatoryTimer = setInterval @testWorker, @infiniteLoopIntervalDuration
+    else
+      @say "No work to do."
+      @hireWorker()
+
+  abort: ->
+    return unless @worker and @running
+    @say "Aborting..."
+    @running = false
+    @work = null
+    _.remove @shared.busyAngels, @
+    @abortTimeout = _.delay @fireWorker, @abortTimeoutDuration
+    @aborting = true
+    @worker.postMessage func: 'abort'
+
+  fireWorker: (rehire=true) =>
+    @aborting = false
+    @running = false
+    _.remove @shared.busyAngels, @
+    @worker?.removeEventListener 'message', @onWorkerMessage
+    @worker?.terminate()
+    @worker = null
+    clearTimeout @condemnTimeout
+    clearInterval @purgatoryTimer
+    @say "Fired worker."
+    @initialized = false
+    @work = null
+    @hireWorker() if rehire
+
+  hireWorker: ->
+    return if @worker
+    @say "Hiring worker."
+    @worker = new Worker @shared.workerCode
+    @worker.addEventListener 'message', @onWorkerMessage
+    @worker.creationTime = new Date()
+
+
+  #### Synchronous code for running worlds on main thread (profiling / IE9) ####
+  simulateSync: (work) =>
+    console?.profile? "World Generation #{(Math.random() * 1000).toFixed(0)}" if imitateIE9?
+    work.t0 = now()
+    work.testWorld = testWorld = new World work.userCodeMap
+    testWorld.loadFromLevel work.level
+    if @shared.goalManager
+      testGM = new @shared.goalManager.constructor @testWorld
+      testGM.setGoals work.goals
+      testGM.setCode work.userCodeMap
+      testGM.worldGenerationWillBegin()
+      testWorld.setGoalManager testGM
+    @doSimulateWorld work
+    console?.profileEnd?() if imitateIE9?
+    console.log "Construction:", (work.t1 - work.t0).toFixed(0), "ms. Simulation:", (work.t2 - work.t1).toFixed(0), "ms --", ((work.t2 - work.t1) / testWorld.frames.length).toFixed(3), "ms per frame, profiled."
+
+    # If performance was really a priority in IE9, we would rework things to be able to skip this step.
+    goalStates = testGM?.getGoalStates()
+    serialized = testWorld.serialize().serializedWorld
+    window.BOX2D_ENABLED = false
+    World.deserialize serialized, @angelsShare.worldClassMap, @shared.lastSerializedWorldFrames, @finishBeholdingWorld(goalStates)
+    window.BOX2D_ENABLED = true
+    @shared.lastSerializedWorldFrames = serialized.frames
+
+  doSimulateWorld: (work) ->
+    work.t1 = now()
+    Math.random = work.testWorld.rand.randf  # so user code is predictable
+    i = 0
+    while i < work.testWorld.totalFrames
+      frame = work.testWorld.getFrame i++
+    work.testWorld.ended = true
+    system.finish work.testWorld.thangs for system in work.testWorld.systems
+    work.t2 = now()

app/lib/CocoClass.coffee

@@ -5,12 +5,28 @@ makeScopeName = -> "class-scope-#{classCount++}"
 doNothing = ->
 
 module.exports = class CocoClass
+  @nicks: []
+  @nicksUsed: {}
+  @remainingNicks: []
+  @nextNick: ->
+    return (@name or "CocoClass") + " " + classCount unless @nicks.length
+    @remainingNicks = if @remainingNicks.length then @remainingNicks else @nicks.slice()
+    baseNick = @remainingNicks.splice(Math.floor(Math.random() * @remainingNicks.length), 1)[0]
+    i = 0
+    while true
+      nick = if i then "#{baseNick} #{i}" else baseNick
+      break unless @nicksUsed[nick]
+      i++
+    @nicksUsed[nick] = true
+    nick
+
   subscriptions: {}
   shortcuts: {}
 
   # setup/teardown
 
   constructor: ->
+    @nick = @constructor.nextNick()
     @subscriptions = utils.combineAncestralObject(@, 'subscriptions')
     @shortcuts = utils.combineAncestralObject(@, 'shortcuts')
     @listenToSubscriptions()
@@ -21,9 +37,10 @@ module.exports = class CocoClass
   destroy: ->
     # teardown subscriptions, prevent new ones
     @stopListening?()
-    @off()
+    @off?()
     @unsubscribeAll()
     @stopListeningToShortcuts()
+    @constructor.nicksUsed[@nick] = false
     @[key] = undefined for key of @
     @destroyed = true
     @off = doNothing
@@ -48,6 +65,7 @@ module.exports = class CocoClass
     Backbone.Mediator.subscribe(channel, func, @)
 
   unsubscribeAll: ->
+    return unless Backbone?.Mediator?
     for channel, func of @subscriptions
       func = utils.normalizeFunc(func, @)
       Backbone.Mediator.unsubscribe(channel, func, @)

app/lib/GPlusHandler.coffee

@@ -107,9 +107,10 @@ module.exports = GPlusHandler = class GPlusHandler extends CocoClass
 
   loadFriends: (friendsCallback) ->
     return friendsCallback() unless @loggedIn
-    expires_in = if @accessToken then parseInt(@accessToken.expires_at) - new Date().getTime()/1000 else -1
+    expiresIn = if @accessToken then parseInt(@accessToken.expires_at) - new Date().getTime()/1000 else -1
     onReauthorized = => gapi.client.request({path:'/plus/v1/people/me/people/visible', callback: friendsCallback})
-    if expires_in < 0
+    if expiresIn < 0
+      # TODO: this tries to open a popup window, which might not ever finish or work, so the callback may never be called.
       @reauthorize()
       @listenToOnce(@, 'logged-in', onReauthorized)
     else

app/lib/God.coffee

@@ -1,290 +1,153 @@
+# Each LevelView or Simulator has a God which listens for spells cast and summons new Angels on the main thread to
+# oversee simulation of the World on worker threads. The Gods and Angels even have names. It's kind of fun.
+# (More fun than ThreadPool and WorkerAgentManager and such.)
+
 {now} = require 'lib/world/world_utils'
 World = require 'lib/world/world'
+CocoClass = require 'lib/CocoClass'
+Angel = require 'lib/Angel'
 
-## Uncomment to imitate IE9 (and in world_utils.coffee)
+module.exports = class God extends CocoClass
-#window.Worker = null
+  @nicks: ['Athena', 'Baldr', 'Crom', 'Dagr', 'Eris', 'Freyja', 'Great Gish', 'Hades', 'Ishtar', 'Janus', 'Khronos', 'Loki', 'Marduk', 'Negafook', 'Odin', 'Poseidon', 'Quetzalcoatl', 'Ra', 'Shiva', 'Thor', 'Umvelinqangi', 'Týr', 'Vishnu', 'Wepwawet', 'Xipe Totec', 'Yahweh', 'Zeus', '上帝', 'Tiamat', '盘古', 'Phoebe', 'Artemis', 'Osiris', "嫦娥", 'Anhur', 'Teshub', 'Enlil', 'Perkele', 'Chaos', 'Hera', 'Iris', 'Theia', 'Uranus', 'Stribog', 'Sabazios', 'Izanagi', 'Ao', 'Tāwhirimātea', 'Tengri', 'Inmar', 'Torngarsuk', 'Centzonhuitznahua', 'Hunab Ku', 'Apollo', 'Helios', 'Thoth', 'Hyperion', 'Alectrona', 'Eos', 'Mitra', 'Saranyu', 'Freyr', 'Koyash', 'Atropos', 'Clotho', 'Lachesis', 'Tyche', 'Skuld', 'Urðr', 'Verðandi', 'Camaxtli', 'Huhetotl', 'Set', 'Anu', 'Allah', 'Anshar', 'Hermes', 'Lugh', 'Brigit', 'Manannan Mac Lir', 'Persephone', 'Mercury', 'Venus', 'Mars', 'Azrael', 'He-Man', 'Anansi', 'Issek', 'Mog', 'Kos', 'Amaterasu Omikami', 'Raijin', 'Susanowo', 'Blind Io', 'The Lady', 'Offler', 'Ptah', 'Anubis', 'Ereshkigal', 'Nergal', 'Thanatos', 'Macaria', 'Angelos', 'Erebus', 'Hecate', 'Hel', 'Orcus', 'Ishtar-Deela Nakh', 'Prometheus', 'Hephaestos', 'Sekhmet', 'Ares', 'Enyo', 'Otrera', 'Pele', 'Hadúr', 'Hachiman', 'Dayisun Tngri', 'Ullr', 'Lua', 'Minerva']
-#window.Float32Array = null
-# Also uncomment vendor_with_box2d.js in index.html if you want Collision to run and things to move.
 
-module.exports = class God
+  subscriptions:
-  @ids: ['Athena', 'Baldr', 'Crom', 'Dagr', 'Eris', 'Freyja', 'Great Gish', 'Hades', 'Ishtar', 'Janus', 'Khronos', 'Loki', 'Marduk', 'Negafook', 'Odin', 'Poseidon', 'Quetzalcoatl', 'Ra', 'Shiva', 'Thor', 'Umvelinqangi', 'Týr', 'Vishnu', 'Wepwawet', 'Xipe Totec', 'Yahweh', 'Zeus', '上帝', 'Tiamat', '盘古', 'Phoebe', 'Artemis', 'Osiris', "嫦娥", 'Anhur', 'Teshub', 'Enlil', 'Perkele', 'Chaos', 'Hera', 'Iris', 'Theia', 'Uranus', 'Stribog', 'Sabazios', 'Izanagi', 'Ao', 'Tāwhirimātea', 'Tengri', 'Inmar', 'Torngarsuk', 'Centzonhuitznahua', 'Hunab Ku', 'Apollo', 'Helios', 'Thoth', 'Hyperion', 'Alectrona', 'Eos', 'Mitra', 'Saranyu', 'Freyr', 'Koyash', 'Atropos', 'Clotho', 'Lachesis', 'Tyche', 'Skuld', 'Urðr', 'Verðandi', 'Camaxtli', 'Huhetotl', 'Set', 'Anu', 'Allah', 'Anshar', 'Hermes', 'Lugh', 'Brigit', 'Manannan Mac Lir', 'Persephone', 'Mercury', 'Venus', 'Mars', 'Azrael', 'He-Man', 'Anansi', 'Issek', 'Mog', 'Kos', 'Amaterasu Omikami', 'Raijin', 'Susanowo', 'Blind Io', 'The Lady', 'Offler', 'Ptah', 'Anubis', 'Ereshkigal', 'Nergal', 'Thanatos', 'Macaria', 'Angelos', 'Erebus', 'Hecate', 'Hel', 'Orcus', 'Ishtar-Deela Nakh', 'Prometheus', 'Hephaestos', 'Sekhmet', 'Ares', 'Enyo', 'Otrera', 'Pele', 'Hadúr', 'Hachiman', 'Dayisun Tngri', 'Ullr', 'Lua', 'Minerva']
+    'tome:cast-spells': 'onTomeCast'
-  @nextID: ->
+    'tome:spell-debug-value-request': 'retrieveValueFromFrame'
-    @lastID = (if @lastID? then @lastID + 1 else Math.floor(@ids.length * Math.random())) % @ids.length
+    'god:new-world-created': 'onNewWorldCreated'
-    @ids[@lastID]
 
-  worldWaiting: false  # whether we're waiting for a worker to free up and run the world
   constructor: (options) ->
-    @id = God.nextID()
     options ?= {}
-    @maxAngels = options.maxAngels ? 2  # How many concurrent web workers to use; if set past 8, make up more names
+    @retrieveValueFromFrame = _.throttle @retrieveValueFromFrame, 1000
-    @maxWorkerPoolSize = options.maxWorkerPoolSize ? 2  # ~20MB per idle worker
+    super()
-    @angels = []
+
-    @firstWorld = true
+    # Angels are all given access to this.
-    Backbone.Mediator.subscribe 'tome:cast-spells', @onTomeCast, @
+    @angelsShare =
-    @fillWorkerPool = _.throttle @fillWorkerPool, 3000, leading: false
+      workerCode: options.workerCode or '/javascripts/workers/worker_world.js'  # Either path or function
-    @fillWorkerPool()
+      headless: options.headless  # Whether to just simulate the goals, or to deserialize all simulation results
+      godNick: @nick
+      workQueue: []
+      firstWorld: true
+      world: undefined
+      goalManager: undefined
+      worldClassMap: undefined
+      angels: []
+      busyAngels: []  # Busy angels will automatically register here.
+
+    # ~20MB per idle worker + angel overhead - every Angel maps to 1 worker
+    angelCount = options.maxAngels ? 2  # How many concurrent Angels/web workers to use at a time
+    # Don't generate all Angels at once.
+    _.delay (=> new Angel @angelsShare unless @destroyed), 250 * i for i in [0 ... angelCount]
+
+  destroy: ->
+    angel.destroy() for angel in @angelsShare.angels.slice()
+    @angelsShare.goalManager?.destroy()
+    @debugWorker?.terminate()
+    @debugWorker?.removeEventListener 'message', @onDebugWorkerMessage
+    super()
+
+  setLevel: (@level) ->
+  setLevelSessionIDs: (@levelSessionIDs) ->
+  setGoalManager: (goalManager) ->
+    @angelsShare.goalManager?.destroy() unless @angelsShare.goalManager is goalManager
+    @angelsShare.goalManager = goalManager
+  setWorldClassMap: (worldClassMap) -> @angelsShare.worldClassMap = worldClassMap
 
   onTomeCast: (e) ->
-    return if @dead
+    @createWorld e.spells, e.preload
-    @spells = e.spells
-    @createWorld()
 
-  fillWorkerPool: =>
+  createWorld: (spells, preload=false) ->
-    return unless Worker and not @dead
+    console.log "#{@nick}: Let there be light upon #{@level.name}! (preload: #{preload})"
-    @workerPool ?= []
+    userCodeMap = @getUserCodeMap spells
-    if @workerPool.length < @maxWorkerPoolSize
-      @workerPool.push @createWorker()
-    if @workerPool.length < @maxWorkerPoolSize
-      @fillWorkerPool()
 
-  getWorker: ->
+    # We only want one world being simulated, so we abort other angels, unless we had one preloading this very code.
-    @fillWorkerPool()
+    hadPreloader = false
-    worker = @workerPool?.shift()
+    for angel in @angelsShare.busyAngels
-    return worker if worker
+      isPreloading = angel.running and angel.work.preload and _.isEqual angel.work.userCodeMap, userCodeMap, (a, b) ->
-    @createWorker()
+        return a.raw is b.raw if a?.raw? and b?.raw?
-
+        undefined  # Let default equality test suffice.
-  createWorker: ->
+      if not hadPreloader and isPreloading
-    worker = new Worker '/javascripts/workers/worker_world.js'
+        angel.finalizePreload()
-    worker.creationTime = new Date()
+        hadPreloader = true
-    worker.addEventListener 'message', @onWorkerMessage
+      else if preload and angel.running and not angel.work.preload
-    worker
+        # It's still running for real, so let's not preload.
-
+        return
-  onWorkerMessage: (event) =>
+      else
-    worker = event.target
-    if event.data.type is 'worker-initialized'
-      #console.log @id, "worker initialized after", ((new Date()) - worker.creationTime), "ms (before it was needed)"
-      worker.initialized = true
-      worker.removeEventListener 'message', @onWorkerMessage
-
-  getAngel: ->
-    freeAngel = null
-    for angel in @angels
-      if angel.busy
         angel.abort()
-      else
+    return if hadPreloader
-        freeAngel ?= angel
-    return freeAngel.enslave() if freeAngel
-    maxedOut = @angels.length is @maxAngels
-    if not maxedOut
-      angel = new Angel @
-      @angels.push angel
-      return angel.enslave()
-    null
 
-  angelInfinitelyLooped: (angel) ->
+    @angelsShare.workQueue = []
-    return if @dead
+    @angelsShare.workQueue.push
-    problem = type: "runtime", level: "error", id: "runtime_InfiniteLoop", message: "Code never finished. It's either really slow or has an infinite loop."
+      userCodeMap: userCodeMap
-    Backbone.Mediator.publish 'god:user-code-problem', problem: problem
-    Backbone.Mediator.publish 'god:infinite-loop', firstWorld: @firstWorld
-
-  angelAborted: (angel) ->
-    return unless @worldWaiting and not @dead
-    @createWorld()
-
-  angelUserCodeProblem: (angel, problem) ->
-    return if @dead
-    #console.log "UserCodeProblem:", '"' + problem.message + '"', "for", problem.userInfo.thangID, "-", problem.userInfo.methodName, 'at line', problem.ranges?[0][0][0], 'column', problem.ranges?[0][0][1]
-    Backbone.Mediator.publish 'god:user-code-problem', problem: problem
-
-  createWorld: ->
-    #console.log @id + ': "Let there be light upon', @world.name + '!"'
-    unless Worker?  # profiling world simulation is easier on main thread, or we are IE9
-      setTimeout @simulateWorld, 1
-      return
-
-    angel = @getAngel()
-    if angel
-      @worldWaiting = false
-    else
-      @worldWaiting = true
-      return
-    #console.log "going to run world with code", @getUserCodeMap()
-    angel.worker.postMessage {func: 'runWorld', args: {
-      worldName: @level.name
-      userCodeMap: @getUserCodeMap()
       level: @level
-      firstWorld: @firstWorld
+      levelSessionIDs: @levelSessionIDs
-      goals: @goalManager?.getGoals()
+      goals: @angelsShare.goalManager?.getGoals()
-    }}
+      headless: @angelsShare.headless
+      preload: preload
+      synchronous: not Worker?  # Profiling world simulation is easier on main thread, or we are IE9.
+    angel.workIfIdle() for angel in @angelsShare.angels
 
-  beholdWorld: (angel, serialized, goalStates) ->
+  getUserCodeMap: (spells) ->
-    worldCreation = angel.started
-    angel.free()
-    return if @latestWorldCreation? and worldCreation < @latestWorldCreation
-    @latestWorldCreation = worldCreation
-    @latestGoalStates = goalStates
-    window.BOX2D_ENABLED = false  # Flip this off so that if we have box2d in the namespace, the Collides Components still don't try to create bodies for deserialized Thangs upon attachment
-    World.deserialize serialized, @worldClassMap, @lastSerializedWorldFrames, worldCreation, @finishBeholdingWorld
-    window.BOX2D_ENABLED = true
-    @lastSerializedWorldFrames = serialized.frames
-
-  finishBeholdingWorld: (newWorld) =>
-    newWorld.findFirstChangedFrame @world
-    @world = newWorld
-    errorCount = (t for t in @world.thangs when t.errorsOut).length
-    Backbone.Mediator.publish('god:new-world-created', world: @world, firstWorld: @firstWorld, errorCount: errorCount, goalStates: @latestGoalStates, team: me.team)
-    for scriptNote in @world.scriptNotes
-      Backbone.Mediator.publish scriptNote.channel, scriptNote.event
-    @goalManager?.world = newWorld
-    @firstWorld = false
-    @testWorld = null
-    unless _.find @angels, 'busy'
-      @spells = null  # Don't hold onto old spells; memory leaks
-
-  getUserCodeMap: ->
     userCodeMap = {}
-    for spellKey, spell of @spells
+    for spellKey, spell of spells
       for thangID, spellThang of spell.thangs
         (userCodeMap[thangID] ?= {})[spell.name] = spellThang.aether.serialize()
     userCodeMap
 
-  destroy: ->
-    worker.removeEventListener 'message', @onWorkerMessage for worker in @workerPool ? []
-    angel.destroy() for angel in @angels
-    @dead = true
-    Backbone.Mediator.unsubscribe('tome:cast-spells', @onTomeCast, @)
-    @goalManager?.destroy()
-    @goalManager = null
-    @fillWorkerPool = null
-    @simulateWorld = null
-    @onWorkerMessage = null
 
-  #### Bad code for running worlds on main thread (profiling / IE9) ####
+  #### New stuff related to debugging ####
-  simulateWorld: =>
+  retrieveValueFromFrame: (args) =>
-    if Worker?
+    return if @destroyed
-      console?.profile? "World Generation #{(Math.random() * 1000).toFixed(0)}"
+    return unless args.thangID and args.spellID and args.variableChain
-    @t0 = now()
+    return console.error "Tried to retrieve debug value with no currentUserCodeMap" unless @currentUserCodeMap
-    @testWorld = new @world.constructor @world.name, @getUserCodeMap()
+    @debugWorker ?= @createDebugWorker()
-    @testWorld.loadFromLevel @level
+    args.frame ?= @angelsShare.world.age / @angelsShare.world.dt
-    if @goalManager
+    @debugWorker.postMessage
-      @testGM = new @goalManager.constructor @testWorld
+      func: 'retrieveValueFromFrame'
-      @testGM.setGoals @goalManager.getGoals()
+      args:
-      @testGM.setCode @getUserCodeMap()
+        userCodeMap: @currentUserCodeMap
-      @testGM.worldGenerationWillBegin()
+        level: @level
-      @testWorld.setGoalManager @testGM
+        levelSessionIDs: @levelSessionIDs
-    @doSimulateWorld()
+        goals: @goalManager?.getGoals()
-    if Worker?
+        frame: args.frame
-      console?.profileEnd?()
+        currentThangID: args.thangID
-    console.log "Construction:", (@t1 - @t0).toFixed(0), "ms. Simulation:", (@t2 - @t1).toFixed(0), "ms --", ((@t2 - @t1) / @testWorld.frames.length).toFixed(3), "ms per frame, profiled."
+        currentSpellID: args.spellID
+        variableChain: args.variableChain
 
-    # If performance was really a priority in IE9, we would rework things to be able to skip this step.
+  createDebugWorker: ->
-    @latestGoalStates = @testGM?.getGoalStates()
+    worker = new Worker '/javascripts/workers/worker_world.js'
-    serialized = @testWorld.serialize().serializedWorld
+    worker.addEventListener 'message', @onDebugWorkerMessage
-    window.BOX2D_ENABLED = false
+    worker
-    World.deserialize serialized, @worldClassMap, @lastSerializedWorldFrames, @t0, @finishBeholdingWorld
-    window.BOX2D_ENABLED = true
-    @lastSerializedWorldFrames = serialized.frames
 
-  doSimulateWorld: ->
+  onDebugWorkerMessage: (event) =>
-    @t1 = now()
-    Math.random = @testWorld.rand.randf  # so user code is predictable
-    i = 0
-    while i < @testWorld.totalFrames
-      frame = @testWorld.getFrame i++
-    @testWorld.ended = true
-    system.finish @testWorld.thangs for system in @testWorld.systems
-    @t2 = now()
-  #### End bad testing code ####
-
-
-class Angel
-  @ids: ['Archer', 'Lana', 'Cyril', 'Pam', 'Cheryl', 'Woodhouse', 'Ray', 'Krieger']
-  @nextID: ->
-    @lastID = (if @lastID? then @lastID + 1 else Math.floor(@ids.length * Math.random())) % @ids.length
-    @ids[@lastID]
-
-  # https://github.com/codecombat/codecombat/issues/81 -- TODO: we need to wait for worker initialization first
-  infiniteLoopIntervalDuration: 7500  # check this often (must be more than the others added)
-  infiniteLoopTimeoutDuration: 2500  # wait this long when we check
-  abortTimeoutDuration: 500  # give in-process or dying workers this long to give up
-  constructor: (@god) ->
-    @id = Angel.nextID()
-    if (navigator.userAgent or navigator.vendor or window.opera).search("MSIE") isnt -1
-      @infiniteLoopIntervalDuration *= 20  # since it's so slow to serialize without transferable objects, we can't trust it
-      @infiniteLoopTimeoutDuration *= 20
-      @abortTimeoutDuration *= 10
-    @spawnWorker()
-
-  spawnWorker: ->
-    @worker = @god.getWorker()
-    @listen()
-
-  enslave: ->
-    @busy = true
-    @started = new Date()
-    @purgatoryTimer = setInterval @testWorker, @infiniteLoopIntervalDuration
-    @spawnWorker() unless @worker
-    @
-
-  free: ->
-    @busy = false
-    @started = null
-    clearInterval @purgatoryTimer
-    @purgatoryTimer = null
-    if @worker
-      worker = @worker
-      onWorkerMessage = @onWorkerMessage
-      _.delay ->
-        worker.terminate()
-        worker.removeEventListener 'message', onWorkerMessage
-      , 3000
-      @worker = null
-    @
-
-  abort: ->
-    return unless @worker
-    @abortTimeout = _.delay @terminate, @abortTimeoutDuration
-    @worker.postMessage {func: 'abort'}
-
-  terminate: =>
-    @worker?.terminate()
-    @worker?.removeEventListener 'message', @onWorkerMessage
-    @worker = null
-    return if @dead
-    @free()
-    @god.angelAborted @
-
-  destroy: ->
-    @dead = true
-    @finishBeholdingWorld = null
-    @abort()
-    @terminate = null
-    @testWorker = null
-    @condemnWorker = null
-    @onWorkerMessage = null
-
-  testWorker: =>
-    unless @worker.initialized
-      console.warn "Worker", @id, "hadn't even loaded the scripts yet after", @infiniteLoopIntervalDuration, "ms."
-      return
-    @worker.postMessage {func: 'reportIn'}
-    @condemnTimeout = _.delay @condemnWorker, @infiniteLoopTimeoutDuration
-
-  condemnWorker: =>
-    @god.angelInfinitelyLooped @
-    @abort()
-
-  listen: ->
-    @worker.addEventListener 'message', @onWorkerMessage
-
-  onWorkerMessage: (event) =>
     switch event.data.type
-      when 'worker-initialized'
-        console.log "Worker", @id, "initialized after", ((new Date()) - @worker.creationTime), "ms (we had been waiting for it)"
-      when 'new-world'
-        @god.beholdWorld @, event.data.serialized, event.data.goalStates
-      when 'world-load-progress-changed'
-        Backbone.Mediator.publish 'god:world-load-progress-changed', event.data unless @dead
       when 'console-log'
-        console.log "|" + @god.id + "'s " + @id + "|", event.data.args...
+        console.log "|#{@nick}'s debugger|", event.data.args...
-      when 'user-code-problem'
+      when 'debug-value-return'
-        @god.angelUserCodeProblem @, event.data.problem
+        Backbone.Mediator.publish 'god:debug-value-return', event.data.serialized
-      when 'abort'
+
-        #console.log @id, "aborted."
+  onNewWorldCreated: (e) ->
-        clearTimeout @abortTimeout
+    @currentUserCodeMap = @filterUserCodeMapWhenFromWorld e.world.userCodeMap
-        @free()
+
-        @god.angelAborted @
+  filterUserCodeMapWhenFromWorld: (worldUserCodeMap) ->
-      when 'reportIn'
+    newUserCodeMap = {}
-        clearTimeout @condemnTimeout
+    for thangName, thang of worldUserCodeMap
-      else
+      newUserCodeMap[thangName] = {}
-        console.log "Unsupported message:", event.data
+      for spellName, aether of thang
+        shallowFilteredObject = _.pick aether, ['raw', 'pure', 'originalOptions']
+        newUserCodeMap[thangName][spellName] = _.cloneDeep shallowFilteredObject
+        newUserCodeMap[thangName][spellName] = _.defaults newUserCodeMap[thangName][spellName],
+          flow: {}
+          metrics: {}
+          problems:
+            errors: []
+            infos: []
+            warnings: []
+          style: {}
+    newUserCodeMap
+
+
+imitateIE9 = false  # (and in world_utils.coffee)
+if imitateIE9
+  window.Worker = null
+  window.Float32Array = null
+  # Also uncomment vendor_with_box2d.js in index.html if you want Collision to run and Thangs to move.

app/lib/LevelBus.coffee

@@ -21,11 +21,13 @@ module.exports = class LevelBus extends Bus
     'level-show-victory': 'onVictory'
     'tome:spell-changed': 'onSpellChanged'
     'tome:spell-created': 'onSpellCreated'
+    'application:idle-changed': 'onIdleChanged'
     
   constructor: ->
     super(arguments...)
     @changedSessionProperties = {}
     @saveSession = _.debounce(@saveSession, 1000, {maxWait: 5000})
+    @playerIsIdle = false
     
   init: ->
     super()
@@ -33,6 +35,15 @@ module.exports = class LevelBus extends Bus
 
   setSession: (@session) ->
     @listenTo(@session, 'change:multiplayer', @onMultiplayerChanged)
+    @timerIntervalID = setInterval(@incrementSessionPlaytime, 1000)
+    
+  onIdleChanged: (e) ->
+    @playerIsIdle = e.idle
+
+  incrementSessionPlaytime: =>
+    if @playerIsIdle then return
+    @changedSessionProperties.playtime = true
+    @session.set("playtime",@session.get("playtime") + 1)
     
   onPoint: ->
     return true unless @session?.get('multiplayer')
@@ -112,7 +123,7 @@ module.exports = class LevelBus extends Bus
     @changedSessionProperties.teamSpells = true
     @session.set({'teamSpells': @teamSpellMap})
     @saveSession()
-    if spellTeam is me.team
+    if spellTeam is me.team or spellTeam is "common"
       @onSpellChanged e  # Save the new spell to the session, too.
 
   onScriptStateChanged: (e) ->
@@ -226,4 +237,5 @@ module.exports = class LevelBus extends Bus
     tempSession.save(patch, {patch: true})
 
   destroy: ->
+    clearInterval(@timerIntervalID)
     super()

app/lib/LevelLoader.coffee

@@ -1,8 +1,13 @@
 Level = require 'models/Level'
-CocoClass = require 'lib/CocoClass'
+LevelComponent = require 'models/LevelComponent'
-AudioPlayer = require 'lib/AudioPlayer'
+LevelSystem = require 'models/LevelSystem'
+Article = require 'models/Article'
 LevelSession = require 'models/LevelSession'
 ThangType = require 'models/ThangType'
+ThangNamesCollection = require 'collections/ThangNamesCollection'
+
+CocoClass = require 'lib/CocoClass'
+AudioPlayer = require 'lib/AudioPlayer'
 app = require 'application'
 World = require 'lib/world/world'
 
@@ -16,24 +21,27 @@ World = require 'lib/world/world'
 
 module.exports = class LevelLoader extends CocoClass
 
-  spriteSheetsBuilt: 0
-  spriteSheetsToBuild: 0
-
   constructor: (options) ->
+    @t0 = new Date().getTime()
     super()
     @supermodel = options.supermodel
+    @supermodel.setMaxProgress 0.2
     @levelID = options.levelID
     @sessionID = options.sessionID
     @opponentSessionID = options.opponentSessionID
     @team = options.team
     @headless = options.headless
     @spectateMode = options.spectateMode ? false
+    @editorMode = options.editorMode # TODO: remove when the surface can load ThangTypes itself
 
     @loadSession()
-    @loadLevelModels()
+    @loadLevel()
     @loadAudio()
     @playJingle()
-    _.defer @update  # Lets everything else resolve first
+    if @supermodel.finished()
+      @onSupermodelLoaded()
+    else
+      @listenToOnce @supermodel, 'loaded-all', @onSupermodelLoaded
 
   playJingle: ->
     return if @headless
@@ -54,70 +62,135 @@ module.exports = class LevelLoader extends CocoClass
       url = "/db/level/#{@levelID}/session"
       url += "?team=#{@team}" if @team
 
-    @session = new LevelSession()
+    session = new LevelSession().setURL url
-    @session.url = -> url
+    @sessionResource = @supermodel.loadModel(session, 'level_session', {cache:false})
-
+    @session = @sessionResource.model
-    # Unless you specify cache:false, sometimes the browser will use a cached session
+    @session.once 'sync', -> @url = -> '/db/level.session/' + @id
-    # and players will 'lose' code
-    @session.fetch({cache:false})
-    @listenToOnce(@session, 'sync', @onSessionLoaded)
 
     if @opponentSessionID
-      @opponentSession = new LevelSession()
+      opponentSession = new LevelSession().setURL "/db/level_session/#{@opponentSessionID}"
-      @opponentSession.url = "/db/level_session/#{@opponentSessionID}"
+      @opponentSessionResource = @supermodel.loadModel(opponentSession, 'opponent_session')
-      @opponentSession.fetch()
+      @opponentSession = @opponentSessionResource.model
-      @listenToOnce(@opponentSession, 'sync', @onSessionLoaded)
-
-  sessionsLoaded: ->
-    return true if @headless
-    @session.loaded and ((not @opponentSession) or @opponentSession.loaded)
-
-  onSessionLoaded: ->
-    return if @destroyed
-    # TODO: maybe have all non versioned models do this? Or make it work to PUT/PATCH to relative urls
-    if @session.loaded
-      @session.url = -> '/db/level.session/' + @id
-    @update() if @sessionsLoaded()
 
   # Supermodel (Level) Loading
 
-  loadLevelModels: ->
+  loadLevel: ->
-    @listenTo(@supermodel, 'loaded-one', @onSupermodelLoadedOne)
-    @listenToOnce(@supermodel, 'error', @onSupermodelError)
     @level = @supermodel.getModel(Level, @levelID) or new Level _id: @levelID
-    levelID = @levelID
+    if @level.loaded
-    headless = @headless
+      @populateLevel()
+    else
+      @level = @supermodel.loadModel(@level, 'level').model
+      @listenToOnce @level, 'sync', @onLevelLoaded
 
-    @supermodel.shouldPopulate = (model) ->
+  onLevelLoaded: ->
-      # if left unchecked, the supermodel would load this level
+    @populateLevel()
-      # and every level next on the chain. This limits the population
-      handles = [model.id, model.get 'slug']
-      return model.constructor.className isnt "Level" or levelID in handles
 
-    @supermodel.shouldLoadProjection = (model) ->
+  populateLevel: ->
-      return true if headless and model.constructor.className is 'ThangType'
+    thangIDs = []
-      false
+    componentVersions = []
+    systemVersions = []
+    articleVersions = []
 
-    @supermodel.populateModel @level
+    for thang in @level.get('thangs') or []
+      thangIDs.push thang.thangType
+      for comp in thang.components or []
+        componentVersions.push _.pick(comp, ['original', 'majorVersion'])
 
-  onSupermodelError: ->
+    for system in @level.get('systems') or []
+      systemVersions.push _.pick(system, ['original', 'majorVersion'])
+      if indieSprites = system?.config?.indieSprites
+        for indieSprite in indieSprites
+          thangIDs.push indieSprite.thangType
 
-  onSupermodelLoadedOne: (e) ->
+    unless @headless
-    @buildSpriteSheetsForThangType e.model if not @headless and e.model instanceof ThangType
+      for article in @level.get('documentation')?.generalArticles or []
-    @update()
+        articleVersions.push _.pick(article, ['original', 'majorVersion'])
 
-  # Things to do when either the Session or Supermodel load
+    objUniq = (array) -> _.uniq array, false, (arg) -> JSON.stringify(arg)
 
-  update: =>
+    worldNecessities = []
-    return if @destroyed
-    @notifyProgress()
 
-    return if @updateCompleted
+    @thangIDs = _.uniq thangIDs
-    return unless @supermodel?.finished() and @sessionsLoaded()
+    @thangNames = new ThangNamesCollection(@thangIDs)
-    @denormalizeSession()
+    worldNecessities.push @supermodel.loadCollection(@thangNames, 'thang_names')
+    worldNecessities.push @sessionResource if @sessionResource?.isLoading
+    worldNecessities.push @opponentSessionResource if @opponentSessionResource?.isLoading
+
+    for obj in objUniq componentVersions
+      url = "/db/level.component/#{obj.original}/version/#{obj.majorVersion}"
+      worldNecessities.push @maybeLoadURL(url, LevelComponent, 'component')
+    for obj in objUniq systemVersions
+      url = "/db/level.system/#{obj.original}/version/#{obj.majorVersion}"
+      worldNecessities.push @maybeLoadURL(url, LevelSystem, 'system')
+    for obj in objUniq articleVersions
+      url = "/db/article/#{obj.original}/version/#{obj.majorVersion}"
+      @maybeLoadURL url, Article, 'article'
+    if obj = @level.get 'nextLevel'
+      url = "/db/level/#{obj.original}/version/#{obj.majorVersion}"
+      @maybeLoadURL url, Level, 'level'
+
+    unless @headless and not @editorMode
+      wizard = ThangType.loadUniversalWizard()
+      @supermodel.loadModel wizard, 'thang'
+
+    jqxhrs = (resource.jqxhr for resource in worldNecessities when resource?.jqxhr)
+    $.when(jqxhrs...).done(@onWorldNecessitiesLoaded)
+
+  onWorldNecessitiesLoaded: =>
+    @initWorld()
+    @supermodel.clearMaxProgress()
+    @trigger 'world-necessities-loaded'
+    return if @headless and not @editorMode
+    thangsToLoad = _.uniq( (t.spriteName for t in @world.thangs when t.exists) )
+    nameModelTuples = ([thangType.get('name'), thangType] for thangType in @thangNames.models)
+    nameModelMap = _.zipObject nameModelTuples
+    @spriteSheetsToBuild = []
+
+    for thangTypeName in thangsToLoad
+      thangType = nameModelMap[thangTypeName]
+      continue if thangType.isFullyLoaded()
+      thangType.fetch()
+      thangType = @supermodel.loadModel(thangType, 'thang').model
+      res = @supermodel.addSomethingResource "sprite_sheet", 5
+      res.thangType = thangType
+      res.markLoading()
+      @spriteSheetsToBuild.push res
+
+    @buildLoopInterval = setInterval @buildLoop, 5
+
+  maybeLoadURL: (url, Model, resourceName) ->
+    return if @supermodel.getModel(url)
+    model = new Model().setURL url
+    @supermodel.loadModel(model, resourceName)
+
+  onSupermodelLoaded: ->
+    console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms'
     @loadLevelSounds()
+    @denormalizeSession()
     app.tracker.updatePlayState(@level, @session) unless @headless
-    @updateCompleted = true
+
+  buildLoop: =>
+    someLeft = false
+    for spriteSheetResource, i in @spriteSheetsToBuild
+      continue if spriteSheetResource.spriteSheetKeys
+      someLeft = true
+      thangType = spriteSheetResource.thangType
+      if thangType.loaded and not thangType.loading
+        keys = @buildSpriteSheetsForThangType spriteSheetResource.thangType
+        if keys and keys.length
+          @listenTo spriteSheetResource.thangType, 'build-complete', @onBuildComplete
+          spriteSheetResource.spriteSheetKeys = keys
+        else
+          spriteSheetResource.markLoaded()
+          
+    clearInterval @buildLoopInterval unless someLeft
+
+  onBuildComplete: (e) ->
+    resource = null
+    for resource in @spriteSheetsToBuild
+      break if e.thangType is resource.thangType
+    resource.spriteSheetKeys = (k for k in resource.spriteSheetKeys when k isnt e.key)
+    resource.markLoaded() if resource.spriteSheetKeys.length is 0
 
   denormalizeSession: ->
     return if @headless or @sessionDenormalized or @spectateMode
@@ -137,6 +210,24 @@ module.exports = class LevelLoader extends CocoClass
 
   # Building sprite sheets
 
+  buildSpriteSheetsForThangType: (thangType) ->
+    return if @headless
+    # TODO: Finish making sure the supermodel loads the raster image before triggering load complete, and that the cocosprite has access to the asset.
+#    if f = thangType.get('raster')
+#      queue = new createjs.LoadQueue()
+#      queue.loadFile('/file/'+f)
+    @grabThangTypeTeams() unless @thangTypeTeams
+    keys = []
+    for team in @thangTypeTeams[thangType.get('original')] ? [null]
+      spriteOptions = {resolutionFactor: SPRITE_RESOLUTION_FACTOR, async: true}
+      if thangType.get('kind') is 'Floor'
+        spriteOptions.resolutionFactor = 2
+      if team and color = @teamConfigs[team]?.color
+        spriteOptions.colorConfig = team: color
+      key = @buildSpriteSheet thangType, spriteOptions
+      if _.isString(key) then keys.push key
+    keys
+
   grabThangTypeTeams: ->
     @grabTeamConfigs()
     @thangTypeTeams = {}
@@ -157,36 +248,21 @@ module.exports = class LevelLoader extends CocoClass
       @teamConfigs = {"humans":{"superteam":"humans","color":{"hue":0,"saturation":0.75,"lightness":0.5},"playable":true},"ogres":{"superteam":"ogres","color":{"hue":0.66,"saturation":0.75,"lightness":0.5},"playable":false},"neutral":{"superteam":"neutral","color":{"hue":0.33,"saturation":0.75,"lightness":0.5}}}
     @teamConfigs
 
-  buildSpriteSheetsForThangType: (thangType) ->
-    @grabThangTypeTeams() unless @thangTypeTeams
-    for team in @thangTypeTeams[thangType.get('original')] ? [null]
-      spriteOptions = {resolutionFactor: 4, async: true}
-      if thangType.get('kind') is 'Floor'
-        spriteOptions.resolutionFactor = 2
-      if team and color = @teamConfigs[team]?.color
-        spriteOptions.colorConfig = team: color
-      @buildSpriteSheet thangType, spriteOptions
-
   buildSpriteSheet: (thangType, options) ->
     if thangType.get('name') is 'Wizard'
       options.colorConfig = me.get('wizard')?.colorConfig or {}
-    building = thangType.buildSpriteSheet options
+    thangType.buildSpriteSheet options
-    return unless building
-    #console.log 'Building:', thangType.get('name'), options
-    @spriteSheetsToBuild += 1
-    thangType.once 'build-complete', =>
-      return if @destroyed
-      @spriteSheetsBuilt += 1
-      @notifyProgress()
 
   # World init
 
   initWorld: ->
     return if @initialized
     @initialized = true
-    @world = new World @level.get('name')
+    @world = new World()
+    @world.levelSessionIDs = if @opponentSessionID then [@sessionID, @opponentSessionID] else [@sessionID]
     serializedLevel = @level.serialize(@supermodel)
     @world.loadFromLevel serializedLevel, false
+    console.log "World has been initialized from level loader."
 
   # Initial Sound Loading
 
@@ -211,25 +287,8 @@ module.exports = class LevelLoader extends CocoClass
 
   # everything else sound wise is loaded as needed as worlds are generated
 
-  allDone: ->
+  progress: -> @supermodel.progress
-    @supermodel.finished() and @sessionsLoaded() and @spriteSheetsBuilt is @spriteSheetsToBuild
 
-  progress: ->
+  destroy: ->
-    return 0 unless @level.loaded
+    clearInterval @buildLoopInterval if @buildLoopInterval
-    overallProgress = 0
+    super()
-    supermodelProgress = @supermodel.progress()
-    overallProgress += supermodelProgress * 0.7
-    overallProgress += 0.1 if @sessionsLoaded()
-    if @headless
-      spriteMapProgress = 0.2
-    else
-      spriteMapProgress = if supermodelProgress is 1 then 0.2 else 0
-      spriteMapProgress *= @spriteSheetsBuilt / @spriteSheetsToBuild if @spriteSheetsToBuild
-    overallProgress += spriteMapProgress
-    return overallProgress
-
-  notifyProgress: ->
-    Backbone.Mediator.publish 'level-loader:progress-changed', progress: @progress()
-    @initWorld() if @allDone()
-    @trigger 'progress'
-    @trigger 'loaded-all' if @progress() is 1

app/lib/LinkedInHandler.coffee

@@ -0,0 +1,27 @@
+CocoClass = require 'lib/CocoClass'
+{me} = require 'lib/auth'
+{backboneFailure} = require 'lib/errors'
+storage = require 'lib/storage'
+
+
+module.exports = LinkedInHandler = class LinkedInHandler extends CocoClass
+  constructor: ->
+    super()
+
+  subscriptions:
+    'linkedin-loaded': 'onLinkedInLoaded'
+
+  onLinkedInLoaded: (e) ->
+    IN.Event.on IN, "auth", @onLinkedInAuth
+
+  onLinkedInAuth: (e) => console.log "Authorized with LinkedIn"
+
+  constructEmployerAgreementObject: (cb) =>
+    IN.API.Profile("me")
+    .fields(["positions","public-profile-url","id","first-name","last-name","email-address"])
+    .error(cb)
+    .result (profiles) =>
+      cb null, profiles.values[0]
+
+  destroy: ->
+    super()

app/lib/LoadingScreen.coffee

@@ -1,104 +0,0 @@
-CocoClass = require 'lib/CocoClass'
-
-module.exports = class LoadingScreen extends CocoClass
-  progress: 0
-
-  constructor: (canvas) ->
-    super()
-    @width = canvas.width
-    @height = canvas.height
-    @stage = new createjs.Stage(canvas)
-
-  subscriptions:
-    'level-loader:progress-changed': 'onLevelLoaderProgressChanged'
-
-  show: ->
-    @stage.removeChild(@screen) if @screen
-    @screen = @makeScreen()
-    @stage.addChild(@screen)
-    @updateProgressBar()
-
-  hide: ->
-    @stage.removeChild(@screen) if @screen
-    @screen = null
-
-  makeScreen: ->
-    c = new createjs.Container()
-    c.addChild(@makeLoadBackground())
-    c.addChild(@makeLoadText())
-    c.addChild(@makeProgressBar())
-    @makeLoadLogo(c)
-    c
-
-  makeLoadBackground: ->
-    g = new createjs.Graphics()
-    g.beginFill(createjs.Graphics.getRGB(30,30,60))
-    g.drawRoundRect(0, 0, @width, @height, 0.0)
-    s = new createjs.Shape(g)
-    s.y = 0
-    s.x = 0
-    s
-
-  makeLoadLogo: (container) ->
-    logoImage = new Image()
-    $(logoImage).load =>
-      @logo = new createjs.Bitmap logoImage
-      @logo.x = @width / 2 - logoImage.width / 2
-      @logo.y = 40
-      container.addChild @logo
-    logoImage.src = "/images/loading_image.png"
-
-  makeLoadText: ->
-    size = @height / 10
-    text = new createjs.Text("LOADING", "#{size}px Monospace", "#ff7700")
-    text.regX = text.getMeasuredWidth() / 2
-    text.regY = text.getMeasuredHeight() / 2
-    text.x = @width / 2
-    text.y = @height / 2
-    @text = text
-    return text
-
-  makeProgressBar: ->
-    BAR_PIXEL_HEIGHT = 20
-    BAR_PCT_WIDTH = .75
-    pixelWidth = parseInt(@width * BAR_PCT_WIDTH)
-    pixelMargin = (@width - (@width * BAR_PCT_WIDTH)) / 2
-    barY = 2 * (@height / 3)
-
-    c = new createjs.Container()
-    c.x = pixelMargin
-    c.y = barY
-
-    g = new createjs.Graphics()
-    g.beginFill(createjs.Graphics.getRGB(255,0,0))
-    g.drawRoundRect(0,0,pixelWidth, BAR_PIXEL_HEIGHT, 5)
-    @progressBar = new createjs.Shape(g)
-    c.addChild(@progressBar)
-
-    g = new createjs.Graphics()
-    g.setStrokeStyle(2)
-    g.beginStroke(createjs.Graphics.getRGB(230,230,230))
-    g.drawRoundRect(0,0,pixelWidth, BAR_PIXEL_HEIGHT, 5)
-    c.addChild(new createjs.Shape(g))
-    c
-
-  onLevelLoaderProgressChanged: (e) ->
-    @progress = e.progress
-    @updateProgressBar()
-
-  updateProgressBar: ->
-    newProg = parseInt((@progress or 0) * 100)
-    newProg = ' '+newProg while newProg.length < 4
-    @lastProg = newProg
-    @text.text = "BUILDING" if @progress is 1
-    @progressBar.scaleX = @progress
-    @stage.update()
-
-  showReady: ->
-    @text.text = 'READY'
-    @text.regX = @text.getMeasuredWidth() / 2
-    @stage.update()
-
-  destroy: ->
-    @stage.canvas = null
-    super()

app/lib/NameLoader.coffee

@@ -0,0 +1,23 @@
+CocoClass = require 'lib/CocoClass'
+
+namesCache = {}
+
+class NameLoader extends CocoClass
+  loadNames: (ids) ->
+    toLoad = (id for id in ids when not namesCache[id])
+    return false unless toLoad.length
+    jqxhrOptions = {
+      url: '/db/user/x/names', 
+      type:'POST', 
+      data:{ids:toLoad}, 
+      success: @loadedNames
+    }
+
+    return jqxhrOptions
+
+  loadedNames: (newNames) =>
+    _.extend namesCache, newNames
+    
+  getName: (id) -> namesCache[id].name
+
+module.exports = new NameLoader()

app/lib/Router.coffee

@@ -17,7 +17,8 @@ module.exports = class CocoRouter extends Backbone.Router
     'editor/:model(/:slug_or_id)(/:subview)': 'editorModelView'
 
     # Experimenting with direct links
-#    'play/ladder/:levelID/team/:team': go('play/ladder/team_view')
+    'play/ladder/:levelID': go('play/ladder/ladder_view')
+    'play/ladder': go('play/ladder_home')
 
     # db and file urls call the server directly
     'db/*path': 'routeToServer'
@@ -76,7 +77,7 @@ module.exports = class CocoRouter extends Backbone.Router
         clientid:gplusClientID,
         cookiepolicy:"single_host_origin",
         scope:"https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email",
-        size:"medium",
+        height: "short",
       }
       if gapi.signin?.render
         gapi.signin.render(gplusButton, params)

app/lib/SystemNameLoader.coffee

@@ -0,0 +1,10 @@
+CocoClass = require 'lib/CocoClass'
+
+namesCache = {}
+
+class SystemNameLoader extends CocoClass
+  getName: (id) -> namesCache[id]?.name
+
+  setName: (system) -> namesCache[system.get('original')] = {name:system.get('name')}
+
+module.exports = new SystemNameLoader()

app/lib/Tracker.coffee

@@ -1,5 +1,7 @@
 {me} = require 'lib/auth'
 
+debugAnalytics = false
+
 module.exports = class Tracker
   constructor: ->
     if window.tracker
@@ -10,7 +12,7 @@ module.exports = class Tracker
     @updateOlark()
 
   identify: (traits) ->
-    #console.log "Would identify", traits
+    console.log "Would identify", traits if debugAnalytics
     return unless me and @isProduction and analytics?
     # https://segment.io/docs/methods/identify
     traits ?= {}
@@ -39,13 +41,13 @@ module.exports = class Tracker
   trackPageView: ->
     return unless @isProduction and analytics?
     url = Backbone.history.getFragment()
-    #console.log "Going to track visit for", "/#{url}"
+    console.log "Going to track visit for", "/#{url}" if debugAnalytics
     analytics.pageview "/#{url}"
 
   trackEvent: (event, properties, includeProviders=null) =>
-    #console.log "Would track analytics event:", event, properties
+    console.log "Would track analytics event:", event, properties if debugAnalytics
     return unless me and @isProduction and analytics?
-    #console.log "Going to track analytics event:", event, properties
+    console.log "Going to track analytics event:", event, properties if debugAnalytics
     properties = properties or {}
     context = {}
     if includeProviders
@@ -54,3 +56,9 @@ module.exports = class Tracker
         context.providers[provider] = true
     event.label = properties.label if properties.label
     analytics?.track event, properties, context
+
+  trackTiming: (duration, category, variable, label, samplePercentage=5) ->
+    # https://developers.google.com/analytics/devguides/collection/gajs/gaTrackingTiming
+    return console.warn "Duration #{duration} invalid for trackTiming call." unless duration >= 0 and duration < 60 * 60 * 1000
+    console.log "Would track timing event:", arguments if debugAnalytics
+    window._gaq?.push ['_trackTiming', category, variable, duration, label, samplePercentage]

app/lib/auth.coffee

@@ -1,4 +1,4 @@
-{backboneFailure, genericFailure} = require 'lib/errors'
+{backboneFailure, genericFailure, parseServerError} = require 'lib/errors'
 User = require 'models/User'
 storage = require 'lib/storage'
 BEEN_HERE_BEFORE_KEY = 'beenHereBefore'
@@ -11,16 +11,31 @@ init = ->
     me.set 'testGroupNumber', Math.floor(Math.random() * 256)
     me.save()
 
-  me.loadGravatarProfile() if me.get('email')
   Backbone.listenTo(me, 'sync', Backbone.Mediator.publish('me:synced', {me:me}))
 
 module.exports.createUser = (userObject, failure=backboneFailure, nextURL=null) ->
   user = new User(userObject)
+  user.notyErrors = false
   user.save({}, {
-    error: failure,
+    error: (model,jqxhr,options) ->
+      error = parseServerError(jqxhr.responseText)
+      property = error.property if error.property
+      if jqxhr.status is 409 and property is 'name'
+        anonUserObject = _.omit(userObject, 'name')
+        module.exports.createUser anonUserObject, failure, nextURL
+      else
+        genericFailure(jqxhr)
     success: -> if nextURL then window.location.href = nextURL else window.location.reload()
   })
 
+module.exports.createUserWithoutReload = (userObject, failure=backboneFailure) ->
+  user = new User(userObject)
+  user.save({}, {
+    error: failure
+    success: ->
+      Backbone.Mediator.publish("created-user-without-reload")
+  })
+
 module.exports.loginUser = (userObject, failure=genericFailure) ->
   jqxhr = $.post('/auth/login',
     {
@@ -52,4 +67,3 @@ trackFirstArrival = ->
   storage.save(BEEN_HERE_BEFORE_KEY, true)
 
 init()
-

app/lib/contact.coffee

@@ -1,13 +1,6 @@
-
-
 module.exports.sendContactMessage = (contactMessageObject, modal) ->
   modal.find('.sending-indicator').show()
-  jqxhr = $.post '/contact',
+  jqxhr = $.post '/contact', contactMessageObject, (response) ->
-    email: contactMessageObject.email
-    message: contactMessageObject.message
-  ,
-    (response) ->
-      console.log "Got contact response:", response
     modal.find('.sending-indicator').hide()
     modal.find('#contact-message').val("Thanks!")
     _.delay ->

app/lib/deltas.coffee

@@ -0,0 +1,177 @@
+SystemNameLoader = require 'lib/SystemNameLoader'
+### 
+  Good-to-knows:
+    dataPath: an array of keys that walks you up a JSON object that's being patched
+      ex: ['scripts', 0, 'description']
+    deltaPath: an array of keys that walks you up a JSON Diff Patch object.
+      ex: ['scripts', '_0', 'description']
+###
+  
+module.exports.expandDelta = (delta, left, schema) ->
+  flattenedDeltas = flattenDelta(delta)
+  (expandFlattenedDelta(fd, left, schema) for fd in flattenedDeltas)
+  
+
+flattenDelta = (delta, dataPath=null, deltaPath=null) ->
+  # takes a single jsondiffpatch delta and returns an array of objects with
+  return [] unless delta
+  dataPath ?= []
+  deltaPath ?= []
+  return [{dataPath:dataPath, deltaPath: deltaPath, o:delta}] if _.isArray delta
+
+  results = []
+  affectingArray = delta._t is 'a'
+  for deltaIndex, childDelta of delta
+    continue if deltaIndex is '_t'
+    dataIndex = if affectingArray then parseInt(deltaIndex.replace('_', '')) else deltaIndex
+    results = results.concat flattenDelta(
+      childDelta, dataPath.concat([dataIndex]), deltaPath.concat([deltaIndex]))
+  results
+  
+
+expandFlattenedDelta = (delta, left, schema) ->
+  # takes a single flattened delta and converts into an object that can be
+  # easily formatted into something human readable.
+  
+  delta.action = '???'
+  o = delta.o # the raw jsondiffpatch delta
+
+  if _.isArray(o) and o.length is 1
+    delta.action = 'added'
+    delta.newValue = o[0]
+
+  if _.isArray(o) and o.length is 2
+    delta.action = 'modified'
+    delta.oldValue = o[0]
+    delta.newValue = o[1]
+
+  if _.isArray(o) and o.length is 3 and o[1] is 0 and o[2] is 0
+    delta.action = 'deleted'
+    delta.oldValue = o[0]
+
+  if _.isPlainObject(o) and o._t is 'a'
+    delta.action = 'modified-array'
+
+  if _.isPlainObject(o) and o._t isnt 'a'
+    delta.action = 'modified-object'
+
+  if _.isArray(o) and o.length is 3 and o[2] is 3
+    delta.action = 'moved-index'
+    delta.destinationIndex = o[1]
+    delta.originalIndex = delta.dataPath[delta.dataPath.length-1]
+
+  if _.isArray(o) and o.length is 3 and o[1] is 0 and o[2] is 2
+    delta.action = 'text-diff'
+    delta.unidiff = o[0]
+
+  humanPath = []
+  parentLeft = left
+  parentSchema = schema
+  for key, i in delta.dataPath
+    # TODO: Better schema/json walking
+    childSchema = parentSchema?.items or parentSchema?.properties?[key] or {}
+    childLeft = parentLeft?[key]
+    humanKey = null
+    childData = if i is delta.dataPath.length-1 and delta.action is 'added' then o[0] else childLeft
+    humanKey ?= childData.name or childData.id if childData
+    humanKey ?= SystemNameLoader.getName(childData?.original)
+    humanKey ?= "#{childSchema.title}" if childSchema.title
+    humanKey ?= _.string.titleize key
+    humanPath.push humanKey
+    parentLeft = childLeft
+    parentSchema = childSchema
+    
+  delta.humanPath = humanPath.join(' :: ')
+  delta.schema = childSchema
+  delta.left = childLeft
+  delta.right = jsondiffpatch.patch childLeft, delta.o unless delta.action is 'moved-index'
+  
+  delta
+  
+module.exports.makeJSONDiffer = ->
+  hasher = (obj) -> obj.name || obj.id || obj._id || JSON.stringify(_.keys(obj))
+  jsondiffpatch.create({objectHash:hasher})
+    
+module.exports.getConflicts = (headDeltas, pendingDeltas) ->
+  # headDeltas and pendingDeltas should be lists of deltas returned by interpretDelta
+  # Returns a list of conflict objects with properties:
+  #   headDelta
+  #   pendingDelta
+  # The deltas that have conflicts also have conflict properties pointing to one another.
+  
+  headPathMap = groupDeltasByAffectingPaths(headDeltas)
+  pendingPathMap = groupDeltasByAffectingPaths(pendingDeltas)
+  paths = _.keys(headPathMap).concat(_.keys(pendingPathMap))
+  
+  # Here's my thinking: conflicts happen when one delta path is a substring of another delta path
+  # So, sort paths from both deltas together, which will naturally make conflicts adjacent,
+  # and if one is identified, one path is from the headDeltas, the other is from pendingDeltas
+  # This is all to avoid an O(nm) brute force search.
+  
+  conflicts = []
+  paths.sort()
+  for path, i in paths
+    continue if i + 1 is paths.length
+    nextPath = paths[i+1]
+    if nextPath.startsWith path
+      headDelta = (headPathMap[path] or headPathMap[nextPath])[0].delta
+      pendingDelta = (pendingPathMap[path] or pendingPathMap[nextPath])[0].delta
+      conflicts.push({headDelta:headDelta, pendingDelta:pendingDelta})
+      pendingDelta.conflict = headDelta
+      headDelta.conflict = pendingDelta
+
+  return conflicts if conflicts.length
+  
+groupDeltasByAffectingPaths = (deltas) ->
+  metaDeltas = []
+  for delta in deltas
+    conflictPaths = []
+    if delta.action is 'moved-index'
+      # every other action affects just the data path, but moved indexes affect a swath
+      indices = [delta.originalIndex, delta.destinationIndex]
+      indices.sort()
+      for index in _.range(indices[0], indices[1]+1)
+        conflictPaths.push delta.dataPath.slice(0, delta.dataPath.length-1).concat(index)
+    else
+      conflictPaths.push delta.dataPath
+    for path in conflictPaths
+      metaDeltas.push {
+        delta: delta
+        path: (item.toString() for item in path).join('/')
+      }
+  
+  map = _.groupBy metaDeltas, 'path'
+
+  # Turns out there are cases where a single delta can include paths
+  # that 'conflict' with each other, ie one is a substring of the other
+  # because of moved indices. To handle this case, go through and prune
+  # out all deeper paths that conflict with more shallow paths, so
+  # getConflicts path checking works properly.
+
+  paths = _.keys(map)
+  return map unless paths.length
+  paths.sort()
+  prunedMap = {}
+  previousPath = paths[0]
+  for path, i in paths
+    continue if i is 0
+    continue if path.startsWith previousPath
+    prunedMap[path] = map[path]
+    previousPath = path
+  
+  prunedMap
+  
+module.exports.pruneConflictsFromDelta = (delta, conflicts) ->
+  # the jsondiffpatch delta mustn't include any dangling nodes,
+  # or else things will get removed which shouldn't be, or errors will occur
+  for conflict in conflicts
+    prunePath delta, conflict.pendingDelta.deltaPath
+  if _.isEmpty delta then undefined else delta
+    
+prunePath = (delta, path) ->
+  if path.length is 1
+    delete delta[path]
+  else
+    prunePath delta[path[0]], path.slice(1)
+    keys = (k for k in _.keys(delta[path[0]]) when k isnt '_t')
+    delete delta[path[0]] if keys.length is 0

app/lib/forms.coffee

@@ -4,7 +4,8 @@ module.exports.formToObject = (el) ->
   inputs = $('input', el).add('textarea', el)
   for input in inputs
     input = $(input)
-    obj[input.attr('name')] = input.val()
+    continue unless name = input.attr('name')
+    obj[name] = input.val()
 
   obj
 

app/lib/scripts/DOMScriptModule.coffee

@@ -35,6 +35,7 @@ module.exports = class DOMScriptModule extends ScriptModule
         sides: dom.highlight.sides
         offset: dom.highlight.offset
         rotation: dom.highlight.rotation
+    note.event = _.pick note.event, (value) -> not _.isUndefined value
     @maybeApplyDelayToNote note
     note
 

app/lib/scripts/GoalsScriptModule.coffee

@@ -21,7 +21,6 @@ module.exports = class GoalsScriptModule extends ScriptModule
       channel: 'level-add-goals'
       event:
         goals: @noteGroup.goals.add
-        worldName: @view.world.name
     return note
 
   removeNote: ->
@@ -29,7 +28,4 @@ module.exports = class GoalsScriptModule extends ScriptModule
       channel: 'level-remove-goals'
       event:
         goals: @noteGroup.goals.remove
-        worldName: @view.world.name
     return note
-
- 

app/lib/scripts/ScriptManager.coffee

@@ -52,12 +52,14 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     @debugScripts = @view.getQueryVariable 'dev'
     @initProperties()
     @addScriptSubscriptions()
+    @beginTicking()
 
   setScripts: (@originalScripts) ->
     @quiet = true
     @initProperties()
     @loadFromSession()
     @quiet = false
+    @addScriptSubscriptions()
     @run()
 
   initProperties: ->
@@ -75,6 +77,25 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
       callback = makeCallback(script.channel) # curry in the channel argument
       @addNewSubscription(script.channel, callback)
       
+  beginTicking: ->
+    @tickInterval = setInterval @tick, 5000
+    
+  tick: =>
+    scriptStates = {}
+    now = new Date()
+    for script in @scripts
+      scriptStates[script.id] =
+        timeSinceLastEnded: (if script.lastEnded then now - script.lastEnded else 0) / 1000
+        timeSinceLastTriggered: (if script.lastTriggered then now - script.lastTriggered else 0) / 1000
+    
+    stateEvent =
+      scriptRunning: @currentNoteGroup?.scriptID or ''
+      noteGroupRunning: @currentNoteGroup?.name or ''
+      scriptStates: scriptStates
+      timeSinceLastScriptEnded: (if @lastScriptEnded then now - @lastScriptEnded else 0) / 1000
+
+    Backbone.Mediator.publish 'script-manager:tick', stateEvent
+
   loadFromSession: ->
     # load the queue with note groups to skip through
     @addEndedScriptsFromSession()
@@ -88,6 +109,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     return unless script
     @triggered.push(script.id)
     noteChain = @processScript(script)
+    return unless noteChain
     if scripts.currentScriptOffset
       noteGroup.skipMe = true for noteGroup in noteChain[..scripts.currentScriptOffset-1]
     @addNoteChain(noteChain, false)
@@ -107,6 +129,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
       @triggered.push(scriptID)
       @ended.push(scriptID)
       noteChain = @processScript(script)
+      return unless noteChain
       noteGroup.skipMe = true for noteGroup in noteChain
       @addNoteChain(noteChain, false)
 
@@ -123,6 +146,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
 
   destroy: ->
     @onEndAll()
+    clearInterval @tickInterval
     super()
 
   # TRIGGERERING NOTES
@@ -147,10 +171,11 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
       continue unless @scriptPrereqsSatisfied(script)
       continue unless scriptMatchesEventPrereqs(script, event)
       # everything passed!
-      console.log "SCRIPT: Running script '#{script.id}'" if @debugScripts
+      console.debug "SCRIPT: Running script '#{script.id}'" if @debugScripts
       script.lastTriggered = new Date().getTime()
       @triggered.push(script.id) unless alreadyTriggered
       noteChain = @processScript(script)
+      if not noteChain then return @trackScriptCompletions (script.id)
       @addNoteChain(noteChain)
       @run()
 
@@ -159,8 +184,8 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
 
   processScript: (script) ->
     noteChain = script.noteChain
+    return null unless noteChain?.length
     noteGroup.scriptID = script.id for noteGroup in noteChain
-    if noteChain.length
     lastNoteGroup = noteChain[noteChain.length - 1]
     lastNoteGroup.isLast = true
     return noteChain
@@ -207,11 +232,11 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     @notifyScriptStateChanged()
     @scriptInProgress = true
     @currentTimeouts = []
-    console.log "SCRIPT: Starting note group '#{nextNoteGroup.name}'" if @debugScripts
+    console.debug "SCRIPT: Starting note group '#{nextNoteGroup.name}'" if @debugScripts
     for module in nextNoteGroup.modules
       @processNote(note, nextNoteGroup) for note in module.startNotes()
     if nextNoteGroup.script.duration
-      f = => @onNoteGroupTimeout nextNoteGroup
+      f = => @onNoteGroupTimeout? nextNoteGroup
       setTimeout(f, nextNoteGroup.script.duration)
     Backbone.Mediator.publish('note-group-started')
 
@@ -221,12 +246,12 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     @ignoreEvents = true
     for noteGroup, i in @noteGroupQueue
       break unless noteGroup.skipMe
-      console.log "SCRIPT: Skipping note group '#{noteGroup.name}'" if @debugScripts
+      console.debug "SCRIPT: Skipping note group '#{noteGroup.name}'" if @debugScripts
       @processNoteGroup(noteGroup)
       for module in noteGroup.modules
         notes = module.skipNotes()
         @processNote(note, noteGroup) for note in notes
-      @trackScriptCompletions(noteGroup)
+      @trackScriptCompletionsFromNoteGroup(noteGroup)
     @noteGroupQueue = @noteGroupQueue[i..]
     @ignoreEvents = false
 
@@ -268,14 +293,13 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     return if @ending # kill infinite loops right here
     @ending = true
     return unless @currentNoteGroup?
-    console.log "SCRIPT: Ending note group '#{@currentNoteGroup.name}'" if @debugScripts
+    console.debug "SCRIPT: Ending note group '#{@currentNoteGroup.name}'" if @debugScripts
     clearTimeout(timeout) for timeout in @currentTimeouts
     for module in @currentNoteGroup.modules
       @processNote(note, @currentNoteGroup) for note in module.endNotes()
     Backbone.Mediator.publish 'note-group-ended' unless @quiet
     @scriptInProgress = false
-    @ended.push(@currentNoteGroup.scriptID) if @currentNoteGroup.isLast
+    @trackScriptCompletionsFromNoteGroup(@currentNoteGroup)
-    @trackScriptCompletions(@currentNoteGroup)
     @currentNoteGroup = null
     unless @noteGroupQueue.length
       @notifyScriptStateChanged()
@@ -302,7 +326,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
       for module in noteGroup.modules
         notes = module.skipNotes()
         @processNote(note, noteGroup) for note in notes unless @quiet
-      @trackScriptCompletions(noteGroup) unless @quiet
+      @trackScriptCompletionsFromNoteGroup(noteGroup) unless @quiet
 
     @noteGroupQueue = []
 
@@ -317,11 +341,18 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     Backbone.Mediator.publish 'level-enable-controls', {}
     Backbone.Mediator.publish 'level-set-letterbox', { on: false }
 
-  trackScriptCompletions: (noteGroup) ->
+  trackScriptCompletionsFromNoteGroup: (noteGroup) ->
-    return if @quiet
     return unless noteGroup.isLast
-    @ended.push(noteGroup.scriptID) unless noteGroup.scriptID in @ended
+    @trackScriptCompletions(noteGroup.scriptID)
-    Backbone.Mediator.publish 'script:ended', {scriptID: noteGroup.scriptID}
+
+  trackScriptCompletions: (scriptID) ->
+    return if @quiet
+    @ended.push(scriptID) unless scriptID in @ended
+    for script in @scripts
+      if script.id is scriptID
+        script.lastEnded = new Date()
+    @lastScriptEnded = new Date()
+    Backbone.Mediator.publish 'script:ended', {scriptID: scriptID}
 
   notifyScriptStateChanged: ->
     return if @quiet

app/lib/scripts/ScriptModule.coffee

@@ -36,4 +36,4 @@ module.exports = class ScriptModule extends CocoClass
     Math.max(0, sums...)
 
   maybeApplyDelayToNote: (note) ->
-    note.delay = @scrubbingTime + @movementTime
+    note.delay = (@scrubbingTime + @movementTime) or 0

app/lib/scripts/SurfaceScriptModule.coffee

@@ -30,7 +30,6 @@ module.exports = class SurfaceScriptModule extends ScriptModule
     e.pos = focus.target if _.isPlainObject focus.target
     e.thangID = focus.target if _.isString focus.target
     e.zoom = focus.zoom or 2.0  # TODO: test only doing this if e.pos, e.thangID, or focus.zoom?
-    e.zoom *= 2 if e.zoom  # On 2014-03-16, we doubled the canvas width/height, so now we have a legacy zoom multipler.
     e.duration = if focus.duration? then focus.duration else 1500
     e.duration = 0 if instant
     e.bounds = focus.bounds if focus.bounds?

app/lib/scripts/defaultScripts.coffee

@@ -1,36 +0,0 @@
-module.exports = [
-  {
-    "id": "Add Default Goals",
-    "channel": "god:new-world-created",
-    "noteChain": [
-      {
-        "goals": {
-          "add": [
-            {
-              "name": "Humans Survive",
-              "id": "humans-survive",
-              "saveThangs": [
-                "humans"
-              ],
-              "worldEndsAfter": 3,
-              "howMany": 1,
-              "hiddenGoal": true
-            },
-            {
-              "name": "Ogres Die",
-              "id": "ogres-die",
-              "killThangs": [
-                "ogres"
-              ],
-              "worldEndsAfter": 3,
-              "hiddenGoal": true
-            }
-          ]
-        }
-      }
-    ]
-  }
-]
-
-
-# Could add other default scripts, like not having to redo Victory Playback sequence from scratch every time.

app/lib/simulator/Simulator.coffee

@@ -4,25 +4,130 @@ LevelLoader = require 'lib/LevelLoader'
 GoalManager = require 'lib/world/GoalManager'
 God = require 'lib/God'
 
+Aether.addGlobal 'Vector', require 'lib/world/vector'
+Aether.addGlobal '_', _
+
 module.exports = class Simulator extends CocoClass
 
-  constructor: ->
+  constructor: (@options) ->
+    @options ?= {}
     _.extend @, Backbone.Events
     @trigger 'statusUpdate', 'Starting simulation!'
     @retryDelayInSeconds = 10
     @taskURL = '/queue/scoring'
+    @simulatedByYou = 0
+    @god = new God maxAngels: 1, workerCode: @options.workerCode, headless: true  # Start loading worker.
 
   destroy: ->
     @off()
     @cleanupSimulation()
+    @god?.destroy()
     super()
 
+  fetchAndSimulateOneGame: (humanGameID, ogresGameID) =>
+    return if @destroyed
+    $.ajax
+      url: "/queue/scoring/getTwoGames"
+      type: "POST"
+      parse: true
+      data:
+        "humansGameID": humanGameID
+        "ogresGameID": ogresGameID
+      error: (errorData) ->
+        console.warn "There was an error fetching two games! #{JSON.stringify errorData}"
+      success: (taskData) =>
+        return if @destroyed
+        @trigger 'statusUpdate', 'Setting up simulation...'
+        #refactor this
+        @task = new SimulationTask(taskData)
+
+        @supermodel ?= new SuperModel()
+        @supermodel.resetProgress()
+        @levelLoader = new LevelLoader supermodel: @supermodel, levelID: @task.getLevelName(), sessionID: @task.getFirstSessionID(), headless: true
+
+        if @supermodel.finished()
+          @simulateSingleGame()
+        else
+          @listenToOnce @supermodel, 'loaded-all', @simulateSingleGame
+
+  simulateSingleGame: ->
+    return if @destroyed
+    @trigger 'statusUpdate', 'Simulating...'
+    @assignWorldAndLevelFromLevelLoaderAndDestroyIt()
+    @setupGod()
+    try
+      @commenceSingleSimulation()
+    catch error
+      @handleSingleSimulationError error
+
+  commenceSingleSimulation: ->
+    Backbone.Mediator.subscribeOnce 'god:infinite-loop', @handleSingleSimulationInfiniteLoop, @
+    Backbone.Mediator.subscribeOnce 'god:goals-calculated', @processSingleGameResults, @
+    @god.createWorld @generateSpellsObject()
+
+  handleSingleSimulationError: (error) ->
+    console.error "There was an error simulating a single game!", error
+    if @options.headlessClient
+      console.log "GAMERESULT:tie"
+      process.exit(0)
+    @cleanupSimulation()
+
+  handleSingleSimulationInfiniteLoop: ->
+    console.log "There was an infinite loop in the single game!"
+    if @options.headlessClient
+      console.log "GAMERESULT:tie"
+      process.exit(0)
+    @cleanupSimulation()
+
+  processSingleGameResults: (simulationResults) ->
+    taskResults = @formTaskResultsObject simulationResults
+    console.log "Processing results:", taskResults
+    humanSessionRank = taskResults.sessions[0].metrics.rank
+    ogreSessionRank = taskResults.sessions[1].metrics.rank
+    if @options.headlessClient
+      if humanSessionRank is ogreSessionRank
+        console.log "GAMERESULT:tie"
+      else if humanSessionRank < ogreSessionRank
+        console.log "GAMERESULT:humans"
+      else if ogreSessionRank < humanSessionRank
+        console.log "GAMERESULT:ogres"
+      process.exit(0)
+    else
+      @sendSingleGameBackToServer(taskResults)
+
+    @cleanupSimulation()
+
+  sendSingleGameBackToServer: (results) ->
+    @trigger 'statusUpdate', 'Simulation completed, sending results back to server!'
+
+    $.ajax
+      url: "/queue/scoring/recordTwoGames"
+      data: results
+      type: "PUT"
+      parse: true
+      success: @handleTaskResultsTransferSuccess
+      error: @handleTaskResultsTransferError
+      complete: @cleanupAndSimulateAnotherTask
+
+
   fetchAndSimulateTask: =>
     return if @destroyed
+
+    if @options.headlessClient
+      if @dumpThisTime # The first heapdump would be useless to find leaks.
+        console.log "Writing snapshot."
+        @options.heapdump.writeSnapshot()
+      @dumpThisTime = true if @options.heapdump
+
+      if @options.testing
+        _.delay @setupSimulationAndLoadLevel, 0, @options.testFile, "Testing...", status: 400
+        return
+
     @trigger 'statusUpdate', 'Fetching simulation data!'
     $.ajax
       url: @taskURL
       type: "GET"
+      parse: true
       error: @handleFetchTaskError
       success: @setupSimulationAndLoadLevel
 
@@ -31,9 +136,13 @@ module.exports = class Simulator extends CocoClass
     @trigger 'statusUpdate', 'There was an error fetching games to simulate. Retrying in 10 seconds.'
     @simulateAnotherTaskAfterDelay()
 
+
   handleNoGamesResponse: ->
-    @trigger 'statusUpdate', 'There were no games to simulate--nice. Retrying in 10 seconds.'
+    info = 'Finding game to simulate...'
-    @simulateAnotherTaskAfterDelay()
+    console.log info
+    @trigger 'statusUpdate', info
+    @fetchAndSimulateOneGame()
+    application.tracker?.trackEvent 'Simulator Result', label: "No Games"
 
   simulateAnotherTaskAfterDelay: =>
     console.log "Retrying in #{@retryDelayInSeconds}"
@@ -53,14 +162,18 @@ module.exports = class Simulator extends CocoClass
       return
 
     @supermodel ?= new SuperModel()
-    @god = new God maxWorkerPoolSize: 1, maxAngels: 1  # Start loading worker.
+    @supermodel.resetProgress()
-
     @levelLoader = new LevelLoader supermodel: @supermodel, levelID: levelID, sessionID: @task.getFirstSessionID(), headless: true
-    @listenToOnce(@levelLoader, 'loaded-all', @simulateGame)
+    if @supermodel.finished()
+      @simulateGame()
+    else
+      @listenToOnce @supermodel, 'loaded-all', @simulateGame
 
   simulateGame: ->
     return if @destroyed
-    @trigger 'statusUpdate', 'All resources loaded, simulating!', @task.getSessions()
+    info = 'All resources loaded, simulating!'
+    console.log info
+    @trigger 'statusUpdate', info, @task.getSessions()
     @assignWorldAndLevelFromLevelLoaderAndDestroyIt()
     @setupGod()
 
@@ -72,25 +185,45 @@ module.exports = class Simulator extends CocoClass
 
   assignWorldAndLevelFromLevelLoaderAndDestroyIt: ->
     @world = @levelLoader.world
+    @task.setWorld(@world)
     @level = @levelLoader.level
     @levelLoader.destroy()
     @levelLoader = null
 
   setupGod: ->
-    @god.level = @level.serialize @supermodel
+    @god.setLevel @level.serialize @supermodel
-    @god.worldClassMap = @world.classMap
+    @god.setLevelSessionIDs (session.sessionID for session in @task.getSessions())
-    @setupGoalManager()
+    @god.setWorldClassMap @world.classMap
-    @setupGodSpells()
+    @god.setGoalManager new GoalManager(@world, @level.get 'goals')
-
-  setupGoalManager: ->
-    @god.goalManager = new GoalManager @world
-    @god.goalManager.goals = @god.level.goals
-    @god.goalManager.goalStates = @manuallyGenerateGoalStates()
 
   commenceSimulationAndSetupCallback: ->
-    @god.createWorld()
     Backbone.Mediator.subscribeOnce 'god:infinite-loop', @onInfiniteLoop, @
-    Backbone.Mediator.subscribeOnce 'god:new-world-created', @processResults, @
+    Backbone.Mediator.subscribeOnce 'god:goals-calculated', @processResults, @
+    @god.createWorld @generateSpellsObject()
+
+    #Search for leaks, headless-client only.
+    if @options.headlessClient and @options.leakTest and not @memwatch?
+      leakcount = 0
+      maxleakcount = 0
+      console.log "Setting leak callbacks."
+      @memwatch = require 'memwatch'
+
+      @memwatch.on 'leak', (info) =>
+        console.warn "LEAK!!\n" + JSON.stringify(info)
+
+        unless @hd?
+          if (leakcount++ is maxleakcount)
+            @hd = new @memwatch.HeapDiff()
+
+            @memwatch.on 'stats', (stats) =>
+              console.warn "stats callback: " + stats
+              diff = @hd.end()
+              console.warn "HeapDiff:\n" + JSON.stringify(diff)
+
+              if @options.exitOnLeak
+                console.warn "Exiting because of Leak."
+                process.exit()
+              @hd = new @memwatch.HeapDiff()
 
   onInfiniteLoop: ->
     console.warn "Skipping infinitely looping game."
@@ -101,34 +234,44 @@ module.exports = class Simulator extends CocoClass
     taskResults = @formTaskResultsObject simulationResults
     @sendResultsBackToServer taskResults
 
-  sendResultsBackToServer: (results) =>
+  sendResultsBackToServer: (results) ->
     @trigger 'statusUpdate', 'Simulation completed, sending results back to server!'
-    console.log "Sending result back to server!"
+    console.log "Sending result back to server:", results
+
+    if @options.headlessClient and @options.testing
+      return @fetchAndSimulateTask()
+
     $.ajax
       url: "/queue/scoring"
       data: results
       type: "PUT"
+      parse: true
       success: @handleTaskResultsTransferSuccess
       error: @handleTaskResultsTransferError
       complete: @cleanupAndSimulateAnotherTask
 
   handleTaskResultsTransferSuccess: (result) =>
+    return if @destroyed
     console.log "Task registration result: #{JSON.stringify result}"
     @trigger 'statusUpdate', 'Results were successfully sent back to server!'
+    console.log "Simulated by you:", @simulatedByYou
+    @simulatedByYou++
+    unless @options.headlessClient
       simulatedBy = parseInt($('#simulated-by-you').text(), 10) + 1
       $('#simulated-by-you').text(simulatedBy)
+    application.tracker?.trackEvent 'Simulator Result', label: "Success"
 
   handleTaskResultsTransferError: (error) =>
+    return if @destroyed
     @trigger 'statusUpdate', 'There was an error sending the results back to the server.'
     console.log "Task registration error: #{JSON.stringify error}"
 
   cleanupAndSimulateAnotherTask: =>
+    return if @destroyed
     @cleanupSimulation()
     @fetchAndSimulateTask()
 
   cleanupSimulation: ->
-    @god?.destroy()
-    @god = null
     @world = null
     @level = null
 
@@ -142,11 +285,12 @@ module.exports = class Simulator extends CocoClass
       sessions: []
 
     for session in @task.getSessions()
-
       sessionResult =
         sessionID: session.sessionID
         submitDate: session.submitDate
         creator: session.creator
+        name: session.creatorName
+        totalScore: session.totalScore
         metrics:
           rank: @calculateSessionRank session.sessionID, simulationResults.goalStates, @task.generateTeamToSessionMap()
       if session.sessionID is taskResults.originalSessionID
@@ -157,42 +301,28 @@ module.exports = class Simulator extends CocoClass
     return taskResults
 
   calculateSessionRank: (sessionID, goalStates, teamSessionMap) ->
-    humansDestroyed = goalStates["destroy-humans"].status is "success"
+    ogreGoals = (goalState for key, goalState of goalStates when goalState.team is 'ogres')
-    ogresDestroyed = goalStates["destroy-ogres"].status is "success"
+    humanGoals = (goalState for key, goalState of goalStates when goalState.team is 'humans')
-    if humansDestroyed is ogresDestroyed
+    ogresWon = _.all ogreGoals, {status: 'success'}
+    humansWon = _.all humanGoals, {status: 'success'}
+    if ogresWon is humansWon
       return 0
-    else if humansDestroyed and teamSessionMap["ogres"] is sessionID
+    else if ogresWon and teamSessionMap["ogres"] is sessionID
       return 0
-    else if humansDestroyed and teamSessionMap["ogres"] isnt sessionID
+    else if ogresWon and teamSessionMap["ogres"] isnt sessionID
       return 1
-    else if ogresDestroyed and teamSessionMap["humans"] is sessionID
+    else if humansWon and teamSessionMap["humans"] is sessionID
       return 0
     else
       return 1
 
-  manuallyGenerateGoalStates: ->
-    goalStates =
-      "destroy-humans":
-        keyFrame: 0
-        killed:
-          "Human Base": false
-        status: "incomplete"
-      "destroy-ogres":
-        keyFrame:0
-        killed:
-          "Ogre Base": false
-        status: "incomplete"
-
-  setupGodSpells: ->
-    @generateSpellsObject()
-    @god.spells = @spells
-
   generateSpellsObject: ->
     @currentUserCodeMap = @task.generateSpellKeyToSourceMap()
     @spells = {}
     for thang in @level.attributes.thangs
       continue if @thangIsATemplate thang
       @generateSpellKeyToSourceMapPropertiesFromThang thang
+    @spells
 
   thangIsATemplate: (thang) ->
     for component in thang.components
@@ -222,7 +352,6 @@ module.exports = class Simulator extends CocoClass
     spellKey = spellKeyComponents.join '/'
     spellKey
 
-
   createSpellAndAssignName: (spellKey, spellName) ->
     @spells[spellKey] ?= {}
     @spells[spellKey].name = spellName
@@ -230,25 +359,34 @@ module.exports = class Simulator extends CocoClass
   createSpellThang: (thang, method, spellKey) ->
     @spells[spellKey].thangs ?= {}
     @spells[spellKey].thangs[thang.id] ?= {}
-    @spells[spellKey].thangs[thang.id].aether = @createAether @spells[spellKey].name, method
+    spellTeam = @task.getSpellKeyToTeamMap()[spellKey]
+    playerTeams = @task.getPlayerTeams()
+    useProtectAPI = true
+    if spellTeam not in playerTeams then useProtectAPI = false
+    @spells[spellKey].thangs[thang.id].aether = @createAether @spells[spellKey].name, method, useProtectAPI
+
 
   transpileSpell: (thang, spellKey, methodName) ->
     slugifiedThangID = _.string.slugify thang.id
-    source = @currentUserCodeMap[[slugifiedThangID,methodName].join '/'] ? ""
+    generatedSpellKey = [slugifiedThangID,methodName].join '/'
+    source = @currentUserCodeMap[generatedSpellKey] ? ""
     aether = @spells[spellKey].thangs[thang.id].aether
+    unless _.contains(@task.spellKeysToTranspile, generatedSpellKey)
+      aether.pure = source
+    else
       try
         aether.transpile source
       catch e
         console.log "Couldn't transpile #{spellKey}:\n#{source}\n", e
         aether.transpile ''
 
-  createAether: (methodName, method) ->
+  createAether: (methodName, method, useProtectAPI) ->
     aetherOptions =
       functionName: methodName
-      protectAPI: true
+      protectAPI: useProtectAPI
       includeFlow: false
-      requiresThis: true
+      yieldConditionally: methodName is "plan"
-      yieldConditionally: false
+      globals: ['Vector', '_']
       problems:
         jshint_W040: {level: "ignore"}
         jshint_W030: {level: "ignore"}  # aether_NoEffect instead
@@ -259,9 +397,11 @@ module.exports = class Simulator extends CocoClass
     #console.log "creating aether with options", aetherOptions
     return new Aether aetherOptions
 
+
 class SimulationTask
   constructor: (@rawData) ->
-    console.log 'Simulating sessions', (session for session in @getSessions())
+    @spellKeyToTeamMap = {}
+    @spellKeysToTranspile = []
 
   getLevelName: ->
     levelName = @rawData.sessions?[0]?.levelID
@@ -287,20 +427,54 @@ class SimulationTask
 
   getSessions: -> @rawData.sessions
 
+  getSpellKeyToTeamMap: -> @spellKeyToTeamMap
+
+  getPlayerTeams: -> _.pluck @rawData.sessions, 'team'
+
+  setWorld: (@world) ->
+
+
   generateSpellKeyToSourceMap: ->
+    playerTeams = _.pluck @rawData.sessions, 'team'
     spellKeyToSourceMap = {}
     for session in @rawData.sessions
       teamSpells = session.teamSpells[session.team]
+      allTeams = _.keys session.teamSpells
+      nonPlayerTeams = _.difference allTeams, playerTeams
+      for team in allTeams
+        for spell in session.teamSpells[team]
+          @spellKeyToTeamMap[spell] = team
+      for nonPlayerTeam in nonPlayerTeams
+        for spell in session.teamSpells[nonPlayerTeam]
+          spellKeyToSourceMap[spell] ?= @getWorldProgrammableSource(spell, @world)
+          @spellKeysToTranspile.push spell
       teamCode = {}
-      for thangName, thangSpells of session.code
+
+      for thangName, thangSpells of session.transpiledCode
         for spellName, spell of thangSpells
           fullSpellName = [thangName,spellName].join '/'
           if _.contains(teamSpells, fullSpellName)
             teamCode[fullSpellName]=spell
 
       _.merge spellKeyToSourceMap, teamCode
-      commonSpells = session.teamSpells["common"]
-      _.merge spellKeyToSourceMap, _.pick(session.code, commonSpells) if commonSpells?
-
 
     spellKeyToSourceMap
+
+  getWorldProgrammableSource: (desiredSpellKey ,world) ->
+    programmableThangs = _.filter world.thangs, 'isProgrammable'
+    language = @getSessions()[0]['codeLanguage'] ? me.get('aceConfig')?.language ? 'javascript'
+    @spells ?= {}
+    @thangSpells ?= {}
+    for thang in programmableThangs
+      continue if @thangSpells[thang.id]?
+      @thangSpells[thang.id] = []
+      for methodName, method of thang.programmableMethods
+        pathComponents = [thang.id, methodName]
+        if method.cloneOf
+          pathComponents[0] = method.cloneOf  # referencing another Thang's method
+        pathComponents[0] = _.string.slugify pathComponents[0]
+        spellKey = pathComponents.join '/'
+        @thangSpells[thang.id].push spellKey
+        if not method.cloneOf and spellKey is desiredSpellKey
+          #console.log "Setting #{desiredSpellKey} from world!"
+          return method.source

app/lib/sprites/SpriteParser.coffee

@@ -114,9 +114,11 @@ module.exports = class SpriteParser
       @animationRenamings[shortKey] = name
     else
       shortKey = name
+      if @thangType.animations[shortKey]?
+        shortKey = @animationName + ":" + name
       @thangType.animations[shortKey] = animation
       @animationLongKeys[longKey] = shortKey
-      @animationRenamings[name] = name
+      @animationRenamings[name] = shortKey
     return shortKey
 
   walk: (node, parent, fn) ->
@@ -188,9 +190,8 @@ module.exports = class SpriteParser
                   lastRect = bounds
                 else if arg.type is 'Literal' and arg.value is null
                   bounds = [0, 0, 1, 1]  # Let's try this.
-                frameBounds.push bounds
+                frameBounds.push _.clone bounds
           else
-            console.log "Didn't have multiframe bounds for this movie clip!"
             frameBounds = [nominalBounds]
 
           # Subtract half of width/height parsed from lib.properties
@@ -378,7 +379,9 @@ module.exports = class SpriteParser
         argsSource = argsSource.replace(/cjs(.+)\)/, '"createjs$1)"') # turns cjs.Ease.get(0.5)
 
         args = eval "[#{argsSource}]"
-        if args[0]?.state?[0]?.t?.search?("shape") is 0 and not _.find(localShapes, bn: args[0].state[0].t)
+        shadowTween = args[0]?.search?('shape') is 0 and not _.find(localShapes, bn: args[0])
+        shadowTween = shadowTween or args[0]?.state?[0]?.t?.search?("shape") is 0 and not _.find(localShapes, bn: args[0].state[0].t)
+        if shadowTween
           console.log "Skipping tween", name, argsSource, args, "from localShapes", localShapes, "presumably because it's a shadow we skipped."
           return
         callExpressions.push {n: name, a: args}

app/lib/storage.coffee

@@ -5,7 +5,7 @@ module.exports.load = (key) ->
     value = JSON.parse(s)
     return value
   catch SyntaxError
-    console.warning('error loading from storage', key)
+    console.warn('error loading from storage', key)
     return null
 
 module.exports.save = (key, value) ->

app/lib/surface/Camera.coffee

@@ -10,6 +10,8 @@ MIN_ZOOM = 0.1
 DEFAULT_ZOOM = 2.0
 DEFAULT_TARGET = {x:0, y:0}
 DEFAULT_TIME = 1000
+STANDARD_ZOOM_WIDTH = 924
+STANDARD_ZOOM_HEIGHT = 589
 
 # You can't mutate any of the constructor parameters after construction.
 # You can only call zoomTo to change the zoom target and zoom level.
@@ -23,6 +25,8 @@ module.exports = class Camera extends CocoClass
   # what the camera is pointed at right now
   target: DEFAULT_TARGET
   zoom: DEFAULT_ZOOM
+  canvasScaleFactorX: 1
+  canvasScaleFactorY: 1
 
   # properties for tracking going between targets
   oldZoom: null
@@ -38,20 +42,26 @@ module.exports = class Camera extends CocoClass
   subscriptions:
     'camera-zoom-in': 'onZoomIn'
     'camera-zoom-out': 'onZoomOut'
-    'surface:mouse-scrolled': 'onMouseScrolled'
+    'camera-zoom-to': 'onZoomTo'
     'level:restarted': 'onLevelRestarted'
+    'surface:mouse-scrolled': 'onMouseScrolled'
     'sprite:mouse-down': 'onMouseDown'
     'sprite:dragged': 'onMouseDragged'
-    'camera-zoom-to': 'onZoomTo'
 
-  constructor: (@canvasWidth, @canvasHeight, angle=Math.asin(0.75), hFOV=d2r(30)) ->
+  constructor: (@canvas, angle=Math.asin(0.75), hFOV=d2r(30)) ->
     super()
-    @offset = {x: 0, y:0}
+    @canvasWidth = parseInt(@canvas.attr('width'), 10)
+    @canvasHeight = parseInt(@canvas.attr('height'), 10)
+    @offset = {x: 0, y: 0}
     @calculateViewingAngle angle
     @calculateFieldOfView hFOV
     @calculateAxisConversionFactors()
+    @calculateMinMaxZoom()
     @updateViewports()
-    @calculateMinZoom()
+
+  onResize: (newCanvasWidth, newCanvasHeight) ->
+    @canvasScaleFactorX = newCanvasWidth / @canvasWidth
+    @canvasScaleFactorY = newCanvasHeight / @canvasHeight
 
   calculateViewingAngle: (angle) ->
     # Operate on open interval between 0 - 90 degrees to make the math easier
@@ -91,15 +101,11 @@ module.exports = class Camera extends CocoClass
   surfaceToCanvas: (pos) ->
     {x: (pos.x - @surfaceViewport.x) * @zoom, y: (pos.y - @surfaceViewport.y) * @zoom}
 
-  # TODO: do we even need separate screen coordinates?
-  # We would need some other properties for the actual ratio of screen size to canvas size.
   canvasToScreen: (pos) ->
-    #{x: pos.x * @someCanvasToScreenXScaleFactor, y: pos.y * @someCanvasToScreenYScaleFactor}
+    {x: pos.x * @canvasScaleFactorX, y: pos.y * @canvasScaleFactorY}
-    {x: pos.x, y: pos.y}
 
   screenToCanvas: (pos) ->
-    #{x: pos.x / @someCanvasToScreenXScaleFactor, y: pos.y / @someCanvasToScreenYScaleFactor}
+    {x: pos.x / @canvasScaleFactorX, y: pos.y / @canvasScaleFactorY}
-    {x: pos.x, y: pos.y}
 
   canvasToSurface: (pos) ->
     {x: pos.x / @zoom + @surfaceViewport.x, y: pos.y / @zoom + @surfaceViewport.y}
@@ -149,35 +155,36 @@ module.exports = class Camera extends CocoClass
   onZoomIn: (e) -> @zoomTo @target, @zoom * 1.15, 300
   onZoomOut: (e) -> @zoomTo @target, @zoom / 1.15, 300
   onMouseScrolled: (e) ->
+    return unless e.canvas is @canvas
     ratio = 1 + 0.05 * Math.sqrt(Math.abs(e.deltaY))
     ratio = 1 / ratio if e.deltaY > 0
     newZoom = @zoom * ratio
-    if e.surfacePos and not @focusedOnSprite()
+    if e.screenPos and not @focusedOnSprite()
       # zoom based on mouse position, adjusting the target so the point under the mouse stays the same
-      mousePoint = @canvasToSurface(e.surfacePos)
+      mousePoint = @screenToSurface(e.screenPos)
       ratioPosX = (mousePoint.x - @surfaceViewport.x) / @surfaceViewport.width
       ratioPosY = (mousePoint.y - @surfaceViewport.y) / @surfaceViewport.height
       newWidth = @canvasWidth / newZoom
       newHeight = @canvasHeight / newZoom
       newTargetX = mousePoint.x - (newWidth * ratioPosX) + (newWidth / 2)
       newTargetY = mousePoint.y - (newHeight * ratioPosY) + (newHeight / 2)
-      target = {x: newTargetX, y:newTargetY}
+      target = {x: newTargetX, y: newTargetY}
     else
       target = @target
-    if not(newZoom >= MAX_ZOOM or newZoom <= Math.max(@minZoom, MIN_ZOOM))
     @zoomTo target, newZoom, 0
 
   onMouseDown: (e) ->
+    return unless e.canvas is @canvas
     return if @dragDisabled
     @lastPos = {x: e.originalEvent.rawX, y: e.originalEvent.rawY}
 
   onMouseDragged: (e) ->
+    return unless e.canvas is @canvas
     return if @dragDisabled
     target = @boundTarget(@target, @zoom)
-    newPos = {
+    newPos =
       x: target.x + (@lastPos.x - e.originalEvent.rawX) / @zoom
       y: target.y + (@lastPos.y - e.originalEvent.rawY) / @zoom
-    }
     @zoomTo newPos, @zoom, 0
     @lastPos = {x: e.originalEvent.rawX, y: e.originalEvent.rawY}
     Backbone.Mediator.publish 'camera:dragged'
@@ -191,7 +198,7 @@ module.exports = class Camera extends CocoClass
     # receives an array of two world points. Normalize and apply them
     @firstBounds = worldBounds unless @firstBounds
     @bounds = @normalizeBounds(worldBounds)
-    @calculateMinZoom()
+    @calculateMinMaxZoom()
     @updateZoom true if updateZoom
     @target = @currentTarget unless @focusedOnSprite()
 
@@ -207,29 +214,31 @@ module.exports = class Camera extends CocoClass
     p2 = @worldToSurface({x:right, y:bottom})
     {x:p1.x, y:p1.y, width:p2.x-p1.x, height:p2.y-p1.y}
 
-  calculateMinZoom: ->
+  calculateMinMaxZoom: ->
     # Zoom targets are always done in Surface coordinates.
-    if not @bounds
+    @maxZoom = MAX_ZOOM
-      @minZoom = 0.5
+    return @minZoom = MIN_ZOOM unless @bounds
-      return
     @minZoom = Math.max @canvasWidth / @bounds.width, @canvasHeight / @bounds.height
-    @zoom = Math.max(@minZoom, @zoom) if @zoom
+    if @zoom
+      @zoom = Math.max @minZoom, @zoom
+      @zoom = Math.min @maxZoom, @zoom
 
   zoomTo: (newTarget=null, newZoom=1.0, time=1500) ->
     # Target is either just a {x, y} pos or a display object with {x, y} that might change; surface coordinates.
     time = 0 if @instant
-    newTarget ?= {x:0, y:0}
+    newTarget ?= {x: 0, y: 0}
     newTarget = (@newTarget or @target) if @locked
-    newZoom = Math.min((Math.max @minZoom, newZoom), MAX_ZOOM)
+    newZoom = Math.max newZoom, @minZoom
+    newZoom = Math.min newZoom, @maxZoom
 
     thangType = @target?.sprite?.thangType
     if thangType
-      @offset = _.clone(thangType.get('positions')?.torso or {x: 0, y:0})
+      @offset = _.clone(thangType.get('positions')?.torso or {x: 0, y: 0})
       scale = thangType.get('scale') or 1
       @offset.x *= scale
       @offset.y *= scale
     else
-      @offset = {x: 0, y:0}
+      @offset = {x: 0, y: 0}
 
     return if @zoom is newZoom and newTarget is newTarget.x and newTarget.y is newTarget.y
 
@@ -310,4 +319,4 @@ module.exports = class Camera extends CocoClass
     super()
 
   onZoomTo: (pos, time) ->
-    @zoomTo(@worldToSurface(pos), @zoom, time)
+    @zoomTo @worldToSurface(pos), @zoom, time

app/lib/surface/CastingScreen.coffee

@@ -15,8 +15,8 @@ module.exports = class CastingScreen extends CocoClass
     console.error @toString(), "needs a layer." unless @layer
     @build()
 
-  onCastingBegins: -> @show()
+  onCastingBegins: (e) -> @show() unless e.preload
-  onCastingEnds: -> @hide()
+  onCastingEnds: (e) -> @hide()
 
   toString: -> "<CastingScreen>"
 

app/lib/surface/CocoSprite.coffee

@@ -16,7 +16,6 @@ healthColors =
 module.exports = CocoSprite = class CocoSprite extends CocoClass
   thangType: null # ThangType instance
 
-  displayObject: null
   imageObject: null
 
   healthBar: null
@@ -25,7 +24,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
   ranges: null
 
   options:
-    resolutionFactor: 4
+    resolutionFactor: SPRITE_RESOLUTION_FACTOR
     groundLayer: null
     textLayer: null
     floatingLayer: null
@@ -34,16 +33,21 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     camera: null
     spriteSheetCache: null
     showInvisible: false
+    async: true
 
   possessed: false
   flipped: false
   flippedCount: 0
-  originalScaleX: null
-  originalScaleY: null
   actionQueue: null
   actions: null
   rotation: 0
 
+  # Scale numbers
+  baseScaleX: 1 # scale + flip (for current action) / resolutionFactor.
+  baseScaleY: 1 # These numbers rarely change, so keep them around.
+  scaleFactor: 1 # Current scale adjustment. This can change rapidly.
+  targetScaleFactor: 1 # What the scaleFactor is going toward during a tween.
+
   # ACTION STATE
   # Actions have relations. If you say 'move', 'move_side' may play because of a direction
   # relationship, and if you say 'cast', 'cast_begin' may happen first, or 'cast_end' after.
@@ -62,70 +66,96 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @options = _.extend($.extend(true, {}, @options), options)
     @setThang @options.thang
     console.error @toString(), "has no ThangType!" unless @thangType
+
+    # this is a stub, use @setImageObject to swap it out for something else later
+    @imageObject = new createjs.Container
+
     @actionQueue = []
     @marks = {}
     @labels = {}
     @ranges = []
-    @handledAoEs = {}
+    @handledDisplayEvents = {}
     @age = 0
-    @scaleFactor = @targetScaleFactor = 1
+    @stillLoading = true
-    @displayObject = new createjs.Container()
+    if @thangType.isFullyLoaded()
-    if @thangType.get('actions')
       @setupSprite()
     else
-      @stillLoading = true
       @thangType.fetch()
       @listenToOnce(@thangType, 'sync', @setupSprite)
 
   setupSprite: ->
+    for trigger, sounds of @thangType.get('soundTriggers') or {} when trigger isnt 'say'
+      AudioPlayer.preloadSoundReference sound for sound in sounds
+    if @thangType.get('raster')
+      @stillLoading = false
+      @actions = {}
+      @isRaster = true
+      @setUpRasterImage()
+    else
+      result = @buildSpriteSheet()
+      if _.isString result # async build
+        @listenToOnce @thangType,  'build-complete', @setupSprite
+      else
         @stillLoading = false
         @actions = @thangType.getActions()
-    @buildFromSpriteSheet @buildSpriteSheet()
+        @buildFromSpriteSheet result
         @createMarks()
 
-  destroy: ->
+  finishSetup: ->
-    mark.destroy() for name, mark of @marks
+    @updateBaseScale()
-    label.destroy() for name, label of @labels
+    @scaleFactor = @thang.scaleFactor if @thang?.scaleFactor
-    @imageObject?.off 'animationend', @playNextAction
+    @update true  # Reflect initial scale and other state
-    @displayObject?.off()
+
-    clearInterval @effectInterval if @effectInterval
+  setUpRasterImage: ->
-    super()
+    raster = @thangType.get('raster')
+    image = new createjs.Bitmap('/file/'+raster)
+    @setImageObject image
+    $(image.image).one 'load', => @updateScale?()
+    @configureMouse()
+    @imageObject.sprite = @
+    @imageObject.layerPriority = @thangType.get 'layerPriority'
+    @imageObject.name = @thang?.spriteName or @thangType.get 'name'
+    reg = @getOffset 'registration'
+    @imageObject.regX = -reg.x
+    @imageObject.regY = -reg.y
+    @finishSetup()
 
   toString: -> "<CocoSprite: #{@thang?.id}>"
 
   buildSpriteSheet: ->
     options = _.extend @options, @thang?.getSpriteOptions?() ? {}
     options.colorConfig = @options.colorConfig if @options.colorConfig
-    options.async = false
+    options.async = @options.async
     @thangType.getSpriteSheet options
 
+  setImageObject: (newImageObject) ->
+    if parent = @imageObject?.parent
+      parent.removeChild @imageObject
+      parent.addChild newImageObject
+    @imageObject = newImageObject
+
   buildFromSpriteSheet: (spriteSheet) ->
     if spriteSheet
       sprite = new createjs.Sprite(spriteSheet)
     else
       sprite = new createjs.Shape()
-    sprite.scaleX = sprite.scaleY = 1 / @options.resolutionFactor
+
-    # temp, until these are re-exported with perspective
+    @setImageObject sprite
-    if @options.camera and @thangType.get('name') in ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Goal Trigger', 'Obstacle']
-      sprite.scaleY *= @options.camera.y2x
-    @displayObject.removeChild(@imageObject) if @imageObject
-    @imageObject = sprite
-    @displayObject.addChild(sprite)
     @addHealthBar()
     @configureMouse()
     # TODO: generalize this later?
-    @originalScaleX = sprite.scaleX
+    @imageObject.sprite = @
-    @originalScaleY = sprite.scaleY
+    @imageObject.layerPriority = @thangType.get 'layerPriority'
-    @displayObject.sprite = @
+    @imageObject.name = @thang?.spriteName or @thangType.get 'name'
-    @displayObject.layerPriority = @thangType.get 'layerPriority'
-    @displayObject.name = @thang?.spriteName or @thangType.get 'name'
     @imageObject.on 'animationend', @playNextAction
+    @finishSetup()
 
   ##################################################
   # QUEUEING AND PLAYING ACTIONS
 
   queueAction: (action) ->
     # The normal way to have an action play
+    return unless @thangType.isFullyLoaded()
     action = @actions[action] if _.isString(action)
     action ?= @actions.idle
     @actionQueue = []
@@ -143,9 +173,11 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @playAction(@actionQueue.splice(0,1)[0]) if @actionQueue.length
 
   playAction: (action) ->
+    return if @isRaster
     @currentAction = action
     return @hide() unless action.animation or action.container or action.relatedActions
     @show()
+    @updateBaseScale()
     return @updateActionDirection() unless action.animation or action.container
     m = if action.container then "gotoAndStop" else "gotoAndPlay"
     @imageObject.framerate = action.framerate or 20
@@ -168,16 +200,20 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
   stop: ->
     @imageObject?.stop?()
     mark.stop() for name, mark of @marks
+    @stopped = true
 
   play: ->
     @imageObject?.play?()
     mark.play() for name, mark of @marks
+    @stopped = false
 
   update: (frameChanged) ->
     # Gets the sprite to reflect what the current state of the thangs and surface are
     return if @stillLoading
     @updatePosition()
+    frameChanged = frameChanged or @targetScaleFactor isnt @scaleFactor
     if frameChanged
+      @handledDisplayEvents = {}
       @updateScale()  # must happen before rotation
       @updateAlpha()
       @updateRotation()
@@ -185,6 +221,8 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       @updateStats()
       @updateGold()
       @showAreaOfEffects()
+      @showTextEvents()
+      @updateHealthBar()
     @updateMarks()
     @updateLabels()
 
@@ -192,9 +230,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     return unless @thang?.currentEvents
     for event in @thang.currentEvents
       continue unless event.startsWith 'aoe-'
-      continue if @handledAoEs[event]
+      continue if @handledDisplayEvents[event]
 
-      @handledAoEs[event] = true
+      @handledDisplayEvents[event] = true
       args = JSON.parse(event[4...])
       pos = @options.camera.worldToSurface {x:args[0], y:args[1]}
       circle = new createjs.Shape()
@@ -212,16 +250,42 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
         .call =>
           return if @destroyed
           @options.groundLayer.removeChild circle
-          delete @handledAoEs[event]
+          delete @handledDisplayEvents[event]
+
+  showTextEvents: ->
+    return unless @thang?.currentEvents
+    for event in @thang.currentEvents
+      continue unless event.startsWith 'text-'
+      continue if @handledDisplayEvents[event]
+      @handledDisplayEvents[event] = true
+      options = JSON.parse(event[5...])
+      label = new createjs.Text options.text, "bold #{options.size or 16}px Arial", options.color or '#FFF'
+      shadowColor = {humans: '#F00', ogres: '#00F', neutral: '#0F0', common: '#0F0'}[@thang.team] ? '#000'
+      label.shadow = new createjs.Shadow shadowColor, 1, 1, 3
+      offset = @getOffset 'aboveHead'
+      [label.x, label.y] = [@imageObject.x + offset.x - label.getMeasuredWidth() / 2, @imageObject.y + offset.y]
+      @options.floatingLayer.addChild label
+      window.labels ?= []
+      window.labels.push label
+      label.alpha = 0
+      createjs.Tween.get(label)
+        .to({y:label.y-2, alpha:1}, 200, createjs.Ease.linear)
+        .to({y:label.y-12}, 1000, createjs.Ease.linear)
+        .to({y:label.y-22, alpha:0}, 1000, createjs.Ease.linear)
+        .call =>
+          return if @destroyed
+          @options.floatingLayer.removeChild label
+
 
   cache: ->
     bounds = @imageObject.getBounds()
-    @displayObject.cache 0, 0, bounds.width, bounds.height
+    @imageObject.cache 0, 0, bounds.width, bounds.height
     #console.log "just cached", @thang.id, "which was at", @imageObject.x, @imageObject.y, bounds.width, bounds.height, "with scale", Math.max(@imageObject.scaleX, @imageObject.scaleY)
 
   getBobOffset: ->
     return 0 unless @thang.bobHeight
-    @thang.bobHeight * (1 + Math.sin(@age * Math.PI / @thang.bobTime))
+    return @lastBobOffset if @stopped
+    return @lastBobOffset = @thang.bobHeight * (1 + Math.sin(@age * Math.PI / @thang.bobTime))
 
   getWorldPosition: ->
     p1 = if @possessed then @shadow.pos else @thang.pos
@@ -230,29 +294,48 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       p1.z += bobOffset
     x: p1.x, y: p1.y, z: if @thang.isLand then 0 else p1.z - @thang.depth / 2
 
-  updatePosition: ->
+  updatePosition: (log) ->
+    return if @stillLoading
     return unless @thang?.pos and @options.camera?
     wop = @getWorldPosition()
     [p0, p1] = [@lastPos, @thang.pos]
-    return if p0 and p0.x is p1.x and p0.y is p1.y and p0.z is p1.z and not @options.camera.tweeningZoomTo
+    return if p0 and p0.x is p1.x and p0.y is p1.y and p0.z is p1.z and not @options.camera.tweeningZoomTo and not @thang.bobHeight
     sup = @options.camera.worldToSurface wop
-    [@displayObject.x, @displayObject.y] = [sup.x, sup.y]
+    [@imageObject.x, @imageObject.y] = [sup.x, sup.y]
     @lastPos = p1.copy?() or _.clone(p1)
     @hasMoved = true
 
+  updateBaseScale: ->
+    scale = 1
+    scale = @thangType.get('scale') or 1 if @isRaster
+    scale /= @options.resolutionFactor unless @isRaster
+    @baseScaleX = @baseScaleY = scale
+    @baseScaleX *= -1 if @getActionProp 'flipX'
+    @baseScaleY *= -1 if @getActionProp 'flipY'
+    # temp, until these are re-exported with perspective
+    floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Goal Trigger', 'Obstacle']
+    if @options.camera and @thangType.get('name') in floors
+      @baseScaleY *= @options.camera.y2x
+
   updateScale: ->
+    return unless @imageObject
     if @thangType.get('matchWorldDimensions') and @thang
       if @thang.width isnt @lastThangWidth or @thang.height isnt @lastThangHeight
-        [@lastThangWidth, @lastThangHeight] = [@thang.width, @thang.height]
         bounds = @imageObject.getBounds()
+        return unless bounds
         @imageObject.scaleX = @thang.width * Camera.PPM / bounds.width
         @imageObject.scaleY = @thang.height * Camera.PPM * @options.camera.y2x / bounds.height
+        @imageObject.regX = bounds.width / 2
+        @imageObject.regY = bounds.height / 2
+
         unless @thang.spriteName is 'Beam'
           @imageObject.scaleX *= @thangType.get('scale') ? 1
           @imageObject.scaleY *= @thangType.get('scale') ? 1
+        [@lastThangWidth, @lastThangHeight] = [@thang.width, @thang.height]
       return
-    scaleX = if @getActionProp 'flipX' then -1 else 1
+
-    scaleY = if @getActionProp 'flipY' then -1 else 1
+    scaleX = scaleY = 1
+
     if @thangType.get('name') in ['Arrow', 'Spear']
       # Scales the arrow so it appears longer when flying parallel to horizon.
       # To do that, we convert angle to [0, 90] (mirroring half-planes twice), then make linear function out of it:
@@ -266,15 +349,16 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       angle = -angle if angle < 0
       angle = 180 - angle if angle > 90
       scaleX = 0.5 + 0.5 * (90 - angle) / 90
-    scaleFactorX = @thang.scaleFactorX ? @scaleFactor
-    scaleFactorY = @thang.scaleFactorY ? @scaleFactor
-    @imageObject.scaleX = @originalScaleX * scaleX * scaleFactorX
-    @imageObject.scaleY = @originalScaleY * scaleY * scaleFactorY
 
-    if (@thang.scaleFactor or 1) isnt @targetScaleFactor
+#    console.error "No thang for", @ unless @thang
+    # TODO: support using scaleFactorX/Y from the thang object
+    @imageObject.scaleX = @baseScaleX * @scaleFactor * scaleX
+    @imageObject.scaleY = @baseScaleY * @scaleFactor * scaleY
+
+    if @thang and (@thang.scaleFactor or 1) isnt @targetScaleFactor
       createjs.Tween.removeTweens(@)
       createjs.Tween.get(@).to({scaleFactor:@thang.scaleFactor or 1}, 2000, createjs.Ease.elasticOut)
-      @targetScaleFactor = @thang.scaleFactor
+      @targetScaleFactor = @thang.scaleFactor or 1
 
   updateAlpha: ->
     @imageObject.alpha = if @hiding then 0 else 1
@@ -318,12 +402,13 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
 
   ##################################################
   updateAction: ->
+    return if @isRaster
     action = @determineAction()
     isDifferent = action isnt @currentRootAction or action is null
     if not action and @thang?.actionActivated and not @stopLogging
       console.error "action is", action, "for", @thang?.id, "from", @currentRootAction, @thang.action, @thang.getActionName?()
       @stopLogging = true
-    @queueAction(action) if isDifferent or (@thang?.actionActivated and action.name isnt 'move')
+    @queueAction(action) if action and (isDifferent or (@thang?.actionActivated and action.name isnt 'move'))
     @updateActionDirection()
 
   determineAction: ->
@@ -332,8 +417,11 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     action = thang.action if thang?.acts
     action ?= @currentRootAction.name if @currentRootAction?
     action ?= 'idle'
-    action = null unless @actions[action]?
+    unless @actions[action]?
-    return null unless action
+      @warnedFor ?= {}
+      console.warn 'Cannot show action', action, 'for', @thangType.get('name'), 'because it DNE' unless @warnedFor[action]
+      @warnedFor[action] = true
+      return if @action is 'idle' then null else 'idle'
     action = 'break' if @actions.break? and @thang?.erroredOut
     action = 'die' if @actions.die? and thang?.health? and thang.health <= 0
     @actions[action]
@@ -397,32 +485,35 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       [bar.x, bar.y] = [healthOffset.x - bar.width / 2, healthOffset.y]
 
   configureMouse: ->
-    @displayObject.cursor = 'pointer' if @thang?.isSelectable
+    @imageObject.cursor = 'pointer' if @thang?.isSelectable
-    @displayObject.mouseEnabled = @displayObject.mouseChildren = false unless @thang?.isSelectable or @thang?.isLand
+    @imageObject.mouseEnabled = @imageObject.mouseChildren = false unless @thang?.isSelectable or @thang?.isLand
-    if @displayObject.mouseEnabled
+    if @imageObject.mouseEnabled
-      @displayObject.on 'mousedown', @onMouseEvent, @, false, 'sprite:mouse-down'
+      @imageObject.on 'mousedown', @onMouseEvent, @, false, 'sprite:mouse-down'
-      @displayObject.on 'click',     @onMouseEvent, @, false, 'sprite:clicked'
+      @imageObject.on 'click',     @onMouseEvent, @, false, 'sprite:clicked'
-      @displayObject.on 'dblclick',  @onMouseEvent, @, false, 'sprite:double-clicked'
+      @imageObject.on 'dblclick',  @onMouseEvent, @, false, 'sprite:double-clicked'
-      @displayObject.on 'pressmove', @onMouseEvent, @, false, 'sprite:dragged'
+      @imageObject.on 'pressmove', @onMouseEvent, @, false, 'sprite:dragged'
-      @displayObject.on 'pressup',   @onMouseEvent, @, false, 'sprite:mouse-up'
+      @imageObject.on 'pressup',   @onMouseEvent, @, false, 'sprite:mouse-up'
 
   onSetLetterbox: (e) ->
     @letterboxOn = e.on
 
   onMouseEvent: (e, ourEventName) ->
     return if @letterboxOn
-    Backbone.Mediator.publish ourEventName, sprite: @, thang: @thang, originalEvent: e
+    p = @imageObject
+    p = p.parent while p.parent
+    newEvent = sprite: @, thang: @thang, originalEvent: e, canvas:p
+    @trigger ourEventName, newEvent
+    Backbone.Mediator.publish ourEventName, newEvent
 
   addHealthBar: ->
-    @displayObject.removeChild @healthBar if @healthBar?.parent
+    return unless @thang?.health? and "health" in (@thang?.hudProperties ? []) and @options.floatingLayer
-    return unless @thang?.health? and "health" in (@thang?.hudProperties ? [])
     healthColor = healthColors[@thang?.team] ? healthColors["neutral"]
     healthOffset = @getOffset 'aboveHead'
-    bar = @healthBar = createProgressBar(healthColor, healthOffset.y)
+    bar = @healthBar = createProgressBar(healthColor, healthOffset)
-    bar.x = healthOffset.x - bar.width / 2
     bar.name = 'health bar'
     bar.cache 0, -bar.height * bar.baseScale / 2, bar.width * bar.baseScale, bar.height * bar.baseScale
-    @displayObject.addChild bar
+    @options.floatingLayer.addChild bar
+    @updateHealthBar()
 
   getActionProp: (prop, subProp, def=null) ->
     # Get a property or sub-property from an action, falling back to ThangType
@@ -436,6 +527,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     def = x: 0, y: {registration: 0, torso: -50, mouth: -60, aboveHead: -100}[prop]
     pos = @getActionProp 'positions', prop, def
     pos = x: pos.x, y: pos.y
+    if not @isRaster
       scale = @getActionProp 'scale', null, 1
       scale *= @options.resolutionFactor if prop is 'registration'
       pos.x *= scale
@@ -444,6 +536,10 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       scaleFactor = @thang.scaleFactor ? 1
       pos.x *= @thang.scaleFactorX ? scaleFactor
       pos.y *= @thang.scaleFactorY ? scaleFactor
+    # We might need to do this, but I don't have a good test case yet. TODO: figure out.
+    #if prop isnt @registration
+    #  pos.x *= if @getActionProp 'flipX' then -1 else 1
+    #  pos.y *= if @getActionProp 'flipY' then -1 else 1
     pos
 
   createMarks: ->
@@ -455,7 +551,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       allProps = allProps.concat (@thang.moreProgrammableProperties ? [])
 
       for property in allProps
-        if m = property.match /.*Range$/
+        if m = property.match /.*(Range|Distance|Radius)$/
           if @thang[m[0]]? and @thang[m[0]] < 9001
             @ranges.push
               name: m[0]
@@ -480,13 +576,14 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       @marks[range['name']].toggle false for range in @ranges
 
     if @thangType.get('name') in ['Arrow', 'Spear'] and @thang.action is 'die'
-      @marks.shadow.hide()
+      @marks.shadow?.hide()
     mark.update() for name, mark of @marks
     #@thang.effectNames = ['berserk', 'confuse', 'control', 'curse', 'fear', 'poison', 'paralyze', 'regen', 'sleep', 'slow', 'haste']
     @updateEffectMarks() if @thang?.effectNames?.length or @previousEffectNames?.length
 
   updateEffectMarks: ->
     return if _.isEqual @thang.effectNames, @previousEffectNames
+    return if @stopped
     for effect in @thang.effectNames
       mark = @addMark effect, @options.floatingLayer, effect
       mark.statusEffect = true
@@ -534,11 +631,6 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @addMark 'debug', @options.floatingLayer if debug
     @marks.debug?.toggle debug
 
-  getAverageDimension: ->
-    bounds = @imageObject.getBounds()
-    averageDimension = (bounds.height + bounds.width) / 2
-    Math.min(80, averageDimension)
-
   addLabel: (name, style) ->
     @labels[name] ?= new Label sprite: @, camera: @options.camera, layer: @options.textLayer, style: style
     @labels[name]
@@ -587,11 +679,14 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
   updateGold: ->
     # TODO: eventually this should be moved into some sort of team-based update
     # rather than an each-thang-that-shows-gold-per-team thing.
+    return unless @thang
     return if @thang.gold is @lastGold
     gold = Math.floor @thang.gold
+    if @thang.world.age is 0
+      gold = @thang.world.initialTeamGold[@thang.team].gold
     return if gold is @lastGold
     @lastGold = gold
-    Backbone.Mediator.publish 'surface:gold-changed', {team: @thang.team, gold: gold}
+    Backbone.Mediator.publish 'surface:gold-changed', {team: @thang.team, gold: gold, goldEarned: Math.floor(@thang.goldEarned)}
 
   playSounds: (withDelay=true, volume=1.0) ->
     for event in @thang.currentEvents ? []
@@ -615,7 +710,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     delay = if withDelay and sound.delay then 1000 * sound.delay / createjs.Ticker.getFPS() else 0
     name = AudioPlayer.nameForSoundReference sound
     instance = AudioPlayer.playSound name, volume, delay, @getWorldPosition()
-#    console.log @thang?.id, "played sound", name, "with delay", delay, "volume", volume, "and got sound instance", instance
+    #console.log @thang?.id, "played sound", name, "with delay", delay, "volume", volume, "and got sound instance", instance
     instance
 
   onMove: (e) ->
@@ -644,7 +739,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       z = @shadow.pos.z
       @shadow.pos = pos
       @shadow.pos.z = z
-      @imageObject.gotoAndPlay(endAnimation)
+      @imageObject.gotoAndPlay?(endAnimation)
       return
 
     @shadow.action = 'move'
@@ -660,7 +755,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
 
     endFunc = =>
       @lastTween = null
-      @imageObject.gotoAndPlay(endAnimation)
+      @imageObject.gotoAndPlay(endAnimation) unless @stillLoading
       @shadow.action = 'idle'
       @update true
       @possessed = false
@@ -681,3 +776,16 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @shadow.rotation = @thang.rotation
     @shadow.action = @thang.action
     @shadow.actionActivated = @thang.actionActivated
+
+  updateHealthBar: ->
+    return unless @healthBar
+    @healthBar.x = @imageObject.x
+    @healthBar.y = @imageObject.y
+
+  destroy: ->
+    mark.destroy() for name, mark of @marks
+    label.destroy() for name, label of @labels
+    p.removeChild @healthBar if p = @healthBar?.parent
+    @imageObject?.off 'animationend', @playNextAction
+    clearInterval @effectInterval if @effectInterval
+    super()

app/lib/surface/CoordinateDisplay.coffee

@@ -24,7 +24,7 @@ module.exports = class CoordinateDisplay extends createjs.Container
   build: ->
     @mouseEnabled = @mouseChildren = false
     @addChild @background = new createjs.Shape()
-    @addChild @label = new createjs.Text("", "bold 32px Arial", "#FFFFFF")
+    @addChild @label = new createjs.Text("", "bold 16px Arial", "#FFFFFF")
     @label.name = 'Coordinate Display Text'
     @label.shadow = new createjs.Shadow("#000000", 1, 1, 0)
     @background.name = "Coordinate Display Background"
@@ -37,7 +37,7 @@ module.exports = class CoordinateDisplay extends createjs.Container
       $('#surface').addClass('flag-cursor') unless $('#surface').hasClass('flag-cursor')
     else if @mouseInBounds
       $('#surface').removeClass('flag-cursor') if $('#surface').hasClass('flag-cursor')
-    wop = @camera.canvasToWorld x: e.x, y: e.y
+    wop = @camera.screenToWorld x: e.x, y: e.y
     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
@@ -47,7 +47,7 @@ module.exports = class CoordinateDisplay extends createjs.Container
 
   onMouseDown: (e) ->
     return unless key.shift
-    wop = @camera.canvasToWorld x: e.x, y: e.y
+    wop = @camera.screenToWorld x: e.x, y: e.y
     wop.x = Math.round wop.x
     wop.y = Math.round wop.y
     Backbone.Mediator.publish 'surface:coordinate-selected', wop
@@ -63,8 +63,8 @@ module.exports = class CoordinateDisplay extends createjs.Container
     @uncache()
 
   updateSize: ->
-    margin = 6
+    margin = 3
-    radius = 5
+    radius = 2.5
     width = @label.getMeasuredWidth() + 2 * margin
     height = @label.getMeasuredHeight() + 2 * margin
     @label.regX = @background.regX = width / 2 - margin
@@ -81,11 +81,11 @@ module.exports = class CoordinateDisplay extends createjs.Container
 
   show: =>
     return unless @mouseInBounds and @lastPos and not @destroyed
-    @label.text = "(#{@lastPos.x}, #{@lastPos.y})"
+    @label.text = "{x: #{@lastPos.x}, y: #{@lastPos.y}}"
     [width, height] = @updateSize()
     sup = @camera.worldToSurface @lastPos
     @x = sup.x
-    @y = sup.y - 5
+    @y = sup.y - 2.5
     @addChild @background
     @addChild @label
     @cache -width / 2, -height / 2, width, height

app/lib/surface/DebugDisplay.coffee

@@ -25,10 +25,10 @@ module.exports = class DebugDisplay extends createjs.Container
 
   build: ->
     @mouseEnabled = @mouseChildren = false
-    @addChild @frameText = new createjs.Text "...", "40px Arial", "#FFF"
+    @addChild @frameText = new createjs.Text "...", "20px Arial", "#FFF"
     @frameText.name = 'frame text'
-    @frameText.x = @canvasWidth - 100
+    @frameText.x = @canvasWidth - 50
-    @frameText.y = @canvasHeight - 50
+    @frameText.y = @canvasHeight - 25
     @frameText.alpha = 0.5
 
   updateFrame: (currentFrame) ->
@@ -42,4 +42,4 @@ module.exports = class DebugDisplay extends createjs.Container
       @framesRenderedThisSecond = 0
 
     @frameText.text = Math.round(currentFrame) + (if @fps? then " - " + @fps + ' fps' else '')
-    @frameText.x = @canvasWidth - @frameText.getMeasuredWidth() - 20
+    @frameText.x = @canvasWidth - @frameText.getMeasuredWidth() - 10

app/lib/surface/Dimmer.coffee

@@ -67,7 +67,7 @@ module.exports = class Dimmer extends CocoClass
     @dimMask.graphics.clear()
     for thangID, sprite of @sprites
       continue unless (thangID in @highlightedThangIDs) or sprite.isTalking?() or sprite.thang?.id is 'My Wizard'
-      sup = x: sprite.displayObject.x, y: sprite.displayObject.y
+      sup = x: sprite.imageObject.x, y: sprite.imageObject.y
       cap = @camera.surfaceToCanvas sup
       r = 50 * @camera.zoom  # TODO: find better way to get the radius based on the sprite's size
       @dimMask.graphics.beginRadialGradientFill(["rgba(0,0,0,1)", "rgba(0,0,0,0)"], [0.5, 1], cap.x, cap.y, 0, cap.x, cap.y, r).drawCircle(cap.x, cap.y, r)

app/lib/surface/Label.coffee

@@ -45,10 +45,12 @@ module.exports = class Label extends CocoClass
 
   update: ->
     return unless @text
-    offset = @sprite.getOffset? (if @style is 'dialogue' then 'mouth' else 'aboveHead')
+    offset = @sprite.getOffset? (if @style in ['dialogue', 'say'] then 'mouth' else 'aboveHead')
     offset ?= x: 0, y: 0  # temp (if not CocoSprite)
-    @label.x = @background.x = @sprite.displayObject.x + offset.x
+    rotation = @sprite.getRotation()
-    @label.y = @background.y = @sprite.displayObject.y + offset.y
+    offset.x *= -1 if rotation >= 135 or rotation <= -135
+    @label.x = @background.x = @sprite.imageObject.x + offset.x
+    @label.y = @background.y = @sprite.imageObject.y + offset.y
     null
 
   buildLabelOptions: ->
@@ -59,7 +61,7 @@ module.exports = class Label extends CocoClass
     o.fontWeight = {D: "bold", S: "bold", N: "bold"}[st]
     o.shadow = {D: false, S: true, N: true}[st]
     o.shadowColor = {D: "#FFF", S: "#000", N: "#FFF"}[st]
-    o.fontSize = {D: 50, S: 24, N: 24}[st]
+    o.fontSize = {D: 25, S: 12, N: 12}[st]
     fontFamily = {D: "Arial", S: "Arial", N: "Arial"}[st]
     o.fontDescriptor = "#{o.fontWeight} #{o.fontSize}px #{fontFamily}"
     o.fontColor = {D: "#000", S: "#FFF", N: "#00a"}[st]
@@ -106,7 +108,7 @@ module.exports = class Label extends CocoClass
       pointerWidth += radius  # Convenience value including pointer width and border radius
 
       # Figure out the position of the pointer for the bubble
-      sup = x: @sprite.displayObject.x, y: @sprite.displayObject.y  # a little more accurate to aim for mouth--how?
+      sup = x: @sprite.imageObject.x, y: @sprite.imageObject.y  # a little more accurate to aim for mouth--how?
       cap = @camera.surfaceToCanvas sup
       hPos = if cap.x / @camera.canvasWidth > 0.53 then 'right' else 'left'
       vPos = if cap.y / @camera.canvasHeight > 0.53 then 'bottom' else 'top'
@@ -172,6 +174,8 @@ module.exports = class Label extends CocoClass
       if width > maxWidth
         if row.length is 1 # one long word, truncate it
           row[0] = _.string.truncate(row[0], 40)
+          text.text = row[0]
+          textWidth = Math.max(text.getMeasuredWidth(), textWidth)
           rows.push(row)
           row = []
         else
@@ -180,7 +184,7 @@ module.exports = class Label extends CocoClass
           row = [word]
       else
         textWidth = Math.max(textWidth, width)
-    rows.push(row)
+    rows.push(row) if row.length
     for row, i in rows
       rows[i] = _.string.join(" ", row...)
     text: _.string.join("\n", rows...), textWidth: textWidth

app/lib/surface/Layer.coffee

@@ -35,12 +35,13 @@ module.exports = class Layer extends createjs.Container
     @transformStyle = options.transform ? Layer.TRANSFORM_CHILD
     @camera = options.camera
     console.error @toString(), "needs a camera." unless @camera
-    @updateLayerOrder = _.throttle @updateLayerOrder, 1  # don't call multiple times in one frame
+    @updateLayerOrder = _.throttle @updateLayerOrder, 1000 / 30  # Don't call multiple times in one frame; 30 FPS is probably good enough
     Backbone.Mediator.subscribe(channel, @[func], @) for channel, func of @subscriptions
 
   destroy: ->
     child.destroy?() for child in @children
     Backbone.Mediator.unsubscribe(channel, @[func], @) for channel, func of @subscriptions
+    delete @updateLayerOrder
 
   toString: -> "<Layer #{@layerPriority}: #{@name}>"
 
@@ -60,20 +61,29 @@ module.exports = class Layer extends createjs.Container
 
   updateLayerOrder: =>
     #console.log @, @toString(), "sorting children", _.clone @children if @name is 'Default'
-    @sortChildren (a, b) ->
+    @sortChildren @layerOrderComparator
-      alp = a.layerPriority ? 0
+
-      blp = b.layerPriority ? 0
+  layerOrderComparator: (a, b) ->
+    # Optimize
+    alp = a.layerPriority or 0
+    blp = b.layerPriority or 0
     return alp - blp if alp isnt blp
     # TODO: remove this z stuff
-      az = if a.z then a.z else 1000
+    az = a.z or 1000
-      bz = if b.z then b.z else 1000
+    bz = b.z or 1000
-      aThang = a.sprite?.thang
+    if aSprite = a.sprite
-      bThang = b.sprite?.thang
+      if aThang = aSprite.thang
-      az -= 1 if aThang?.health < 0
+        aPos = aThang.pos
-      bz -= 1 if bThang?.health < 0
+        if aThang.health < 0
-      if az == bz
+          --az
-        return 0 unless aThang?.pos and bThang?.pos
+    if bSprite = b.sprite
-        return (bThang.pos.y - aThang.pos.y) or (bThang.pos.x - aThang.pos.x)
+      if bThang = bSprite.thang
+        bPos = bThang.pos
+        if bThang.health < 0
+          --bz
+    if az is bz
+      return 0 unless aPos and bPos
+      return (bPos.y - aPos.y) or (bPos.x - aPos.x)
     return az - bz
 
   onZoomUpdated: (e) ->
@@ -91,4 +101,5 @@ module.exports = class Layer extends createjs.Container
   cache: ->
     return unless @children.length
     bounds = @getBounds()
+    return unless bounds
     super bounds.x, bounds.y, bounds.width, bounds.height, 2

app/lib/surface/Mark.coffee

@@ -20,6 +20,7 @@ module.exports = class Mark extends CocoClass
     @build()
 
   destroy: ->
+    createjs.Tween.removeTweens @mark if @mark
     @mark?.parent?.removeChild @mark
     @markSprite?.destroy()
     @sprite = null
@@ -54,7 +55,7 @@ module.exports = class Mark extends CocoClass
       if @name is 'bounds' then @buildBounds()
       else if @name is 'shadow' then @buildShadow()
       else if @name is 'debug' then @buildDebug()
-      else if @name.match(/.+Range$/) then @buildRadius(@name)
+      else if @name.match(/.+(Range|Distance|Radius)$/) then @buildRadius(@name)
       else if @thangType then @buildSprite()
       else console.error "Don't know how to build mark for", @name
       @mark?.mouseEnabled = false
@@ -81,7 +82,7 @@ module.exports = class Mark extends CocoClass
     shape.graphics.endStroke()
     shape.graphics.endFill()
 
-    text = new createjs.Text "" + index, "40px Arial", color.replace('0.5', '1')
+    text = new createjs.Text "" + index, "20px Arial", color.replace('0.5', '1')
     text.regX = text.getMeasuredWidth() / 2
     text.regY = text.getMeasuredHeight() / 2
     text.shadow = new createjs.Shadow("#000000", 1, 1, 0)
@@ -93,6 +94,7 @@ module.exports = class Mark extends CocoClass
     @lastHeight = @sprite.thang.height
 
   buildShadow: ->
+    alpha = @sprite.thang?.alpha ? 1
     width = (@sprite.thang?.width ? 0) + 0.5
     height = (@sprite.thang?.height ? 0) + 0.5
     longest = Math.max width, height
@@ -103,7 +105,7 @@ module.exports = class Mark extends CocoClass
     height *= Camera.PPM * @camera.y2x  # TODO: doesn't work with rotation
     @mark = new createjs.Shape()
     @mark.mouseEnabled = false
-    @mark.graphics.beginFill "black"
+    @mark.graphics.beginFill "rgba(0, 0, 0, #{alpha})"
     if @sprite.thang.shape in ['ellipsoid', 'disc']
       @mark.graphics.drawEllipse 0, 0, width, height
     else
@@ -112,17 +114,17 @@ module.exports = class Mark extends CocoClass
     @mark.regX = width / 2
     @mark.regY = height / 2
     @mark.layerIndex = 10
-    #@mark.cache 0, 0, diameter, diameter  # not actually faster than simple ellipse draw
+    @mark.cache -1, 0, width+2, height # not actually faster than simple ellipse draw
 
   buildRadius: (range) ->
-    alpha = 0.35
+    alpha = 0.15
     colors =
       voiceRange: "rgba(0, 145, 0, #{alpha})"
       visualRange: "rgba(0, 0, 145, #{alpha})"
       attackRange: "rgba(145, 0, 0, #{alpha})"
 
     # Fallback colors which work on both dungeon and grass tiles
-    extracolors = [
+    extraColors = [
       "rgba(145, 0, 145, #{alpha})"
       "rgba(0, 145, 145, #{alpha})"
       "rgba(145, 105, 0, #{alpha})"
@@ -137,10 +139,8 @@ module.exports = class Mark extends CocoClass
 
     @mark = new createjs.Shape()
 
-    if colors[range]?
+    fillColor = colors[range] ? extraColors[i]
-      @mark.graphics.beginFill colors[range]
+    @mark.graphics.beginFill fillColor
-    else
-      @mark.graphics.beginFill extracolors[i]
 
     # Draw the outer circle
     @mark.graphics.drawCircle 0, 0, @sprite.thang[range] * Camera.PPM
@@ -149,13 +149,16 @@ module.exports = class Mark extends CocoClass
     if i+1 < @sprite.ranges.length
       @mark.graphics.arc 0, 0, @sprite.ranges[i+1]['radius'], Math.PI*2, 0, true
 
-    # Add perspective
-    @mark.scaleY *= @camera.y2x
-
-    @mark.graphics.endStroke()
     @mark.graphics.endFill()
 
-    return
+    strokeColor = fillColor.replace '' + alpha, '0.75'
+    @mark.graphics.setStrokeStyle 2
+    @mark.graphics.beginStroke strokeColor
+    @mark.graphics.arc 0, 0, @sprite.thang[range] * Camera.PPM, Math.PI*2, 0, true
+    @mark.graphics.endStroke()
+
+    # Add perspective
+    @mark.scaleY *= @camera.y2x
 
   buildDebug: ->
     @mark = new createjs.Shape()
@@ -178,9 +181,10 @@ module.exports = class Mark extends CocoClass
 
     return @listenToOnce(@thangType, 'sync', @onLoadedThangType) if not @thangType.loaded
     CocoSprite = require './CocoSprite'
-    markSprite = new CocoSprite @thangType, @thangType.spriteOptions
+    # don't bother with making these render async for now, but maybe later for fun and more complexity of code
+    markSprite = new CocoSprite @thangType, {async: false}
     markSprite.queueAction 'idle'
-    @mark = markSprite.displayObject
+    @mark = markSprite.imageObject
     @markSprite = markSprite
 
   loadThangType: ->
@@ -199,11 +203,11 @@ module.exports = class Mark extends CocoClass
 
   update: (pos=null) ->
     return false unless @on and @mark
+    return false if @sprite? and not @sprite.thangType.isFullyLoaded()
     @mark.visible = not @hidden
     @updatePosition pos
     @updateRotation()
     @updateScale()
-    @mark.advance?()
     if @name is 'highlight' and @highlightDelay and not @highlightTween
       @mark.visible = false
       @highlightTween = createjs.Tween.get(@mark).to({}, @highlightDelay).call =>
@@ -218,7 +222,7 @@ module.exports = class Mark extends CocoClass
         worldZ = @sprite.thang.pos.z - @sprite.thang.depth / 2 + @sprite.getBobOffset()
         @mark.alpha = 0.451 / Math.sqrt(worldZ / 2 + 1)
     else
-      pos ?= @sprite?.displayObject
+      pos ?= @sprite?.imageObject
     @mark.x = pos.x
     @mark.y = pos.y
     if @statusEffect or @name is 'highlight'
@@ -238,16 +242,25 @@ module.exports = class Mark extends CocoClass
       oldMark.parent.addChild @mark
       oldMark.parent.swapChildren oldMark, @mark
       oldMark.parent.removeChild oldMark
+    
+    if @markSprite?
+      @markSprite.scaleFactor = 1.2
+      @markSprite.updateScale()
     return unless @name in ["selection", "target", "repair", "highlight"]
-    scale = 0.5
+    
-    if @sprite
+    # scale these marks to 10m (100px). Adjust based on sprite size.
-      size = @sprite.getAverageDimension()
+    factor = 0.3 # default size: 3m width, most commonly for target when pointing to a location
-      size += 60 if @name is 'selection'
+
-      size += 60 if @name is 'repair'
+    if @sprite?.imageObject
-      scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name]
+      width = @sprite.imageObject.getBounds()?.width or 0
-      if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
+      width /= @sprite.options.resolutionFactor
-        scale *= 2
+      # all targets should be set to have a width of 100px, and then be scaled accordingly
-    @mark.scaleX = @mark.scaleY = Math.min 1, scale
+      factor = width / 100 # normalize
+      factor *= 1.1 # add margin
+      factor = Math.max(factor, 0.3) # lower bound
+    @mark.scaleX *= factor
+    @mark.scaleY *= factor
+      
     if @name in ['selection', 'target', 'repair']
       @mark.scaleY *= @camera.y2x  # code applies perspective
 

app/lib/surface/MusicPlayer.coffee

@@ -21,9 +21,11 @@ module.exports = class MusicPlayer extends CocoClass
 
   onPlayMusic: (e) ->
     src = e.file
-    if src
+    src = "/file#{e.file}#{AudioPlayer.ext}"
-      src = "/file#{src}#{AudioPlayer.ext}"
+    if (not e.file) or src is @currentMusic?.src
-      return @currentMusic.play('none', 0, 0, -1, 0.3) if src is @currentMusic?.src
+      if e.play then @restartCurrentMusic() else @fadeOutCurrentMusic()
+      return
+      
     media = AudioPlayer.getStatus(src)
     if not media?.loaded
       AudioPlayer.preloadSound(src)
@@ -31,11 +33,21 @@ module.exports = class MusicPlayer extends CocoClass
       return
 
     @standingBy = null
-    if @currentMusic
+    @fadeOutCurrentMusic()
+    @startNewMusic(src) if e.play
+      
+  restartCurrentMusic: ->
+    return unless @currentMusic
+    @currentMusic.play('none', 0, 0, -1, 0.3)
+    @updateMusicVolume()
+    
+  fadeOutCurrentMusic: ->
+    return unless @currentMusic
     f = -> @stop()
     createjs.Tween.get(@currentMusic).to({volume:0.0}, CROSSFADE_LENGTH).call(f)
     
-    @currentMusic = createjs.Sound.play(src, 'none', 0, 0, -1, 0.3) if src and e.play
+  startNewMusic: (src) ->
+    @currentMusic = createjs.Sound.play(src, 'none', 0, 0, -1, 0.3) if src
     return unless @currentMusic
     @currentMusic.volume = 0.0
     if me.get('music')

app/lib/surface/PointChooser.coffee

@@ -26,7 +26,7 @@ module.exports = class PointChooser extends CocoClass
   onMouseDown: (e) =>
     console.log "got stagemousedown", e, key.shift
     return unless key.shift
-    @setPoint @options.camera.canvasToWorld {x: e.stageX, y: e.stageY}
+    @setPoint @options.camera.screenToWorld {x: e.stageX, y: e.stageY}
     Backbone.Mediator.publish 'choose-point', point: @point
 
   updateShape: ->

app/lib/surface/RegionChooser.coffee

@@ -16,12 +16,12 @@ module.exports = class RegionChooser extends CocoClass
 
   onMouseDown: (e) =>
     return unless key.shift
-    @firstPoint = @options.camera.canvasToWorld {x: e.stageX, y: e.stageY}
+    @firstPoint = @options.camera.screenToWorld {x: e.stageX, y: e.stageY}
     @options.camera.dragDisabled = true
 
   onMouseMove: (e) =>
     return unless @firstPoint
-    @secondPoint = @options.camera.canvasToWorld {x: e.stageX, y: e.stageY}
+    @secondPoint = @options.camera.screenToWorld {x: e.stageX, y: e.stageY}
     @restrictRegion() if @options.restrictRatio
     @updateShape()
 
@@ -33,7 +33,7 @@ module.exports = class RegionChooser extends CocoClass
     @options.camera.dragDisabled = false
 
   restrictRegion: ->
-    RATIO = 1.56876  # 1848 / 1178
+    RATIO = 1.56876  # 924 / 589
     rect = @options.camera.normalizeBounds([@firstPoint, @secondPoint])
     currentRatio = rect.width / rect.height
     if currentRatio > RATIO

app/lib/surface/SpriteBoss.coffee

@@ -11,16 +11,14 @@ module.exports = class SpriteBoss extends CocoClass
   subscriptions:
     'bus:player-joined': 'onPlayerJoined'
     'bus:player-left': 'onPlayerLeft'
-    'level-set-debug': 'onSetDebug'
+#    'level-set-debug': 'onSetDebug'
     'level-highlight-sprites': 'onHighlightSprites'
-    'sprite:mouse-up': 'onSpriteMouseUp'
     'surface:stage-mouse-down': 'onStageMouseDown'
     'level-select-sprite': 'onSelectSprite'
     'level-suppress-selection-sounds': 'onSuppressSelectionSounds'
     'level-lock-select': 'onSetLockSelect'
     'level:restarted': 'onLevelRestarted'
     'god:new-world-created': 'onNewWorld'
-    'tome:cast-spells': 'onCastSpells'
     'camera:dragged': 'onCameraDragged'
     'sprite:loaded': -> @update(true)
 
@@ -34,6 +32,7 @@ module.exports = class SpriteBoss extends CocoClass
     @world = options.world
     @options.thangTypes ?= []
     @sprites = {}
+    @spriteArray = []  # Mirror @sprites, but faster for when we just need to iterate
     @selfWizardSprite = null
     @createLayers()
     @spriteSheetCache = {}
@@ -44,7 +43,7 @@ module.exports = class SpriteBoss extends CocoClass
     @selectionMark?.destroy()
     super()
 
-  toString: -> "<SpriteBoss: #{@sprites.length} sprites>"
+  toString: -> "<SpriteBoss: #{@spriteArray.length} sprites>"
 
   thangTypeFor: (type) ->
     _.find @options.thangTypes, (m) -> m.get('original') is type or m.get('name') is type
@@ -77,9 +76,10 @@ module.exports = class SpriteBoss extends CocoClass
     id ?= sprite.thang.id
     console.error "Sprite collision! Already have:", id if @sprites[id]
     @sprites[id] = sprite
+    @spriteArray.push sprite
     layer ?= @spriteLayers["Obstacle"] if sprite.thang?.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
-    layer ?= @layerForChild sprite.displayObject, sprite
+    layer ?= @layerForChild sprite.imageObject, sprite
-    layer.addChild sprite.displayObject
+    layer.addChild sprite.imageObject
     layer.updateLayerOrder()
     sprite
 
@@ -94,11 +94,8 @@ module.exports = class SpriteBoss extends CocoClass
     unless @indieSprites
       @indieSprites = []
       @indieSprites = (@createIndieSprite indieSprite for indieSprite in indieSprites) if indieSprites
-    unless @selfWizardSprite
+    if withWizards and not @selfWizardSprite
       @selfWizardSprite = @createWizardSprite thangID: "My Wizard", isSelf: true, sprites: @sprites
-    unless withWizards
-      @selfWizardSprite.displayObject.visible = false
-      @selfWizardSprite.labels.name.setText null
 
   createIndieSprite: (indieSprite) ->
     unless thangType = @thangTypeFor indieSprite.thangType
@@ -117,7 +114,6 @@ module.exports = class SpriteBoss extends CocoClass
     else
       sprite.targetPos = if opponent.team is 'ogres' then {x:52, y: 28} else {x: 20, y:28}
 
-
   createWizardSprite: (options) ->
     sprite = new WizardSprite @thangTypeFor("Wizard"), @createSpriteOptions(options)
     @addSprite sprite, sprite.thang.id, @spriteLayers["Floating"]
@@ -138,7 +134,7 @@ module.exports = class SpriteBoss extends CocoClass
   onSetDebug: (e) ->
     return if e.debug is @debug
     @debug = e.debug
-    sprite.setDebug @debug for thangID, sprite of @sprites
+    sprite.setDebug @debug for sprite in @spriteArray
 
   onHighlightSprites: (e) ->
     highlightedIDs = e.thangIDs or []
@@ -147,27 +143,34 @@ module.exports = class SpriteBoss extends CocoClass
 
   addThangToSprites: (thang, layer=null) ->
     return console.warn 'Tried to add Thang to the surface it already has:', thang.id if @sprites[thang.id]
-    thangType = _.find @options.thangTypes, (m) -> m.get('name') is thang.spriteName
+    thangType = _.find @options.thangTypes, (m) ->
+      return false unless m.get('actions') or m.get('raster')
+      return m.get('name') is thang.spriteName
+    thangType ?= _.find @options.thangTypes, (m) -> return m.get('name') is thang.spriteName
+
     options = @createSpriteOptions thang: thang
-    options.resolutionFactor = if thangType.get('kind') is 'Floor' then 2 else 4
+    options.resolutionFactor = if thangType.get('kind') is 'Floor' then 2 else SPRITE_RESOLUTION_FACTOR
     sprite = new CocoSprite thangType, options
+    @listenTo sprite, 'sprite:mouse-up', @onSpriteMouseUp
     @addSprite sprite, null, layer
     sprite.setDebug @debug
     sprite
 
   removeSprite: (sprite) ->
-    sprite.displayObject.parent.removeChild sprite.displayObject
+    sprite.imageObject.parent.removeChild sprite.imageObject
     thang = sprite.thang
     delete @sprites[sprite.thang.id]
+    @spriteArray.splice @spriteArray.indexOf(sprite), 1
+    @stopListening sprite
     sprite.destroy()
     sprite.thang = thang  # Keep around so that we know which thang the destroyed thang was for
 
   updateSounds: ->
-    sprite.playSounds() for thangID, sprite of @sprites  # hmm; doesn't work for sprites which we didn't add yet in adjustSpriteExistence
+    sprite.playSounds() for sprite in @spriteArray  # hmm; doesn't work for sprites which we didn't add yet in adjustSpriteExistence
 
   update: (frameChanged) ->
     @adjustSpriteExistence() if frameChanged
-    sprite.update frameChanged for thangID, sprite of @sprites
+    sprite.update frameChanged for sprite in @spriteArray
     @updateSelection()
     @spriteLayers["Default"].updateLayerOrder()
     @cache()
@@ -181,11 +184,11 @@ module.exports = class SpriteBoss extends CocoClass
       else
         sprite = @addThangToSprites(thang)
         Backbone.Mediator.publish 'surface:new-thang-added', thang:thang, sprite:sprite
-        updateCache = updateCache or sprite.displayObject.parent is @spriteLayers["Obstacle"]
+        updateCache = updateCache or sprite.imageObject.parent is @spriteLayers["Obstacle"]
         sprite.playSounds()
     for thangID, sprite of @sprites
       missing = not (sprite.notOfThisWorld or @world.thangMap[thangID]?.exists)
-      isObstacle = sprite.displayObject.parent is @spriteLayers["Obstacle"]
+      isObstacle = sprite.imageObject.parent is @spriteLayers["Obstacle"]
       updateCache = updateCache or (isObstacle and (missing or sprite.hasMoved))
       sprite.hasMoved = false
       @removeSprite sprite if missing
@@ -197,7 +200,8 @@ module.exports = class SpriteBoss extends CocoClass
 
   cache: (update=false) ->
     return if @cached and not update
-    wallSprites = (sprite for thangID, sprite of @sprites when sprite.thangType?.get('name').search(/(dungeon|indoor).wall/i) isnt -1)
+    wallSprites = (sprite for sprite in @spriteArray when sprite.thangType?.get('name').search(/(dungeon|indoor).wall/i) isnt -1)
+    return if _.any (s.stillLoading for s in wallSprites)
     walls = (sprite.thang for sprite in wallSprites)
     @world.calculateBounds()
     wallGrid = new Grid walls, @world.size()...
@@ -209,25 +213,23 @@ module.exports = class SpriteBoss extends CocoClass
     @spriteLayers["Obstacle"].uncache() if @spriteLayers["Obstacle"].cacheID  # might have changed sizes
     @spriteLayers["Obstacle"].cache()
     # test performance of doing land layer, too, to see if it's faster
-    #@spriteLayers["Land"].uncache() if @spriteLayers["Land"].cacheID  # might have changed sizes
+#    @spriteLayers["Land"].uncache() if @spriteLayers["Land"].cacheID  # might have changed sizes
-    #@spriteLayers["Land"].cache()
+#    @spriteLayers["Land"].cache()
+    # I don't notice much difference - Scott
     @cached = true
 
   spriteFor: (thangID) -> @sprites[thangID]
 
   onNewWorld: (e) ->
     @world = @options.world = e.world
-    @play()
-
-  onCastSpells: -> @stop()
 
   play: ->
-    sprite.imageObject.play() for thangID, sprite of @sprites
+    sprite.play() for sprite in @spriteArray
     @selectionMark?.play()
     @targetMark?.play()
 
   stop: ->
-    sprite.imageObject.stop() for thangID, sprite of @sprites
+    sprite.stop() for sprite in @spriteArray
     @selectionMark?.stop()
     @targetMark?.stop()
 
@@ -263,15 +265,15 @@ module.exports = class SpriteBoss extends CocoClass
   selectSprite: (e, sprite=null, spellName=null, treemaThangSelected = null) ->
     return if e and (@disabled or @selectLocked)  # Ignore clicks for selection/panning/wizard movement while disabled or select is locked
     worldPos = sprite?.thang?.pos
-    worldPos ?= @camera.canvasToWorld {x: e.originalEvent.rawX, y: e.originalEvent.rawY} if e
+    worldPos ?= @camera.screenToWorld {x: e.originalEvent.rawX, y: e.originalEvent.rawY} if e
     if worldPos and (@options.navigateToSelection or not sprite or treemaThangSelected)
-      @camera.zoomTo(sprite?.displayObject or @camera.worldToSurface(worldPos), @camera.zoom, 1000)
+      @camera.zoomTo(sprite?.imageObject or @camera.worldToSurface(worldPos), @camera.zoom, 1000, true)
     sprite = null if @options.choosing  # Don't select sprites while choosing
     if sprite isnt @selectedSprite
       @selectedSprite?.selected = false
       sprite?.selected = true
       @selectedSprite = sprite
-    alive = sprite?.thang.health > 0
+    alive = sprite and not (sprite.thang.health < 0)
 
     Backbone.Mediator.publish 'surface:sprite-selected',
       thang: if sprite then sprite.thang else null

app/lib/surface/Surface.coffee

@@ -48,7 +48,7 @@ module.exports = Surface = class Surface extends CocoClass
     coords: true
     playJingle: false
     showInvisible: false
-    frameRate: 60  # Best as a divisor of 60, like 15, 30, 60, with RAF_SYNCHED timing.
+    frameRate: 30  # Best as a divisor of 60, like 15, 30, 60, with RAF_SYNCHED timing.
 
   subscriptions:
     'level-disable-controls': 'onDisableControls'
@@ -65,6 +65,8 @@ module.exports = Surface = class Surface extends CocoClass
     'god:new-world-created': 'onNewWorld'
     'tome:cast-spells': 'onCastSpells'
     'level-set-letterbox': 'onSetLetterbox'
+    'application:idle-changed': 'onIdleChanged'
+    'camera:zoom-updated': 'onZoomUpdated'
 
   shortcuts:
     'ctrl+\\, ⌘+\\': 'onToggleDebug'
@@ -80,6 +82,10 @@ module.exports = Surface = class Surface extends CocoClass
     @options = _.extend(@options, givenOptions) if givenOptions
     @initEasel()
     @initAudio()
+    @onResize = _.debounce @onResize, 500
+    $(window).on 'resize', @onResize
+    if @world.ended
+      _.defer => @setWorld @world
 
   destroy: ->
     @dead = true
@@ -97,10 +103,14 @@ module.exports = Surface = class Surface extends CocoClass
     @stage.removeAllChildren()
     @stage.removeEventListener 'stagemousemove', @onMouseMove
     @stage.removeEventListener 'stagemousedown', @onMouseDown
+    @stage.removeEventListener 'stagemouseup', @onMouseUp
     @stage.removeAllEventListeners()
     @stage.enableDOMEvents false
     @stage.enableMouseOver 0
     @canvas.off 'mousewheel', @onMouseWheel
+    $(window).off 'resize', @onResize
+    clearTimeout @surfacePauseTimeout if @surfacePauseTimeout
+    clearTimeout @surfaceZoomPauseTimeout if @surfaceZoomPauseTimeout
     super()
 
   setWorld: (@world) ->
@@ -221,8 +231,8 @@ module.exports = Surface = class Surface extends CocoClass
         @currentFrame = tempFrame
         frame = @world.getFrame(@getCurrentFrame())
         frame.restoreState()
-        for thangID, sprite of @spriteBoss.sprites
+        volume = Math.max(0.05, Math.min(1, 1 / @scrubbingPlaybackSpeed))
-          sprite.playSounds false, Math.max(0.05, Math.min(1, 1 / @scrubbingPlaybackSpeed))
+        sprite.playSounds false, volume for sprite in @spriteBoss.spriteArray
         tempFrame += if rising then 1 else -1
       @currentFrame = actualCurrentFrame
 
@@ -240,7 +250,7 @@ module.exports = Surface = class Surface extends CocoClass
 
   onSetCamera: (e) ->
     if e.thangID
-      return unless target = @spriteBoss.spriteFor(e.thangID)?.displayObject
+      return unless target = @spriteBoss.spriteFor(e.thangID)?.imageObject
     else if e.pos
       target = @camera.worldToSurface e.pos
     else
@@ -249,6 +259,11 @@ module.exports = Surface = class Surface extends CocoClass
     @cameraBorder.updateBounds @camera.bounds
     @camera.zoomTo target, e.zoom, e.duration  # TODO: SurfaceScriptModule perhaps shouldn't assign e.zoom if not set
 
+  onZoomUpdated: (e) ->
+    if @ended
+      @setPaused false
+      @surfaceZoomPauseTimeout = _.delay (=> @setPaused true), 3000
+
   setDisabled: (@disabled) ->
     @spriteBoss.disabled = @disabled
 
@@ -267,6 +282,7 @@ module.exports = Surface = class Surface extends CocoClass
 
   onSetPlaying: (e) ->
     @playing = (e ? {}).playing ? true
+    @setPlayingCalled = true
     if @playing and @currentFrame >= (@world.totalFrames - 5)
       @currentFrame = 0
     if @fastForwarding and not @playing
@@ -301,22 +317,44 @@ module.exports = Surface = class Surface extends CocoClass
     )
 
     if @lastFrame < @world.totalFrames and @currentFrame >= @world.totalFrames - 1
-      @spriteBoss.stop()
-      @playbackOverScreen.show()
       @ended = true
+      @setPaused true
       Backbone.Mediator.publish 'surface:playback-ended'
     else if @currentFrame < @world.totalFrames and @ended
-      @spriteBoss.play()
-      @playbackOverScreen.hide()
       @ended = false
+      @setPaused false
       Backbone.Mediator.publish 'surface:playback-restarted'
 
     @lastFrame = @currentFrame
 
-  onCastSpells: ->
+  onIdleChanged: (e) ->
+    @setPaused e.idle unless @ended
+
+  setPaused: (paused) ->
+    # We want to be able to essentially stop rendering the surface if it doesn't need to animate anything.
+    # If pausing, though, we want to give it enough time to finish any tweens.
+    performToggle = =>
+      createjs.Ticker.setFPS if paused then 1 else @options.frameRate
+      @surfacePauseTimeout = null
+    clearTimeout @surfacePauseTimeout if @surfacePauseTimeout
+    clearTimeout @surfaceZoomPauseTimeout if @surfaceZoomPauseTimeout
+    @surfacePauseTimeout = @surfaceZoomPauseTimeout = null
+    if paused
+      @surfacePauseTimeout = _.delay performToggle, 2000
+      @spriteBoss.stop()
+      @playbackOverScreen.show()
+    else
+      performToggle()
+      @spriteBoss.play()
+      @playbackOverScreen.hide()
+
+  onCastSpells: (e) ->
+    return if e.preload
+    @setPaused false if @ended
     @casting = true
     @wasPlayingWhenCastingBegan = @playing
     Backbone.Mediator.publish 'level-set-playing', { playing: false }
+    @setPlayingCalled = false # don't overwrite playing settings if they changed by, say, scripts
 
     if @coordinateDisplay?
       @surfaceTextLayer.removeChild @coordinateDisplay
@@ -328,10 +366,14 @@ module.exports = Surface = class Surface extends CocoClass
   onNewWorld: (event) ->
     return unless event.world.name is @world.name
     @casting = false
+    if @ended and not @wasPlayingWhenCastingBegan
+      @setPaused true
+    else
+      @spriteBoss.play()
 
     # This has a tendency to break scripts that are waiting for playback to change when the level is loaded
     # so only run it after the first world is created.
-    Backbone.Mediator.publish 'level-set-playing', { playing: @wasPlayingWhenCastingBegan } unless event.firstWorld
+    Backbone.Mediator.publish 'level-set-playing', { playing: @wasPlayingWhenCastingBegan } unless event.firstWorld or @setPlayingCalled
 
     fastForwardTo = null
     if @playing
@@ -358,10 +400,10 @@ module.exports = Surface = class Surface extends CocoClass
   initEasel: ->
     # takes DOM objects, not jQuery objects
     @stage = new createjs.Stage(@canvas[0])
-    canvasWidth = parseInt(@canvas.attr('width'), 10)
+    canvasWidth = parseInt @canvas.attr('width'), 10
-    canvasHeight = parseInt(@canvas.attr('height'), 10)
+    canvasHeight = parseInt @canvas.attr('height'), 10
     @camera?.destroy()
-    @camera = new Camera canvasWidth, canvasHeight
+    @camera = new Camera @canvas
     AudioPlayer.camera = @camera
     @layers.push @surfaceLayer = new Layer name: "Surface", layerPriority: 0, transform: Layer.TRANSFORM_SURFACE, camera: @camera
     @layers.push @surfaceTextLayer = new Layer name: "Surface Text", layerPriority: 1, transform: Layer.TRANSFORM_SURFACE_TEXT, camera: @camera
@@ -375,10 +417,26 @@ module.exports = Surface = class Surface extends CocoClass
     @stage.enableMouseOver(10)
     @stage.addEventListener 'stagemousemove', @onMouseMove
     @stage.addEventListener 'stagemousedown', @onMouseDown
+    @stage.addEventListener 'stagemouseup', @onMouseUp
     @canvas.on 'mousewheel', @onMouseWheel
     @hookUpChooseControls() if @options.choosing
     createjs.Ticker.timingMode = createjs.Ticker.RAF_SYNCHED
     createjs.Ticker.setFPS @options.frameRate
+    @onResize()
+
+  onResize: (e) =>
+    oldWidth = parseInt @canvas.attr('width'), 10
+    oldHeight = parseInt @canvas.attr('height'), 10
+    newWidth = @canvas.width()
+    newHeight = @canvas.height()
+    return unless newWidth > 0 and newHeight > 0
+    #if InstallTrigger?  # Firefox rendering performance goes down as canvas size goes up
+    #  newWidth = Math.min 924, newWidth
+    #  newHeight = Math.min 589, newHeight
+    @canvas.attr width: newWidth, height: newHeight
+    @stage.scaleX *= newWidth / oldWidth
+    @stage.scaleY *= newHeight / oldHeight
+    @camera.onResize newWidth, newHeight
 
   showLevel: ->
     return if @dead
@@ -471,10 +529,10 @@ module.exports = Surface = class Surface extends CocoClass
     if @debug and not @debugDisplay
       @screenLayer.addChild @debugDisplay = new DebugDisplay canvasWidth: @camera.canvasWidth, canvasHeight: @camera.canvasHeight
 
-  # uh
+  # Some mouse handling callbacks
 
   onMouseMove: (e) =>
-    @mouseSurfacePos = {x:e.stageX, y:e.stageY}
+    @mouseScreenPos = {x: e.stageX, y: e.stageY}
     return if @disabled
     Backbone.Mediator.publish 'surface:mouse-moved', x: e.stageX, y: e.stageY
 
@@ -483,6 +541,11 @@ module.exports = Surface = class Surface extends CocoClass
     onBackground = not @stage.hitTest e.stageX, e.stageY
     Backbone.Mediator.publish 'surface:stage-mouse-down', onBackground: onBackground, x: e.stageX, y: e.stageY, originalEvent: e
 
+  onMouseUp: (e) =>
+    return if @disabled
+    onBackground = not @stage.hitTest e.stageX, e.stageY
+    Backbone.Mediator.publish 'surface:stage-mouse-up', onBackground: onBackground, x: e.stageX, y: e.stageY, originalEvent: e
+
   onMouseWheel: (e) =>
     # https://github.com/brandonaaron/jquery-mousewheel
     e.preventDefault()
@@ -490,7 +553,8 @@ module.exports = Surface = class Surface extends CocoClass
     event =
       deltaX: e.deltaX
       deltaY: e.deltaY
-      surfacePos: @mouseSurfacePos
+      screenPos: @mouseScreenPos
+      canvas: @canvas
     Backbone.Mediator.publish 'surface:mouse-scrolled', event unless @disabled
 
   hookUpChooseControls: ->
@@ -536,12 +600,14 @@ module.exports = Surface = class Surface extends CocoClass
       @mouseInBounds = mib
 
   restoreWorldState: ->
-    @world.getFrame(@getCurrentFrame()).restoreState()
+    frame = @world.getFrame(@getCurrentFrame())
+    frame.restoreState()
     current = Math.max(0, Math.min(@currentFrame, @world.totalFrames - 1))
     if current - Math.floor(current) > 0.01
       next = Math.ceil current
       ratio = current % 1
       @world.frames[next].restorePartialState ratio if next > 1
+    frame.clearEvents() if parseInt(@currentFrame) is parseInt(@lastFrame)
     @spriteBoss.updateSounds()
 
   updateState: (frameChanged) ->
@@ -575,8 +641,6 @@ module.exports = Surface = class Surface extends CocoClass
     @paths.parent.removeChild @paths
     @paths = null
 
-  # Screenshot
-
   screenshot: (scale=0.25, format='image/jpeg', quality=0.8, zoom=2) ->
     # Quality doesn't work with image/png, just image/jpeg and image/webp
     [w, h] = [@camera.canvasWidth, @camera.canvasHeight]
@@ -586,6 +650,5 @@ module.exports = Surface = class Surface extends CocoClass
     #console.log "Screenshot with scale", scale, "format", format, "quality", quality, "was", Math.floor(imageData.length / 1024), "kB"
     screenshot = document.createElement("img")
     screenshot.src = imageData
-    #$('body').append(screenshot)
     @stage.uncache()
     imageData

app/lib/surface/WizardSprite.coffee

@@ -29,10 +29,9 @@ module.exports = class WizardSprite extends IndieSprite
     'right': 'onMoveKey'
 
   constructor: (thangType, options) ->
-    if options?.isSelf
+    if @isSelf = options.isSelf
       options.colorConfig = $.extend(true, {}, me.get('wizard')?.colorConfig) or {}
     super thangType, options
-    @isSelf = options.isSelf
     @targetPos = @thang.pos
     if @isSelf
       @setNameLabel me.displayName()
@@ -48,6 +47,13 @@ module.exports = class WizardSprite extends IndieSprite
     thang.pos.z += thang.bobHeight
     thang
 
+  finishSetup: ->
+    @updateBaseScale()
+    @scaleFactor = @thang.scaleFactor if @thang?.scaleFactor
+    @updateScale()
+    @updateRotation()
+    # Don't call general update() because Thang isn't built yet
+
   onPlayerStatesChanged: (e) ->
     for playerID, state of e.states
       continue unless playerID is @thang.id
@@ -64,7 +70,7 @@ module.exports = class WizardSprite extends IndieSprite
 
   onMeSynced: (e) ->
     return unless @isSelf
-    @setNameLabel me.displayName() if @displayObject.visible  # not if we hid the wiz
+    @setNameLabel me.displayName() if @imageObject.visible  # not if we hid the wiz
     newColorConfig = me.get('wizard')?.colorConfig or {}
     shouldUpdate = not _.isEqual(newColorConfig, @options.colorConfig)
     @options.colorConfig = $.extend(true, {}, newColorConfig)
@@ -77,12 +83,12 @@ module.exports = class WizardSprite extends IndieSprite
     @setTarget e.sprite or e.worldPos
 
   animateIn: ->
-    @displayObject.scaleX = @displayObject.scaleY = @displayObject.alpha = 0
+    @imageObject.scaleX = @imageObject.scaleY = @imageObject.alpha = 0
-    createjs.Tween.get(@displayObject)
+    createjs.Tween.get(@imageObject)
       .to({scaleX: 1, scaleY: 1, alpha: 1}, 1000, createjs.Ease.getPowInOut(2.2))
 
   animateOut: (callback) ->
-    tween = createjs.Tween.get(@displayObject)
+    tween = createjs.Tween.get(@imageObject)
       .to({scaleX: 0, scaleY: 0, alpha: 0}, 1000, createjs.Ease.getPowInOut(2.2))
     tween.call(callback) if callback
 
@@ -202,8 +208,8 @@ module.exports = class WizardSprite extends IndieSprite
     @thang.pos = @getCurrentPosition()
     @faceTarget()
     sup = @options.camera.worldToSurface x: @thang.pos.x, y: @thang.pos.y, z: @thang.pos.z - @thang.depth / 2
-    @displayObject.x = sup.x
+    @imageObject.x = sup.x
-    @displayObject.y = sup.y
+    @imageObject.y = sup.y
 
   getCurrentPosition: ->
     """
@@ -244,7 +250,7 @@ module.exports = class WizardSprite extends IndieSprite
       @pointToward(@targetSprite.thang.pos)
 
   updateMarks: ->
-    super() if @displayObject.visible  # not if we hid the wiz
+    super() if @imageObject.visible  # not if we hid the wiz
 
   onMoveKey: (e) ->
     return unless @isSelf

app/lib/surface/path.coffee

@@ -144,7 +144,7 @@ module.exports.Trailmaster = class Trailmaster
     sprites = []
     sprite = @sprites[thang.id]
     return sprites unless sprite?
-    lastPos = @camera.surfaceToWorld x: sprite.displayObject.x, y: sprite.displayObject.y
+    lastPos = @camera.surfaceToWorld x: sprite.imageObject.x, y: sprite.imageObject.y
     minDistance = Math.pow(CLONE_INTERVAL * Camera.MPP, 2)
     actions = @world.actionsForThang(thang.id)
     lastAction = null

app/lib/surface/sprite_utils.coffee

@@ -3,7 +3,7 @@ PROG_BAR_HEIGHT = 2
 PROG_BAR_SCALE = 2.5
 EDGE_SIZE = 0.3
 
-module.exports.createProgressBar = createProgressBar = (color, y, width=PROG_BAR_WIDTH, height=PROG_BAR_HEIGHT) ->
+module.exports.createProgressBar = createProgressBar = (color, offset, width=PROG_BAR_WIDTH, height=PROG_BAR_HEIGHT) ->
   g = new createjs.Graphics()
   g.setStrokeStyle(1)
 
@@ -17,12 +17,12 @@ module.exports.createProgressBar = createProgressBar = (color, y, width=PROG_BAR
   g.drawRoundRect(sEdge, sEdge - sHeight/2, sWidth-sEdge*2, sHeight-sEdge*2, sHeight-sEdge*2)
 
   s = new createjs.Shape(g)
-  s.x = -width / 2
-  s.y = y
   s.z = 100
   s.baseScale = PROG_BAR_SCALE
   s.scaleX = 1 / PROG_BAR_SCALE
   s.scaleY = 1 / PROG_BAR_SCALE
   s.width = width
   s.height = height
+  s.regX = (-offset.x + width / 2) * PROG_BAR_SCALE
+  s.regY = (-offset.y) * PROG_BAR_SCALE
   return s