From 085fb82cc999aa7e7961434b6adbcc3df5563db9 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Fri, 7 Mar 2014 21:02:10 -0800
Subject: [PATCH] Fixed a multiplayer link and debug mark alpha.

---
 app/lib/surface/CocoSprite.coffee               | 2 +-
 app/lib/surface/Mark.coffee                     | 4 ++--
 app/lib/surface/Surface.coffee                  | 2 +-
 app/templates/play/level/modal/multiplayer.jade | 2 +-
 server/articles/article_schema.coffee           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee
index cdbde389e..b454031e1 100644
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@@ -389,7 +389,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @addMark('bounds').toggle true if @thang?.drawsBounds
     @addMark('shadow').toggle true unless @thangType.get('shadow') is 0
     mark.update() for name, mark of @marks
-    #@thang.effectNames = ['berserk', 'confuse', 'control', 'curse', 'fear', 'poison', 'paralyze', 'regen', 'sleep', 'slow', 'speed']
+    #@thang.effectNames = ['berserk', 'confuse', 'control', 'curse', 'fear', 'poison', 'paralyze', 'regen', 'sleep', 'slow', 'haste']
     @updateEffectMarks() if @thang?.effectNames?.length or @previousEffectNames?.length
 
   updateEffectMarks: ->
diff --git a/app/lib/surface/Mark.coffee b/app/lib/surface/Mark.coffee
index 5a2e7689f..62801a60f 100644
--- a/app/lib/surface/Mark.coffee
+++ b/app/lib/surface/Mark.coffee
@@ -151,14 +151,14 @@ module.exports = class Mark extends CocoClass
     @thangType.fetch()
     markThangTypes[name] = @thangType
     window.mtt = markThangTypes
-    
+
   onLoadedThangType: ->
     @build()
     @toggle(@toggleTo) if @toggleTo?
 
   update: (pos=null) ->
     return false unless @on and @mark
-    @mark.alpha = if @hidden then 0 else 1
+    @mark.visible = not @hidden
     @updatePosition pos
     @updateRotation()
     @updateScale()
diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee
index c5e15813d..feb87fc93 100644
--- a/app/lib/surface/Surface.coffee
+++ b/app/lib/surface/Surface.coffee
@@ -302,7 +302,7 @@ module.exports = Surface = class Surface extends CocoClass
       world: @world
     )
 
-    if @lastFrame < @world.totalFrames and @currentFrame >= @world.totalFrames
+    if @lastFrame < @world.totalFrames and @currentFrame >= @world.totalFrames - 1
       @spriteBoss.stop()
       @playbackOverScreen.show()
       @ended = true
diff --git a/app/templates/play/level/modal/multiplayer.jade b/app/templates/play/level/modal/multiplayer.jade
index bc8cc39b5..2135e1977 100644
--- a/app/templates/play/level/modal/multiplayer.jade
+++ b/app/templates/play/level/modal/multiplayer.jade
@@ -30,7 +30,7 @@
       if me.get('anonymous')
         p Sign in or create an account and get your solution on the leaderboard!
       else
-        a#go-to-leaderboard-button.btn.btn-primary(href="/play/ladder/#{levelSlug}/team/#{team}") Go to the leaderboard!
+        a#go-to-leaderboard-button.btn.btn-primary(href="/play/ladder/#{levelSlug}#my-matches") Go to the leaderboard!
         p You can submit your game to be ranked from the leaderboard page.
   
   .modal-footer
diff --git a/server/articles/article_schema.coffee b/server/articles/article_schema.coffee
index 48ae42821..1fd4769f7 100644
--- a/server/articles/article_schema.coffee
+++ b/server/articles/article_schema.coffee
@@ -10,4 +10,4 @@ c.extendBasicProperties(ArticleSchema, 'article')
 c.extendSearchableProperties(ArticleSchema)
 c.extendVersionedProperties(ArticleSchema, 'article')
 
-module.exports = ArticleSchema
\ No newline at end of file
+module.exports = ArticleSchema