codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-29 15:35:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing mixins and indoor wall handling.

Browse source
This commit is contained in:
Nick Winter 2014-01-30 14:21:58 -08:00
parent b09d1b1c74
commit 7dcbbb983f
3 changed files with 43 additions and 3 deletions

2
app/lib/surface/Mark.coffee
View file

@ -166,7 +166,7 @@ module.exports = class Mark extends CocoClass
size += 60 if @name is 'selection' size += 60 if @name is 'selection'
size += 60 if @name is 'repair' size += 60 if @name is 'repair'
scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name] scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name]
if @sprite?.thang.spriteName.search(/dungeon.wall/i) isnt -1 if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
scale *= 2 scale *= 2
@mark.scaleX = @mark.scaleY = Math.min 1, scale @mark.scaleX = @mark.scaleY = Math.min 1, scale
if @name in ['selection', 'target', 'repair'] if @name in ['selection', 'target', 'repair']

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

@ -76,7 +76,7 @@ module.exports = class SpriteBoss extends CocoClass
id ?= sprite.thang.id id ?= sprite.thang.id
console.error "Sprite collision! Already have:", id if @sprites[id] console.error "Sprite collision! Already have:", id if @sprites[id]
@sprites[id] = sprite @sprites[id] = sprite
layer ?= @spriteLayers["Obstacle"] if sprite.thang?.spriteName.search(/dungeon.wall/i) isnt -1 layer ?= @spriteLayers["Obstacle"] if sprite.thang?.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
layer ?= @layerForChild sprite.displayObject, sprite layer ?= @layerForChild sprite.displayObject, sprite
layer.addChild sprite.displayObject layer.addChild sprite.displayObject
layer.updateLayerOrder() layer.updateLayerOrder()
@ -177,7 +177,7 @@ module.exports = class SpriteBoss extends CocoClass
cache: (update=false) -> cache: (update=false) ->
return if @cached and not update return if @cached and not update
wallSprites = (sprite for thangID, sprite of @sprites when sprite.thangType?.get('name') is 'Dungeon Wall') wallSprites = (sprite for thangID, sprite of @sprites when sprite.thangType?.get('name').search(/(dungeon|indoor).wall/i) isnt -1)
walls = (sprite.thang for sprite in wallSprites) walls = (sprite.thang for sprite in wallSprites)
@world.calculateBounds() @world.calculateBounds()
wallGrid = new Grid walls, @world.size()... wallGrid = new Grid walls, @world.size()...

40
app/styles/mixins.sass Normal file
View file

@ -0,0 +1,40 @@
@import "app/styles/bootstrap/mixins"
@mixin gradient-radial-custom-stops($innerColor: #555, $innerStop: 20%, $outerColor: #333, $outerStop: 70%)
background-color: $outerColor
@include gradient-vertical($innerColor, $outerColor) // IE6-9 fallback on vertical gradient
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor $innerStop), to($outerColor $outerStop))
background-image: -webkit-radial-gradient(circle, $innerColor $innerStop, $outerColor $outerStop)
background-image: -moz-radial-gradient(circle, $innerColor $innerStop, $outerColor $outerStop)
background-image: -o-radial-gradient(circle, $innerColor $innerStop, $outerColor $outerStop)
background-image: radial-gradient(circle, $innerColor $innerStop, $outerColor $outerStop)
background-repeat: no-repeat
@mixin gradient-banner-button($topBottomColor: #2C446A, $middleColor: #3A537F)
background-color: mix($topBottomColor, $middleColor, 80%)
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($topBottomColor), color-stop(16%, $topBottomColor), color-stop(17%, $middleColor), color-stop(83%, $middleColor), color-stop(84%, $topBottomColor), to($topBottomColor))
background-image: -webkit-linear-gradient($topBottomColor, $topBottomColor 16%, $middleColor 16%, $middleColor 83%, $topBottomColor 84%, $topBottomColor)
background-image: -moz-linear-gradient(top, $topBottomColor, $topBottomColor 16%, $middleColor 16%, $middleColor 83%, $topBottomColor 84%, $topBottomColor)
background-image: -o-linear-gradient($topBottomColor, $topBottomColor 16%, $middleColor 16%, $middleColor 83%, $topBottomColor 84%, $topBottomColor)
background-image: linear-gradient($topBottomColor, $topBottomColor 16%, $middleColor 16%, $middleColor 83%, $topBottomColor 84%, $topBottomColor)
background-repeat: no-repeat
@mixin banner-button($backgroundColor: #3A537F, $textColor: #FFF)
$topBottomColor: darken($backgroundColor, 9%)
@include gradient-banner-button($topBottomColor, $backgroundColor)
color: $textColor
&:hover:not(.disabled):not([disabled]), &:focus:not(.disabled):not([disabled])
@include gradient-banner-button(lighten($topBottomColor, 6%), lighten($backgroundColor, 6%))
&.active, &:active
background-image: none
outline: 0
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05))
// Disabled state
&.disabled, &[disabled]
cursor: default
background-image: none
@include opacity(0.65)
@include box-shadow(none)