aboutsummaryrefslogtreecommitdiffstats
path: root/xml/playerSpawnHill1.xml
diff options
context:
space:
mode:
Diffstat (limited to 'xml/playerSpawnHill1.xml')
-rw-r--r--xml/playerSpawnHill1.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index c5e736b..269b393 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -10,7 +10,11 @@
<npc name="Ralph" hasDialog="true" />
<npc name="Johnny" hasDialog="false" />
- <structure type="5" inside="playerSpawnHill1_Building1.xml" />
+ <!-- <structure type="5" inside="playerSpawnHill1_Building1.xml" /> -->
+ <village name="Meme-Town">
+ <structure type="0" x="-100" inside="playerSpawnHill1_Building1.xml"/>
+ <structure type="5" x="-500" 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">