Remove autogenerated 001-4 content and fix whitespace in news

4 files changed, 137 insertions, 154 deletions

diff --git a/world/map/news.txt b/world/map/news.txt
index 8bee339f..e9a7772b 100644
--- a/world/map/news.txt
+++ b/world/map/news.txt
@@ -1,17 +1,17 @@
 ##2 ~ The Hurnscald Herald ~
- 
+
 ##3 July 2011
- 
+
 ##0 Will Kill Monsters For Food?
- 
+
 ##0 Recovery from the Great Earthquake is still
 ##0 very slow throughout the world.  The vast
-##0 devastation still causes starvation and 
+##0 devastation still causes starvation and
 ##0 a lack of work.  A side effect of the Great
 ##0 Earthquake has been the increasing number of
 ##0 aggressive monsters and dooms long thought
-##0 forgotten.  
- 
+##0 forgotten.
+
 ##0 To answer this problem Tulimshar
 ##0 has issued a call to be spread far and wide:
 ##0 "If you're hungry, if you need work, if you
@@ -19,7 +19,7 @@
 ##0 Slaying monsters, liberating mines and
 ##0 defeating the night horrors that terrify even
 ##0 the most strong willed never paid so well!"
- 
+
 ##0 Needless to say, many are answering this call.
 ##0 You may very well be one of them.
 
@@ -34,7 +34,7 @@
 ##0 I would've returned immediately, but I didn't
 ##0 want to put my family at risk until travel
 ##0 became a little safer."
- 
+
 ##0 When asked about her daughters, Olana smiled
 ##0 "They love wandering the woods around here,
 ##0 other than the occasional bandit group, things
@@ -42,83 +42,83 @@
 ##0 in Tulimshar.  I just hope they don't wander
 ##0 near these caves...I've heard many of them can
 ##0 be quite dangerous."
- 
+
 ##2 ~ The Hurnscald Herald ~
- 
+
 ##3 June 2011
- 
+
 ##0 A large shipment of gold coins was plundered
-##0 by pirates.  The shipment was to be sent to 
+##0 by pirates.  The shipment was to be sent to
 ##0 Tulimshar as part of their effort to control
 ##0 inflation.  "They seemed to just come out of
 ##0 no where!  They took the shipment and my pet
 ##0 squirrel Chompers!"  Captain Zierock reported
 ##0 while in tears.
- 
+
 ##0 It is believed the pirates divided the gold
 ##0 then went separate ways to spend their spoils.
 ##0 Ironically, these pirates were the target of
 ##0 monsters, who plundered them not just for
 ##0 their new found wealth, but also for their
 ##0 crunchy bones and sea salty flesh.
- 
+
 ##0 On that note, be on the lookout for Green Slimes,
-##0 which have grown hostile as they evolve to the 
-##0 harsh Tonori desert, making them a threat to 
+##0 which have grown hostile as they evolve to the
+##0 harsh Tonori desert, making them a threat to
 ##0 travel and trade.  It is believed many of the
 ##0 pirates attempted to cross the Snake Desert,
 ##0 where they met the Green Slimes...and their
 ##0 end.
- 
-##0 In other news, Andra, a friend of Hinnak, has 
-##0 increased her agricultural knowledge and needs 
-##0 help keeping the soil around the farm fertile.  
-##0 Interested volunteers should speak with her 
+
+##0 In other news, Andra, a friend of Hinnak, has
+##0 increased her agricultural knowledge and needs
+##0 help keeping the soil around the farm fertile.
+##0 Interested volunteers should speak with her
 ##0 about how to help.
- 
-##0 Last, but certainly not least, Agostine has 
+
+##0 Last, but certainly not least, Agostine has
 ##0 returned to Nivalis.  While he enjoyed his
 ##0 time in Tulimshar, mingling with other artisans,
 ##0 he has missed his home in Kaizei.  "I made this
 ##0 fabulous sweater, but nobody wanted to wear it
 ##0 in this hot and smelly desert.  That is when I
 ##0 decided enough was enough.  Sweat is just gross."
- 
+
 ##2 ~ The Hurnscald Herald ~
- 
+
 ##3 May 2011
- 
+
 ##0 Many battle hardened warriors took some time
 ##0 during April and enjoyed helping the somewhat
 ##0 forgetful Easter Bunny make his baskets. The
 ##0 children surely must have enjoyed their sweets.
- 
+
 ##0 The demi-god Golbenez has finally made good on
 ##0 his promise to open a 'place of leisure' in
 ##0 the form of an inn. Youngsters beware, since
