aboutsummaryrefslogtreecommitdiffstats
path: root/xml
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-02-19 18:33:29 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-02-19 18:33:29 -0500
commit0075f9e7997d01fa2105bff38e40a3d5b8b421e6 (patch)
treec2e9bbbced1ac97cbcfd81930905aec50325dc64 /xml
parent2a4a514b654ef0e08134a116c658d49a8f16cfe7 (diff)
Village work
Diffstat (limited to 'xml')
-rw-r--r--xml/playerSpawnHill1.xml9
1 files changed, 4 insertions, 5 deletions
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index c5e736b..b0fb163 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -11,6 +11,10 @@
<npc name="Ralph" hasDialog="true" />
<npc name="Johnny" hasDialog="false" />
<structure type="5" inside="playerSpawnHill1_Building1.xml" />
+ <village name="Meme-Town">
+ <structure type="0" inside="playerSpawnHill1_Building1.xml" />
+ <structure type="5" inside="playerSpawnHill1_Building1.xml" />
+ </village>
</World>
@@ -29,14 +33,9 @@ And it wasn't stormy.
You should go talk to my friend Johnny. He's a pretty chill dude.
</text>
-<<<<<<< HEAD
- <text id="2" call="Johnny" callid="1">
- what you have done it to trick Microsoft?
-=======
<text id="2" >
Niice.
<quest check="Your First Quest" fail="3" />
->>>>>>> 3033594b89f23e65b6152daa6610f991307f2f67
</text>
<text id="3">