Updated World files for release and merged conflicts

This commit is contained in:
Rumble
2017-02-04 19:05:59 +01:00
40 changed files with 112 additions and 124 deletions

1
lib/house/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

1
lib/plrvars/A-E/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

1
lib/plrvars/F-J/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

1
lib/plrvars/K-O/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

1
lib/plrvars/P-T/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

1
lib/plrvars/U-Z/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

1
lib/plrvars/ZZZ/00 Normal file
View File

@@ -0,0 +1 @@
This is a placeholder file so the directory will be created

View File

@@ -4,4 +4,5 @@
Immortals
~~~~~~~~~
Wylder

View File

@@ -4,6 +4,7 @@
Implementors
~~~~~~~~~~~~
Wyld
Greater Gods
~~~~~~~~~~~~

View File

@@ -559,53 +559,18 @@ from you. It's a beautiful reciprocal arrangement.
~
0 8 0 0 0 0
E
july4~
On July 4, 1776, we claimed our independence from England and Democracy was
born. Every day thousands leave their homeland to come to the "land of the
free and the home of the brave" so they can begin their American Dream. The
United States is truly a diverse nation made up of dynamic people. Each year
on July 4, Americans celebrate that freedom and indepen-dence with barbecues,
picnics, and family ga-therings. Through the Internet we are learning about
and communicat-ing with people of different nations, with different languages
and different races throughout the world. Bringing the world closer with
understanding and knowledge can only benefit all nations. We invite all
nations to celebrate with Americans online this Fourth of July. Happy
Birthday, America!
~
E
oath~
I do solemnly swear that I will support and defend the Constitution of the
United States against all enemies, foreign and domestic, and to bear true faith
and allegiance to the same that I take this obligation freely, without any
mental reservation or purpose of evasion, and that I will well and faithfully
discharge the duties of the office upon which I am about to enter.
~
E
builder~
There is one timeless way of building.
It is thousands of years old, and the same today as it has always been.
The great traditional buildings of the past, the villages and tents and
temples in which man feels at home, have always been made by people who were
very close to the center of this way. It is not possible to make great
buildings, or great towns, beautiful places, places where you feel yourself,
places where you feel alive, except by following this way. And, as you will
see, this way will lead anyone who looks for it to buildings which are
themselves as ancient in their form, as the trees and hills, and as our faces
are.
--The Timeless Way of Building
~
E
war~
War is an ugly thing, but not the ugliest of things. The decayed and
degraded state of moral and patriotic feeling which thinks that nothing is
worth war is much worse. The person who has nothing for which he is willing to
fight, nothing which is more important than his own personal safety, is a
miserable creature and has no chance of being free unless made and kept so by
the exertions of better men than himself.
John Stuart Mill
Catcher Rye~
The mark of the immature man is that he wants to die nobly for a cause,
while the mark of the mature man is that he wants to live humbly for one.
--Wilhelm Stekel
...you'll find that you're not the first person who was ever confused and
frighteneed and even sickened by human behavior. You're by no means alone on
that score, you'll be excited and stimulated to know. Many, many men have been
just as troubled morally and spiritually as you are right now. Happily, some
of them kept records of their troubles. You'll learn from them-if you want to.
Just as someday, if you have something to offer, someone will learn something
from you. It's a beautiful reciprocal arrangement.
--The Catcher in the Rye
~
E
old glory flag~
@@ -638,18 +603,53 @@ or daughter-I am proud. My name is Old Glory-long may I wave. Dear God, long
may I wave.
~
E
Catcher Rye~
The mark of the immature man is that he wants to die nobly for a cause,
while the mark of the mature man is that he wants to live humbly for one.
--Wilhelm Stekel
...you'll find that you're not the first person who was ever confused and
frighteneed and even sickened by human behavior. You're by no means alone on
that score, you'll be excited and stimulated to know. Many, many men have been
just as troubled morally and spiritually as you are right now. Happily, some
of them kept records of their troubles. You'll learn from them-if you want to.
Just as someday, if you have something to offer, someone will learn something
from you. It's a beautiful reciprocal arrangement.
--The Catcher in the Rye
war~
War is an ugly thing, but not the ugliest of things. The decayed and
degraded state of moral and patriotic feeling which thinks that nothing is
worth war is much worse. The person who has nothing for which he is willing to
fight, nothing which is more important than his own personal safety, is a
miserable creature and has no chance of being free unless made and kept so by
the exertions of better men than himself.
John Stuart Mill
~
E
builder~
There is one timeless way of building.
It is thousands of years old, and the same today as it has always been.
The great traditional buildings of the past, the villages and tents and
temples in which man feels at home, have always been made by people who were
very close to the center of this way. It is not possible to make great
buildings, or great towns, beautiful places, places where you feel yourself,
places where you feel alive, except by following this way. And, as you will
see, this way will lead anyone who looks for it to buildings which are
themselves as ancient in their form, as the trees and hills, and as our faces
are.
--The Timeless Way of Building
~
E
oath~
I do solemnly swear that I will support and defend the Constitution of the
United States against all enemies, foreign and domestic, and to bear true faith
and allegiance to the same that I take this obligation freely, without any
mental reservation or purpose of evasion, and that I will well and faithfully
discharge the duties of the office upon which I am about to enter.
~
E
july4~
On July 4, 1776, we claimed our independence from England and Democracy was
born. Every day thousands leave their homeland to come to the "land of the
free and the home of the brave" so they can begin their American Dream. The
United States is truly a diverse nation made up of dynamic people. Each year
on July 4, Americans celebrate that freedom and indepen-dence with barbecues,
picnics, and family ga-therings. Through the Internet we are learning about
and communicat-ing with people of different nations, with different languages
and different races throughout the world. Bringing the world closer with
understanding and knowledge can only benefit all nations. We invite all
nations to celebrate with Americans online this Fourth of July. Happy
Birthday, America!
~
S
#34
@@ -857,14 +857,14 @@ D2
~
0 0 98
E
sky winds~
Cold winds plunge ceaselessly at you from the dark, cloudless sky.
~
E
floor~
The stone floor is the same shade of grey as the sky and is completely plain
and unscratched. It is probably too hard for anything to leave as much as a
scratch on it.
~
E
sky winds~
Cold winds plunge ceaselessly at you from the dark, cloudless sky.
~
S
$~

