codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-20 18:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed goal states to handle teams.

Browse source
This commit is contained in:
Scott Erickson 2014-05-19 20:50:05 -07:00
parent 8b5014a053
commit b816055f9e
2 changed files with 6 additions and 3 deletions

6
app/lib/world/GoalManager.coffee
View file

@ -15,7 +15,7 @@ module.exports = class GoalManager extends CocoClass
nextGoalID: 0
constructor: (@world, @initialGoals) ->
constructor: (@world, @initialGoals, @team) ->
super()
@init()
@ -114,7 +114,9 @@ module.exports = class GoalManager extends CocoClass
checkOverallStatus: (ignoreIncomplete=false) ->
overallStatus = null
statuses = if @goalStates then (val.status for key, val of @goalStates) else []
goals = if @goalStates then _.values @goalStates else []
goals = (g for g in goals when g.team in [undefined, @team]) if @team
statuses = if @goalStates then (goal.status for goal in goals) else []
overallStatus = 'success' if statuses.length > 0 and _.every(statuses, (s) -> s is 'success' or (ignoreIncomplete and s is null))
overallStatus = 'failure' if statuses.length > 0 and 'failure' in statuses
overallStatus

3
app/views/play/level_view.coffee
View file

@ -211,9 +211,10 @@ module.exports = class PlayLevelView extends View
team ?= 'humans'
me.team = team
Backbone.Mediator.publish 'level:team-set', team: team
@team = team
initGoalManager: ->
@goalManager = new GoalManager(@world, @level.get('goals'))
@goalManager = new GoalManager(@world, @level.get('goals'), @team)
@god.setGoalManager @goalManager
insertSubviews: ->