Merge branch 'master' into production

app/lib/LevelLoader.coffee

@@ -228,7 +228,7 @@ module.exports = class LevelLoader extends CocoClass
     return false unless _.filter(@worldNecessities).length is 0
     return false unless @thangNamesLoaded
     return false if @sessionDependenciesRegistered and not @sessionDependenciesRegistered[@session.id]
-    return false if @opponentSession and not @sessionDependenciesRegistered[@opponentSession.id]
+    return false if @sessionDependenciesRegistered and @opponentSession and not @sessionDependenciesRegistered[@opponentSession.id]
     true
 
   onWorldNecessitiesLoaded: ->

app/lib/LevelOptions.coffee

@@ -183,7 +183,7 @@ module.exports = LevelOptions =
   'thornbush-farm':
     requiredGear: {feet: 'leather-boots', 'right-hand': 'builders-hammer', eyes: 'crude-glasses'}
     restrictedGear: {feet: 'simple-boots', 'right-hand': 'simple-sword'}
-  'a-fiery-trap':
+  'back-to-back':
     requiredGear: {feet: 'leather-boots', torso: 'leather-tunic', waist: 'leather-belt', 'programming-book': 'programmaticon-i', eyes: 'crude-glasses', 'right-hand': 'simple-sword', 'left-hand': 'wooden-shield'}
     restrictedGear: {feet: 'simple-boots', 'right-hand': 'builders-hammer'}
   'ogre-encampment':

app/lib/world/world.coffee

@@ -101,9 +101,7 @@ module.exports = class World
     if @realTime and not @countdownFinished
       @realTimeSpeedFactor = 1
       unless @showsCountdown
-        if @levelID in ['the-first-kithmaze', 'haunted-kithmaze', 'the-second-kithmaze', 'the-final-kithmaze', 'the-gauntlet', 'winding-trail', 'thornbush-farm', 'a-fiery-trap']
-          @realTimeSpeedFactor = 5
-        else if @levelID in ['forgetful-gemsmith', 'descending-further', 'tactical-strike', 'kithgard-gates', 'ogre-encampment', 'woodland-cleaver', 'shield-rush', 'peasant-protection', 'munchkin-swarm']
+        if @levelID in ['thornbush-farm', 'back-to-back', 'ogre-encampment', 'woodland-cleaver', 'shield-rush', 'peasant-protection', 'munchkin-swarm']
           @realTimeSpeedFactor = 3
       if @showsCountdown
         return setTimeout @finishCountdown(continueLaterFn), REAL_TIME_COUNTDOWN_DELAY

app/views/play/WorldMapView.coffee

@@ -615,14 +615,14 @@ forest = [
     original: '5447030525cce60000745e2a'
     description: 'Determine refugee peasant from ogre when defending the farm.'
     nextLevels:
-      continue: 'a-fiery-trap'
+      continue: 'back-to-back'
     x: 44.09
     y: 57.75
   }
   {
-    name: 'A Fiery Trap'
+    name: 'Back to Back'
     type: 'hero'
-    id: 'a-fiery-trap'
+    id: 'back-to-back'
     original: '5448330517d7283e051f9b9e'
     description: 'Patrol the village entrances, but stay defensive.'
     nextLevels: