From 239f94697f6cf49243499290094774eb84b0e757 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Wed, 10 Dec 2014 10:37:57 -0800
Subject: [PATCH 1/6] Fixed IE hero lock image.

---
 app/styles/play/modal/play-heroes-modal.sass    | 3 +++
 app/templates/play/modal/play-heroes-modal.jade | 5 ++++-
 app/views/play/modal/PlayHeroesModal.coffee     | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/styles/play/modal/play-heroes-modal.sass b/app/styles/play/modal/play-heroes-modal.sass
index 4aa7d6c0c..2d6b90894 100644
--- a/app/styles/play/modal/play-heroes-modal.sass
+++ b/app/styles/play/modal/play-heroes-modal.sass
@@ -110,6 +110,9 @@ $heroCanvasHeight: 265px
               background-color: goldenrod
               @include filter(contrast(50%) brightness(65%))
 
+              &.ie
+                @include opacity(0.35)
+
             .lock-indicator
               position: absolute
               width: 40%
diff --git a/app/templates/play/modal/play-heroes-modal.jade b/app/templates/play/modal/play-heroes-modal.jade
index 827df7b1e..9f0fc4afb 100644
--- a/app/templates/play/modal/play-heroes-modal.jade
+++ b/app/templates/play/modal/play-heroes-modal.jade
@@ -20,7 +20,10 @@
             li(data-hero-id=hero.get('original'), title=hero.name, data-slide-to=index, data-target="#hero-carousel", class="hero-indicator hero-index-" + index + (hero.locked ? " locked" : "") + (hero.purchasable ? " purchasable" : "") + (hero.restricted ? " restricted" : ""))
               .hero-avatar
               if hero.locked && !hero.purchasable
-                img.lock-indicator(src="/images/pages/game-menu/lock.png", draggable="false")
+                if isIE
+                  img.lock-indicator(src="/images/pages/game-menu/lock-processed.png", draggable="false")
+                else
+                  img.lock-indicator(src="/images/pages/game-menu/lock.png", draggable="false")
       .carousel-inner
         for hero in heroes
           div(class="item hero-item" + (hero.locked ? " locked" : "") + (hero.purchasable ? " purchasable" : "") + (hero.restricted ? " restricted" : ""), data-hero-id=hero.get('original'))
diff --git a/app/views/play/modal/PlayHeroesModal.coffee b/app/views/play/modal/PlayHeroesModal.coffee
index 94b99f61a..837ecbb64 100644
--- a/app/views/play/modal/PlayHeroesModal.coffee
+++ b/app/views/play/modal/PlayHeroesModal.coffee
@@ -69,11 +69,13 @@ module.exports = class PlayHeroesModal extends ModalView
     context.confirmButtonI18N = @confirmButtonI18N
     context.visibleHero = @visibleHero
     context.gems = me.gems()
+    context.isIE = @isIE()
     context
 
   afterRender: ->
     super()
     return unless @supermodel.finished()
+    @$el.find('.hero-avatar').addClass 'ie' if @isIE()
     heroes = @heroes.models
     @$el.find('.hero-indicator').each ->
       heroID = $(@).data('hero-id')

From f8661c4a96d17cdc3f15f8c9dd72cc75e498b029 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Wed, 10 Dec 2014 10:40:10 -0800
Subject: [PATCH 2/6] Added the lock image, actually.

---
 .../images/pages/game-menu/lock-processed.png    | Bin 0 -> 2343 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/images/pages/game-menu/lock-processed.png

diff --git a/app/assets/images/pages/game-menu/lock-processed.png b/app/assets/images/pages/game-menu/lock-processed.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb038b4b09a72c8cc6e7d736eda705e7d7643e1d
GIT binary patch
literal 2343
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
Dlk}yr

literal 0
HcmV?d00001


From 94a400bfd83f7a53a150124fe82c941a4f4dc88d Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Wed, 10 Dec 2014 10:44:25 -0800
Subject: [PATCH 3/6] Hero icons now show up on the world map on levels where
 you can unlock them.

---
 app/styles/play/world-map-view.sass    |  9 +++++++++
 app/templates/play/world-map-view.jade |  2 ++
 app/views/play/WorldMapView.coffee     | 23 +++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/app/styles/play/world-map-view.sass b/app/styles/play/world-map-view.sass
index 4cb0b62af..a3b5ec389 100644
--- a/app/styles/play/world-map-view.sass
+++ b/app/styles/play/world-map-view.sass
@@ -199,6 +199,15 @@ $gameControlMargin: 30px
       &.started .glyphicon-star
         left: 0.5px
         
+      img.hero-portrait
+        width: 120%
+        position: absolute
+        bottom: 75%
+        left: 75%
+        border: 1px solid black
+        border-radius: 100%
+        background: white
+        
 
     .level-shadow
       z-index: 1
diff --git a/app/templates/play/world-map-view.jade b/app/templates/play/world-map-view.jade
index 7b65c7b52..57599a8af 100644
--- a/app/templates/play/world-map-view.jade
+++ b/app/templates/play/world-map-view.jade
@@ -11,6 +11,8 @@
       - var next = level.id == nextLevel || (!seenNext && levelStatusMap[level.id] != "complete" && !level.locked && !level.disabled);
       - seenNext = seenNext || next;
       div(style="left: #{level.x}%; bottom: #{level.y}%; background-color: #{level.color}", class="level" + (next ? " next" : "") + (level.disabled ? " disabled" : "") + (level.locked ? " locked" : "") + " " + levelStatusMap[level.id] || "", data-level-id=level.id, title=level.name + (level.disabled ? ' (Coming Soon to Adventurers)' : ''))
+        if level.unlocksHero && !level.unlockedHero
+          img.hero-portrait(src=level.unlocksHero.img)
         a(href=level.type == 'hero' ? '#' : level.disabled ? "/play" : "/play/#{level.levelPath || 'level'}/#{level.id}", disabled=level.disabled, data-level-id=level.id, data-level-path=level.levelPath || 'level', data-level-name=level.name)
         if level.requiresSubscription
           img.star(src="/images/pages/play/star.png")
diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee
index 8e4b451c0..627def668 100644
--- a/app/views/play/WorldMapView.coffee
+++ b/app/views/play/WorldMapView.coffee
@@ -141,6 +141,9 @@ module.exports = class WorldMapView extends RootView
       level.color = 'rgb(255, 80, 60)'
       if level.requiresSubscription
         level.color = 'rgb(80, 130, 200)'
+      if level.unlocksHero
+        level.color = 'rgb(0,0,0)'
+        level.unlockedHero = level.unlocksHero.originalID in (me.get('earned')?.heroes or [])
       level.hidden = level.locked or level.disabled
 
     ## put lower levels in last, so in the world map they layer over one another properly.
