codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-04 17:19:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed how the goal manager handles arriving at goals and figuring out the how many requirement.

Browse source
This commit is contained in:
Scott Erickson 2014-02-20 11:43:35 -08:00
parent 251d483eaa
commit 6b2e0bc364
1 changed files with 6 additions and 6 deletions

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

@ -142,13 +142,13 @@ module.exports = class GoalManager extends CocoClass
onThangTouchedGoal: (e, frameNumber) ->
for goal in @goals ? []
@checkArrived(goal.id, goal.getToLocations.who, goal.getToLocations.targets, e.actor.id, e.touched.id, frameNumber) if goal.getToLocations?
@checkArrived(goal.id, goal.keepFromLocations.who, goal.keepFromLocations.targets, e.actor.id, e.touched.id, frameNumber) if goal.keepFromLocations?
@checkArrived(goal.id, goal.getToLocations.who, goal.getToLocations.targets, e.actor, e.touched.id, frameNumber) if goal.getToLocations?
@checkArrived(goal.id, goal.keepFromLocations.who, goal.keepFromLocations.targets, e.actor, e.touched.id, frameNumber) if goal.keepFromLocations?
checkArrived: (goalID, who, targets, thangID, touchedID, frameNumber) ->
checkArrived: (goalID, who, targets, thang, touchedID, frameNumber) ->
return unless touchedID in targets
return unless thangID in who
@updateGoalState(goalID, thangID, 'arrived', frameNumber)
return unless thang.id in who or thang.team in who
@updateGoalState(goalID, thang.id, 'arrived', frameNumber)
onThangLeftMap: (e, frameNumber) ->
for goal in @goals ? []
@ -211,7 +211,7 @@ module.exports = class GoalManager extends CocoClass
stateThangs[thangID] = true
success = @goalIsPositive goalID
if success
numNeeded = Math.max((goal.howMany ? 1), _.size stateThangs)
numNeeded = goal.howMany ? Math.max(1, _.size stateThangs)
else
# saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done"
numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1