From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 15 Jun 2016 11:49:35 +0000 (-0400)
Subject: mergeeee
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=1b49be1c9c8e8887564dbb0aa69519bc538d81e7;p=clyne%2Fgamedev.git

mergeeee
---

1b49be1c9c8e8887564dbb0aa69519bc538d81e7
diff --cc brice.dat
index ee48d24,2653f9c..3b090ad
--- a/brice.dat
+++ b/brice.dat
@@@ -1,7 -1,7 +1,7 @@@
  3
--Slow
 -1
 -canJump
 -0
+ canSprint
  0
 +canJump
 +0
- canSprint
- 0
++Slow
++1
diff --cc xml/000.xml
index bf0af6c,1779b0c..1806332
--- a/xml/000.xml
+++ b/xml/000.xml
@@@ -14,12 -14,7 +14,12 @@@
  <Trigger id="first">Guy</Trigger>
  
  <Dialog name="Guy">
 -    <text id="0">
 -        <gotox>-600</gotox>
 +    <text id="0" nextid="1" pause="true">
 +        <gotox playerMove="0" advance="1">-600</gotox>
 +    </text>
 +    <text id="1">
 +        ...
-                                                                                                                                                                                                                                                                 <gotox>700</gotox>
++                                                                                                                                                                                                                                                                        <gotox>700</gotox>
 +        <set id="Slow" value="0"/>
      </text>
  </Dialog>
diff --cc xml/playerSpawnHill1.xml
index 534b5d9,94ef9b8..f997b4d
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@@ -3,24 -3,70 +3,24 @@@
      <style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/"/>
      <generation type="Random" width="500"/>
      <link right="playerSpawnHill2.xml"/>
 -    <time>12000</time>
      <hill peakx="0" peaky="1000" width="50"/>
 -    <rabbit spawnx="300" aggressive="false" maxHealth="100"/>
 -    <bird spawny="500" maxHealth="1"/>
 -    <cat/>
 -    <!--<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"/>
 -    <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" 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>
 -                <deny>Come back with more money to get this item!</deny>
 -                <leave>Have a great day, and watch out for my rabbit Mr. Cuddles, he might try to attack you.</leave>
 -            </text>
 -            <trade quantity="420" item="Dank MayMay" quantity1="1" item1="Wood Sword"/>
 -            <trade quantity="666" item="Wood Sword" quantity1="420" item1="Dank MayMay"/>
 -        </stall>
 -    </village>
 +    <weather>Rainy</weather>
 +    <time>3400</time>
 +    <spawnx>-880</spawnx>
 +    <trigger spawnx="-850" id="first" notext="1"/>
 +    <npc name="Guy" hasDialog="true" spawnx="0" canMove="false"/>
  </World>
  
 -<Trigger id="Test">It was a dark and stormy night...
 -Except it was the middle of the day.
 -And it wasn't stormy.
 -...</Trigger>
 +<Trigger id="first">Guy</Trigger>
  
 -<Dialog name="Ralph">
 +<Dialog name="Guy">
      <text id="0" nextid="1">
 -		Hello there! My name is Ralph.
 -		                                                                                                                                                                                                                                                                                <gotox>300</gotox>
 +        <gotox>-600</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>
 -    <text id="3">
 -		Go check out Johnny. He's cool.
 -	</text>
 -</Dialog>
 -
 -<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">
 -			Dank MayMay,2
 -			Wood Sword,1
 -		</quest>
 +    <text id="1">
 +		...
- 		                                                                                                                                                                                                                                                                                                                                                                                                                                                                <gotox>1000</gotox>
++		                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <gotox>1000</gotox>
 +        <set id="Slow" value="0"/>
 +        <set id="canSprint" value="1"/>
      </text>
 -    <text id="1" nextid="1" pause="true">
 -		Broooooooooooooo...
 -	</text>
 -</Dialog>
 -
 -<Dialog name="Big Dave">
 -    <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>
  </Dialog>
diff --cc xml/playerSpawnHill1_Building1.xml
index 50b34e0,b86fd9f..d5c07b3
--- a/xml/playerSpawnHill1_Building1.xml
+++ b/xml/playerSpawnHill1_Building1.xml
@@@ -9,18 -9,18 +9,18 @@@
  
  <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>
++	Hey. Have a Dank MayMay :)
++	        <give id="Dank MayMay" count="1"/></text>
      <text id="1" nextid="2">
--		What? You want another Dank MayMay?
--	</text>
++	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>
++                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           <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>
++		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <give id="Wood Sword" count="1"/></text>
  </Dialog>