codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-10-02 17:04:47 -07:00
commit b2e6bcf872
74 changed files with 40328 additions and 40387 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/lib/Angel.coffee
View file

@ -119,13 +119,12 @@ module.exports = class Angel extends CocoClass
return if @aborting
# Toggle BOX2D_ENABLED during deserialization so that if we have box2d in the namespace, the Collides Components still don't try to create bodies for deserialized Thangs upon attachment.
window.BOX2D_ENABLED = false
World.deserialize serialized, @shared.worldClassMap, @shared.lastSerializedWorldFrames, @finishBeholdingWorld(goalStates), startFrame, endFrame, streamingWorld
@streamingWorld = World.deserialize serialized, @shared.worldClassMap, @shared.lastSerializedWorldFrames, @finishBeholdingWorld(goalStates), startFrame, endFrame, streamingWorld
window.BOX2D_ENABLED = true
@shared.lastSerializedWorldFrames = serialized.frames
finishBeholdingWorld: (goalStates) -> (world) =>
return if @aborting
@streamingWorld = world
finished = world.frames.length is world.totalFrames
firstChangedFrame = world.findFirstChangedFrame @shared.world
eventType = if finished then 'god:new-world-created' else 'god:streaming-world-updated'
@ -208,6 +207,8 @@ module.exports = class Angel extends CocoClass
@say 'Fired worker.'
@initialized = false
@work = null
@streamingWorld = null
@deserializationQueue = null
@hireWorker() if rehire
hireWorker: ->

17
app/lib/sprites/SpriteParser.coffee
View file