-##0 the entrance to this inn is near the old 
+##0 the entrance to this inn is near the old
 ##0 graveyard and could be dangerous.
- 
+
 ##0 There have also been reports about a mysterious
 ##0 stranger roaming the beaches near Tulimshar.
-##0 Be on the lookout if you are in the area. 
- 
+##0 Be on the lookout if you are in the area.
+
 ##2 ~ The Hurnscald Herald ~
- 
+
 ##3 January 2011
- 
-##0 Reports of bandit raids to the west of 
+
+##0 Reports of bandit raids to the west of
 ##0 Hurnscald has mobilized the town.  Those
 ##0 injured by these bandits may have a long stay
 ##0 ahead of them in Hurnscald's hospital.
- 
+
 ##0 Shortly after Tulimshar loosened the tariff
 ##0 on travel, skill trainers have come to Mana.
 ##0 If one wants to improve themselves through
 ##0 acquiring skills, be on the lookout for these
 ##0 trainers.
- 
-##0 In other news, Taro is still missing, but 
+
+##0 In other news, Taro is still missing, but
 ##0 Diryn, an agent of Tulimshar, has established
 ##0 a connection with the Kaizei area, making
 ##0 travel to Nivalis possible again.  He still
@@ -127,37 +127,37 @@
 ##0 back can be done by finding Frozenbeard, a
 ##0 pioneer who is mapping a trade route to get
 ##0 to Nivalis by ship.
- 
-##0 Diryn's re-connection with Nivalis came none 
-##0 too soon.  Golbenez, a demi-god who demanded 
-##0 a half billion gold pieces for building some 
-##0 sort of leisure place, scrapped the idea and 
+
+##0 Diryn's re-connection with Nivalis came none
+##0 too soon.  Golbenez, a demi-god who demanded
+##0 a half billion gold pieces for building some
+##0 sort of leisure place, scrapped the idea and
 ##0 went for good old fashioned kidnapping to get
 ##0 whatever he wanted from the world of Mana.
 ##0 He kidnapped Santa Claus.  Fearful Santa may
 ##0  not gift the children of the world, wizards,
 ##0 warriors and archers rallied to pay the
 ##0 demi-god his demands.
- 
-##0 Shortly after Santa was freed, something more 
-##0 sinister has come to Kaizei.  The yeti.  
+
+##0 Shortly after Santa was freed, something more
+##0 sinister has come to Kaizei.  The yeti.
 ##0 Sightings of this beast returns with stories
 ##0 of them.  Though aggressive, their behavior
 ##0 seems out of place.  They've never been known
 ##0 as cave dwellers nor to kidnap people.
- 
+
 ##0 Last, but definitely not least, Dimond's Cove
 ##0 is observing "Burns' Supper" January 24-26th.
 ##0 Shanon is hosting the event, which he promises
 ##0 will be an excellent time for food, drink and
 ##0 poems.
- 
+
 ##2 ~ The Hurnscald Herald ~
- 
+
 ##3 Countless candy-concerning complaints: council
 ##3 consequently considers citizen-composed cleanup crew
 ##3 Eighteenth of November 2010
- 
+
 ##0 Recently, the ancient tradition of Hallowe'en
 ##0 was celebrated across Argaes, Tonori and other
 ##0 continents. Estimated tons of sweets were given
@@ -166,25 +166,25 @@
 ##0 dropped on the night. Even a week and a half
 ##0 after Hallowe'en, many kilograms of sweets
 ##0 still litter our pleasant woodlands.
- 
+
 ##0 After dozens of letters regarding the situation,
 ##0 the Hurnscald Council has said that the best
 ##0 solution would be to organise a team of
 ##0 volunteers to work on collecting dropped sweets
 ##0 and disposing of them - but it has yet to
 ##0 organise any such thing.
- 
+
 ##0 In the meantime, why not do your bit and collect
 ##0 some sweets for yourself? If you don't mind them
 ##0 being a bit old, you could be able to make the
 ##0 biggest Hallowe'en haul in history.
- 
+
 ##0 Additionally, we've been getting some reports of
 ##0 a rather creepy skeleton hanging around the
 ##0 woodland. He doesn't appear to be aggressive,
 ##0 but he chatters unintelligibly at passers-by.
- 
- 
+
+
 ##3 Rollback
 ##0 2010-11-17
 ##0
@@ -234,9 +234,9 @@
 ##0 Please note that the current state may only
 ##0 be ##3temporary##0, and that if usable newer backups
 ##0 are found within the next 24 hours, those will
