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

Merge pull request from jayant1992/master

Browse source 
Couple of fixes for the terrain generator
This commit is contained in:
Nick Winter 2014-07-15 16:41:12 -07:00
commit c4921a6500
1 changed files with 12 additions and 11 deletions

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

@ -22,7 +22,8 @@ presets = {
'grassy': { 'grassy': {
'type':'grassy' 'type':'grassy'
'borders':['Tree 1', 'Tree 2', 'Tree 3'] 'borders':['Tree 1', 'Tree 2', 'Tree 3']
'floors':['Grass01', 'Grass02', 'Grass03'] 'floors':['Grass']
# 'floors':['Grass01', 'Grass02', 'Grass03']
'decorations': { 'decorations': {
'house': { 'house': {
'num':[1,2] #min-max 'num':[1,2] #min-max
@ -61,12 +62,12 @@ sizes = {
} }
'floorSize': { 'floorSize': {
'x':20 'x':20
'y':20 'y':17
} }
'borderSize': { 'borderSize': {
'x':4 'x':4
'y':4 'y':4
'thickness':2 'thickness':3
} }
} }
@ -108,42 +109,42 @@ module.exports = class TerrainRandomizeModal extends ModalView
@thangs.push { @thangs.push {
'id': @getRandomThang(preset.floors) 'id': @getRandomThang(preset.floors)
'pos': { 'pos': {
'x': i 'x': i + sizes.floorSize.x/2
'y': j 'y': j + sizes.floorSize.y/2
} }
} }
randomizeBorder: (preset, presetSize) -> randomizeBorder: (preset, presetSize) ->
for i in _.range(0-sizes.floorSize.x/2+sizes.borderSize.x, presetSize.x-sizes.floorSize.x/2, sizes.borderSize.x) for i in _.range(0, presetSize.x, sizes.borderSize.x)
for j in _.range(sizes.borderSize.thickness) for j in _.range(sizes.borderSize.thickness)
@thangs.push { @thangs.push {
'id': @getRandomThang(preset.borders) 'id': @getRandomThang(preset.borders)
'pos': { 'pos': {
'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2) 'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2)
'y': 0 - sizes.floorSize.x/2 + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2) 'y': 0 + _.random(-sizes.borderSize.y/2, sizes.borderSize.y)
} }
} }
@thangs.push { @thangs.push {
'id': @getRandomThang(preset.borders) 'id': @getRandomThang(preset.borders)
'pos': { 'pos': {
'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2) 'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2)
'y': presetSize.y - sizes.borderSize.y + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2) 'y': presetSize.y + _.random(-sizes.borderSize.y, sizes.borderSize.y/2)
} }
} }
for i in _.range(0-sizes.floorSize.y/2, presetSize.y-sizes.borderSize.y, sizes.borderSize.y) for i in _.range(0, presetSize.y, sizes.borderSize.y)
for j in _.range(3) for j in _.range(3)
@thangs.push { @thangs.push {
'id': @getRandomThang(preset.borders) 'id': @getRandomThang(preset.borders)
'pos': { 'pos': {
'x': 0-sizes.floorSize.x/2+sizes.borderSize.x + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2) 'x': 0 + _.random(-sizes.borderSize.x/2, sizes.borderSize.x)
'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2) 'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
} }
} }
@thangs.push { @thangs.push {
'id': @getRandomThang(preset.borders) 'id': @getRandomThang(preset.borders)
'pos': { 'pos': {
'x': presetSize.x - sizes.borderSize.x - sizes.floorSize.x/2 + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2) 'x': presetSize.x + _.random(-sizes.borderSize.x, sizes.borderSize.x/2)
'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2) 'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
} }
} }