diff --git a/app/assets/images/pages/editor/level/preset_dungeon_large.jpg b/app/assets/images/pages/editor/level/preset_dungeon_large.jpg
new file mode 100644
index 000000000..b39f3558e
Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_dungeon_large.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_dungeon_small.jpg b/app/assets/images/pages/editor/level/preset_dungeon_small.jpg
new file mode 100644
index 000000000..a8fea9c5c
Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_dungeon_small.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_indoor_large.jpg b/app/assets/images/pages/editor/level/preset_indoor_large.jpg
new file mode 100644
index 000000000..0ea8b6907
Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_indoor_large.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_indoor_small.jpg b/app/assets/images/pages/editor/level/preset_indoor_small.jpg
new file mode 100644
index 000000000..e172b56bd
Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_indoor_small.jpg differ
diff --git a/app/views/editor/level/modals/TerrainRandomizeModal.coffee b/app/views/editor/level/modals/TerrainRandomizeModal.coffee
index c9decc61c..7dc37d7c8 100644
--- a/app/views/editor/level/modals/TerrainRandomizeModal.coffee
+++ b/app/views/editor/level/modals/TerrainRandomizeModal.coffee
@@ -24,7 +24,7 @@ clusters = {
'margin': 1
}
'wood': {
- 'thangs': ['Firewood 1', 'Firewood 2', 'Firewood 3', 'Barrel']
+ 'thangs': ['Firewood 1', 'Firewood 2', 'Firewood 3']
'margin': 1
}
'farm': {
@@ -39,6 +39,18 @@ clusters = {
'thangs': ['Gargoyle', 'Rock Cluster 1', 'Rock Cluster 2', 'Rock Cluster 3']
'margin': 1
}
+ 'torch': {
+ 'thangs': ['Torch']
+ 'margin': 0
+ }
+ 'chains': {
+ 'thangs': ['Chains']
+ 'margin': 0
+ }
+ 'barrel': {
+ 'thangs': ['Barrel']
+ 'margin': 1
+ }
'doors': {
'thangs': ['Dungeon Door']
'margin': -1
@@ -55,6 +67,18 @@ clusters = {
'thangs': ['Dungeon Floor']
'margin': -1
}
+ 'indoor_wall': {
+ 'thangs': ['Indoor Wall']
+ 'margin': 2
+ }
+ 'indoor_floor': {
+ 'thangs': ['Indoor Floor']
+ 'margin': -1
+ }
+ 'furniture': {
+ 'thangs': ['Bookshelf', 'Chair', 'Table', 'Candle', 'Treasure Chest']
+ 'margin': -1
+ }
}
presets = {
@@ -63,8 +87,23 @@ presets = {
'borders':'dungeon_wall'
'borderNoise':0
'borderSize':4
+ 'borderThickness':1
'floors':'dungeon_floor'
'decorations': {
+ 'Room': {
+ 'num': [1,1]
+ 'width': [12, 20]
+ 'height': [8, 16]
+ 'thickness': [2,2]
+ 'cluster': 'dungeon_wall'
+ }
+ 'Barrels': {
+ 'num': [1,1]
+ 'width': [8, 12]
+ 'height': [8, 12]
+ 'numBarrels': [4,6]
+ 'cluster': 'barrel'
+ }
'cave': {
'num':[1,1]
'width': 10
@@ -74,12 +113,30 @@ presets = {
'stone':[2,4]
}
}
+ }
+ }
+ 'indoor': {
+ 'type':'indoor'
+ 'borders':'indoor_wall'
+ 'borderNoise':0
+ 'borderSize':4
+ 'borderThickness':1
+ 'floors':'indoor_floor'
+ 'decorations': {
'Room': {
'num': [1,1]
'width': [12, 20]
'height': [8, 16]
'thickness': [2,2]
- 'cluster': 'dungeon_wall'
+ 'cluster': 'indoor_wall'
+ }
+ 'furniture': {
+ 'num':[1,2]
+ 'width': 15
+ 'height': 15
+ 'clusters': {
+ 'furniture':[2,4]
+ }
}
}
}
@@ -88,6 +145,7 @@ presets = {
'borders':'trees'
'borderNoise':1
'borderSize':0
+ 'borderThickness':3
'floors':'grass_floor'
'decorations': {
'house': {
@@ -120,10 +178,12 @@ presetSizes = {
'small': {
'x':80
'y':68
+ 'sizeFactor':1
}
'large': {
'x':160
'y':136
+ 'sizeFactor':2
}
}
@@ -135,7 +195,6 @@ thangSizes = {
'borderSize': {
'x':4
'y':4
- 'thickness':3
}
}
@@ -185,7 +244,8 @@ module.exports = class TerrainRandomizeModal extends ModalView
randomizeBorder: (preset, presetSize, noiseFactor=1) ->
for i in _.range(0, presetSize.x, thangSizes.borderSize.x)
- for j in _.range(thangSizes.borderSize.thickness)
+ for j in _.range(preset.borderThickness)
+ # Bottom wall
while not @addThang {
'id': @getRandomThang(clusters[preset.borders].thangs)
'pos': {
@@ -195,6 +255,8 @@ module.exports = class TerrainRandomizeModal extends ModalView
'margin': clusters[preset.borders].margin
}
continue
+
+ # Top wall
while not @addThang {
'id': @getRandomThang(clusters[preset.borders].thangs)
'pos': {
@@ -205,8 +267,38 @@ module.exports = class TerrainRandomizeModal extends ModalView
}
continue
+ # Double wall on top
+ if preset.type is 'dungeon'
+ @addThang {
+ 'id': @getRandomThang(clusters[preset.borders].thangs)
+ 'pos': {
+ 'x': i + preset.borderSize/2
+ 'y': presetSize.y - 3 * preset.borderSize/2
+ }
+ 'margin': clusters[preset.borders].margin
+ }
+ if ( i / preset.borderSize ) % 2 and i isnt presetSize.x - thangSizes.borderSize.x
+ @addThang {
+ 'id': @getRandomThang(clusters['torch'].thangs)
+ 'pos': {
+ 'x': i + preset.borderSize
+ 'y': presetSize.y - preset.borderSize
+ }
+ 'margin': clusters['torch'].margin
+ }
+ else if ( i / preset.borderSize ) % 2 is 0 and i and _.random(100) < 30
+ @addThang {
+ 'id': @getRandomThang(clusters['chains'].thangs)
+ 'pos': {
+ 'x': i + preset.borderSize
+ 'y': presetSize.y - preset.borderSize
+ }
+ 'margin': clusters['chains'].margin
+ }
+
for i in _.range(0, presetSize.y, thangSizes.borderSize.y)
- for j in _.range(3)
+ for j in _.range(preset.borderThickness)
+ # Left wall
while not @addThang {
'id': @getRandomThang(clusters[preset.borders].thangs)
'pos': {
@@ -216,6 +308,8 @@ module.exports = class TerrainRandomizeModal extends ModalView
'margin': clusters[preset.borders].margin
}
continue
+
+ # Right wall
while not @addThang {
'id': @getRandomThang(clusters[preset.borders].thangs)
'pos': {
@@ -227,9 +321,8 @@ module.exports = class TerrainRandomizeModal extends ModalView
continue
randomizeDecorations: (preset, presetSize)->
- if presetSize is presetSizes['small'] then sizeFactor = 1 else sizeFactor = 2
for name, decoration of preset.decorations
- for num in _.range(sizeFactor * _.random(decoration.num[0], decoration.num[1]))
+ for num in _.range(presetSize.sizeFactor * _.random(decoration.num[0], decoration.num[1]))
if @['build'+name] isnt undefined
@['build'+name](preset, presetSize, decoration)
continue
@@ -255,23 +348,22 @@ module.exports = class TerrainRandomizeModal extends ModalView
continue
buildRoom: (preset, presetSize, room) ->
- if presetSize is presetSizes['small'] then sizeFactor = 1 else sizeFactor = 2
while true
rect = {
- 'width':sizeFactor * (room.width[0] + preset.borderSize * _.random(0, (room.width[1] - room.width[0])/preset.borderSize))
- 'height':sizeFactor * (room.height[0] + preset.borderSize * _.random(0, (room.height[1] - room.height[0])/preset.borderSize))
+ 'width':presetSize.sizeFactor * (room.width[0] + preset.borderSize * _.random(0, (room.width[1] - room.width[0])/preset.borderSize))
+ 'height':presetSize.sizeFactor * (room.height[0] + preset.borderSize * _.random(0, (room.height[1] - room.height[0])/preset.borderSize))
}
roomThickness = _.random(room.thickness[0], room.thickness[1])
- rect.x = _.random(rect.width/2 + preset.borderSize * (roomThickness+1), presetSize.x - rect.width/2 - preset.borderSize * (roomThickness+1))
- rect.y = _.random(rect.height/2 + preset.borderSize * (roomThickness+1), presetSize.y - rect.height/2 - preset.borderSize * (roomThickness+1))
+ rect.x = _.random(rect.width/2 + preset.borderSize * (roomThickness+1.5), presetSize.x - rect.width/2 - preset.borderSize * (roomThickness+1.5))
+ rect.y = _.random(rect.height/2 + preset.borderSize * (roomThickness+2.5), presetSize.y - rect.height/2 - preset.borderSize * (roomThickness+3.5))
# Snap room walls to the wall grid.
rect.x = Math.round((rect.x - preset.borderSize / 2) / preset.borderSize) * preset.borderSize + preset.borderSize / 2
rect.y = Math.round((rect.y - preset.borderSize / 2) / preset.borderSize) * preset.borderSize + preset.borderSize / 2
break if @addRect {
'x': rect.x
'y': rect.y
- 'width': rect.width + 2 * roomThickness * preset.borderSize
- 'height': rect.height + 2 * roomThickness * preset.borderSize
+ 'width': rect.width + 2.5 * roomThickness * preset.borderSize
+ 'height': rect.height + 2.5 * roomThickness * preset.borderSize
}
xRange = _.range(rect.x - rect.width/2 + preset.borderSize, rect.x + rect.width/2, preset.borderSize)
@@ -282,6 +374,7 @@ module.exports = class TerrainRandomizeModal extends ModalView
for t in _.range(0, roomThickness+1)
for i in _.range(rect.x - rect.width/2 - (t-1) * preset.borderSize, rect.x + rect.width/2 + t * preset.borderSize, preset.borderSize)
+ # Bottom wall
thang = {
'id': @getRandomThang(clusters[room.cluster].thangs)
'pos': {
@@ -295,6 +388,18 @@ module.exports = class TerrainRandomizeModal extends ModalView
thang.pos.y -= preset.borderSize/3
@addThang thang unless i is bottomDoorX and t isnt roomThickness and bottomDoor
+ if t is roomThickness and i isnt rect.x - rect.width/2 - (t-1) * preset.borderSize and preset.type is 'dungeon'
+ if ( i isnt bottomDoorX and i isnt bottomDoorX + preset.borderSize ) or not bottomDoor
+ @addThang {
+ 'id': @getRandomThang(clusters['torch'].thangs)
+ 'pos': {
+ 'x': thang.pos.x - preset.borderSize / 2
+ 'y': thang.pos.y + preset.borderSize / 2
+ }
+ 'margin': clusters['torch'].margin
+ }
+
+ # Top wall
thang = {
'id': @getRandomThang(clusters[room.cluster].thangs)
'pos': {
@@ -310,6 +415,7 @@ module.exports = class TerrainRandomizeModal extends ModalView
for t in _.range(0, roomThickness)
for i in _.range(rect.y - rect.height/2 - t * preset.borderSize, rect.y + rect.height/2 + (t+1) * preset.borderSize, preset.borderSize)
+ # Left wall
@addThang {
'id': @getRandomThang(clusters[room.cluster].thangs)
'pos': {
@@ -319,6 +425,7 @@ module.exports = class TerrainRandomizeModal extends ModalView
'margin': clusters[room.cluster].margin
}
+ # Right wall
@addThang {
'id': @getRandomThang(clusters[room.cluster].thangs)
'pos': {
@@ -328,6 +435,35 @@ module.exports = class TerrainRandomizeModal extends ModalView
'margin': clusters[room.cluster].margin
}
+ buildBarrels: (preset, presetSize, decoration) ->
+ rect = {
+ 'width':presetSize.sizeFactor * ( _.random( decoration.width[0], decoration.width[1] ) )
+ 'height':presetSize.sizeFactor * ( _.random( decoration.height[0], decoration.height[1] ) )
+ }
+ x = [ rect.width/2 + preset.borderSize , presetSize.x - rect.width/2 - preset.borderSize ]
+ y = [ rect.height/2 + preset.borderSize , presetSize.y - rect.height/2 - 2 * preset.borderSize ]
+
+ for i in x
+ for j in y
+ if _.random(100) < 40
+ rect = {
+ 'x': i
+ 'y': j
+ 'width': rect.width
+ 'height': rect.height
+ }
+ if @addRect rect
+ for num in _.range( _.random( decoration.numBarrels[0], decoration.numBarrels[1] ) )
+ while not @addThang {
+ 'id': @getRandomThang(clusters[decoration.cluster].thangs)
+ 'pos': {
+ 'x': _.random(rect.x - rect.width/2, rect.x + rect.width/2)
+ 'y': _.random(rect.y - rect.height/2, rect.y + rect.height/2)
+ }
+ 'margin': clusters[decoration.cluster].margin
+ }
+ continue
+
addThang: (thang) ->
if @falseCount > 100
console.log 'infinite loop', thang
@@ -348,7 +484,7 @@ module.exports = class TerrainRandomizeModal extends ModalView
@falseCount = 0
return true
for existingRect in @rects
- if Math.abs(existingRect.x - rect.x) < rect.width/2 + existingRect.width/2 and Math.abs(existingRect.y - rect.y) < rect.height/2 + existingRect.height/2
+ if Math.abs(existingRect.x - rect.x) <= rect.width/2 + existingRect.width/2 and Math.abs(existingRect.y - rect.y) <= rect.height/2 + existingRect.height/2
@falseCount++
return false
@rects.push rect