-##0 be used instead, and any character progress 
-##0 made may be lost. If no usable backups are 
-##0 found during this time, the four-day rollback 
+##0 be used instead, and any character progress
+##0 made may be lost. If no usable backups are
+##0 found during this time, the four-day rollback
 ##0 will have to be permanent.
 ##0
 ##0 More news updates will follow once we've
@@ -279,8 +279,8 @@
 ##3 2010-08-29
 ##0 Throughout Argaes, new trade regulations from
 ##0 Tulimshar have concentrated wealth and power
-##0 inside Tonori's largest city.  The primary 
-##0 resource of Argaes, iron ore, now must be 
+##0 inside Tonori's largest city.  The primary
+##0 resource of Argaes, iron ore, now must be
 ##0 refined into ingots within Tulimshar's
 ##0 imperial capital.
 ##0
@@ -293,19 +293,19 @@
 ##3 2010-08-18
 ##0 The impact of the Great Earthquake has brought
 ##0 a rising evil to the land.  After much debate
-##0 Tulimshar's Wizard Council has begun to expand 
-##0 its influence in the world to meet the new 
+##0 Tulimshar's Wizard Council has begun to expand
+##0 its influence in the world to meet the new
 ##0 challenges presented.
 ##0
-##0 While still slow to act, Tulimshar has begun 
+##0 While still slow to act, Tulimshar has begun
 ##0 monitoring the changing monster threat in the
-##0 sandstorm and sent agents into Argaes.  The 
+##0 sandstorm and sent agents into Argaes.  The
 ##0 landbridge that long united Argaes with Tonori
-##0 has fallen into the sea, prompting Tulimshar's 
-##0 merchants to charge a hefty fee for trade and 
+##0 has fallen into the sea, prompting Tulimshar's
+##0 merchants to charge a hefty fee for trade and
 ##0 travel between the two continents.
 ##0
-##0 Something sinister has happened to Taro, Nivalis 
+##0 Something sinister has happened to Taro, Nivalis
 ##0 and the magical connection Kaizei had with
 ##0 Argaes.  Some speculate it has something to do
 ##0 with the evil while others think Nivalis and the
@@ -313,16 +313,16 @@
 ##0 Tulimshar's influence.  Either way, all portals
 ##0 to Kaizei have been closed.
 ##0
-##3 The Candor Challenge 
+##3 The Candor Challenge
 ##3 2010-08-18
 ##0
 ##0 In the lost island of Candor, a skeletal figure
 ##0 stands, awaiting for fresh blood to wander right
 ##0 in and pay him for the privilege of being killed
-##0 in nasty ways. How long are you and your friends 
-##0 able to survive in the cave of horrors?      
+##0 in nasty ways. How long are you and your friends
+##0 able to survive in the cave of horrors?
 ##0
-##0 In other news, you may also have run into an  
+##0 In other news, you may also have run into an
 ##0 evil obelisk, trader of strange items, a water
 ##0 pump, a flood and some new insect life recently!
 ##0
@@ -366,7 +366,7 @@
 
 ##3 Skill Changes
 ##3 2009-10-27
- 
+
 ##0 For simplification and realism purposes, the old
 ##0 basic skill has been removed. Emote, trade, and
 ##0 party-related abilities are now available in
@@ -375,46 +375,46 @@
 ##0 that give them out in Tulimshar. Don't worry,
 ##0 this won't affect existing parties, and sitting
 ##0 will always be available from now on.
- 
+
 ##3 Undead?
 ##3 2009-10-27
- 
+
 ##0 Reports of undead south west of Dimond's Cove
 ##0 been pouring in. More later.
- 
+
 ##2 ~ The Hurnscald Herald ~
- 
+
 ##3 Magic Fixes
 ##3 2009-09-15
- 
+
 ##0 The second tier healing spell no longer works on
 ##0 yourself, it will still take mana if you try to
 ##0 cast it on dead players. We're working to fix
 ##0 that. It will halt health regeneration when used.
- 
+
 ##0 Making lifestones now prioritizes bug legs, then
 ##0 maggot slime, then the herbs.
- 
+
 ##3 Technical updates
 ##3 2009-08-16
- 
+
 ##0 GMs will now have their nicks highlighted in
 ##0 newer clients.
- 
+
 ##0 The automatic bans for spam have been
 ##0 adjusted. You will no longer be banned for
 ##0 trade spam, it will just be ignored by the
 ##0 server. Sit spam is now checked for and extra
 ##0 packets are ignored.
