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

Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow

Browse source
This commit is contained in:
Nick Winter 2014-03-19 18:01:49 -07:00
commit 9713f7d142
2 changed files with 7 additions and 1 deletions
app/lib/surface
CocoSprite.coffee
server/commons
logging.coffee

6
app/lib/surface/CocoSprite.coffee
View file

@ -252,6 +252,12 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
return
scaleX = if @getActionProp 'flipX' then -1 else 1
scaleY = if @getActionProp 'flipY' then -1 else 1
if @thangType.get('name') is 'Arrow'
# scale the arrow so it appears longer when flying parallel to horizon
angle = @getRotation()
angle = -angle if angle < 0
angle = 180 - angle if angle > 90
scaleX = 0.5 + 0.5 * (90 - angle) / 90
scaleFactorX = @thang.scaleFactorX ? @scaleFactor
scaleFactorY = @thang.scaleFactorY ? @scaleFactor
@imageObject.scaleX = @originalScaleX * scaleX * scaleFactorX

2
server/commons/logging.coffee
View file

@ -5,4 +5,4 @@ module.exports.setup = ->
winston.add(winston.transports.Console,
colorize: true,
timestamp: true
)
)