diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-02-12 08:48:50 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-02-12 08:48:50 -0500 |
| commit | 51b0b214967ca4770b1674431cffa15777b0ec06 (patch) | |
| tree | 2165f359d803bbc1944f5bcc10a377b06f6676e7 /xml/playerSpawnHill1.xml | |
| parent | ba7df965e73e121820f20e3a0e57631d078c11db (diff) | |
| parent | 2a4a514b654ef0e08134a116c658d49a8f16cfe7 (diff) | |
mergge
Diffstat (limited to 'xml/playerSpawnHill1.xml')
| -rw-r--r-- | xml/playerSpawnHill1.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml index 3bd0095..c5e736b 100644 --- a/xml/playerSpawnHill1.xml +++ b/xml/playerSpawnHill1.xml @@ -1,9 +1,8 @@ <?xml version="1.0"?> <World> - <style background="0" bgm="assets/music/embark.wav" /> + <style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/" /> <generation type="Random" width="1600" /> - - <link right="playerSpawnHill2.xml" /> + <link left="playerSpawnHill2.xml" /> <mob type="1" aggressive="false" /> @@ -30,9 +29,14 @@ 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"> |