- 
+
 ##3 Has Magic Returned?
 ##3 2009-05-31
- 
+
 ##0 A string of curious incidents have left Hurnscald
 ##0 citizens baffled, and raised questions about
 ##0 whether magic might have made a come-back in
 ##0 our peaceful province.
- 
+
 ##0 Tulimshar healer Elanore reports that a small
 ##0 group of novice healers have sought to become
 ##0 her apprentices-- for the first time in years.
@@ -425,18 +425,18 @@
 ##0 over night! Can there be any natural explanation
 ##0 for these events? We do ask our readers to keep
 ##0 their eyes open!
- 
+
 ##2 ~ The Hurnscald Herald ~
 
 ##3 Central Tulimshar
 ##3 2009-02-11
- 
+
 ##0 Central Tulimshar is now open again. Work
 ##0 continues on the rest of the city.
- 
+
 ##3 Rebalancing
 ##3 2009-01-19
- 
+
 ##0 The rebalancing done on enigma (our official
 ##0 test server) is now on our main server. Work is
 ##0 being done on getting the next testing period
@@ -444,7 +444,7 @@
 ##0 the desert especially has different monster
 ##0 positions. Monster exp has been reworked as
 ##0 well.
- 
+
 ##0 The cotton boots are finally available in
 ##0 certain shops. Also, as most of you have already
 ##0 seen, hair styles have been reorganized so both
@@ -452,10 +452,10 @@
 ##0 can see them all. Older clients will only see the
 ##0 male styles. New hair colors are in the works as
 ##0 well.
- 
+
 ##3 Open Testing on Official Test Server
 ##3 2009-01-04 through 2009-01-11
- 
+
 ##0 A testing period on enigma (our official test
 ##0 server) has started. Experience and drop rates
 ##0 are 10 times higher than normal during this
@@ -465,17 +465,17 @@
 ##0 though all currently supported clients are
 ##0 welcome. Please direct all feedback to the
 ##0 appropriate thread on the forums.
- 
+
 ##0 To participate in this testing, set your server
 ##0 to enigma.dy.fi. Enigma shouldn't be used
 ##0 between open test periods, as the content
 ##0 may be in an unusable state. Characters and
 ##0 accounts may be wiped at any time between
 ##0 testing periods.
- 
+
 ##3 Monster Mutations and Experience Point Changes
 ##3 2008-12-10
- 
+
 ##0 We have rebalanced monster experience points
 ##0 and added two new mechanisms to make the
 ##0 game more challenging:  monster mutations, by
@@ -488,58 +488,58 @@
 ##0 increase, we have reduced base experience points
 ##0 for low and medium-level monsters, though we
 ##0 expect levelling to be easier overall.
- 
+
 ##2 The TMW development team
- 
+
 ##3 Mines and weddings!
 ##3 2008-10-11
- 
+
 ##0 A new mining operation has started north of
 ##0 town. The company's director has stated that
 ##0 the mine's output has been sufficient and no
 ##0 problems have been encountered.
- 
+
 ##0 A new wedding officiator has been
 ##0 commissioned. She has set up shop west of
 ##0 town. Many couples are rejoicing that a new
 ##0 officiator is in the region.
- 
+
 ##2 ~ Hurnscald Gazette ~
- 
+
 ##3 Volcano erupted!
 ##3 14/09/2008
- 
+
 ##0 A volcano has erupted east of the city, causing
 ##0 major damage. Repairs are under way. The guard
 ##0 has cautioned that the new beach area that was
 ##0 opened up by the rumbling should be explored
 ##0 with caution.
- 
+
 ##0 In related news, local alchemists have stated
 ##0 that the ash from the eruption is what caused
 ##0 many items of clothing to be bleached.
- 
+
 ##2 ~ Tulimshar Herald ~
- 
+
 ##3 Strange stones appeared and pass cleared
 ##3 15/04/2008
- 
+
 ##0 Strange stones appeared in towns all over The
 ##0 Mana World. No one knows how they appeared
 ##0 and what they are good for. Can you solve their
 ##0 riddle?
- 
+
 ##0 In other news: The pass to the southeast of the
 ##0 desert has been cleared and a mountain area
 ##0 with a lot of snakes has been discovered behind
 ##0 it. Rumors say that an eremite lives in that
 ##0 area who is a genius at leatherworks.
- 
+
 ##2 The Mana World News
- 
+
 ##3 Fast attack bug fixed, gameplay changes
 ##3 07/04/2008
