From f785f17cdb286449e8d98be747213740172629c5 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Sun, 22 Oct 2017 16:45:57 -0400
Subject: removed random gen, indoor changes

---
 xml/!town.xml     | 12 ++----------
 xml/bobshouse.xml | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'xml')

diff --git a/xml/!town.xml b/xml/!town.xml
index 26a62a1..b2d96a5 100644
--- a/xml/!town.xml
+++ b/xml/!town.xml
@@ -16,18 +16,10 @@
 		x = 0
 
 		ground = function()
-			if (x == 330) then
+			if (x == 320) then
 				height = -1
 			else
-				if (x &lt; 10) then
-					height = 800
-				else
-					if (x &lt; 30) then
-						height = -100 * math.tan(0.08 * (x - 10) + 1.77) + 75
-					else
-						height = 60
-					end
-				end
+				height = 1 / math.pow(2, (x - 50) / 2) + 60 
 			end
 			x = x + 1
 		end
diff --git a/xml/bobshouse.xml b/xml/bobshouse.xml
index d7c8172..9160ef0 100644
--- a/xml/bobshouse.xml
+++ b/xml/bobshouse.xml
@@ -2,7 +2,7 @@
 <include file="entities.xml"/>
 
 <IndoorWorld>
-	<style bgm="assets/music/theme_jazz.wav" folder="assets/style/classic/">
+	<style bgm="assets/music/theme_jazz.wav" folder="assets/style/indoors/">
 		<layer path="bg/bg.png"/>
 		<layer path="bg/bgFarMountain.png"/>
 		<layer path="bg/forestTileFar.png"/>
@@ -10,10 +10,26 @@
 		<layer path="bg/forestTileMid.png"/>
 		<layer path="bg/forestTileFront.png"/>
 		<layer path="bg/dirt.png"/>
-		<layer path="bg/grass.png"/>
+		<layer path="bg/carpet.png"/>
 	</style>
 	<house width="800" texture="assets/style/classic/bg/insideWoodHouse.png"/>
-	<generation width="320"/>
+	<generation>
+		x = 0
+
+		ground = function()
+			if (x == 320) then
+				height = -1
+			else
+				height = 60
+			end
+
+			x = x + 1
+		end
+
+		grass = function()
+			height = 2
+		end
+	</generation>
 	<time>6000</time>
 	<!--<link outside="town.xml"/>-->
 	<npc name="Bob" hasDialog="true" spawnx="30"/>
-- 
cgit v1.2.3