From 1e9f6aaddb2d21045f5e7dc63d6312a4407b3a08 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 9 Jun 2016 08:49:21 -0400
Subject: Fixed particle crashing

---
 xml/playerSpawnHill1.xml           | 21 ++++++++++-----------
 xml/playerSpawnHill1_Building1.xml |  6 +++---
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'xml')

diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index d7889fc..f16b511 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -5,13 +5,13 @@
     <link right="playerSpawnHill2.xml"/>
     <time>12000</time>
     <hill peakx="0" peaky="1000" width="50"/>
-    <rabbit spawnx="300" aggressive="false" maxHealth="100"/>
-    <bird spawny="500"/>
-    <cat/>
+    <rabbit spawnx="300" aggressive="false" maxHealth="100" health="50"/>
+    <bird spawny="500" x="-534.19525" y="712.36743" health="1"/>
+    <cat x="-48.600014" y="64.996986" alive="1"/>
     <!--<trigger x="-300" id="Test"/>-->
-    <npc name="Ralph" hasDialog="true" spawnx="300"/>
-    <npc name="Johnny" hasDialog="false" spawnx="300"/>
-    <npc name="Big Dave" hasDialog="true" spawnx="300"/>
+    <npc name="Ralph" hasDialog="true" spawnx="300" health="1" x="-22.480118" y="64.996986" dindex="0"/>
+    <npc name="Johnny" hasDialog="false" spawnx="300" health="1" x="639.87152" y="68.796982" dindex="9999"/>
+    <npc name="Big Dave" hasDialog="true" spawnx="300" health="1" x="794.33545" y="69.796974" dindex="0"/>
     <page spawnx="-200" id="assets/pages/gootaGoFast.png" cid="canSprint" cvalue="1"/>
     <page spawnx="-500" id="assets/pages/gootaJump.png" cid="canJump" cvalue="1"/>
     <village name="Big Dave&apos;s bagel emporium! The greatest place on earth!">
@@ -37,15 +37,14 @@ And it wasn't stormy.
 
 <Dialog name="Ralph">
     <text id="0" nextid="1">
-		Hello there! My name is Ralph.
-		                                                                                                                                                                                                                                                                                                <gotox>300</gotox>
+		Hello there! My name is Ralph.	                                                                                                                                                                                                                                                                                                                                                                                                <gotox>300</gotox>
     </text>
     <text id="1" nextid="2" call="Johnny" callid="0" pause="true">
 		You should go talk to my friend Johnny. He's a pretty chill dude.
 	</text>
     <text id="2">
 		Niice.
-		                                                                                                                                                                                                                                                                                                <quest check="Your First Quest" fail="3"/></text>
+		                                                                                                <quest check="Your First Quest" fail="3"/></text>
     <text id="3">
 		Go check out Johnny. He's cool.
 	</text>
@@ -54,7 +53,7 @@ And it wasn't stormy.
 <Dialog name="Johnny">
     <text id="0" nextid="1" pause="true">
 		Sup bro! Have a quest. To complete it, just go talk to Ralph again.
-		                                                                                                                                                                                                                                                                                                <quest assign="Your First Quest">
+		                                                                                                                                                                                                                                                                                                                <quest assign="Your First Quest">
 		Dank MayMay,2
 		Wood Sword,1
 		</quest>
@@ -68,5 +67,5 @@ And it wasn't stormy.
     <text id="0" pause="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 800f007..eb63d7b 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>
-- 
cgit v1.2.3