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

Merge pull request #3270 from sasha-bichkov/master

Browse source 
Refactor Level.coffee
This commit is contained in:
Nick Winter 2015-12-23 08:56:00 -08:00
commit 8fb358425d
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/models/Level.coffee
View file

@ -104,31 +104,28 @@ module.exports = class Level extends CocoModel
if isHero and placeholderComponent = placeholders[defaultThangComponent.original]
placeholdersUsed[placeholderComponent.original] = true
placeholderConfig = placeholderComponent.config ? {}
levelThangComponent.config ?= {}
config = levelThangComponent.config
if placeholderConfig.pos # Pull in Physical pos x and y
levelThangComponent.config ?= {}
levelThangComponent.config.pos ?= {}
levelThangComponent.config.pos.x = placeholderConfig.pos.x
levelThangComponent.config.pos.y = placeholderConfig.pos.y
levelThangComponent.config.rotation = placeholderConfig.rotation
config.pos ?= {}
config.pos.x = placeholderConfig.pos.x
config.pos.y = placeholderConfig.pos.y
config.rotation = placeholderConfig.rotation
else if placeholderConfig.team # Pull in Allied team
levelThangComponent.config ?= {}
levelThangComponent.config.team = placeholderConfig.team
config.team = placeholderConfig.team
else if placeholderConfig.significantProperty # For levels where we cheat on what counts as an enemy
levelThangComponent.config ?= {}
levelThangComponent.config.significantProperty = placeholderConfig.significantProperty
config.significantProperty = placeholderConfig.significantProperty
else if placeholderConfig.programmableMethods
# Take the ThangType default Programmable and merge level-specific Component config into it
copy = $.extend true, {}, placeholderConfig
programmableProperties = levelThangComponent.config?.programmableProperties ? []
programmableProperties = config?.programmableProperties ? []
copy.programmableProperties = _.union programmableProperties, copy.programmableProperties ? []
levelThangComponent.config = _.merge copy, levelThangComponent.config
config = _.merge copy, config
else if placeholderConfig.extraHUDProperties
levelThangComponent.config ?= {}
levelThangComponent.config.extraHUDProperties = _.union(levelThangComponent.config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties)
config.extraHUDProperties = _.union(config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties)
else if placeholderConfig.voiceRange # Pull in voiceRange
levelThangComponent.config ?= {}
levelThangComponent.config.voiceRange = placeholderConfig.voiceRange
levelThangComponent.config.cooldown = placeholderConfig.cooldown
config.voiceRange = placeholderConfig.voiceRange
config.cooldown = placeholderConfig.cooldown
if isHero
if equips = _.find levelThang.components, {original: LevelComponent.EquipsID}