From 741956b25119f3ede1d62e51ac49bc457d406b52 Mon Sep 17 00:00:00 2001
From: Jayant Jain <jayantjain1992@gmail.com>
Date: Wed, 16 Jul 2014 04:46:43 +0530
Subject: [PATCH 1/2] Borders and floors are placed inside positive axes

---
 .../modal/terrain_randomize_modal.coffee      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/editor/level/modal/terrain_randomize_modal.coffee b/app/views/editor/level/modal/terrain_randomize_modal.coffee
index cf631d54c..d80b29c0d 100644
--- a/app/views/editor/level/modal/terrain_randomize_modal.coffee
+++ b/app/views/editor/level/modal/terrain_randomize_modal.coffee
@@ -22,7 +22,8 @@ presets = {
   'grassy': {
     'type':'grassy'
     'borders':['Tree 1', 'Tree 2', 'Tree 3']
-    'floors':['Grass01', 'Grass02', 'Grass03']
+    'floors':['Grass']
+    # 'floors':['Grass01', 'Grass02', 'Grass03']
     'decorations': {
       'house': {
         'num':[1,2] #min-max
@@ -61,12 +62,12 @@ sizes = {
   }
   'floorSize': {
     'x':20
-    'y':20
+    'y':17
   }
   'borderSize': {
     'x':4
     'y':4
-    'thickness':2
+    'thickness':3
   }
 }
 
@@ -108,19 +109,19 @@ module.exports = class TerrainRandomizeModal extends ModalView
         @thangs.push {
           'id': @getRandomThang(preset.floors)
           'pos': {
-            'x': i
-            'y': j
+            'x': i + sizes.floorSize.x/2
+            'y': j + sizes.floorSize.y/2
           }
         }
 
   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+sizes.borderSize.x, presetSize.x, sizes.borderSize.x)
       for j in _.range(sizes.borderSize.thickness)
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
             '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/2)
           }
         }
         @thangs.push {
@@ -131,19 +132,19 @@ module.exports = class TerrainRandomizeModal extends ModalView
           }
         }
 
-    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, sizes.borderSize.y)
       for j in _.range(3)
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': 0-sizes.floorSize.x/2+sizes.borderSize.x + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
+            'x': 0+sizes.borderSize.x + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
             'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
           }
         }
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           '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.y/2, sizes.borderSize.y/2)
             'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
           }
         }

From fa595fcb329357737bf45ba888b479588974148f Mon Sep 17 00:00:00 2001
From: Jayant Jain <jayantjain1992@gmail.com>
Date: Wed, 16 Jul 2014 05:02:17 +0530
Subject: [PATCH 2/2] Better positioned level border trees

---
 .../level/modal/terrain_randomize_modal.coffee       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/editor/level/modal/terrain_randomize_modal.coffee b/app/views/editor/level/modal/terrain_randomize_modal.coffee
index d80b29c0d..b7b65b142 100644
--- a/app/views/editor/level/modal/terrain_randomize_modal.coffee
+++ b/app/views/editor/level/modal/terrain_randomize_modal.coffee
@@ -115,36 +115,36 @@ module.exports = class TerrainRandomizeModal extends ModalView
         }
 
   randomizeBorder: (preset, presetSize) ->
-    for i in _.range(0+sizes.borderSize.x, presetSize.x, sizes.borderSize.x)
+    for i in _.range(0, presetSize.x, sizes.borderSize.x)
       for j in _.range(sizes.borderSize.thickness)
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
             'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2)
-            'y': 0 + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
+            'y': 0 + _.random(-sizes.borderSize.y/2, sizes.borderSize.y)
           }
         }
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
             '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, presetSize.y-sizes.borderSize.y, sizes.borderSize.y)
+    for i in _.range(0, presetSize.y, sizes.borderSize.y)
       for j in _.range(3)
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': 0+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)
           }
         }
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': presetSize.x + _.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)
           }
         }