- 
+
 ##0 This weekend a fix was applied for the bug that
 ##0 allowed you to attack with light-speed with
 ##0 several weapons. We understand this changes
@@ -548,100 +548,100 @@
 ##0 of this bug has effectively prevented us from
 ##0 ever being able to balance the gameplay
 ##0 properly.
- 
+
 ##0 Please stay with us and allow us some time to
 ##0 make the necessary adjustments. Suggestions are
 ##0 welcome!
- 
+
 ##2 TMW Development Team
- 
+
 ##3 The Mana World 0.0.24 released
 ##3 24/12/2007
- 
+
 ##0 Female-specific hairstyles, XP gaining
 ##0 notification and improved resource caching are
 ##0 but three examples of the new features in this
 ##0 release. A lot of bug fixes where also made.
 ##0 See the full details on the website!
- 
+
 ##2 Bjorn Lindeijer
- 
+
 ##3 Village of Hurnscald released
 ##3 21/08/2007
- 
+
 ##0 The village of Hurnscald has been released
 ##0 today. You will find this little village in the
 ##0 woodland (try to explore paths you found
 ##0 blocked before). In Hurnscald you will find two
 ##0 new quests, new items and a lot of little
 ##0 surprises. Enjoy!
- 
+
 ##2 Crush
- 
+
 ##3 The Mana World 0.0.23 released
 ##3 04/06/2007
- 
+
 ##0 A particle engine was added, which allowed us
 ##0 to add several nice effects to various locations
 ##0 in the world as well as effects based on hitting
 ##0 enemies or going level up. A series of bug fixes
 ##0 was also made.
- 
+
 ##2 Bjorn Lindeijer
- 
+
 ##3 The Mana World 0.0.22.2 released
 ##3 17/02/2007
- 
+
 ##0 Several small fixes have been made and we
 ##0 hope to have solved some updater problems.
 ##0 Upgrade whenever you're ready.
- 
+
 ##2 Bjorn Lindeijer
- 
+
 ##3 Soulless characters deleted and money cut
 ##3 21/01/2007
- 
+
 ##0 A long time ago we have allowed characteres to
 ##0 sell their soul in order to gain additional
 ##0 powers. They were explicitly warned that they
 ##0 would be eventually deleted. This time has now
 ##0 come.
- 
+
 ##0 In addition, we have cut the fortune of
 ##0 anybody who had more than 10.000 GP.
- 
+
 ##2 Bjorn Lindeijer
- 
+
 ##3 Server address change!
 ##3 17/01/2007
- 
+
 ##0 The animesites.de host is no longer available.
 ##0 We thank Ultramichy for hosting us for so long
 ##0 at no cost! The new server address is:
- 
+
 ##1  server.themanaworld.org
- 
+
 ##0 We are now kindly hosted on platinum, thanks
 ##0 to Platyna.
- 
+
 ##2 Bjorn Lindeijer
- 
+
 ##3 The Mana World 0.0.22.1 released
 ##3 15/01/2007
- 
+
 ##0 A minor update was released based on the new
 ##0 Guichan 0.6.0. Some small fixes are also
 ##0 included.
- 
+
 ##2 Bjorn Lindeijer
- 
+
 ##3 The Mana World 0.0.22 released
 ##3 24/12/2006
- 
+
 ##0 On the edge of Christmas, we've released a
 ##0 new client version. A Christmas event is
 ##0 expected to start soon and you'll need the
 ##0 new client for it, so go get it! Read the
 ##0 NEWS for file details on what's new.
- 
+
 ##2 Bjorn Lindeijer
diff --git a/world/map/npc/001-4/_import.txt b/world/map/npc/001-4/_import.txt
deleted file mode 100644
index b4d7eaf4..00000000
--- a/world/map/npc/001-4/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 001-4: Omars house
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-4.gat
-npc: npc/001-4/_mobs.txt
-npc: npc/001-4/_warps.txt
diff --git a/world/map/npc/001-4/_mobs.txt b/world/map/npc/001-4/_mobs.txt
deleted file mode 100644
index 097896c8..00000000
--- a/world/map/npc/001-4/_mobs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Omars house mobs
-
-
-
-001-4.gat,0,0,0	script	Mob001-4	-1,{
-	end;
-}
diff --git a/world/map/npc/001-4/_warps.txt b/world/map/npc/001-4/_warps.txt
deleted file mode 100644
index 7831e9a1..00000000
--- a/world/map/npc/001-4/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Omars house warps
-
-001-4.gat,26,34	warp	toOutdoor	-1,-1,001-1.gat,75,42