codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 18:15:52 -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-11-11 08:05:23 -08:00
commit 5534759f25
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/LevelLoader.coffee
View file

@ -228,7 +228,7 @@ module.exports = class LevelLoader extends CocoClass
return false unless _.filter(@worldNecessities).length is 0 return false unless _.filter(@worldNecessities).length is 0
return false unless @thangNamesLoaded return false unless @thangNamesLoaded
return false if @sessionDependenciesRegistered and not @sessionDependenciesRegistered[@session.id] return false if @sessionDependenciesRegistered and not @sessionDependenciesRegistered[@session.id]
return false if @opponentSession and not @sessionDependenciesRegistered[@opponentSession.id] return false if @sessionDependenciesRegistered and @opponentSession and not @sessionDependenciesRegistered[@opponentSession.id]
true true
onWorldNecessitiesLoaded: -> onWorldNecessitiesLoaded: ->

2
app/lib/LevelOptions.coffee
View file

@ -183,7 +183,7 @@ module.exports = LevelOptions =
'thornbush-farm': 'thornbush-farm':
requiredGear: {feet: 'leather-boots', 'right-hand': 'builders-hammer', eyes: 'crude-glasses'} requiredGear: {feet: 'leather-boots', 'right-hand': 'builders-hammer', eyes: 'crude-glasses'}
restrictedGear: {feet: 'simple-boots', 'right-hand': 'simple-sword'} restrictedGear: {feet: 'simple-boots', 'right-hand': 'simple-sword'}
'a-fiery-trap': 'back-to-back':
requiredGear: {feet: 'leather-boots', torso: 'leather-tunic', waist: 'leather-belt', 'programming-book': 'programmaticon-i', eyes: 'crude-glasses', 'right-hand': 'simple-sword', 'left-hand': 'wooden-shield'} requiredGear: {feet: 'leather-boots', torso: 'leather-tunic', waist: 'leather-belt', 'programming-book': 'programmaticon-i', eyes: 'crude-glasses', 'right-hand': 'simple-sword', 'left-hand': 'wooden-shield'}
restrictedGear: {feet: 'simple-boots', 'right-hand': 'builders-hammer'} restrictedGear: {feet: 'simple-boots', 'right-hand': 'builders-hammer'}
'ogre-encampment': 'ogre-encampment':

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

@ -101,9 +101,7 @@ module.exports = class World
if @realTime and not @countdownFinished if @realTime and not @countdownFinished
@realTimeSpeedFactor = 1 @realTimeSpeedFactor = 1
unless @showsCountdown unless @showsCountdown
if @levelID in ['the-first-kithmaze', 'haunted-kithmaze', 'the-second-kithmaze', 'the-final-kithmaze', 'the-gauntlet', 'winding-trail', 'thornbush-farm', 'a-fiery-trap'] if @levelID in ['thornbush-farm', 'back-to-back', 'ogre-encampment', 'woodland-cleaver', 'shield-rush', 'peasant-protection', 'munchkin-swarm']
@realTimeSpeedFactor = 5
else if @levelID in ['forgetful-gemsmith', 'descending-further', 'tactical-strike', 'kithgard-gates', 'ogre-encampment', 'woodland-cleaver', 'shield-rush', 'peasant-protection', 'munchkin-swarm']
@realTimeSpeedFactor = 3 @realTimeSpeedFactor = 3
if @showsCountdown if @showsCountdown
return setTimeout @finishCountdown(continueLaterFn), REAL_TIME_COUNTDOWN_DELAY return setTimeout @finishCountdown(continueLaterFn), REAL_TIME_COUNTDOWN_DELAY

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

@ -615,14 +615,14 @@ forest = [
original: '5447030525cce60000745e2a' original: '5447030525cce60000745e2a'
description: 'Determine refugee peasant from ogre when defending the farm.' description: 'Determine refugee peasant from ogre when defending the farm.'
nextLevels: nextLevels:
continue: 'a-fiery-trap' continue: 'back-to-back'
x: 44.09 x: 44.09
y: 57.75 y: 57.75
} }
{ {
name: 'A Fiery Trap' name: 'Back to Back'
type: 'hero' type: 'hero'
id: 'a-fiery-trap' id: 'back-to-back'
original: '5448330517d7283e051f9b9e' original: '5448330517d7283e051f9b9e'
description: 'Patrol the village entrances, but stay defensive.' description: 'Patrol the village entrances, but stay defensive.'
nextLevels: nextLevels: