Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.

app/models/Article.coffee

@@ -2,5 +2,6 @@ CocoModel = require('./CocoModel')
 
 module.exports = class Article extends CocoModel
   @className: "Article"
+  @schema: require 'schemas/models/article'
   urlRoot: "/db/article"
   saveBackups: true

app/models/CocoModel.coffee

@@ -11,7 +11,6 @@ class CocoModel extends Backbone.Model
 
   initialize: ->
     super()
-    @constructor.schema ?= require "schemas/models/#{@urlRoot[4..].replace '.', '_'}"
     if not @constructor.className
       console.error("#{@} needs a className set.")
     @markToRevert()
@@ -223,7 +222,7 @@ class CocoModel extends Backbone.Model
   watch: (doWatch=true) ->
     $.ajax("#{@urlRoot}/#{@id}/watch", {type:'PUT', data:{on:doWatch}})
     @watching = -> doWatch
-    
+
   watching: ->
     return me.id in (@get('watchers') or [])
 

app/models/File.coffee

@@ -2,4 +2,5 @@ CocoModel = require('./CocoModel')
 
 module.exports = class File extends CocoModel
   @className: "File"
-  urlRoot: "/db/file"
+  @schema: require 'schemas/models/file'
+  urlRoot: "/db/file"

app/models/Level.coffee

@@ -5,6 +5,7 @@ ThangType = require './ThangType'
 
 module.exports = class Level extends CocoModel
   @className: "Level"
+  @schema: require 'schemas/models/level'
   urlRoot: "/db/level"
 
   serialize: (supermodel) ->

app/models/LevelComponent.coffee

@@ -2,6 +2,7 @@ CocoModel = require('./CocoModel')
 
 module.exports = class LevelComponent extends CocoModel
   @className: "LevelComponent"
+  @schema: require 'schemas/models/level_component'
   urlRoot: "/db/level.component"
 
   set: (key, val, options) ->

app/models/LevelFeedback.coffee

@@ -2,4 +2,5 @@ CocoModel = require('./CocoModel')
 
 module.exports = class LevelFeedback extends CocoModel
   @className: "LevelFeedback"
+  @schema: require 'schemas/models/level_feedback'
   urlRoot: "/db/level.feedback"

app/models/LevelSession.coffee

@@ -2,6 +2,7 @@ CocoModel = require('./CocoModel')
 
 module.exports = class LevelSession extends CocoModel
   @className: "LevelSession"
+  @schema: require 'schemas/models/level_session'
   urlRoot: "/db/level.session"
 
   initialize: ->
@@ -10,7 +11,7 @@ module.exports = class LevelSession extends CocoModel
       state = @get('state') or {}
       state.scripts ?= {}
       @set('state', state)
-      
+
   updatePermissions: ->
     permissions = @get 'permissions'
     permissions = (p for p in permissions when p.target isnt 'public')

app/models/LevelSystem.coffee

@@ -3,6 +3,7 @@ SystemNameLoader = require('lib/SystemNameLoader')
 
 module.exports = class LevelSystem extends CocoModel
   @className: "LevelSystem"
+  @schema: require 'schemas/models/level_system'
   urlRoot: "/db/level.system"
 
   set: (key, val, options) ->

app/models/Patch.coffee

@@ -2,10 +2,11 @@ CocoModel = require('./CocoModel')
 
 module.exports = class PatchModel extends CocoModel
   @className: "Patch"
-  urlRoot: "/db/patch" 
+  @schema: require 'schemas/models/patch'
-  
+  urlRoot: "/db/patch"
+
   setStatus: (status) ->
     PatchModel.setStatus @id, status
-    
+
   @setStatus: (id, status) ->
-    $.ajax("/db/patch/#{id}/status", {type:"PUT", data: {status:status}})
+    $.ajax("/db/patch/#{id}/status", {type:"PUT", data: {status:status}})

app/models/ThangType.coffee

@@ -5,6 +5,7 @@ buildQueue = []
 
 module.exports = class ThangType extends CocoModel
   @className: "ThangType"
+  @schema: require 'schemas/models/thang_type'
   urlRoot: "/db/thang.type"
   building: {}
 

app/models/User.coffee

@@ -4,6 +4,7 @@ CocoModel = require('./CocoModel')
 
 module.exports = class User extends CocoModel
   @className: "User"
+  @schema: require 'schemas/models/user'
   urlRoot: "/db/user"
 
   initialize: ->

app/schemas/models/level.coffee

@@ -1,5 +1,5 @@
 c = require './../schemas'
-ThangComponentSchema = require './../models/thang_component'
+ThangComponentSchema = require './thang_component'
 
 SpecificArticleSchema = c.object()
 c.extendNamedProperties SpecificArticleSchema  # name first

app/styles/play/level.sass

@@ -18,7 +18,7 @@ body.is-playing
     position: relative
     
   canvas#surface
-    background-color: #ddd
+    background-color: #333
     width: 100%
     display: block
     z-index: 1

app/views/editor/components/main.coffee

@@ -156,17 +156,18 @@ module.exports = class ThangComponentEditView extends CocoView
     @reportChanges()
 
   onAddComponentEnterPressed: (node) =>
-    extantSystems =
+    if extantSystems
-      (@supermodel.getModelByOriginalAndMajorVersion LevelSystem, sn.original, sn.majorVersion).attributes.name.toLowerCase() for idx, sn of @level.get('systems')
+      extantSystems =
-    requireSystem = node.data.system.toLowerCase()
+        (@supermodel.getModelByOriginalAndMajorVersion LevelSystem, sn.original, sn.majorVersion).attributes.name.toLowerCase() for idx, sn of @level.get('systems')
+      requireSystem = node.data.system.toLowerCase()
 
-    if requireSystem not in extantSystems
+      if requireSystem not in extantSystems
-      warn_element = 'Component <b>' + node.data.name + '</b> requires system <b>' + requireSystem + '</b> which is currently not specified in this level.'
+        warn_element = 'Component <b>' + node.data.name + '</b> requires system <b>' + requireSystem + '</b> which is currently not specified in this level.'
-      noty({
+        noty({
-        text: warn_element,
+          text: warn_element,
-        layout: 'bottomLeft',
+          layout: 'bottomLeft',
-        type: 'warning'
+          type: 'warning'
-      })
+        })
 
     currentSelection = @addComponentsTreema?.getLastSelectedTreema()?.data._id
 

app/views/play/level/playback_view.coffee

@@ -112,7 +112,7 @@ module.exports = class PlaybackView extends View
       @$el.find('.toggle-fullscreen').hide()
 
   updatePopupContent: ->
-    @timePopup.updateContent "<h2>#{@timeToString @newTime}</h2>#{@formatTime(@current, @currentTime)}<br/>#{@formatTime(@total, @totalTime)}"
+    @timePopup?.updateContent "<h2>#{@timeToString @newTime}</h2>#{@formatTime(@current, @currentTime)}<br/>#{@formatTime(@total, @totalTime)}"
 
   # These functions could go to some helper class
 

app/views/play/level/tome/tome_view.coffee

@@ -222,7 +222,7 @@ module.exports = class TomeView extends View
       @spellPaletteView.toggleControls {}, spell.view.controlsEnabled   # TODO: know when palette should have been disabled but didn't exist
 
   reloadAllCode: ->
-    spell.view.reloadCode false for spellKey, spell of @spells when spell.team is me.team
+    spell.view.reloadCode false for spellKey, spell of @spells when spell.team is me.team or (spell.team in ["common", "neutral", null])
     Backbone.Mediator.publish 'tome:cast-spells', spells: @spells
 
   updateLanguageForAllSpells: ->