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

Fixed Grass01-Grass05 scaling issues.

Browse source
This commit is contained in:
Nick Winter 2014-07-15 18:08:00 -07:00
parent 8c9c41f477
commit 03cc2d1af0
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,7 +328,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
@baseScaleX *= -1 if @getActionProp 'flipX' @baseScaleX *= -1 if @getActionProp 'flipX'
@baseScaleY *= -1 if @getActionProp 'flipY' @baseScaleY *= -1 if @getActionProp 'flipY'
# temp, until these are re-exported with perspective # temp, until these are re-exported with perspective
floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Goal Trigger', 'Obstacle'] floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Grass01', 'Grass02', 'Grass03', 'Grass04', 'Grass05', 'Goal Trigger', 'Obstacle']
if @options.camera and @thangType.get('name') in floors if @options.camera and @thangType.get('name') in floors
@baseScaleY *= @options.camera.y2x @baseScaleY *= @options.camera.y2x

3
app/views/editor/level/modal/terrain_randomize_modal.coffee
View file

@ -22,8 +22,7 @@ presets = {
'grassy': { 'grassy': {
'type':'grassy' 'type':'grassy'
'borders':['Tree 1', 'Tree 2', 'Tree 3'] 'borders':['Tree 1', 'Tree 2', 'Tree 3']
'floors':['Grass'] 'floors':['Grass01', 'Grass02', 'Grass03', 'Grass04', 'Grass05']
# 'floors':['Grass01', 'Grass02', 'Grass03']
'decorations': { 'decorations': {
'house': { 'house': {
'num':[1,2] #min-max 'num':[1,2] #min-max