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

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2016-08-18 15:04:48 -07:00
commit 1de03cce15
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/core/ParticleMan.coffee
View file

@ -84,7 +84,6 @@ module.exports = ParticleMan = class ParticleMan extends CocoClass
addEmitter: (x, y, kind="level-dungeon-premium") -> addEmitter: (x, y, kind="level-dungeon-premium") ->
return if @unsupported return if @unsupported
kind = kind.replace 'intro', 'dungeon'
options = $.extend true, {}, particleKinds[kind] options = $.extend true, {}, particleKinds[kind]
return console.error "Couldn't find particle configuration for", kind unless options.group return console.error "Couldn't find particle configuration for", kind unless options.group
options.group.texture = THREE.ImageUtils.loadTexture "/images/common/particles/#{options.group.texture}.png" options.group.texture = THREE.ImageUtils.loadTexture "/images/common/particles/#{options.group.texture}.png"

2
app/views/play/CampaignView.coffee
View file

@ -404,7 +404,7 @@ module.exports = class CampaignView extends RootView
@particleMan.removeEmitters() @particleMan.removeEmitters()
@particleMan.attach @$el.find('.map') @particleMan.attach @$el.find('.map')
for level in @campaign.renderedLevels ? {} for level in @campaign.renderedLevels ? {}
terrain = @terrain.replace('-branching-test', '').replace(/(game|web)-dev-\d/, 'forest') terrain = @terrain.replace('-branching-test', '').replace(/(campaign-)?(game|web)-dev-\d/, 'forest').replace('intro', 'dungeon')
particleKey = ['level', terrain] particleKey = ['level', terrain]
particleKey.push level.type if level.type and not (level.type in ['hero', 'course']) # Would use isType, but it's not a Level model particleKey.push level.type if level.type and not (level.type in ['hero', 'course']) # Would use isType, but it's not a Level model
particleKey.push 'replayable' if level.replayable particleKey.push 'replayable' if level.replayable