@@ -441,6 +444,10 @@ dungeon = [
     y: 10.70
     nextLevels:
       continue: 'the-raised-sword'
+    unlocksHero: {
+      img: '/file/db/thang.type/53e12be0d042f23505c3023b/portrait.png'
+      originalID: '53e12be0d042f23505c3023b'
+    }
   }
   {
     name: 'Favorable Odds'
@@ -779,6 +786,10 @@ forest = [
     x: 38
     y: 72
     requiresSubscription: true
+    unlocksHero: {
+      img: '/file/db/thang.type/52fc0ed77e01835453bd8f6c/portrait.png'
+      originalID: '52fc0ed77e01835453bd8f6c'
+    }
   }
   {
     name: 'Swift Dagger'
@@ -817,6 +828,10 @@ forest = [
     x: 47
     y: 71
     requiresSubscription: true
+    unlocksHero: {
+      img: '/file/db/thang.type/52fbf74b7e01835453bd8d8e/portrait.png'
+      originalID: '529ec584c423d4e83b000014'
+    }
   }
   {
     name: 'Touch of Death'
@@ -887,6 +902,10 @@ forest = [
     x: 74.5
     y: 92
     requiresSubscription: true
+    unlocksHero: {
+      img: '/file/db/thang.type/5466d449417c8b48a9811e83/portrait.png'
+      originalID: '5466d449417c8b48a9811e83'
+    }
   }
   {
     name: 'Rich Forager'
@@ -898,6 +917,10 @@ forest = [
       continue: 'siege-of-stonehold'
     x: 80
     y: 88
+    unlocksHero: {
+      img: '/file/db/thang.type/52e9adf7427172ae56002172/portrait.png'
+      originalID: '52e9adf7427172ae56002172'
+    }
   }
   {
     name: 'Siege of Stonehold'

From 87c34e81c67d07c8705904fd016dce893305fd16 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Wed, 10 Dec 2014 11:00:52 -0800
Subject: [PATCH 4/6] Using new border image popover backgrounds.

---
 .../images/level/popover_background.png       | Bin 2483 -> 3411 bytes
 .../level/popover_border_background.png       | Bin 0 -> 2388 bytes
 app/styles/common/common.sass                 |   4 ++--
 app/styles/play/level/tome/spell_debug.sass   |   4 ++--
 app/styles/play/level/tome/spell_list.sass    |   4 ++--
 .../level/tome/spell_list_entry_thangs.sass   |   4 ++--
 .../play/level/tome/spell_palette_entry.sass  |   4 ++--
 app/styles/play/level/tome/spell_toolbar.sass |   4 ++--
 app/styles/play/level/tome/tome.sass          |   4 ++--
 app/styles/play/world-map-view.sass           |   4 ++--
 10 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/images/level/popover_border_background.png

diff --git a/app/assets/images/level/popover_background.png b/app/assets/images/level/popover_background.png
index 214edeaae2c9a0bae405430a51bfbed510944016..f87ea6d4b24412bd7cb047195e9967de4e05ff6e 100644
GIT binary patch
literal 3411
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
D0PnJ0

literal 2483
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
Z1GK%gMd?@sbzFQ#QQW;rm2Tll{{eU+4zmCN

diff --git a/app/assets/images/level/popover_border_background.png b/app/assets/images/level/popover_border_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..e74234591bf2a9d02459b4effd6cde70191343b0
GIT binary patch
literal 2388
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
GLSTYZGL=&R

literal 0
HcmV?d00001

diff --git a/app/styles/common/common.sass b/app/styles/common/common.sass
index 5a17efca4..b20819601 100644
--- a/app/styles/common/common.sass
+++ b/app/styles/common/common.sass
@@ -230,8 +230,8 @@ kbd
 
 .popover
   border-style: solid
-  border-image: url(/images/level/popover_background.png) 29 39 fill stretch
-  border-width: 15px 20px
+  border-image: url(/images/level/popover_border_background.png) 16 12 fill stretch
+  border-width: 16px 12px
   .arrow
     display: none
   .btn
diff --git a/app/styles/play/level/tome/spell_debug.sass b/app/styles/play/level/tome/spell_debug.sass
index 945b01d8f..b2d3ca17a 100644
--- a/app/styles/play/level/tome/spell_debug.sass
+++ b/app/styles/play/level/tome/spell_debug.sass
@@ -8,8 +8,8 @@
   max-width: 400px
   padding: 10px
   border-style: solid
-  border-image: url(/images/level/popover_background.png) 18 fill round
-  border-width: 8px
+  border-image: url(/images/level/popover_border_background.png) 16 12 fill round
+  border-width: 8px 6px
   .progress
     position: relative
     span
diff --git a/app/styles/play/level/tome/spell_list.sass b/app/styles/play/level/tome/spell_list.sass
index 7a234a402..b66cd5f82 100644
--- a/app/styles/play/level/tome/spell_list.sass
+++ b/app/styles/play/level/tome/spell_list.sass
@@ -10,8 +10,8 @@
   right: 10%
   padding: 4%
   border-style: solid
-  border-image: url(/images/level/popover_background.png) 18 fill round
-  border-width: 15px
+  border-image: url(/images/level/popover_border_background.png) 16 12 fill round
+  border-width: 16px 12px
   
 html.no-borderimage
   #spell-list-view
diff --git a/app/styles/play/level/tome/spell_list_entry_thangs.sass b/app/styles/play/level/tome/spell_list_entry_thangs.sass
index b8faebba0..abe03b44a 100644
--- a/app/styles/play/level/tome/spell_list_entry_thangs.sass
+++ b/app/styles/play/level/tome/spell_list_entry_thangs.sass
@@ -12,8 +12,8 @@
     overflow: scroll
     padding: 4%
     border-style: solid
-    border-image: url(/images/level/popover_background.png) 18 fill round
-    border-width: 15px
+    border-image: url(/images/level/popover_border_background.png) 16 12 fill round
+    border-width: 16px 12px
     
     .thang-avatar-view
       cursor: pointer
diff --git a/app/styles/play/level/tome/spell_palette_entry.sass b/app/styles/play/level/tome/spell_palette_entry.sass
index bb0177039..e7dfa7806 100644
--- a/app/styles/play/level/tome/spell_palette_entry.sass
+++ b/app/styles/play/level/tome/spell_palette_entry.sass
@@ -56,8 +56,8 @@ body:not(.dialogue-view-active)
   max-width: 600px
   padding: 0
   border-style: solid
-  border-image: url(/images/level/popover_background.png) 29 39 fill stretch
-  border-width: 15px 20px
+  border-image: url(/images/level/popover_border_background.png) 16 12 fill round
+  border-width: 16px 12px
   @include box-shadow(0 0 0 #000)
 
   // Jiggle animation
diff --git a/app/styles/play/level/tome/spell_toolbar.sass b/app/styles/play/level/tome/spell_toolbar.sass
index a17f84769..1445b3055 100644
--- a/app/styles/play/level/tome/spell_toolbar.sass
+++ b/app/styles/play/level/tome/spell_toolbar.sass
@@ -83,9 +83,9 @@
       z-index: 10
       pointer-events: none
       border-style: solid
-      border-image: url(/images/level/popover_background.png) 29 39 fill stretch
+      border-image: url(/images/level/popover_border_background.png) 16 12 fill round
       padding: 0
-      border-width: 15px 20px
+      border-width: 16px 12px
       font-variant: small-caps
       text-overflow: ellipsis
       font-size: 13px
diff --git a/app/styles/play/level/tome/tome.sass b/app/styles/play/level/tome/tome.sass
index ff6f691d0..924b72e31 100644
--- a/app/styles/play/level/tome/tome.sass
+++ b/app/styles/play/level/tome/tome.sass
@@ -38,8 +38,8 @@
   .popover
     padding: 10px 10px 30px 10px
     border-style: solid
-    border-image: url(/images/level/popover_background.png) 18 fill round
-    border-width: 15px
+    border-image: url(/images/level/popover_border_background.png) 16 12 fill round
+    border-width: 16px 12px
     @include box-shadow(0 0 0 #000)
 
     h1:not(.not-code), h2:not(.not-code), h3:not(.not-code), h4:not(.not-code), h5:not(.not-code), h6:not(.not-code)
diff --git a/app/styles/play/world-map-view.sass b/app/styles/play/world-map-view.sass
index a3b5ec389..4b4022784 100644
--- a/app/styles/play/world-map-view.sass
+++ b/app/styles/play/world-map-view.sass
@@ -259,11 +259,11 @@ $gameControlMargin: 30px
       position: absolute
       z-index: 3
       padding: 10px
-      border-width: 15px
+      border-width: 16px 12px
       // Using modernizr-mixin for compat detection
       @include yep(borderimage)
         border-style: solid
-        border-image: url(/images/level/popover_background.png) 18 fill round
+        border-image: url(/images/level/popover_border_background.png) 16 12 fill round
       @include nope(borderimage)
         background-color: rgb(247, 242, 218)
 

From e870de61463f7a15280cb1b89cdade995f92f70e Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Wed, 10 Dec 2014 11:22:41 -0800
Subject: [PATCH 5/6] Tweaked SpriteParser to be smarter about finding root
 MovieClips and shifting their bounds.

---
 app/lib/sprites/SpriteParser.coffee | 36 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/lib/sprites/SpriteParser.coffee b/app/lib/sprites/SpriteParser.coffee
index 361dc8411..5bdc183aa 100644
--- a/app/lib/sprites/SpriteParser.coffee
+++ b/app/lib/sprites/SpriteParser.coffee
@@ -37,14 +37,7 @@ module.exports = class SpriteParser
     blocks = @findBlocks ast, source
     containers = _.filter blocks, {kind: 'Container'}
     movieClips = _.filter blocks, {kind: 'MovieClip'}
-    if movieClips.length
-      # First movie clip is root, so do it last
-      movieClips = movieClips[1 ... movieClips.length].concat([movieClips[0]])
-    
-    # first container isn't necessarily root... actually the last one is root in blue-cart
-#    else if containers.length
-#      # First container is root, so do it last
-#      containers = containers[1 ... containers.length].concat([containers[0]])
+
     mainClip = _.last(movieClips) ? _.last(containers)
     @animationName = mainClip.name
     for container, index in containers
@@ -69,17 +62,24 @@ module.exports = class SpriteParser
             break
       continue unless container.bounds and instructions.length
       @addContainer {c: instructions, b: container.bounds}, container.name
+    
+    childrenMovieClips = []
+      
     for movieClip, index in movieClips
-      if index is 0
-        for bounds in movieClip.frameBounds
-          bounds[0] -= @width / 2
-          bounds[1] -= @height / 2
-        movieClip.bounds[0] -= @width / 2
-        movieClip.bounds[1] -= @height / 2
+      lastBounds = null
+      # fill in bounds which are null...
+      for bounds, boundsIndex in movieClip.frameBounds
+        if not bounds
+          movieClip.frameBounds[boundsIndex] = _.clone(lastBounds)
+        else
+          lastBounds = bounds
+      
       localGraphics = @getGraphicsFromBlock(movieClip, source)
       [shapeKeys, localShapes] = @getShapesFromBlock movieClip, source
       localContainers = @getContainersFromMovieClip movieClip, source, true
       localAnimations = @getAnimationsFromMovieClip movieClip, source, true
+      for animation in localAnimations
+        childrenMovieClips.push(animation.gn)
       localTweens = @getTweensFromMovieClip movieClip, source, localShapes, localContainers, localAnimations
       @addAnimation {
         shapes: localShapes
@@ -90,6 +90,14 @@ module.exports = class SpriteParser
         bounds: movieClip.bounds
         frameBounds: movieClip.frameBounds
       }, movieClip.name
+      
+    for movieClip in movieClips
+      if movieClip.name not in childrenMovieClips
+        for bounds in movieClip.frameBounds
+          bounds[0] -= @width / 2
+          bounds[1] -= @height / 2
+        movieClip.bounds[0] -= @width / 2
+        movieClip.bounds[1] -= @height / 2
 
     @saveToModel()
     return movieClips[0]?.name

From 84cdc5d15005cdf13737b66a7271ae56a1eff7a4 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Wed, 10 Dec 2014 11:28:06 -0800
Subject: [PATCH 6/6] Undisabled new adventurer levels.

---
 app/views/play/WorldMapView.coffee | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee
index 627def668..f474a249b 100644
--- a/app/views/play/WorldMapView.coffee
+++ b/app/views/play/WorldMapView.coffee
@@ -930,11 +930,9 @@ forest = [
     description: 'Unlock the desert world, if you are strong enough to win this epic battle!'
     nextLevels:
       continue: 'the-dunes'
-    disabled: not me.isAdmin()
     x: 85.5
     y: 83.5
     adventurer: true
-    requiresSubscription: true
   }
   {
     name: 'Multiplayer Treasure Grove'
@@ -966,7 +964,6 @@ desert = [
     description: 'Behold, the desert, full of glory, danger, and sand. Lots of sand.'
     nextLevels:
       continue: 'the-mighty-sand-yak'
-    disabled: not me.isAdmin()
     x: 8.47
     y: 21.93
     adventurer: true
@@ -980,7 +977,6 @@ desert = [
     description: 'Test your nerves by dodging huge sand yaks on the open dunes!'
     nextLevels:
       continue: 'oasis'
-    disabled: not me.isAdmin()
     x: 16.56
     y: 27.77
     adventurer: true
@@ -994,7 +990,6 @@ desert = [
     description: 'Run a gauntlet of sand yaks to reach oasis and quench your thirst!'
     #nextLevels:
     #  continue: ''
-    disabled: not me.isAdmin()
     x: 23.35
     y: 31.60
     adventurer: true