A few tweaks here and there.

This commit is contained in:
Nick Winter 2014-11-01 09:35:19 -07:00
parent 19c7d7b3b8
commit e129faf384
4 changed files with 13 additions and 3 deletions

View file

@ -68,6 +68,8 @@ class AudioPlayer extends CocoClass
return null unless say = soundTriggers?.say
message = _.string.slugify message
return sound if sound = say[message]
if _.string.startsWith message, 'attack'
return sound if sound = say.attack
defaults = say.defaultSimlish
if say.swearingSimlish?.length and _.find(swears, (s) -> message.search(s) isnt -1)
defaults = say.swearingSimlish

View file

@ -99,9 +99,9 @@ module.exports = class World
continueLaterFn = =>
@loadFrames(loadedCallback, errorCallback, loadProgressCallback, preloadedCallback, skipDeferredLoading, loadUntilFrame) unless @destroyed
if @realTime and not @countdownFinished
if @levelID in ['the-first-kithmaze', 'descending-further', 'the-second-kithmaze', 'the-final-kithmaze', 'the-gauntlet', 'winding-trail', 'thornbush-farm']
if @levelID in ['the-first-kithmaze', 'the-second-kithmaze', 'the-final-kithmaze', 'the-gauntlet', 'winding-trail', 'thornbush-farm']
@realTimeSpeedFactor = 5
else if @levelID in ['forgotten-gemsmith', 'tactical-strike', 'kithgard-gates']
else if @levelID in ['forgotten-gemsmith', 'descending-further', 'tactical-strike', 'kithgard-gates']
@realTimeSpeedFactor = 3
else
@realTimeSpeedFactor = 1

View file

@ -889,6 +889,8 @@ forest = [
id: 'defense-of-plainswood'
original: '541b67f71ccc8eaae19f3c62'
description: 'Protect the peasants from the pursuing ogres.'
nextLevels:
continue: 'winding-trail'
x: 29.63
y: 53.69
}
@ -899,6 +901,8 @@ forest = [
id: 'winding-trail'
original: '5446cb40ce01c23e05ecf027'
description: 'Stay alive and navigate through the forest.'
nextLevels:
continue: 'thornbush-farm'
x: 39.03
y: 54.97
}
@ -909,6 +913,8 @@ forest = [
id: 'thornbush-farm'
original: '5447030525cce60000745e2a'
description: 'Determine refugee peasant from ogre when defending the farm.'
nextLevels:
continue: 'a-fiery-trap'
x: 44.09
y: 57.75
}

View file

@ -187,7 +187,9 @@ module.exports = class SpellPaletteView extends CocoView
itemsByProp = {}
for slot, inventoryID of @thang.inventoryIDs ? {}
if item = itemThangTypes[inventoryID]
for component in item.get('components') when component.config
unless item.get('components')
console.error 'Item', item, 'did not have any components when we went to assemble docs.'
for component in item.get('components') ? [] when component.config
for owner, storages of propStorage
if props = component.config[storages]
for prop in _.sortBy(props) when prop[0] isnt '_' # no private properties