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

Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map.

Browse source
This commit is contained in:
Nick Winter 2014-10-02 17:21:06 -07:00
parent 6ee898eaec
commit 3cdb8ff416
4 changed files with 8 additions and 8 deletions

4
app/lib/surface/MusicPlayer.coffee
View file

@ -53,7 +53,7 @@ module.exports = class MusicPlayer extends CocoClass
@currentMusic = createjs.Sound.play(src, 'none', 0, 0, -1, 0.3) if src @currentMusic = createjs.Sound.play(src, 'none', 0, 0, -1, 0.3) if src
return unless @currentMusic return unless @currentMusic
@currentMusic.volume = 0.0 @currentMusic.volume = 0.0
if me.get('music') if me.get('music', true)
createjs.Tween.get(@currentMusic).to({volume: MUSIC_VOLUME}, CROSSFADE_LENGTH) createjs.Tween.get(@currentMusic).to({volume: MUSIC_VOLUME}, CROSSFADE_LENGTH)
onMusicSettingChanged: -> onMusicSettingChanged: ->
@ -62,7 +62,7 @@ module.exports = class MusicPlayer extends CocoClass
updateMusicVolume: -> updateMusicVolume: ->
return unless @currentMusic return unless @currentMusic
createjs.Tween.removeTweens(@currentMusic) createjs.Tween.removeTweens(@currentMusic)
@currentMusic.volume = if me.get('music') then MUSIC_VOLUME else 0.0 @currentMusic.volume = if me.get('music', true) then MUSIC_VOLUME else 0.0
onRealTimePlaybackStarted: (e) -> onRealTimePlaybackStarted: (e) ->
@previousMusic = @currentMusic @previousMusic = @currentMusic

2
app/views/game-menu/OptionsView.coffee
View file

@ -42,7 +42,7 @@ module.exports = class OptionsView extends CocoView
@aceConfig = _.cloneDeep me.get('aceConfig') ? {} @aceConfig = _.cloneDeep me.get('aceConfig') ? {}
@aceConfig = _.defaults @aceConfig, @defaultConfig @aceConfig = _.defaults @aceConfig, @defaultConfig
c.aceConfig = @aceConfig c.aceConfig = @aceConfig
c.music = me.get('music') c.music = me.get('music', true)
c.autorunDelay = me.get('autocastDelay') ? 5000 c.autorunDelay = me.get('autocastDelay') ? 5000
c c

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

@ -611,8 +611,8 @@ hero = [
id: 'the-second-kithmaze' id: 'the-second-kithmaze'
original: '5418cf256bae62f707c7e1c3' original: '5418cf256bae62f707c7e1c3'
description: 'Many have tried, few have found their way through this maze.' description: 'Many have tried, few have found their way through this maze.'
x: 67 x: 55.54
y: 41 y: 26.96
} }
{ {
name: 'New Sight' name: 'New Sight'
@ -621,8 +621,8 @@ hero = [
id: 'new-sight' id: 'new-sight'
original: '5418d40f4c16460000ab9ac2' original: '5418d40f4c16460000ab9ac2'
description: 'A true name can only be seen with the correct lenses.' description: 'A true name can only be seen with the correct lenses.'
x: 55.54 x: 67
y: 26.96 y: 41
} }
{ {
name: 'Lowly Kithmen' name: 'Lowly Kithmen'

2
app/views/play/level/LevelPlaybackView.coffee
View file

@ -389,7 +389,7 @@ module.exports = class LevelPlaybackView extends CocoView
onToggleMusic: (e) -> onToggleMusic: (e) ->
e?.preventDefault() e?.preventDefault()
me.set('music', not me.get('music')) me.set('music', not me.get('music', true))
me.patch() me.patch()
$(document.activeElement).blur() $(document.activeElement).blur()