From ad21fc81a02f1566504f04fdcee299333f970acc Mon Sep 17 00:00:00 2001
From: rofl256 <rofl256@gmail.com>
Date: Sun, 25 Jun 2017 21:45:31 +0200
Subject: [PATCH] add more map things

---
 css/main.css | 18 ++++++++++++++++++
 s_map.js     | 33 +++++++--------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/css/main.css b/css/main.css
index 983c2e4..f5893d7 100644
--- a/css/main.css
+++ b/css/main.css
@@ -14,6 +14,24 @@
     background: url(../img/objectlayer.png) 125px -29px;;
 }
 
+.tree1{
+    width: 60px;
+    height: 60px;
+    background: url(../img/objectlayer.png) 315px -70px;
+}
+
+.stone1{
+    width: 32px;
+    height: 35px;
+    background: url(../img/objectlayer.png) 158px -65px;
+}
+
+.fass{
+    width: 32px;
+    height: 43px;
+    background: url(../img/objectlayer.png) 157px -18px;
+}
+
 .water {
     background: url(../img/ground_tiles.png) 192px 254px;
 }
diff --git a/s_map.js b/s_map.js
index 668f0b9..73871b9 100644
--- a/s_map.js
+++ b/s_map.js
@@ -2,31 +2,6 @@ module.exports = {
   generateMap: function(width, height) {
   	var map = [];
   	var utilMap = [];
-  	var i = 0;
-  	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","4","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","4","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","4","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","4","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","4","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","4","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
-	map[i++] = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
 
 	var g = [6,5,4,3,2];
   	for(var k=0;k<g.length;k++) {
@@ -130,11 +105,17 @@ module.exports = {
 	//Set ground type
 	for(var w=0;w<width;w++) {
   		for(var h=0;h<height;h++) {
-  			if(map[w][h] == "#") {
+  			if(map[w][h] == "#") { //is ground
   				map[w][h] = "6"; //set ground
 
   				if(Math.random()<0.011) {
   					utilMap[w][h] = "flower";
+  				} else if(Math.random()<0.011) {
+  					utilMap[w][h] = "tree1";
+  				} else if(Math.random()<0.011) {
+  					utilMap[w][h] = "stone1";
+  				} else if(Math.random()<0.011) {
+  					utilMap[w][h] = "fass";
   				}
   			}
   		}