Merge branch 'master' into production

app/models/ThangType.coffee

@@ -339,9 +339,10 @@ module.exports = class ThangType extends CocoModel
     unless itemConfig = _.find(components, original: LevelComponent.ItemID)?.config
       console.warn @get('name'), 'is not an item, but you are asking for its stats.'
       return props: [], stats: {}
+    stats = {}
     props = itemConfig.programmableProperties ? []
     props = props.concat itemConfig.moreProgrammableProperties ? []
-    stats = {}
+    props = _.without props, 'canCast', 'spellNames', 'spells'
     for stat, modifiers of itemConfig.stats ? {}
       stats[stat] = @formatStatDisplay stat, modifiers
     for stat in itemConfig.extraHUDProperties ? []

app/views/play/modal/ItemDetailsView.coffee

@@ -12,9 +12,11 @@ module.exports = class ItemDetailsView extends CocoView
   constructor: ->
     super(arguments...)
     @propDocs = {}
+    @spellDocs = {}
 
   setItem: (@item) ->
     if @item
+      @spellDocs = {}
       @item.name = utils.i18n @item.attributes, 'name'
       @item.affordable = me.gems() >= @item.get('gems')
       @item.owned = me.ownsItem @item.get('original')
@@ -22,12 +24,13 @@ module.exports = class ItemDetailsView extends CocoView
 
       stats = @item.getFrontFacingStats()
       props = (p for p in stats.props when not @propDocs[p])
-      if props.length > 0
+      if props.length > 0 or ('cast' in stats.props)
 
         docs = new CocoCollection([], {
           url: '/db/level.component?view=prop-doc-lookup'
           model: LevelComponent
           project: [
+            'name'
             'propertyDocumentation.name'
             'propertyDocumentation.description'
             'propertyDocumentation.i18n'
@@ -46,7 +49,10 @@ module.exports = class ItemDetailsView extends CocoView
   onDocsLoaded: (levelComponents) ->
     for component in levelComponents.models
       for propDoc in component.get('propertyDocumentation')
-        @propDocs[propDoc.name] = propDoc
+        if /^cast.+/.test propDoc.name
+          @spellDocs[propDoc.name] = propDoc
+        else
+          @propDocs[propDoc.name] = propDoc
     @render()
 
   getRenderData: ->
@@ -57,20 +63,27 @@ module.exports = class ItemDetailsView extends CocoView
       c.stats = _.values(stats.stats)
       _.last(c.stats).isLast = true if c.stats.length
       c.props = []
-      progLang = (me.get('aceConfig') ? {}).language or 'python'
+      stats.props = stats.props.concat _.keys @spellDocs
+      codeLanguage = (me.get('aceConfig') ? {}).language or 'python'
       for prop in stats.props
-        description = utils.i18n @propDocs[prop] ? {}, 'description'
+        doc = @propDocs[prop] ? @spellDocs[prop] ? {}
+        description = utils.i18n doc, 'description'
 
         if _.isObject description
-          description = description[progLang] or _.values(description)[0]
+          description = description[codeLanguage] or _.values(description)[0]
         if _.isString description
           description = description.replace(/#{spriteName}/g, 'hero')
           if fact = stats.stats.shieldDefenseFactor
             description = description.replace(/#{shieldDefensePercent}%/g, fact.display)
+          ## We don't have the full components loaded here, so we can't really get most of these values.
+          #description = description.replace /#{([^.]+?)}/g, (match, keyChain) ->
+          #  console.log 'gotta find', keyChain, 'from', match, 'and have', stats
+          #  match
+          description = description.replace(/#{(.+?)}/g, '`$1`')
           description = $(marked(description)).html()
 
         c.props.push {
-          name: prop
+          name: _.string.humanize prop
           description: description or '...'
         }
     c

server/levels/components/level_component_handler.coffee

@@ -39,7 +39,10 @@ LevelComponentHandler = class LevelComponentHandler extends Handler
         return @sendBadInputError(res, 'Could not parse componentOriginals or propertyNames.')
 
       query['original'] = {$in: components}
-      query['propertyDocumentation.name'] = {$in: properties}
+      query.$or = [
+        {'propertyDocumentation.name': {$in: properties}}
+        {'propertyDocumentation.name': {$regex: /^cast.+/}}
+      ]
 
       q = LevelComponent.find(query, projection)
       q.exec (err, documents) =>