From b61e4e5b140278705c79674c02de6886b2189f71 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Sun, 26 Jun 2016 11:50:15 -0400
Subject: fixing everything that's apparently broken...

---
 xml/bobshouse.xml                  | 39 ++++++--------------------------------
 xml/playerSpawnHill1.xml           |  6 +++---
 xml/playerSpawnHill1_Building1.xml |  6 +++---
 xml/town.xml                       |  8 ++++----
 4 files changed, 16 insertions(+), 43 deletions(-)

(limited to 'xml')

diff --git a/xml/bobshouse.xml b/xml/bobshouse.xml
index 32e6a95..243063d 100644
--- a/xml/bobshouse.xml
+++ b/xml/bobshouse.xml
@@ -1,34 +1,7 @@
 <?xml version="1.0"?>
-<World>
-    <style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/"/>
-    <generation type="Random" width="1600"/>
-    <time>6000</time>
-    <spawnx>-300</spawnx>
-    <npc name="Sanc" hasDialog="true"/>
-    <npc name="Bob" hasDialog="true" spawnx="30"/>
-    <structure type="1" spawnx="300"/>
-    <structure inside="bobshouse.xml" type="1" spawnx="10"/>
-</World>
-
-<Dialog name="Bob">
-    <text id="0" nextid="1" pause="true">
-        <content>
-			Hey there! The name's Bob. Good to see you've finally woken up from your nap by the cliff there... lol
-		</content>
-    </text>
-    <text id="1" pause="true">
-        <quest assign="Check out m&apos;swag, man!">
-			No description
-		</quest>
-        <content>
-			Looks like you've got yourself pretty empty handed... you know, I have a simple solution for that. Come on inside, I have somethin' to show you.
-		</content>
-    </text>
-</Dialog>
-
-<Dialog name="Sanc">
-    <text id="0">
-        <set id="Slow" value="0"/>
-        <set id="canSprint" value="1"/>
-    </text>
-</Dialog>
+<IndoorWorld>
+	<style background="1" bgm="assets/music/embark.wav" folder="assets/style/classic/"/>
+	<floor width="1600"/>
+	<link outside="town.xml"/>
+	<npc name="Bob" hasDialog="false" spawnx="30"/>
+</IndoorWorld>
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index e052c50..e197f2e 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -16,11 +16,11 @@
 <Dialog name="Guy">
     <text id="0" nextid="1">
 		Hello there! My name is Ralph.
-		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <gotox>300</gotox>
+		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <gotox>300</gotox>
     </text>
     <text id="1">
 		...
-		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <gotox>1000</gotox>
+		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <gotox>1000</gotox>
         <set id="Slow" value="0"/>
         <set id="canSprint" value="1"/>
     </text>
@@ -33,5 +33,5 @@
     <text id="0" stop="true">
 		Hey friend! It's dangerous out there, here take these!
 		Wait, promise you'll stop by my stand in the local market!
-		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <give id="Wood Sword" count="1"/>        <give id="Hunters Bow" count="1"/>        <give id="Crude Arrow" count="110"/>        <give id="Fried Chicken" count="1"/>        <give id="Mossy Torch" count="1"/></text>
+		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <give id="Wood Sword" count="1"/>        <give id="Hunters Bow" count="1"/>        <give id="Crude Arrow" count="110"/>        <give id="Fried Chicken" count="1"/>        <give id="Mossy Torch" count="1"/></text>
 </Dialog>
diff --git a/xml/playerSpawnHill1_Building1.xml b/xml/playerSpawnHill1_Building1.xml
index 28add1f..5c5dfdc 100644
--- a/xml/playerSpawnHill1_Building1.xml
+++ b/xml/playerSpawnHill1_Building1.xml
@@ -10,17 +10,17 @@
 <Dialog name="Bob">
     <text id="0" nextid="1" pause="true">
 	Hey. Have a Dank MayMay :)
-	                                                                                                                                                                                                                                                                                                                                <give id="Dank MayMay" count="1"/></text>
+	                                                                                                                                                                                                                                                                                                                                                <give id="Dank MayMay" count="1"/></text>
     <text id="1" nextid="2">
 	What? You want another Dank MayMay?
     </text>
     <text id="2" nextid="3" pause="true">
 		K.
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   <give id="Dank MayMay" count="1"/></text>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   <give id="Dank MayMay" count="1"/></text>
     <text id="3" nextid="4">
 		Well... I'm out of Dank MayMays.
 	</text>
     <text id="4">
 		Have a sword though.
-		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <give id="Wood Sword" count="1"/></text>
+		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <give id="Wood Sword" count="1"/></text>
 </Dialog>
diff --git a/xml/town.xml b/xml/town.xml
index 32e6a95..8d0a0a4 100644
--- a/xml/town.xml
+++ b/xml/town.xml
@@ -4,10 +4,10 @@
     <generation type="Random" width="1600"/>
     <time>6000</time>
     <spawnx>-300</spawnx>
-    <npc name="Sanc" hasDialog="true"/>
-    <npc name="Bob" hasDialog="true" spawnx="30"/>
-    <structure type="1" spawnx="300"/>
-    <structure inside="bobshouse.xml" type="1" spawnx="10"/>
+    <npc name="Sanc" hasDialog="true" health="1" x="-316.38254" y="62.999008" dindex="9999"/>
+    <npc name="Bob" hasDialog="true" spawnx="30" health="1" x="262.3949" y="66.698959" dindex="0"/>
+    <structure type="1" spawnx="300" alive="1"/>
+    <structure inside="bobshouse.xml" type="1" spawnx="10" alive="1"/>
 </World>
 
 <Dialog name="Bob">
-- 
cgit v1.2.3