@ -63,7 +63,13 @@ module.exports = class SpriteParser
instructions.push {t: c.t, gn: c.gn}
break
@addContainer {c: instructions, b: container.bounds}, container.name
for movieClip in movieClips
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
localGraphics = @getGraphicsFromBlock(movieClip, source)
[shapeKeys, localShapes] = @getShapesFromBlock movieClip, source
localContainers = @getContainersFromMovieClip movieClip, source, true
@ -174,7 +180,7 @@ module.exports = class SpriteParser
frameBoundsSource = @subSourceFromRange frameBoundsRange, source
if frameBoundsSource.search(/\[rect/) is -1 # some other statement; we don't have multiframe bounds
console.log 'Didn\'t have multiframe bounds for this movie clip.'
frameBounds = [nominalBounds]
frameBounds = [_.clone(nominalBounds)]
else
lastRect = nominalBounds
frameBounds = []
@ -192,12 +198,7 @@ module.exports = class SpriteParser
bounds = [0, 0, 1, 1] # Let's try this.
frameBounds.push _.clone bounds
else
frameBounds = [nominalBounds]
# Subtract half of width/height parsed from lib.properties
for bounds in frameBounds
bounds[0] -= @width / 2
bounds[1] -= @height / 2
frameBounds = [_.clone(nominalBounds)]
functionExpressions.push {name: name, bounds: nominalBounds, frameBounds: frameBounds, expression: node.parent.parent, kind: kind}
@walk ast, null, gatherFunctionExpressions

4
app/lib/surface/Lank.coffee
View file

@ -141,9 +141,9 @@ module.exports = Lank = class Lank extends CocoClass
playAction: (action) ->
return if @isRaster
@currentAction = action
return @hide() unless action.animation or action.container or action.relatedActions
return @hide() unless action.animation or action.container or action.relatedActions or action.goesTo
@show()
return @updateActionDirection() unless action.animation or action.container
return @updateActionDirection() unless action.animation or action.container or action.goesTo
return if @sprite.placeholder
m = if action.container then 'gotoAndStop' else 'gotoAndPlay'
@sprite[m]?(action.name)

11
app/lib/surface/LayerAdapter.coffee
View file

@ -340,7 +340,7 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
if action.container
containersToRender[action.container] = true
else if action.animation
animationContainers = @getContainersForAnimation(thangType, action.animation)
animationContainers = @getContainersForAnimation(thangType, action.animation, action)
containersToRender[container.gn] = true for container in animationContainers
spriteBuilder = new SpriteBuilder(thangType, {colorConfig: colorConfig})
@ -355,10 +355,13 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
frame = spriteSheetBuilder.addFrame(container, null, @resolutionFactor * (thangType.get('scale') or 1))
spriteSheetBuilder.addAnimation(containerKey, [frame], false)
getContainersForAnimation: (thangType, animation) ->
containers = thangType.get('raw').animations[animation].containers
getContainersForAnimation: (thangType, animation, action) ->
rawAnimation = thangType.get('raw').animations[animation]
if not rawAnimation
console.error 'thang type', thangType.get('name'), 'is missing animation', animation, 'from action', action
containers = rawAnimation.containers
for animation in thangType.get('raw').animations[animation].animations
containers = containers.concat(@getContainersForAnimation(thangType, animation.gn))
containers = containers.concat(@getContainersForAnimation(thangType, animation.gn, action))
return containers
#- Rendering sprite sheets for singular thang types

64
app/lib/surface/SegmentedSprite.coffee
View file

@ -1,5 +1,13 @@
SpriteBuilder = require 'lib/sprites/SpriteBuilder'
# Put this on MovieClips
specialGoToAndStop = (frame) ->
if frame is @currentFrame and @childrenCopy
@addChild(@childrenCopy...)
else
@gotoAndStop(frame)
@childrenCopy = @children.slice(0)
module.exports = class SegmentedSprite extends createjs.SpriteContainer
childMovieClips: null
@ -59,9 +67,14 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
else
@currentFrame = 0
@baseMovieClip.gotoAndStop(@currentFrame)
movieClip.gotoAndStop(@currentFrame) for movieClip in @childMovieClips
@takeChildrenFromMovieClip()
@baseMovieClip.specialGoToAndStop(@currentFrame)
for movieClip in @childMovieClips
if movieClip.mode is 'single'
movieClip.specialGoToAndStop(movieClip.startPosition)
else
movieClip.specialGoToAndStop(@currentFrame)
@takeChildrenFromMovieClip(@baseMovieClip, @)
@loop = action.loops isnt false
@goesTo = action.goesTo
@notifyActionNeedsRender(action) if @actionNotSupported
@ -93,7 +106,11 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
sprite.scaleX = sprite.scaleY = 1 / @resolutionFactor
@children = []
@addChild(sprite)
else if action.goesTo
@goto(action.goesTo, @paused)
return
@scaleX *= -1 if action.flipX
@scaleY *= -1 if action.flipY
@baseScaleX = @scaleX
@ -101,7 +118,7 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
return
notifyActionNeedsRender: (action) ->
@sprite?.trigger('action-needs-render', @sprite, action)
@lank?.trigger('action-needs-render', @lank, action)
buildMovieClip: (animationName, mode, startPosition, loops) ->
key = JSON.stringify([@spriteSheetPrefix].concat(arguments))
@ -115,7 +132,6 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
raw = @thangType.get('raw')
animData = raw.animations[animationName]
@lastAnimData = animData
movieClip = new createjs.MovieClip()
locals = {}
_.extend locals, @buildMovieClipContainers(animData.containers)
@ -127,6 +143,7 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
anim = new createjs.MovieClip()
anim.initialize(mode ? createjs.MovieClip.INDEPENDENT, startPosition ? 0, loops ? true)
anim.specialGoToAndStop = specialGoToAndStop
for tweenData in animData.tweens
stopped = false
@ -221,7 +238,7 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
else if not @loop
@paused = true
newFrame = @animLength - 1
@dispatchEvent('animationend')
_.defer => @dispatchEvent('animationend')
else
newFrame = newFrame % @animLength
@ -243,30 +260,23 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer
@currentFrame = newFrame
return if translatedFrame is @baseMovieClip.currentFrame
@baseMovieClip.gotoAndStop(translatedFrame)
movieClip.gotoAndStop(newFrame) for movieClip in @childMovieClips
@baseMovieClip.specialGoToAndStop(translatedFrame)
for movieClip in @childMovieClips
movieClip.specialGoToAndStop(if movieClip.mode is 'single' then movieClip.startPosition else newFrame)
@children = []
@takeChildrenFromMovieClip()
@takeChildrenFromMovieClip(@baseMovieClip, @)
takeChildrenFromMovieClip: ->
i = 0
while i < @baseMovieClip.children.length
child = @baseMovieClip.children[i]
takeChildrenFromMovieClip: (movieClip, recipientContainer) ->
for child in movieClip.childrenCopy
if child instanceof createjs.MovieClip
newChild = new createjs.SpriteContainer(@spriteSheet)
j = 0
while j < child.children.length
grandChild = child.children[j]
if grandChild instanceof createjs.MovieClip
console.error('MovieClip Segmentedsprites not currently working at this depth!')
continue
newChild.addChild(grandChild)
for prop in ['regX', 'regY', 'rotation', 'scaleX', 'scaleY', 'skewX', 'skewY', 'x', 'y']
newChild[prop] = child[prop]
@addChild(newChild)
i += 1
childRecipient = new createjs.SpriteContainer(@spriteSheet)
@takeChildrenFromMovieClip(child, childRecipient)
for prop in ['regX', 'regY', 'rotation', 'scaleX', 'scaleY', 'skewX', 'skewY', 'x', 'y']
childRecipient[prop] = child[prop]
recipientContainer.addChild(childRecipient)
else
@addChild(child)
recipientContainer.addChild(child)
# _getBounds: createjs.SpriteContainer.prototype.getBounds

2
app/lib/surface/SingularSprite.coffee
View file

@ -75,4 +75,4 @@ module.exports = class SingularSprite extends createjs.Sprite
return
notifyActionNeedsRender: (action) ->
@sprite?.trigger('action-needs-render', @sprite, action)
@lank?.trigger('action-needs-render', @lank, action)

1
app/lib/surface/Surface.coffee
View file

@ -98,6 +98,7 @@ module.exports = Surface = class Surface extends CocoClass
initEasel: ->
@normalStage = new createjs.Stage(@normalCanvas[0])
@webGLStage = new createjs.SpriteStage(@webGLCanvas[0])
@normalStage.nextStage = @webGLStage
@camera = AudioPlayer.camera = new Camera @webGLCanvas
@normalLayers.push @surfaceTextLayer = new Layer name: 'Surface Text', layerPriority: 1, transform: Layer.TRANSFORM_SURFACE_TEXT, camera: @camera

2
app/lib/world/world.coffee
View file

@ -364,7 +364,6 @@ module.exports = class World
o.trackedPropertiesPerThangValuesOffsets = [] # Needed to reconstruct ArrayBufferViews on other end, since Firefox has bugs transfering those: https://bugzilla.mozilla.org/show_bug.cgi?id=841904 and https://bugzilla.mozilla.org/show_bug.cgi?id=861925 # Actually, as of January 2014, it should be fixed. So we could try to undo the workaround.
transferableStorageBytesNeeded = 0
nFrames = endFrame - startFrame
streaming = nFrames < @totalFrames
for thang in @thangs
# Don't serialize empty trackedProperties for stateless Thangs which haven't changed (like obstacles).
# Check both, since sometimes people mark stateless Thangs but then change them, and those should still be tracked, and the inverse doesn't work on the other end (we'll just think it doesn't exist then).
@ -477,6 +476,7 @@ module.exports = class World
w.frames = [] unless streamingWorld
clearTimeout @deserializationTimeout if @deserializationTimeout
@deserializationTimeout = _.delay @deserializeSomeFrames, 1, o, w, finishedWorldCallback, perf, startFrame, endFrame
w # Return in-progress deserializing world
# Spread deserialization out across multiple calls so the interface stays responsive
@deserializeSomeFrames: (o, w, finishedWorldCallback, perf, startFrame, endFrame) =>

1597
app/locale/ar.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/bg.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/ca.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/cs.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/da.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/de-AT.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/de-CH.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/de-DE.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/el.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/en-AU.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/en-GB.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/en-US.coffee
View file

File diff suppressed because it is too large Load diff

1600
app/locale/en.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/es-419.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/es-ES.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/fa.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/fi.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/fr.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/he.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/hi.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/hu.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/id.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/it.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/ja.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/ko.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/lt.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/ms.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/nb.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/nl-BE.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/nl-NL.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/nn.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/no.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/pl.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/pt-BR.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/pt-PT.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/ro.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/ru.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/sk.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/sl.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/sr.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/sv.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/th.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/tr.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/uk.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/ur.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/vi.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/zh-HANS.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/zh-HANT.coffee
View file

File diff suppressed because it is too large Load diff

1599
app/locale/zh-WUU-HANS.coffee
View file

File diff suppressed because it is too large Load diff

1597
app/locale/zh-WUU-HANT.coffee
View file

File diff suppressed because it is too large Load diff

2
app/styles/editor/thang/thang-type-edit-view.sass
View file

@ -58,7 +58,7 @@
select
margin-top: 10px
#marker-button, #end-button
#marker-button, #play-button, #stop-button
margin: 10px 10px 10px 0
.slider-cell

8
app/styles/employers.sass
View file

@ -1,4 +1,12 @@
#employers-view
.deprecation-warning
text-align: center
margin-bottom: 50px
.deprecated
cursor: default
opacity: 0.25
.artisanal-claim
background: transparent url(/images/pages/employer/artisanal_claim.png) no-repeat center
margin-bottom: 5px

34
app/styles/play/world-map-view.sass
View file

@ -5,7 +5,8 @@ $mapHeight: 1536
$forestMapWidth: 2500
$dungeonMapWidth: 2350
$forestMapSeaBackground: #71bad0
$dungeonMapCaveBackground: rgb(54, 43, 34)
$dungeonMapCaveBackground: rgba(68, 54, 45, 1)
$dungeonMapCaveBackgroundTransparent: rgba(68, 54, 45, 0)
$levelDotWidth: 2%
$levelDotHeight: $levelDotWidth * $forestMapWidth / $mapHeight
$levelDotZ: $levelDotHeight * 0.25
@ -30,6 +31,7 @@ $gameControlMargin: 30px
#world-map-view
width: 100%
height: 100%
position: absolute
&.forest
background-color: $forestMapSeaBackground
@ -37,6 +39,36 @@ $gameControlMargin: 30px
&.dungeon
background-color: $dungeonMapCaveBackground
.gradient
position: absolute
z-index: 0
&.horizontal-gradient
left: 0
right: 0
height: 3%
&.vertical-gradient
top: 0
bottom: 0
width: 3%
&.top-gradient
top: 0
background: linear-gradient(to bottom, $dungeonMapCaveBackground 0%, $dungeonMapCaveBackgroundTransparent 100%)
&.right-gradient
right: 0
background: linear-gradient(to left, $dungeonMapCaveBackground 0%, $dungeonMapCaveBackgroundTransparent 100%)
&.bottom-gradient
bottom: 0
background: linear-gradient(to top, $dungeonMapCaveBackground 0%, $dungeonMapCaveBackgroundTransparent 100%)
&.left-gradient
left: 0
background: linear-gradient(to right, $dungeonMapCaveBackground 0%, $dungeonMapCaveBackgroundTransparent 100%)
.map
position: relative

10
app/templates/account/account_home.jade
View file

@ -104,11 +104,11 @@ block content
h3.panel-title
i.glyphicon.glyphicon-wrench
a(href="account/settings#password" data-i18n="general.password") Password
.panel.panel-default
.panel-heading
h3.panel-title
i.glyphicon.glyphicon-briefcase
a(href="account/settings#job-profile" data-i18n="account_settings.job_profile") Job Profile
//.panel.panel-default
// .panel-heading
// h3.panel-title
// i.glyphicon.glyphicon-briefcase
// a(href="account/settings#job-profile" data-i18n="account_settings.job_profile") Job Profile
.col-sm-6
h2(data-i18n="user.recently_played") Recently Played
hr

5
app/templates/base.jade
View file

@ -63,10 +63,7 @@ body
.footer.clearfix
.content
p.footer-link-text
if pathname == "/" || (me.get('permissions', true)).indexOf('employer') != -1
a(href='/employers', tabindex=-1, data-i18n="nav.employers") Employers
else
a(href='/', tabindex=-1, data-i18n="nav.home") Home
a(href='/', tabindex=-1, data-i18n="nav.home") Home
a(href='/play/ladder', tabindex=-1, data-i18n="home.multiplayer") Multiplayer
a(href='/community', tabindex=-1, data-i18n="nav.community") Community
a(href='/contribute', tabindex=-1, data-i18n="nav.contribute") Contribute

7
app/templates/editor/thang/thang-type-edit-view.jade
View file

@ -90,7 +90,7 @@ block outer_content
div#thang-type-treema
.clearfix
div#display-col.well
canvas#canvas(width="400", height="400")
canvas#canvas(width="400", height="600")
select#animations-select.form-control
for animation in animations
option #{animation}
@ -98,7 +98,10 @@ block outer_content
button.btn.btn-small.btn-primary#marker-button
i.icon-map-marker
span.spl Markers
button.btn.btn-small.btn-primary#end-button
button.btn.btn-small.btn-primary#play-button
i.icon-play
span.spl Play
button.btn.btn-small.btn-primary#stop-button
i.icon-stop
span.spl Stop
div.slider-cell

361
app/templates/employers.jade
View file

@ -1,183 +1,188 @@
extends /templates/recruitment_base
block content
.artisanal-claim
if me.get('anonymous')
a#login-link(data-i18n="login.log_in") Log In
br
if !isEmployer && !me.isAdmin()
#tagline
h1(data-i18n="employers.hire_developers_not_credentials") Hire developers, not credentials.
button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
else
if !me.get('anonymous')
a#logout-link(data-i18n="login.log_out") Log Out
.deprecation-warning
h1(data-i18n="employers.deprecation_warning_title") Sorry, CodeCombat is not recruiting right now.
p(data-i18n="employers.deprecation_warning") We are focusing on beginner levels instead of finding expert developers for the time being.
.deprecated
.artisanal-claim
if me.get('anonymous')
a#login-link(data-i18n="login.log_in") Log In
br
.row
- var fullProfiles = isEmployer || me.isAdmin();
if fullProfiles
#filter-column.col-md-3
#filter
.panel-group#filter_panel
a#filter-link(data-toggle="collapse" data-target="#collapseOne")
.panel.panel-default
.panel-heading
h4.panel-title
span.glyphicon.glyphicon-folder-open#folder-icon
| Filter
.panel-collapse.collapse.in#collapseOne
.panel-body
p
strong(data-i18n="employers.already_screened") We've already technically screened all our candidates
span(data-i18n="employers.filter_further") , but you can also filter further:
form#filters
.filter_section#visa_filter
h4(data-i18n="employers.filter_visa") Visa
label
input(type="checkbox" name="visa" value="Authorized to work in the US")
span(data-i18n="employers.filter_visa_yes") US Authorized
| (#{candidatesInFilter("visa","Authorized to work in the US")})
label
input(type="checkbox" name="visa" value="Need visa sponsorship")
span(data-i18n="employers.filter_visa_no") Not Authorized
| (#{candidatesInFilter("visa","Need visa sponsorship")})
.filter_section#school_filter
h4(data-i18n="account_profile.education") Education
label
input(type="checkbox" name="schoolFilter" value="Top School")
span(data-i18n="employers.filter_education_top") Top School
| (#{candidatesInFilter("schoolFilter","Top School")})
label
input(type="checkbox" name="schoolFilter" value="Other")
span(data-i18n="employers.filter_education_other") Other
| (#{candidatesInFilter("schoolFilter","Other")})
.filter_section#role_filter
h4(data-i18n="employers.candidate_role") Role
label
input(type="checkbox" name="roleFilter" value="Web Developer")
span(data-i18n="employers.filter_role_web_developer") Web Developer
| (#{candidatesInFilter("roleFilter","Web Developer")})
label
input(type="checkbox" name="roleFilter" value="Software Developer")
span(data-i18n="employers.filter_role_software_developer") Software Developer
| (#{candidatesInFilter("roleFilter","Software Developer")})
label
input(type="checkbox" name="roleFilter" value="Mobile Developer")
span(data-i18n="employers.filter_role_mobile_developer") Mobile Developer
| (#{candidatesInFilter("roleFilter","Mobile Developer")})
.filter_section#seniority_filter
h4(data-i18n="employers.filter_experience") Experience
label
input(type="checkbox" name="seniorityFilter" value="Senior")
span(data-i18n="employers.filter_experience_senior") Senior
| (#{candidatesInFilter("seniorityFilter","Senior")})
label
input(type="checkbox" name="seniorityFilter" value="Junior")
span(data-i18n="employers.filter_experience_junior") Junior
| (#{candidatesInFilter("seniorityFilter","Junior")})
label
input(type="checkbox" name="seniorityFilter" value="Recent Grad")
span(data-i18n="employers.filter_experience_recent_grad") Recent Grad
| (#{candidatesInFilter("seniorityFilter","Recent Grad")})
label
input(type="checkbox" name="seniorityFilter" value="College Student")
span(data-i18n="employers.filter_experience_student") College Student
| (#{candidatesInFilter("seniorityFilter","College Student")})
//input#select_all_checkbox(type="checkbox" name="select_all" checked)
//| Select all
p#results
| #{numberOfCandidates}
span(data-i18n="employers.results") results
h4#filter-alerts-heading Filter Email Alerts
p Get an email whenever a candidate meeting certain criteria enters the system.
table#saved-filter-table
thead
tr
th Filters
th Remove
tbody
button.btn#create-alert-button Create Alert with Current Filters
#candidates-column(class=fullProfiles ? "full-profiles col-md-9" : "teaser-profiles col-md-12")
if candidates.length
#candidate-table
table
tbody
for candidate, index in featuredCandidates
- var profile = candidate.get('jobProfile');
- var authorized = candidate.id; // If we have the id, then we are authorized.
- var profileAge = (new Date() - new Date(profile.updated)) / 86400 / 1000;
- var expired = profileAge > 2 * 30.4;
- var curated = profile.curated;
- var photoSize = fullProfiles ? 75 : 50;
tr.candidate-row(data-candidate-id=candidate.id, id=candidate.id, class=expired ? "expired" : "")
td(rowspan=3)
- var photoURL = candidate.getPhotoURL(photoSize, false, true);
div(class="candidate-picture " + (/^\/file/.test(photoURL) ? "" : "anonymous"), style='background-image: url(' + encodeURI(photoURL) + ')')
if fullProfiles
td.candidate-name-cell
strong= profile.name
| -
span= profile.jobTitle
tr.description_row(data-candidate-id=candidate.id)
if curated && curated.shortDescription
td.candidate-description
div #{curated.shortDescription}
else
td.candidate-description
div #{profile.shortDescription}
tr.border_row(data-candidate-id=candidate.id)
if curated
- var workHistory = curated.workHistory.join(",");
if !fullProfiles
td.tag_column
img(src="/images/pages/employer/tag.png")
| #{profile.jobTitle}
td.location_column
img(src="/images/pages/employer/location.png")
| #{curated.location}
td.education_column
img(src="/images/pages/employer/education.png")
| #{curated.education}
td.work_column
if workHistory
img(src="/images/pages/employer/briefcase.png")
| #{workHistory}
if !fullProfiles
div#info_wrapper
span.hiring-call-to-action
h2#start-hiring(data-i18n="employers.start_hiring") Start hiring.
if !isEmployer && !me.isAdmin()
#tagline
h1(data-i18n="employers.hire_developers_not_credentials") Hire developers, not credentials.
button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
h2#hiring-reasons.hiring-call-to-action(data-i18n="employers.reasons") Three reasons you should hire through us:
.reasons#top_row
.reason
img.employer_icon(src="/images/pages/employer/employer_icon2.png")
h3(data-i18n="employers.everyone_looking") Everyone here is looking for their next opportunity.
p(data-i18n="employers.everyone_looking_blurb") Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction.
.reason
img.employer_icon(src="/images/pages/employer/employer_icon6.png")
h3(data-i18n="employers.weeding") Sit back; we've done the weeding for you.
p(data-i18n="employers.weeding_blurb") Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time.
.reason
img(class="employer_icon" src="/images/pages/employer/employer_icon3.png")
h3(data-i18n="employers.pass_screen") They will pass your technical screen.
p(data-i18n="employers.pass_screen_blurb") Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News.
span.hiring-call-to-action
h2(data-i18n="employers.make_hiring_easier") Make my hiring easier, please.
button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
.reasons#bottom_row
.reason_long
img.employer_icon(src="/images/pages/employer/employer_icon1.png")
.reason_text
h3(data-i18n="employers.what") What is CodeCombat?
p(data-i18n="employers.what_blurb") CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io.
.reason_long
img.employer_icon(src="/images/pages/employer/employer_icon5.png")
.reason_text
h3(data-i18n="employers.cost") How much do we charge?
p(data-i18n="employers.cost_blurb") We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company.
else
if !me.get('anonymous')
a#logout-link(data-i18n="login.log_out") Log Out
br
.row
- var fullProfiles = isEmployer || me.isAdmin();
if fullProfiles
#filter-column.col-md-3
#filter
.panel-group#filter_panel
a#filter-link(data-toggle="collapse" data-target="#collapseOne")
.panel.panel-default
.panel-heading
h4.panel-title
span.glyphicon.glyphicon-folder-open#folder-icon
| Filter
.panel-collapse.collapse.in#collapseOne
.panel-body
p
strong(data-i18n="employers.already_screened") We've already technically screened all our candidates
span(data-i18n="employers.filter_further") , but you can also filter further:
form#filters
.filter_section#visa_filter
h4(data-i18n="employers.filter_visa") Visa
label
input(type="checkbox" name="visa" value="Authorized to work in the US")
span(data-i18n="employers.filter_visa_yes") US Authorized
| (#{candidatesInFilter("visa","Authorized to work in the US")})
label
input(type="checkbox" name="visa" value="Need visa sponsorship")
span(data-i18n="employers.filter_visa_no") Not Authorized
| (#{candidatesInFilter("visa","Need visa sponsorship")})
.filter_section#school_filter
h4(data-i18n="account_profile.education") Education
label
input(type="checkbox" name="schoolFilter" value="Top School")
span(data-i18n="employers.filter_education_top") Top School
| (#{candidatesInFilter("schoolFilter","Top School")})
label
input(type="checkbox" name="schoolFilter" value="Other")
span(data-i18n="employers.filter_education_other") Other
| (#{candidatesInFilter("schoolFilter","Other")})
.filter_section#role_filter
h4(data-i18n="employers.candidate_role") Role
label
input(type="checkbox" name="roleFilter" value="Web Developer")
span(data-i18n="employers.filter_role_web_developer") Web Developer
| (#{candidatesInFilter("roleFilter","Web Developer")})
label
input(type="checkbox" name="roleFilter" value="Software Developer")
span(data-i18n="employers.filter_role_software_developer") Software Developer
| (#{candidatesInFilter("roleFilter","Software Developer")})
label
input(type="checkbox" name="roleFilter" value="Mobile Developer")
span(data-i18n="employers.filter_role_mobile_developer") Mobile Developer
| (#{candidatesInFilter("roleFilter","Mobile Developer")})
.filter_section#seniority_filter
h4(data-i18n="employers.filter_experience") Experience
label
input(type="checkbox" name="seniorityFilter" value="Senior")
span(data-i18n="employers.filter_experience_senior") Senior
| (#{candidatesInFilter("seniorityFilter","Senior")})
label
input(type="checkbox" name="seniorityFilter" value="Junior")
span(data-i18n="employers.filter_experience_junior") Junior
| (#{candidatesInFilter("seniorityFilter","Junior")})
label
input(type="checkbox" name="seniorityFilter" value="Recent Grad")
span(data-i18n="employers.filter_experience_recent_grad") Recent Grad
| (#{candidatesInFilter("seniorityFilter","Recent Grad")})
label
input(type="checkbox" name="seniorityFilter" value="College Student")
span(data-i18n="employers.filter_experience_student") College Student
| (#{candidatesInFilter("seniorityFilter","College Student")})
//input#select_all_checkbox(type="checkbox" name="select_all" checked)
//| Select all
p#results
| #{numberOfCandidates}
span(data-i18n="employers.results") results
h4#filter-alerts-heading Filter Email Alerts
p Get an email whenever a candidate meeting certain criteria enters the system.
table#saved-filter-table
thead
tr
th Filters
th Remove
tbody
button.btn#create-alert-button Create Alert with Current Filters
#candidates-column(class=fullProfiles ? "full-profiles col-md-9" : "teaser-profiles col-md-12")
if candidates.length
#candidate-table
table
tbody
for candidate, index in featuredCandidates
- var profile = candidate.get('jobProfile');
- var authorized = candidate.id; // If we have the id, then we are authorized.
- var profileAge = (new Date() - new Date(profile.updated)) / 86400 / 1000;
- var expired = profileAge > 2 * 30.4;
- var curated = profile.curated;
- var photoSize = fullProfiles ? 75 : 50;
tr.candidate-row(data-candidate-id=candidate.id, id=candidate.id, class=expired ? "expired" : "")
td(rowspan=3)
- var photoURL = candidate.getPhotoURL(photoSize, false, true);
div(class="candidate-picture " + (/^\/file/.test(photoURL) ? "" : "anonymous"), style='background-image: url(' + encodeURI(photoURL) + ')')
if fullProfiles
td.candidate-name-cell
strong= profile.name
| -
span= profile.jobTitle
tr.description_row(data-candidate-id=candidate.id)
if curated && curated.shortDescription
td.candidate-description
div #{curated.shortDescription}
else
td.candidate-description
div #{profile.shortDescription}
tr.border_row(data-candidate-id=candidate.id)
if curated
- var workHistory = curated.workHistory.join(",");
if !fullProfiles
td.tag_column
img(src="/images/pages/employer/tag.png")
| #{profile.jobTitle}
td.location_column
img(src="/images/pages/employer/location.png")
| #{curated.location}
td.education_column
img(src="/images/pages/employer/education.png")
| #{curated.education}
td.work_column
if workHistory
img(src="/images/pages/employer/briefcase.png")
| #{workHistory}
if !fullProfiles
div#info_wrapper
span.hiring-call-to-action
h2#start-hiring(data-i18n="employers.start_hiring") Start hiring.
button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
h2#hiring-reasons.hiring-call-to-action(data-i18n="employers.reasons") Three reasons you should hire through us:
.reasons#top_row
.reason
img.employer_icon(src="/images/pages/employer/employer_icon2.png")
h3(data-i18n="employers.everyone_looking") Everyone here is looking for their next opportunity.
p(data-i18n="employers.everyone_looking_blurb") Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction.
.reason
img.employer_icon(src="/images/pages/employer/employer_icon6.png")
h3(data-i18n="employers.weeding") Sit back; we've done the weeding for you.
p(data-i18n="employers.weeding_blurb") Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time.
.reason
img(class="employer_icon" src="/images/pages/employer/employer_icon3.png")
h3(data-i18n="employers.pass_screen") They will pass your technical screen.
p(data-i18n="employers.pass_screen_blurb") Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News.
span.hiring-call-to-action
h2(data-i18n="employers.make_hiring_easier") Make my hiring easier, please.
button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
.reasons#bottom_row
.reason_long
img.employer_icon(src="/images/pages/employer/employer_icon1.png")
.reason_text
h3(data-i18n="employers.what") What is CodeCombat?
p(data-i18n="employers.what_blurb") CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io.
.reason_long
img.employer_icon(src="/images/pages/employer/employer_icon5.png")
.reason_text
h3(data-i18n="employers.cost") How much do we charge?
p(data-i18n="employers.cost_blurb") We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company.

10
app/templates/play/modal/play-level-modal.jade
View file

@ -1,8 +1,8 @@
extends /templates/modal/modal_base
block modal-header-content
h1#choose-hero-header(data-i18n="choose_hero.choose_hero") Choose Your Hero
h1#choose-inventory-header.secret(data-i18n="inventory.choose_inventory") Equip Items
h1#choose-hero-header.choose-hero-active.secret(data-i18n="choose_hero.choose_hero") Choose Your Hero
h1#choose-inventory-header.choose-inventory-active.secret(data-i18n="inventory.choose_inventory") Equip Items
block modal-body-content
#choose-hero-view
@ -10,7 +10,7 @@ block modal-body-content
#inventory-view
block modal-footer-content
button#choose-inventory-button.btn.btn-lg.btn-success(data-i18n="play.next") Next
button#choose-hero-button.btn.btn-lg.btn-primary.secret.pull-left(data-i18n="play.previous") Previous
button#play-level-button.btn.btn-lg.btn-success.secret(data-i18n="common.play") Play
button#choose-inventory-button.btn.btn-lg.btn-success.choose-hero-active.secret(data-i18n="play.next") Next
button#choose-hero-button.btn.btn-lg.btn-primary.choose-inventory-active.secret.pull-left(data-i18n="play.change_hero") Change Hero
button#play-level-button.btn.btn-lg.btn-success.choose-inventory-active.secret(data-i18n="common.play") Play

6
app/templates/play/world-map-view.jade
View file

@ -1,4 +1,8 @@
.map
.gradient.horizontal-gradient.top-gradient
.gradient.vertical-gradient.right-gradient
.gradient.horizontal-gradient.bottom-gradient
.gradient.vertical-gradient.left-gradient
img.map-background(src="/images/pages/play/map_" + mapType + ".jpg", alt="")
- var seenNext = false;
@ -17,7 +21,7 @@
each i in Array(level.difficulty)
i.icon-star
- var playCount = levelPlayCountMap[level.id]
if playCount && playCount > 20
if playCount && playCount.sessions > 20
div
span.spr #{playCount.sessions}
span(data-i18n="play.players") players

3
app/views/editor/level/thangs/ThangsTabView.coffee
View file

@ -336,7 +336,7 @@ module.exports = class ThangsTabView extends CocoView
return if e? and $(e.target).closest('#thang-search').length # Ignore if you're trying to search thangs
return unless (e? and $(e.target).closest('#thangs-tab-view').length) or key.isPressed('esc') or forceDeselect
if e then target = $(e.target) else target = @$el.find('.add-thangs-palette') # pretend to click on background if no event
return true if target.attr('id') is 'surface'
return true if target.attr('id') is 'webgl-surface'
target = target.closest('.add-thang-palette-icon')
wasSelected = target.hasClass 'selected'
@$el.find('.add-thangs-palette .add-thang-palette-icon.selected').removeClass('selected')
@ -400,6 +400,7 @@ module.exports = class ThangsTabView extends CocoView
pos.y = Math.round((pos.y - (thang.height ? 1) / 2) / snap.y) * snap.y + (thang.height ? 1) / 2
pos.z = thang.depth / 2
thang.pos = pos
thang.stateChanged = true
@surface.lankBoss.update true # Make sure Obstacle layer resets cache
onSurfaceMouseMoved: (e) ->

105
app/views/editor/thang/ThangTypeEditView.coffee
View file

@ -28,6 +28,7 @@ module.exports = class ThangTypeEditView extends RootView
health: 10.0
maxHealth: 10.0
hudProperties: ['health']
acts: true
events:
'click #clear-button': 'clearRawData'
@ -35,7 +36,8 @@ module.exports = class ThangTypeEditView extends RootView
'change #real-upload-button': 'animationFileChosen'
'change #animations-select': 'showAnimation'
'click #marker-button': 'toggleDots'
'click #end-button': 'endAnimation'
'click #stop-button': 'stopAnimation'
'click #play-button': 'playAnimation'
'click #history-button': 'showVersionHistory'
'click #fork-start-button': 'startForking'
'click #save-button': 'openSaveModal'
@ -74,13 +76,8 @@ module.exports = class ThangTypeEditView extends RootView
context.fileSizeString = @fileSizeString
context
getAnimationNames: ->
raw = _.keys((@thangType.get('raw') or {}).animations)
return [] unless raw
raw = ("raw:#{name}" for name in raw)
main = _.keys(@thangType.get('actions') or {})
main.concat(raw)
getAnimationNames: -> _.keys(@thangType.get('actions') or {})
afterRender: ->
super()
return unless @supermodel.finished()
@ -113,17 +110,20 @@ module.exports = class ThangTypeEditView extends RootView
makeDot: (color) ->
circle = new createjs.Shape()
circle.graphics.beginFill(color).beginStroke('black').drawCircle(0, 0, 5)
circle.x = CENTER.x
circle.y = CENTER.y
circle.scaleY = 0.5
circle.scaleY = 0.2
circle.scaleX = 0.5
circle
initStage: ->
canvas = @$el.find('#canvas')
@stage = new createjs.Stage(canvas[0])
@layerAdapter = new LayerAdapter({name:'Default', webGL: true})
@topLayer = new createjs.Container()
@layerAdapter.container.x = @topLayer.x = CENTER.x
@layerAdapter.container.y = @topLayer.y = CENTER.y
@stage.addChild(@layerAdapter.container, @topLayer)
@listenTo @layerAdapter, 'new-spritesheet', @onNewSpriteSheet
@stage.addChild(@layerAdapter.container)
@camera?.destroy()
@camera = new Camera canvas
@ -131,35 +131,39 @@ module.exports = class ThangTypeEditView extends RootView
@mouthDot = @makeDot('yellow')
@aboveHeadDot = @makeDot('green')
@groundDot = @makeDot('red')
@stage.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
@topLayer.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
@updateGrid()
_.defer @refreshAnimation
@toggleDots(false)
createjs.Ticker.setFPS(30)
createjs.Ticker.addEventListener('tick', @stage)
toggleDots: ->
@showDots = not @showDots
toggleDots: (newShowDots) ->
@showDots = if typeof(newShowDots) is 'boolean' then newShowDots else not @showDots
@updateDots()
updateDots: ->
@stage.removeChild(@torsoDot, @mouthDot, @aboveHeadDot, @groundDot)
@topLayer.removeChild(@torsoDot, @mouthDot, @aboveHeadDot, @groundDot)
return unless @currentLank
return unless @showDots
torso = @currentLank.getOffset 'torso'
mouth = @currentLank.getOffset 'mouth'
aboveHead = @currentLank.getOffset 'aboveHead'
@torsoDot.x = CENTER.x + torso.x * @scale
@torsoDot.y = CENTER.y + torso.y * @scale
@mouthDot.x = CENTER.x + mouth.x * @scale
@mouthDot.y = CENTER.y + mouth.y * @scale
@aboveHeadDot.x = CENTER.x + aboveHead.x * @scale
@aboveHeadDot.y = CENTER.y + aboveHead.y * @scale
@stage.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
@torsoDot.x = torso.x
@torsoDot.y = torso.y
@mouthDot.x = mouth.x
@mouthDot.y = mouth.y
@aboveHeadDot.x = aboveHead.x
@aboveHeadDot.y = aboveHead.y
@topLayer.addChild(@groundDot, @torsoDot, @mouthDot, @aboveHeadDot)
endAnimation: ->
stopAnimation: ->
@currentLank?.queueAction('idle')
playAnimation: ->
@currentLank?.queueAction(@$el.find('#animations-select').val())
updateGrid: ->
grid = new createjs.Container()
line = new createjs.Shape()
@ -247,19 +251,18 @@ module.exports = class ThangTypeEditView extends RootView
$('#spritesheets').empty()
for image in @layerAdapter.spriteSheet._images
$('#spritesheets').append(image)
@layerAdapter.container.x = CENTER.x
@layerAdapter.container.y = CENTER.y
@updateScale()
showAnimation: (animationName) ->
animationName = @$el.find('#animations-select').val() unless _.isString animationName
return unless animationName
if animationName.startsWith('raw:')
animationName = animationName[4...]
@showMovieClip(animationName)
else
@showAction(animationName)
@mockThang.action = animationName
@showAction(animationName)
@updateRotation()
@updateScale() # must happen after update rotation, because updateRotation calls the sprite update() method.
showMovieClip: (animationName) ->
vectorParser = new SpriteBuilder(@thangType)
movieClip = vectorParser.buildMovieClip(animationName)
@ -268,6 +271,9 @@ module.exports = class ThangTypeEditView extends RootView
if reg
movieClip.regX = -reg.x
movieClip.regY = -reg.y
scale = @thangType.get('scale')
if scale
movieClip.scaleX = movieClip.scaleY = scale
@showSprite(movieClip)
getLankOptions: -> {resolutionFactor: @resolution, thang: @mockThang}
@ -292,23 +298,16 @@ module.exports = class ThangTypeEditView extends RootView
@layerAdapter.resetSpriteSheet()
@layerAdapter.addLank(lank)
@currentLank = lank
lank.sprite.x = CENTER.x
lank.sprite.y = CENTER.y
lank.on 'new-sprite', ->
lank.sprite.x = CENTER.x
lank.sprite.y = CENTER.y
showSprite: (sprite) ->
@clearDisplayObject()
@clearLank()
sprite.x = CENTER.x
sprite.y = CENTER.y
@stage.addChildAt(sprite, 1)
@topLayer.addChild(sprite)
@currentObject = sprite
@updateDots()
clearDisplayObject: ->
@stage.removeChild(@currentObject) if @currentObject?
@topLayer.removeChild(@currentObject) if @currentObject?
clearLank: ->
@layerAdapter.removeLank(@currentLank) if @currentLank
@ -330,18 +329,12 @@ module.exports = class ThangTypeEditView extends RootView
@currentLank.update(true)
updateScale: =>
resValue = (@resolutionSlider.slider('value') + 1) / 10
scaleValue = (@scaleSlider.slider('value') + 1) / 10
@layerAdapter.container.scaleX = @layerAdapter.container.scaleY = @topLayer.scaleX = @topLayer.scaleY = scaleValue
fixed = scaleValue.toFixed(1)
@scale = scaleValue
@$el.find('.scale-label').text " #{fixed}x "
if @currentLank
@currentLank.sprite.scaleX = @currentLank.sprite.baseScaleX * scaleValue
@currentLank.sprite.scaleY = @currentLank.sprite.baseScaleY * scaleValue
else if @currentObject?
@currentObject.scaleX = @currentObject.scaleY = scaleValue / resValue
@updateGrid()
@updateDots()
updateResolution: =>
value = (@resolutionSlider.slider('value') + 1) / 10
@ -427,6 +420,7 @@ module.exports = class ThangTypeEditView extends RootView
onSelectNode: (e, selected) =>
selected = selected[0]
@topLayer.removeChild(@boundsBox) if @boundsBox
return @stopShowingSelectedNode() if not selected
path = selected.getPath()
parts = path.split('/')
@ -437,15 +431,16 @@ module.exports = class ThangTypeEditView extends RootView
obj = vectorParser.buildMovieClip(key) if type is 'animations'
obj = vectorParser.buildContainerFromStore(key) if type is 'containers'
obj = vectorParser.buildShapeFromStore(key) if type is 'shapes'
if obj?.bounds
obj.regX = obj.bounds.x + obj.bounds.width / 2
obj.regY = obj.bounds.y + obj.bounds.height / 2
else if obj?.frameBounds?[0]
bounds = obj.frameBounds[0]
obj.regX = bounds.x + bounds.width / 2
obj.regY = bounds.y + bounds.height / 2
bounds = obj?.bounds or obj?.nominalBounds
if bounds
@boundsBox = new createjs.Shape()
@boundsBox.graphics.beginFill('#aaaaaa').beginStroke('black').drawRect(bounds.x, bounds.y, bounds.width, bounds.height)
@topLayer.addChild(@boundsBox)
obj.regX = @boundsBox.regX = bounds.x + bounds.width / 2
obj.regY = @boundsBox.regY = bounds.y + bounds.height / 2
@showSprite(obj) if obj
obj.y = 200 if obj # truly center the container
@showingSelectedNode = true
@currentLank?.destroy()
@currentLank = null

6
app/views/game-menu/InventoryView.coffee
View file

@ -115,6 +115,9 @@ module.exports = class InventoryView extends CocoView
@$el.find('#selected-items').hide() # Hide until one is selected
@delegateEvents()
if @selectedHero and not @startedLoadingFirstHero
@loadHero()
afterInsert: ->
super()
@canvasWidth = @$el.find('canvas').innerWidth()
@ -329,7 +332,8 @@ module.exports = class InventoryView extends CocoView
@loadHero()
loadHero: ->
return unless @selectedHero and not @$el.hasClass 'secret'
return unless @supermodel.finished() and @selectedHero and not @$el.hasClass 'secret'
@startedLoadingFirstHero = true
@stage?.removeAllChildren()
if @selectedHero.loaded and movieClip = @movieClips?[@selectedHero.get('original')]
@stage.addChild(movieClip)

88
app/views/play/WorldMapView.coffee
View file

@ -17,6 +17,7 @@ class LevelSessionsCollection extends CocoCollection
module.exports = class WorldMapView extends RootView
id: 'world-map-view'
template: template
terrain: 'Dungeon' # or Grass
events:
'click .map-background': 'onClickMap'
@ -36,6 +37,7 @@ module.exports = class WorldMapView extends RootView
$(window).on 'resize', @onWindowResize
@playAmbientSound()
@preloadTopHeroes()
@hadEverChosenHero = me.get('heroConfig')?.thangType
destroy: ->
$(window).off 'resize', @onWindowResize
@ -75,7 +77,7 @@ module.exports = class WorldMapView extends RootView
context.levelStatusMap = @levelStatusMap
context.levelPlayCountMap = @levelPlayCountMap
context.isIPadApp = application.isIPadApp
context.mapType = 'dungeon'
context.mapType = _.string.slugify @terrain
context
afterRender: ->
@ -84,6 +86,7 @@ module.exports = class WorldMapView extends RootView
unless application.isIPadApp
_.defer => @$el.find('.game-controls .btn').tooltip() # Have to defer or i18n doesn't take effect.
@$el.find('.level').tooltip()
@$el.addClass _.string.slugify @terrain
onSessionsLoaded: (e) ->
for session in @sessions.models
@ -113,7 +116,7 @@ module.exports = class WorldMapView extends RootView
@startLevel $(e.target).parents('.level-info-container')
startLevel: (levelElement) ->
playLevelModal = new PlayLevelModal supermodel: @supermodel, levelID: levelElement.data('level-id'), levelPath: levelElement.data('level-path'), levelName: levelElement.data('level-name')
playLevelModal = new PlayLevelModal supermodel: @supermodel, levelID: levelElement.data('level-id'), levelPath: levelElement.data('level-path'), levelName: levelElement.data('level-name'), hadEverChosenHero: @hadEverChosenHero
@openModalView playLevelModal
@$levelInfo?.hide()
@ -148,28 +151,45 @@ module.exports = class WorldMapView extends RootView
@$levelInfo.css('top', top)
onWindowResize: (e) =>
mapHeight = 1536
mapWidth = 2350 # 2500 for forest
mapHeight = iPadHeight = 1536
mapWidth = if @terrain is 'Dungeon' then 2350 else 2500
iPadWidth = 2048
aspectRatio = mapWidth / mapHeight
iPadAspectRatio = iPadWidth / iPadHeight
pageWidth = $(window).width()
pageHeight = $(window).height()
widthRatio = pageWidth / mapWidth
heightRatio = pageHeight / mapHeight
if widthRatio > heightRatio
resultingWidth = pageWidth
resultingHeight = resultingWidth / aspectRatio
iPadWidthRatio = pageWidth / iPadWidth
if @terrain is 'Dungeon'
# Make sure we can see almost the whole map, fading to background in one dimension.
if heightRatio <= iPadWidthRatio
# Full width, full height, left and right margin
resultingHeight = pageHeight
resultingWidth = resultingHeight * aspectRatio
else if iPadWidthRatio < heightRatio * (iPadAspectRatio / aspectRatio)
# Cropped width, full height, left and right margin
resultingWidth = pageWidth
resultingHeight = resultingWidth / aspectRatio
else
# Cropped width, full height, top and bottom margin
resultingWidth = pageWidth * aspectRatio / iPadAspectRatio
resultingHeight = resultingWidth / aspectRatio
else
resultingHeight = pageHeight
resultingWidth = resultingHeight * aspectRatio
# Scale it in either dimension so that we're always full on one of the dimensions.
if heightRatio > widthRatio
resultingHeight = pageHeight
resultingWidth = resultingHeight * aspectRatio
else
resultingWidth = pageWidth
resultingHeight = resultingWidth / aspectRatio
resultingMarginX = (pageWidth - resultingWidth) / 2
resultingMarginY = (pageHeight - resultingHeight) / 2
@$el.find('.map').css(width: resultingWidth, height: resultingHeight, 'margin-left': resultingMarginX, 'margin-top': resultingMarginY)
playAmbientSound: ->
return if @ambientSound
#terrain = 'Grass'
terrain = 'Dungeon'
return unless file = {Dungeon: 'ambient-dungeon', Grass: 'ambient-map-grass'}[terrain]
return unless file = {Dungeon: 'ambient-dungeon', Grass: 'ambient-map-grass'}[@terrain]
src = "/file/interface/#{file}#{AudioPlayer.ext}"
unless AudioPlayer.getStatus(src)?.loaded
AudioPlayer.preloadSound src
@ -531,8 +551,8 @@ hero = [
id: 'dungeons-of-kithgard'
original: '528110f30268d018e3000001'
description: 'Grab the gem, but touch nothing else. Start here.'
x: 20.24
y: 32.93
x: 14
y: 15.5
}
{
name: 'Gems in the Deep'
@ -541,8 +561,8 @@ hero = [
id: 'gems-in-the-deep'
original: '54173c90844506ae0195a0b4'
description: 'Quickly collect the gems; you will need them.'
x: 18.47
y: 49.78
x: 32
y: 15.5
}
{
name: 'Shadow Guard'
@ -551,8 +571,8 @@ hero = [
id: 'shadow-guard'
original: '54174347844506ae0195a0b8'
description: 'Evade the Kithgard minion.'
x: 30.89
y: 61.30
x: 54
y: 9
}
{
name: 'True Names'
@ -561,8 +581,8 @@ hero = [
id: 'true-names'
original: '541875da4c16460000ab990f'
description: 'Learn an enemy\'s true name to defeat it.'
x: 44.39
y: 57.39
x: 74
y: 12
}
{
name: 'The Raised Sword'
@ -571,8 +591,8 @@ hero = [
id: 'the-raised-sword'
original: '5418aec24c16460000ab9aa6'
description: 'Learn to equip yourself for combat.'
x: 41.83
y: 41.74
x: 85
y: 20
}
{
name: 'The First Kithmaze'
@ -581,8 +601,8 @@ hero = [
id: 'the-first-kithmaze'
original: '5418b9d64c16460000ab9ab4'
description: 'The builders of Kith constructed many mazes to confuse travelers.'
x: 57.39
y: 48.15
x: 70
y: 28
}
{
name: 'The Second Kithmaze'
@ -591,8 +611,8 @@ hero = [
id: 'the-second-kithmaze'
original: '5418cf256bae62f707c7e1c3'
description: 'Many have tried, few have found their way through this maze.'
x: 61.72
y: 37.07
x: 67
y: 41
}
{
name: 'New Sight'
@ -611,8 +631,8 @@ hero = [
id: 'lowly-kithmen'
original: '541b24511ccc8eaae19f3c1f'
description: 'Use your glasses to seek out and attack the Kithmen.'
x: 70.53
y: 27.93
x: 74
y: 48
}
{
name: 'A Bolt in the Dark'
@ -621,8 +641,8 @@ hero = [
id: 'a-bolt-in-the-dark'
original: '541b288e1ccc8eaae19f3c25'
description: 'Kithmen are not the only ones to stand in your way.'
x: 86.08
y: 40.76
x: 76
y: 60
}
{
name: 'The Final Kithmaze'
@ -631,8 +651,8 @@ hero = [
id: 'the-final-kithmaze'
original: '541b434e1ccc8eaae19f3c33'
description: 'To escape you must find your way through an Elder Kithman\'s maze.'
x: 96.95
y: 58.15
x: 82
y: 70
}
{
name: 'Kithgard Gates'
@ -642,8 +662,8 @@ hero = [
original: '541c9a30c6362edfb0f34479'
description: 'Escape the Kithgard dungeons and don\'t let the guardians get you.'
disabled: true
x: 84.02
y: 72.39
x: 89
y: 82
}
{
name: 'Defence of Plainswood'

10
app/views/play/modal/PlayLevelModal.coffee
View file

@ -45,8 +45,14 @@ module.exports = class PlayLevelModal extends ModalView
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'game-menu-open', volume: 1
@insertSubView @chooseHeroView = new ChooseHeroView @options
@insertSubView @inventoryView = new InventoryView @options
@inventoryView.$el.addClass 'secret'
@chooseHeroView.onShown()
if @options.hadEverChosenHero
@$el.find('.choose-hero-active').add(@chooseHeroView.$el).addClass 'secret'
@$el.find('.choose-inventory-active').removeClass 'secret'
@inventoryView.onShown()
else
@$el.find('.choose-inventory-active').add(@inventoryView.$el).addClass 'secret'
@$el.find('.choose-hero-active').removeClass 'secret'
@chooseHeroView.onShown()
onHidden: ->
unless @navigatingToPlay

3
package.json
View file

@ -75,7 +75,7 @@
"javascript-brunch": "> 1.0 < 1.8",
"coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master",
"coffeelint-brunch": "> 1.0 < 1.8",
"sass-brunch": "1.7.0",
"sass-brunch": "1.7.2",
"css-brunch": "> 1.0 < 1.8",
"jade-brunch": "> 1.0 < 1.8",
"uglify-js-brunch": "~1.7.4",
@ -86,6 +86,7 @@
"marked": "0.2.x",
"telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master",
"bower": "~1.3.8",
"bless-brunch": "https://github.com/ThomasConner/bless-brunch/tarball/master",
"karma-script-launcher": "~0.1.0",
"karma-chrome-launcher": "~0.1.2",
"karma-firefox-launcher": "~0.1.3",

28
server/routes/mail.coffee
View file

@ -21,20 +21,20 @@ module.exports.setup = (app) ->
setupScheduledEmails = ->
testForLockManager()
mailTasks = [
taskFunction: candidateUpdateProfileTask
frequencyMs: 10 * 60 * 1000 #10 minutes
,
taskFunction: internalCandidateUpdateTask
frequencyMs: 10 * 60 * 1000 #10 minutes
,
taskFunction: employerNewCandidatesAvailableTask
frequencyMs: 10 * 60 * 1000 #10 minutes
,
taskFunction: unapprovedCandidateFinishProfileTask
frequencyMs: 10 * 60 * 1000
,
taskFunction: emailUserRemarkTaskRemindersTask
frequencyMs: 10 * 60 * 1000
# taskFunction: candidateUpdateProfileTask
# frequencyMs: 10 * 60 * 1000 #10 minutes
#,
# taskFunction: internalCandidateUpdateTask
# frequencyMs: 10 * 60 * 1000 #10 minutes
#,
# taskFunction: employerNewCandidatesAvailableTask
# frequencyMs: 10 * 60 * 1000 #10 minutes
#,
# taskFunction: unapprovedCandidateFinishProfileTask
# frequencyMs: 10 * 60 * 1000
#,
# taskFunction: emailUserRemarkTaskRemindersTask
# frequencyMs: 10 * 60 * 1000
]
for mailTask in mailTasks