View File

@@ -773,7 +773,7 @@ Upper Immortal Hall, East~
This is the midway down the hallway east, this hallway is lined with wood
paneling and thick maroon, shag carpeting. The hallway is lit by bronze
lanterns that burn brightly here. It continues on to the east and west.
Office doors line the walls.
Office doors line the walls. Wyld's Office is to the south.
~
343 24 0 0 0 0
D0
@@ -1211,7 +1211,7 @@ D3
0 0 34386
S
#34365
Fizbin's Office~
Fizban's Office~
You are in an unfinished room.
~
343 28 0 0 0 0

View File

@@ -112,6 +112,10 @@ O 0 34346 7 34390 (a short teak bench)
R 0 34382 34346 -1 (a short teak bench)
O 0 34346 7 34382 (a short teak bench)
O 0 34347 2 34382 (a gurgling spring)
D 0 34386 0 1 (Inside a Garden)
R 0 34386 34346 -1 (a short teak bench)
O 0 34346 7 34386 (a short teak bench)
M 0 34305 2 34386 (a gardener)
D 0 34385 0 1 (In a Garden)
R 0 34385 34346 -1 (a short teak bench)
O 0 34346 7 34385 (a short teak bench)
@@ -239,7 +243,10 @@ D 0 34315 2 1 (God Hall, North)
D 0 34365 2 1 (Fizbin's Office)
D 0 34367 3 1 (Rhade's Office)
D 0 34366 0 1 (Shama's Office)
D 0 34364 0 1 (Wyld's Office)
D 0 34363 2 1 (Empty Office)
D 0 34330 0 1 (Upper Immortal Hall, East)
D 0 34330 2 1 (Upper Immortal Hall, East)
D 0 34361 2 1 (Rumbles Office)
D 0 34360 0 1 (Empty Office)
D 0 34359 2 1 (Elona's Office)