From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 8 Jun 2016 12:47:31 +0000 (-0400)
Subject: merge; lights, xmls
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=6882786999581e2280c870249ae448c744767e73;p=clyne%2Fgamedev.git

merge; lights, xmls
---

6882786999581e2280c870249ae448c744767e73
diff --cc xml/playerSpawnHill1.xml
index fef154b,e2479b8..c5d88d6
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@@ -5,19 -5,19 +5,19 @@@
      <link right="playerSpawnHill2.xml"/>
      <time>12000</time>
      <hill peakx="0" peaky="1000" width="50"/>
 -    <rabbit x="300" aggressive="false" health="100"/>
 -    <bird y="500"/>
 -    <cat/>
 +    <rabbit spawnx="300" aggressive="false" maxHealth="100" health="32"/>
-     <bird spawny="500" x="379.1998" y="254.95029" health="1"/>
-     <cat x="0" y="67.996956" alive="1"/>
++    <bird spawny="500" x="808.80286" y="295.4079" health="1"/>
++    <cat x="0" y="64.496956" alive="1"/>
      <!--<trigger x="-300" id="Test"/>-->
-     <npc name="Ralph" hasDialog="true" spawnx="300" health="1" x="-96.279839" y="66.496941" dindex="2"/>
 -    <npc name="Ralph" hasDialog="true" x="300"/>
 -    <npc name="Johnny" hasDialog="false" x="300"/>
 -    <npc name="Big Dave" hasDialog="true" x="300"/>
 -    <page x="-200" id="assets/pages/gootaGoFast.png" cid="canSprint" cvalue="1"/>
 -    <page x="-500" id="assets/pages/gootaJump.png" cid="canJump" cvalue="1"/>
++    <npc name="Ralph" hasDialog="true" spawnx="300" health="1" x="-10.007523" y="65.396942" dindex="2"/>
 +    <npc name="Johnny" hasDialog="false" spawnx="300" health="1" x="824.5191" y="71.996918" dindex="0"/>
-     <npc name="Big Dave" hasDialog="true" spawnx="300" health="1" x="235.77779" y="63.396919" dindex="9999"/>
++    <npc name="Big Dave" hasDialog="true" spawnx="300" health="1" x="377.85727" y="62.197029" dindex="9999"/>
 +    <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!">
 -        <structure type="0" x="-300" inside="playerSpawnHill1_Building1.xml"/>
 -        <structure type="5" x="-500"/>
 -        <stall type="market" texture="assets/style/classic/stall.png">
 +        <structure type="0" spawnx="-300" inside="playerSpawnHill1_Building1.xml" alive="1"/>
 +        <structure type="5" spawnx="-500" alive="1"/>
 +        <stall type="market" texture="assets/style/classic/stall.png" alive="1">
              <text>
                  <greet>Welcome to Smithy's! What would you like to purchase today?</greet>
                  <accept>Thanks!</accept>
@@@ -38,14 -38,14 +38,14 @@@ And it wasn't stormy
  <Dialog name="Ralph">
      <text id="0" nextid="1">
  		Hello there! My name is Ralph.
- 		                                                                                                                                <gotox>300</gotox>
 -		<gotox>300</gotox>
++		                                                                                                                                                <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>
++		                                                                                                                                                <quest check="Your First Quest" fail="3"/></text>
      <text id="3">
  		Go check out Johnny. He's cool.
  	</text>
@@@ -54,7 -54,7 +54,7 @@@
  <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">
++		                                                                                                                                                <quest assign="Your First Quest">
  		Dank MayMay,2
  		Wood Sword,1
  		</quest>
@@@ -68,5 -68,10 +68,5 @@@
      <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"/></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>
++		                <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>