Merge remote-tracking branch 'origin/master' into waric

author: Jessica Tölke <jtoelke@mail.upb.de> 2013-05-10 20:31:40 +0200
committer: Jessica Tölke <jtoelke@mail.upb.de> 2013-05-10 20:31:40 +0200
commit: dfa96a49bbdcb0938746adf8d2da7ffac00a6222 (patch)
tree: 6baedebcd87a44cac5f8b4fb15ed0a016fc58d26 /world/map
parent: 6f2c9210413a68524aaebe2c1a0bd9a54dbcd74a (diff)
parent: 262912f0c8545a82fe2fbf68699cc53d65384b1d (diff)
download: serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.gz
serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.bz2
serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.xz
serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.zip
95 files changed, 932 insertions, 2034 deletions
diff --git a/world/map/data/011-1.wlk b/world/map/data/011-1.wlk
index b3089609..bcd21991 100644
--- a/world/map/data/011-1.wlk
+++ b/world/map/data/011-1.wlk
diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk
index 2934051c..9f7730d8 100644
--- a/world/map/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk
index 50cee52b..9fe0d480 100644
--- a/world/map/data/045-1.wlk
+++ b/world/map/data/045-1.wlk
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 8deda424..df7079fd 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -48,10 +48,10 @@
 544,    SilkHeadband,                   Silk Headband,                      5,      5000,       2000,       10,         ,       10,     ,       -10,    0,      2,      256,        ,       0,      0,      {},                                                                     {}
 545,    ForestBow,                      Forest Bow,                         4,      20000,      5000,       1200,       70,     ,       5,      ,       0,      2,      34,         1,      0,      11,     {},                                                                     {}
 546,    DesertShirt,                    Desert Shirt,                       5,      2000,       1000,       20,         ,       6,      ,       -18,    0,      2,      512,        ,       0,      0,      {},                                                                     {}
-547,    Bardiche,                       Bardiche,                           5,      20,         10,         10,         ,       100,    1,      -200,   0,      2,      2,          ,       0,      0,      {},                                                                     {callfunc "UnreleasedItem";}
-548,    Halberd,                        Halberd,                            4,      20,         10,         1400,       100,    ,       1,      ,       0,      2,      2,          1,      0,      0,      {},                                                                     {callfunc "UnreleasedItem";}
-549,    Axe,                            Axe,                                4,      20,         10,         1200,       100,    ,       1,      ,       0,      2,      2,          1,      0,      0,      {},                                                                     {callfunc "UnreleasedItem";}
-550,    BlacksmithsAxe,                 Blacksmith's Axe,                   4,      20,         10,         1200,       100,    ,       1,      ,       0,      2,      2,          1,      0,      0,      {},                                                                     {callfunc "UnreleasedItem";}
+547,    Bardiche,                       Bardiche,                           4,      20,         10,         10,         ,       100,    1,      -200,   0,      2,      2,          ,       0,      1,      {},                                                                     {callfunc "UnreleasedItem";}
+548,    Halberd,                        Halberd,                            4,      20,         10,         1400,       100,    ,       1,      ,       0,      2,      2,          1,      0,      1,      {},                                                                     {callfunc "UnreleasedItem";}
+549,    Axe,                            Axe,                                4,      20,         10,         1200,       100,    ,       1,      ,       0,      2,      2,          1,      0,      1,      {},                                                                     {callfunc "UnreleasedItem";}
+550,    BlacksmithsAxe,                 Blacksmith's Axe,                   4,      20,         10,         1200,       100,    ,       1,      ,       0,      2,      2,          1,      0,      1,      {},                                                                     {callfunc "UnreleasedItem";}
 551,    AquaHint,                       Aqua Hint,                          3,      20,         0,          10,         ,       ,       ,       ,       ,       ,       ,           ,       ,       ,       {},                                                                     {}
 552,    MagentaHint,                    Magenta Hint,                       3,      20,         0,          10,         ,       ,       ,       ,       ,       ,       ,           ,       ,       ,       {},                                                                     {}
 553,    YellowHint,                     Yellow Hint,                        3,      20,         0,          10,         ,       ,       ,       ,       ,       ,       ,           ,       ,       ,       {},                                                                     {}
@@ -88,7 +88,7 @@
 582,    StaffOfFire,                    Staff of Fire,                      4,      8000,       4000,       1500,       100,    ,       1,      ,       0,      2,      2,          1,      1,      1,      {},                                                                     {callfunc "UnreleasedItem";}
 583,    StaffOfIce,                     Staff of Ice,                       4,      8000,       4000,       1500,       100,    ,       1,      ,       0,      2,      2,          1,      1,      1,      {},                                                                     {callfunc "UnreleasedItem";}
 584,    Jackal,                         Jackal,                             4,      8000,       4000,       100,        100,    ,       1,      ,       0,      2,      2,          1,      1,      1,      {},                                                                     {callfunc "UnreleasedItem";}
-585,    ScarabArmlet,                   Scarab Armlet,                      5,      8000,       4000,       200,        ,       0,      ,       5,      0,      2,      32,         ,       1,      1,      {},                                                                     {}
+585,    ScarabArmlet,                   Scarab Armlet,                      5,      8000,       4000,       200,        ,       0,      ,       5,      0,      2,      32,         ,       1,      0,      {},                                                                     {}
 586,    CottonShorts,                   Cotton Shorts,                      5,      1000,       500,        15,         ,       2,      ,       -4,     0,      2,      1,          ,       1,      0,      {},                                                                     {}
 587,    Sword,                          Sword,                              4,      1000,       500,        200,        15,     ,       1,      ,       0,      2,      2,          1,      1,      1,      {},                                                                     {callfunc "UnreleasedItem";}
 //588,  RESERVED,                       BastardSword,                       ,       ,           ,           ,           ,       ,       ,       ,       ,       ,       ,           ,       ,       ,       {},                                                                     {}
diff --git a/world/map/news.d/00-old-news.txt b/world/map/news.d/00-old-news.txt
deleted file mode 100644
index 030381e4..00000000
--- a/world/map/news.d/00-old-news.txt
+++ /dev/null
@@ -1,393 +0,0 @@
-{date:December 2012 again}
-
-A new peninsula has magically raised from the depths,
-south of Hurnscald. A witch seems to be the source of
-this strange phenomenon.
-Why is she here, and what does she want?
-
-Further on the west, Lora Tay is willing to accept
-new challenges to prove once more her skills.
-
-{date:December 2012}
-
-Santa and his helpers have returned to Santa's residence
-near Nivalis to prepare for Christmas.
-Among the helpers, the preparations are moving smoothly
-as they should.
-The reinboos are excited this year since there will be a change
-within their team!
-But not everything is working out as planned.
-
-{date:November 2012}
-
-Halloween has passed and several cities celebrated this event.
-It seems the farmer Oscar just came back from a long journey
-in one of these cities.
-Probably he will have exciting things to tell.
-
-{date:October 2012}
-
-The roadblock to the north east in Argaes was finally lifted
-and parts of the road were reconstructed.
-But there is still some work left until the connection to Port City is done.
-In the Woods you can find a guy who lives alone, seeking seclusion.
-Be careful not to disturb him. He is very vicious.
-
-The smith's apprentice Peter does good progress in mastering his
-handcraft and learned some new techniques.
-
-{date:September 2012}
-
-Agostine is well known for his magnificent winter clothes,
-but he always dreamed of creating something truly exquisite,
-something noble...
-
-An old veteran has set up camp in the caves below Hurnscald
-after a life full of hardship and battle.
-He may be old now, but he surely didn't lose his interest
-in the art of combat!
-
-{date:April/May 2012}
-
-Strange and ominous things are going on in Kaizei.
-Many people around Nivalis have noticed White and Blue Slimes
-around the area, which they have never seen before.
-Where do those come from? Are they dangerous?
-And why did they show up now?
-Rumors say that they originate from the snowy mountains
-north-west of Nivalis, where the famous Sage Nikolai
-has his residence.
-
-Summer is coming near and it might be a good time
-to visit the beach with your Towel and relax a while.
-Oh, you don't have a Towel?
-Well, in that case you might find someone on the beach
-who can give you one!
-
-{date:March 2012}
-
-Two announcements to make:
-
-It seems Tulimshar is finally recovering from the impacts
-of the great earthquake.
-Although the eastern half of the city is still closed,
-it has become much more lively, with children playing between the houses,
-farmers going back to their fields, reports of increased trade activity.
-
-Surely there are lots of tasks for a young adventurer!
-
-Near Hurnscald a bunny showed up that looks like an older version
-of our well-known Easter Bunny.
-But what is he doing there? And where is Easter Bunny?
-
-{date:2012-02-12 (ooh, what a nice date)}
-
-Three pieces of news today.
-
-First, Mana 0.6.0 got released today. You can find it at
-{link:http://manasource.org}, or wait for your distribution.
-
-Second, we will be completely dropping support for the old
-TMW 0.0.29.1 client soon - unless there is further reason
-for delay, in April 2012.
-
-Finally, there will be a purge of accounts that have not been
-used for over a year. This should help responsiveness
-when logging in and choosing a character.
-
--o11c
-
-{date:February 2012}
-
-After all the activity in Nivalis due to the Christmas time,
-the townsfolk would like things to be quiet again.
-Unfortunately, some strange people have set up their camp
-near the woods west of town.
-They came from their village high up in the northern snow mountains.
-What might have caused them to leave their hunting grounds
-and come down to Nivalis?
-
-{date:Christmas 2011}
-
-Christmas is coming near and Santa and his helpers are busy
-preparing everything for the celebration in Santa's house near Nivalis.
-But somehow... everything seems to go wrong.
-Bad luck? Or rather - malicious interference?
-It looks like someone could use your help.
-
-{date:November 2011}
-{blue}A Rule Correction on "No Botting"{/blue}
-
-{blue}Previously, only activity while the user was{/blue}
-{blue}away from the keyboard was a bannable offense.{/blue}
-{blue}Now, any sort of automated following{/blue}
-{blue}(especially, but not only, attack-following){/blue}
-{blue}is also covered.{/blue}
-
-{blue}If you know any of the people who left this game{/blue}
-{blue}due to the prevalence of bots that were previously{/blue}
-{blue}tolerated, please tell them it's time to return.{/blue}
-
-{green}~ The Hurnscald Herald ~{/green}
-
-{date:Halloween 2011}
-
-Happy Halloween!
-This year the governments of Argaes and Tonori have decided to sponsor
-trick-or-treating across both continents.
-Have fun and don't make yourself sick by pigging out!
-
-Credits:
-initial outline - enchilado
-intial draft - alastrim
-rewritten draft - o11c
-review - Jenalya
-new items - Lizandra
-maybe something to do with the new items - salmondine
-old item - maybe Black Don ?
-(We're not spoiling what the items *are*)
--o11c
-
-{date:July 2011}
-
-Will Kill Monsters For Food?
-
-Recovery from the Great Earthquake is still
-very slow throughout the world.  The vast
-devastation still causes starvation and
-a lack of work.  A side effect of the Great
-Earthquake has been the increasing number of
-aggressive monsters and dooms long thought
-forgotten.
-
-To answer this problem Tulimshar
-has issued a call to be spread far and wide:
-"If you're hungry, if you need work, if you
-are in search of adventure, come to Tulimshar.
-Slaying monsters, liberating mines and
-defeating the night horrors that terrify even
-the most strong willed never paid so well!"
-
-Needless to say, many are answering this call.
-You may very well be one of them.
-
-Olana, the Innkeeper's Daughter, Returns to
-Hurnscald...But Where Are Her Daughters?
-
-Olana, who is staying in the West wing of the
-Hurnscald Inn, has been away to Tulimshar with
-her family since before the Earthquake.
-"The Earthquake may of happened a couple years
-ago, but everything is still messed up.
-I would've returned immediately, but I didn't
-want to put my family at risk until travel
-became a little safer."
-
-When asked about her daughters, Olana smiled
-"They love wandering the woods around here.
-Other than the occasional bandit group, things
-are usually much more peaceful around here than
-in Tulimshar.  I just hope they don't wander
-near these caves...I've heard many of them can
-be quite dangerous."
-
-{green}~ The Hurnscald Herald ~{/green}
-
-{date:June 2011}
-
-A large shipment of gold coins was plundered
-by pirates.  The shipment was to be sent to
-Tulimshar as part of their effort to control
-inflation.  "They seemed to just come out of
-no where!  They took the shipment and my pet
-squirrel Chompers!"  Captain Zierock reported
-while in tears.
-
-It is believed the pirates divided the gold
-then went separate ways to spend their spoils.
-Ironically, these pirates were the target of
-monsters, who plundered them not just for
-their new found wealth, but also for their
-crunchy bones and sea salty flesh.
-
-On that note, be on the lookout for Green Slimes,
-which have grown hostile as they evolve to the
-harsh Tonori desert, making them a threat to
-travel and trade.  It is believed many of the
-pirates attempted to cross the Snake Desert,
-where they met the Green Slimes...and their
-end.
-
-In other news, Andra, a friend of Hinnak, has
-increased her agricultural knowledge and needs
-help keeping the soil around the farm fertile.
-Interested volunteers should speak with her
-about how to help.
-
-Last, but certainly not least, Agostine has
-returned to Nivalis.  While he enjoyed his
-time in Tulimshar, mingling with other artisans,
-he has missed his home in Kaizei.  "I made this
-fabulous sweater, but nobody wanted to wear it
-in this hot and smelly desert.  That is when I
-decided enough was enough.  Sweat is just gross."
-
-{green}~ The Hurnscald Herald ~{/green}
-
-{date:May 2011}
-
-Many battle hardened warriors took some time
-during April and enjoyed helping the somewhat
-forgetful Easter Bunny make his baskets. The
-children surely must have enjoyed their sweets.
-
-The demi-god Golbenez has finally made good on
-his promise to open a 'place of leisure' in
-the form of an inn. Youngsters beware, since
-the entrance to this inn is near the old
-graveyard and could be dangerous.
-
-There have also been reports about a mysterious
-stranger roaming the beaches near Tulimshar.
-Be on the lookout if you are in the area.
-
-{green}~ The Hurnscald Herald ~{/green}
-
-{date:January 2011}
-
-Reports of bandit raids to the west of
-Hurnscald has mobilized the town.  Those
-injured by these bandits may have a long stay
-ahead of them in Hurnscald's hospital.
-
-Shortly after Tulimshar loosened the tariff
-on travel, skill trainers have come to Mana.
-If one wants to improve themselves through
-acquiring skills, be on the lookout for these
-trainers.
-
-In other news, Taro is still missing, but
-Diryn, an agent of Tulimshar, has established
-a connection with the Kaizei area, making
-travel to Nivalis possible again.  He still
-assists the battle hardened travel distant
-locations just outside of Hurnscald.  Getting
-back can be done by finding Frozenbeard, a
-pioneer who is mapping a trade route to get
-to Nivalis by ship.
-
-Diryn's re-connection with Nivalis came none
-too soon.  Golbenez, a demi-god who demanded
-a half billion gold pieces for building some
-sort of leisure place, scrapped the idea and
-went for good old fashioned kidnapping to get
-whatever he wanted from the world of Mana.
-He kidnapped Santa Claus.  Fearful Santa may
- not gift the children of the world, wizards,
-warriors and archers rallied to pay the
-demi-god his demands.
-
-Shortly after Santa was freed, something more
-sinister has come to Kaizei.  The yeti.
-Sightings of this beast returns with stories
-of them.  Though aggressive, their behavior
-seems out of place.  They've never been known
-as cave dwellers nor to kidnap people.
-
-Last, but definitely not least, Dimond's Cove
-is observing "Burns' Supper" January 24-26th.
-Shanon is hosting the event, which he promises
-will be an excellent time for food, drink and
-poems.
-
-{green}~ The Hurnscald Herald ~{/green}
-
-{blue}Countless candy-concerning complaints: council{/blue}
-{blue}consequently considers citizen-composed cleanup crew{/blue}
-{date:Eighteenth of November 2010}
-
-Recently, the ancient tradition of Hallowe'en
-was celebrated across Argaes, Tonori and other
-continents. Estimated tons of sweets were given
-out to happy trick-or-treaters, and as with
-most other years a lot of this vast total was
-dropped on the night. Even a week and a half
-after Hallowe'en, many kilograms of sweets
-still litter our pleasant woodlands.
-
-After dozens of letters regarding the situation,
-the Hurnscald Council has said that the best
-solution would be to organise a team of
-volunteers to work on collecting dropped sweets
-and disposing of them - but it has yet to
-organise any such thing.
-
-In the meantime, why not do your bit and collect
-some sweets for yourself? If you don't mind them
-being a bit old, you could be able to make the
-biggest Hallowe'en haul in history.
-
-Additionally, we've been getting some reports of
-a rather creepy skeleton hanging around the
-woodland. He doesn't appear to be aggressive,
-but he chatters unintelligibly at passers-by.
-
-
-{blue}Rollback{/blue}
-2010-11-17
-
-Everything should now be running from a
-complete save state (including storage, banks,
-parties etc) that is even two days more recent
-than what we were temporarilyrunning on before.
-All credit to Platyna for speedy recovery and
-even more recent backups. :)
-
-{blue}Server outage{/blue}
-2010-11-16
-
-Things running on the four day old backups,
-restricted to account save info and character
-save info for now while we try to get other
-databases working.
-
-This means no party data or storage data for
-now, we'll try to recover that along with
-everything else, as we should be able to get
-a full saved state from within the past week.
-
-The current setup is more to have something
-partially up, and so that people know what's
-going on while we try to fix things; any
-in-game progress made right now {red}will not{/red}
-persist.
-
-{blue}Server outage{/blue}
-2010-11-16
-
-Okay, apparently even that won't work right now.
-Servers will remain {blue}offline{/blue} until we figure out
-what we can do.
-
-{blue}Server outage{/blue}
-2010-11-16
-
-We've just had a serious server crash, and the
-databases seem to have been affected here. We're
-currently running on some four-day old backups;
-whether this will be a temporary measure or
-whether newer ones are usable is yet to be
-determined.
-
-Please note that the current state may only
-be {blue}temporary{/blue}, and that if usable newer backups
-are found within the next 24 hours, those will
-be used instead, and any character progress
-made may be lost. If no usable backups are
-found during this time, the four-day rollback
-will have to be permanent.
-
-More news updates will follow once we've
-investigated further; we're doing what we can...
-
-{author:Freeyorp}
diff --git a/world/map/news.d/09-winter2012.txt b/world/map/news.d/09-winter2012.txt
new file mode 100644
index 00000000..7212d700
--- /dev/null
+++ b/world/map/news.d/09-winter2012.txt
@@ -0,0 +1,48 @@
+{date:December 2012 again}
+
+A new peninsula has magically raised from the depths,
+south of Hurnscald. A witch seems to be the source of
+this strange phenomenon.
+Why is she here, and what does she want?
+
+Further on the west, Lora Tay is willing to accept
+new challenges to prove once more her skills.
+
+{date:December 2012}
+
+Santa and his helpers have returned to Santa's residence
+near Nivalis to prepare for Christmas.
+Among the helpers, the preparations are moving smoothly
+as they should.
+The reinboos are excited this year since there will be a change
+within their team!
+But not everything is working out as planned.
+
+{date:November 2012}
+
+Halloween has passed and several cities celebrated this event.
+It seems the farmer Oscar just came back from a long journey
+in one of these cities.
+Probably he will have exciting things to tell.
+
+{date:October 2012}
+
+The roadblock to the north east in Argaes was finally lifted
+and parts of the road were reconstructed.
+But there is still some work left until the connection to Port City is done.
+In the Woods you can find a guy who lives alone, seeking seclusion.
+Be careful not to disturb him. He is very vicious.
+
+The smith's apprentice Peter does good progress in mastering his
+handcraft and learned some new techniques.
+
+{date:September 2012}
+
+Agostine is well known for his magnificent winter clothes,
+but he always dreamed of creating something truly exquisite,
+something noble...
+
+An old veteran has set up camp in the caves below Hurnscald
+after a life full of hardship and battle.
+He may be old now, but he surely didn't lose his interest
+in the art of combat!
diff --git a/world/map/news.d/18-bugfixes.txt b/world/map/news.d/18-bugfixes.txt
new file mode 100644
index 00000000..40f9edf0
--- /dev/null
+++ b/world/map/news.d/18-bugfixes.txt
@@ -0,0 +1,15 @@
+{date:2013-04-28}
+
+We're having a bugfix release today.
+
+The main areas that have been fixed are Brodomir's PvP Cave
+and Orum's quest, both in the
+caves below Hurnscald.
+
+Additionally, there were a lot of small fixes
+on maps, spelling and grammar, and more.
+
+We'd like to thank all the people who reported issues and helped
+testing!
+
+{author:Jenalya}
diff --git a/world/map/news.html b/world/map/news.html
index dfb0a775..9760aa1a 100644
--- a/world/map/news.html
+++ b/world/map/news.html
@@ -1,6 +1,24 @@
 <!-- Generated by tools/news.py for index.php -->
 <div>
 <p/>
+<font color="#0000ff">2013-04-28</font>
+<p/>
+We're having a bugfix release today.
+<p/>
+The main areas that have been fixed are Brodomir's PvP Cave
+and Orum's quest, both in the
+caves below Hurnscald.
+<p/>
+Additionally, there were a lot of small fixes
+on maps, spelling and grammar, and more.
+<p/>
+We'd like to thank all the people who reported issues and helped
+testing!
+<p/>
+-<font color="#009000">Jenalya</font>
+</div>
+<div>
+<p/>
 <font color="#0000ff">2013-03-21</font>
 <p/>
 Today we have a content release.
@@ -228,349 +246,4 @@ An old veteran has set up camp in the caves below Hurnscald
 after a life full of hardship and battle.
 He may be old now, but he surely didn't lose his interest
 in the art of combat!
-<p/>
-<font color="#0000ff">April/May 2012</font>
-<p/>
-Strange and ominous things are going on in Kaizei.
-Many people around Nivalis have noticed White and Blue Slimes
-around the area, which they have never seen before.
-Where do those come from? Are they dangerous?
-And why did they show up now?
-Rumors say that they originate from the snowy mountains
-north-west of Nivalis, where the famous Sage Nikolai
-has his residence.
-<p/>
-Summer is coming near and it might be a good time
-to visit the beach with your Towel and relax a while.
-Oh, you don't have a Towel?
-Well, in that case you might find someone on the beach
-who can give you one!
-<p/>
-<font color="#0000ff">March 2012</font>
-<p/>
-Two announcements to make:
-<p/>
-It seems Tulimshar is finally recovering from the impacts
-of the great earthquake.
-Although the eastern half of the city is still closed,
-it has become much more lively, with children playing between the houses,
-farmers going back to their fields, reports of increased trade activity.
-<p/>
-Surely there are lots of tasks for a young adventurer!
-<p/>
-Near Hurnscald a bunny showed up that looks like an older version
-of our well-known Easter Bunny.
-But what is he doing there? And where is Easter Bunny?
-<p/>
-<font color="#0000ff">2012-02-12 (ooh, what a nice date)</font>
-<p/>
-Three pieces of news today.
-<p/>
-First, Mana 0.6.0 got released today. You can find it at
-<a href="http://manasource.org">http://manasource.org</a>, or wait for your distribution.
-<p/>
-Second, we will be completely dropping support for the old
-TMW 0.0.29.1 client soon - unless there is further reason
-for delay, in April 2012.
-<p/>
-Finally, there will be a purge of accounts that have not been
-used for over a year. This should help responsiveness
-when logging in and choosing a character.
-<p/>
--o11c
-<p/>
-<font color="#0000ff">February 2012</font>
-<p/>
-After all the activity in Nivalis due to the Christmas time,
-the townsfolk would like things to be quiet again.
-Unfortunately, some strange people have set up their camp
-near the woods west of town.
-They came from their village high up in the northern snow mountains.
-What might have caused them to leave their hunting grounds
-and come down to Nivalis?
-<p/>
-<font color="#0000ff">Christmas 2011</font>
-<p/>
-Christmas is coming near and Santa and his helpers are busy
-preparing everything for the celebration in Santa's house near Nivalis.
-But somehow... everything seems to go wrong.
-Bad luck? Or rather - malicious interference?
-It looks like someone could use your help.
-<p/>
-<font color="#0000ff">November 2011</font>
-<font color="#0000ff">A Rule Correction on "No Botting"</font>
-<p/>
-<font color="#0000ff">Previously, only activity while the user was</font>
-<font color="#0000ff">away from the keyboard was a bannable offense.</font>
-<font color="#0000ff">Now, any sort of automated following</font>
-<font color="#0000ff">(especially, but not only, attack-following)</font>
-<font color="#0000ff">is also covered.</font>
-<p/>
-<font color="#0000ff">If you know any of the people who left this game</font>
-<font color="#0000ff">due to the prevalence of bots that were previously</font>
-<font color="#0000ff">tolerated, please tell them it's time to return.</font>
-<p/>
-<font color="#009000">~ The Hurnscald Herald ~</font>
-<p/>
-<font color="#0000ff">Halloween 2011</font>
-<p/>
-Happy Halloween!
-This year the governments of Argaes and Tonori have decided to sponsor
-trick-or-treating across both continents.
-Have fun and don't make yourself sick by pigging out!
-<p/>
-Credits:
-initial outline - enchilado
-intial draft - alastrim
-rewritten draft - o11c
-review - Jenalya
-new items - Lizandra
-maybe something to do with the new items - salmondine
-old item - maybe Black Don ?
-(We're not spoiling what the items *are*)
--o11c
-<p/>
-<font color="#0000ff">July 2011</font>
-<p/>
-Will Kill Monsters For Food?
-<p/>
-Recovery from the Great Earthquake is still
-very slow throughout the world.  The vast
-devastation still causes starvation and
-a lack of work.  A side effect of the Great
-Earthquake has been the increasing number of
-aggressive monsters and dooms long thought
-forgotten.
-<p/>
-To answer this problem Tulimshar
-has issued a call to be spread far and wide:
-"If you're hungry, if you need work, if you
-are in search of adventure, come to Tulimshar.
-Slaying monsters, liberating mines and
-defeating the night horrors that terrify even
-the most strong willed never paid so well!"
-<p/>
-Needless to say, many are answering this call.
-You may very well be one of them.
-<p/>
-Olana, the Innkeeper's Daughter, Returns to
-Hurnscald...But Where Are Her Daughters?
-<p/>
-Olana, who is staying in the West wing of the
-Hurnscald Inn, has been away to Tulimshar with
-her family since before the Earthquake.
-"The Earthquake may of happened a couple years
-ago, but everything is still messed up.
-I would've returned immediately, but I didn't
-want to put my family at risk until travel
-became a little safer."
-<p/>
-When asked about her daughters, Olana smiled
-"They love wandering the woods around here.
-Other than the occasional bandit group, things
-are usually much more peaceful around here than
-in Tulimshar.  I just hope they don't wander
-near these caves...I've heard many of them can
-be quite dangerous."
-<p/>
-<font color="#009000">~ The Hurnscald Herald ~</font>
-<p/>
-<font color="#0000ff">June 2011</font>
-<p/>
-A large shipment of gold coins was plundered
-by pirates.  The shipment was to be sent to
-Tulimshar as part of their effort to control
-inflation.  "They seemed to just come out of
-no where!  They took the shipment and my pet
-squirrel Chompers!"  Captain Zierock reported
-while in tears.
-<p/>
-It is believed the pirates divided the gold
-then went separate ways to spend their spoils.
-Ironically, these pirates were the target of
-monsters, who plundered them not just for
-their new found wealth, but also for their
-crunchy bones and sea salty flesh.
-<p/>
-On that note, be on the lookout for Green Slimes,
-which have grown hostile as they evolve to the
-harsh Tonori desert, making them a threat to
-travel and trade.  It is believed many of the
-pirates attempted to cross the Snake Desert,
-where they met the Green Slimes...and their
-end.
-<p/>
-In other news, Andra, a friend of Hinnak, has
-increased her agricultural knowledge and needs
-help keeping the soil around the farm fertile.
-Interested volunteers should speak with her
-about how to help.
-<p/>
-Last, but certainly not least, Agostine has
-returned to Nivalis.  While he enjoyed his
-time in Tulimshar, mingling with other artisans,
-he has missed his home in Kaizei.  "I made this
-fabulous sweater, but nobody wanted to wear it
-in this hot and smelly desert.  That is when I
-decided enough was enough.  Sweat is just gross."
-<p/>
-<font color="#009000">~ The Hurnscald Herald ~</font>
-<p/>
-<font color="#0000ff">May 2011</font>
-<p/>
-Many battle hardened warriors took some time
-during April and enjoyed helping the somewhat
-forgetful Easter Bunny make his baskets. The
-children surely must have enjoyed their sweets.
-<p/>
-The demi-god Golbenez has finally made good on
-his promise to open a 'place of leisure' in
-the form of an inn. Youngsters beware, since
-the entrance to this inn is near the old
-graveyard and could be dangerous.
-<p/>
-There have also been reports about a mysterious
-stranger roaming the beaches near Tulimshar.
-Be on the lookout if you are in the area.
-<p/>
-<font color="#009000">~ The Hurnscald Herald ~</font>
-<p/>
-<font color="#0000ff">January 2011</font>
-<p/>
-Reports of bandit raids to the west of
-Hurnscald has mobilized the town.  Those
-injured by these bandits may have a long stay
-ahead of them in Hurnscald's hospital.
-<p/>
-Shortly after Tulimshar loosened the tariff
-on travel, skill trainers have come to Mana.
-If one wants to improve themselves through
-acquiring skills, be on the lookout for these
-trainers.
-<p/>
-In other news, Taro is still missing, but
-Diryn, an agent of Tulimshar, has established
-a connection with the Kaizei area, making
-travel to Nivalis possible again.  He still
-assists the battle hardened travel distant
-locations just outside of Hurnscald.  Getting
-back can be done by finding Frozenbeard, a
-pioneer who is mapping a trade route to get
-to Nivalis by ship.
-<p/>
-Diryn's re-connection with Nivalis came none
-too soon.  Golbenez, a demi-god who demanded
-a half billion gold pieces for building some
-sort of leisure place, scrapped the idea and
-went for good old fashioned kidnapping to get
-whatever he wanted from the world of Mana.
-He kidnapped Santa Claus.  Fearful Santa may
- not gift the children of the world, wizards,
-warriors and archers rallied to pay the
-demi-god his demands.
-<p/>
-Shortly after Santa was freed, something more
-sinister has come to Kaizei.  The yeti.
-Sightings of this beast returns with stories
-of them.  Though aggressive, their behavior
-seems out of place.  They've never been known
-as cave dwellers nor to kidnap people.
-<p/>
-Last, but definitely not least, Dimond's Cove
-is observing "Burns' Supper" January 24-26th.
-Shanon is hosting the event, which he promises
-will be an excellent time for food, drink and
-poems.
-<p/>
-<font color="#009000">~ The Hurnscald Herald ~</font>
-<p/>
-<font color="#0000ff">Countless candy-concerning complaints: council</font>
-<font color="#0000ff">consequently considers citizen-composed cleanup crew</font>
-<font color="#0000ff">Eighteenth of November 2010</font>
-<p/>
-Recently, the ancient tradition of Hallowe'en
-was celebrated across Argaes, Tonori and other
-continents. Estimated tons of sweets were given
-out to happy trick-or-treaters, and as with
-most other years a lot of this vast total was
-dropped on the night. Even a week and a half
-after Hallowe'en, many kilograms of sweets
-still litter our pleasant woodlands.
-<p/>
-After dozens of letters regarding the situation,
-the Hurnscald Council has said that the best
-solution would be to organise a team of
-volunteers to work on collecting dropped sweets
-and disposing of them - but it has yet to
-organise any such thing.
-<p/>
-In the meantime, why not do your bit and collect
-some sweets for yourself? If you don't mind them
-being a bit old, you could be able to make the
-biggest Hallowe'en haul in history.
-<p/>
-Additionally, we've been getting some reports of
-a rather creepy skeleton hanging around the
-woodland. He doesn't appear to be aggressive,
-but he chatters unintelligibly at passers-by.
-<p/>
-
-<font color="#0000ff">Rollback</font>
-2010-11-17
-<p/>
-Everything should now be running from a
-complete save state (including storage, banks,
-parties etc) that is even two days more recent
-than what we were temporarilyrunning on before.
-All credit to Platyna for speedy recovery and
-even more recent backups. :)
-<p/>
-<font color="#0000ff">Server outage</font>
-2010-11-16
-<p/>
-Things running on the four day old backups,
-restricted to account save info and character
-save info for now while we try to get other
-databases working.
-<p/>
-This means no party data or storage data for
-now, we'll try to recover that along with
-everything else, as we should be able to get
-a full saved state from within the past week.
-<p/>
-The current setup is more to have something
-partially up, and so that people know what's
-going on while we try to fix things; any
-in-game progress made right now <font color="#ff0000">will not</font>
-persist.
-<p/>
-<font color="#0000ff">Server outage</font>
-2010-11-16
-<p/>
-Okay, apparently even that won't work right now.
-Servers will remain <font color="#0000ff">offline</font> until we figure out
-what we can do.
-<p/>
-<font color="#0000ff">Server outage</font>
-2010-11-16
-<p/>
-We've just had a serious server crash, and the
-databases seem to have been affected here. We're
-currently running on some four-day old backups;
-whether this will be a temporary measure or
-whether newer ones are usable is yet to be
-determined.
-<p/>
-Please note that the current state may only
-be <font color="#0000ff">temporary</font>, and that if usable newer backups
-are found within the next 24 hours, those will
-be used instead, and any character progress
-made may be lost. If no usable backups are
-found during this time, the four-day rollback
-will have to be permanent.
-<p/>
-More news updates will follow once we've
-investigated further; we're doing what we can...
-<p/>
--<font color="#009000">Freeyorp</font>
 </div>
diff --git a/world/map/news.txt b/world/map/news.txt
index 93ac904e..be962a6d 100644
--- a/world/map/news.txt
+++ b/world/map/news.txt
@@ -1,3 +1,20 @@
+##32013-04-28##0
+ 
+We're having a bugfix release today.
+ 
+The main areas that have been fixed are Brodomir's PvP Cave
+and Orum's quest, both in the
+caves below Hurnscald.
+ 
+Additionally, there were a lot of small fixes
+on maps, spelling and grammar, and more.
+ 
+We'd like to thank all the people who reported issues and helped
+testing!
+ 
+-##2Jenalya##0
+ 
+ 
 ##32013-03-21##0
  
 Today we have a content release.
@@ -218,349 +235,4 @@ after a life full of hardship and battle.
 He may be old now, but he surely didn't lose his interest
 in the art of combat!
  
-##3April/May 2012##0
- 
-Strange and ominous things are going on in Kaizei.
-Many people around Nivalis have noticed White and Blue Slimes
-around the area, which they have never seen before.
-Where do those come from? Are they dangerous?
-And why did they show up now?
-Rumors say that they originate from the snowy mountains
-north-west of Nivalis, where the famous Sage Nikolai
-has his residence.
- 
-Summer is coming near and it might be a good time
-to visit the beach with your Towel and relax a while.
-Oh, you don't have a Towel?
-Well, in that case you might find someone on the beach
-who can give you one!
- 
-##3March 2012##0
- 
-Two announcements to make:
- 
-It seems Tulimshar is finally recovering from the impacts
-of the great earthquake.
-Although the eastern half of the city is still closed,
-it has become much more lively, with children playing between the houses,
-farmers going back to their fields, reports of increased trade activity.
- 
-Surely there are lots of tasks for a young adventurer!
- 
-Near Hurnscald a bunny showed up that looks like an older version
-of our well-known Easter Bunny.
-But what is he doing there? And where is Easter Bunny?
- 
-##32012-02-12 (ooh, what a nice date)##0
- 
-Three pieces of news today.
- 
-First, Mana 0.6.0 got released today. You can find it at
-@@http://manasource.org|http://manasource.org@@##0, or wait for your distribution.
- 
-Second, we will be completely dropping support for the old
-TMW 0.0.29.1 client soon - unless there is further reason
-for delay, in April 2012.
- 
-Finally, there will be a purge of accounts that have not been
-used for over a year. This should help responsiveness
-when logging in and choosing a character.
- 
--o11c
- 
-##3February 2012##0
- 
-After all the activity in Nivalis due to the Christmas time,
-the townsfolk would like things to be quiet again.
-Unfortunately, some strange people have set up their camp
-near the woods west of town.
-They came from their village high up in the northern snow mountains.
-What might have caused them to leave their hunting grounds
-and come down to Nivalis?
- 
-##3Christmas 2011##0
- 
-Christmas is coming near and Santa and his helpers are busy
-preparing everything for the celebration in Santa's house near Nivalis.
-But somehow... everything seems to go wrong.
-Bad luck? Or rather - malicious interference?
-It looks like someone could use your help.
- 
-##3November 2011##0
-##3A Rule Correction on "No Botting"##0
- 
-##3Previously, only activity while the user was##0
-##3away from the keyboard was a bannable offense.##0
-##3Now, any sort of automated following##0
-##3(especially, but not only, attack-following)##0
-##3is also covered.##0
- 
-##3If you know any of the people who left this game##0
-##3due to the prevalence of bots that were previously##0
-##3tolerated, please tell them it's time to return.##0
- 
-##2~ The Hurnscald Herald ~##0
- 
-##3Halloween 2011##0
- 
-Happy Halloween!
-This year the governments of Argaes and Tonori have decided to sponsor
-trick-or-treating across both continents.
-Have fun and don't make yourself sick by pigging out!
- 
-Credits:
-initial outline - enchilado
-intial draft - alastrim
-rewritten draft - o11c
-review - Jenalya
-new items - Lizandra
-maybe something to do with the new items - salmondine
-old item - maybe Black Don ?
-(We're not spoiling what the items *are*)
--o11c
- 
-##3July 2011##0
- 
-Will Kill Monsters For Food?
- 
-Recovery from the Great Earthquake is still
-very slow throughout the world.  The vast
-devastation still causes starvation and
-a lack of work.  A side effect of the Great
-Earthquake has been the increasing number of
-aggressive monsters and dooms long thought
-forgotten.
- 
-To answer this problem Tulimshar
-has issued a call to be spread far and wide:
-"If you're hungry, if you need work, if you
-are in search of adventure, come to Tulimshar.
-Slaying monsters, liberating mines and
-defeating the night horrors that terrify even
-the most strong willed never paid so well!"
- 
-Needless to say, many are answering this call.
-You may very well be one of them.
- 
-Olana, the Innkeeper's Daughter, Returns to
-Hurnscald...But Where Are Her Daughters?
- 
-Olana, who is staying in the West wing of the
-Hurnscald Inn, has been away to Tulimshar with
-her family since before the Earthquake.
-"The Earthquake may of happened a couple years
-ago, but everything is still messed up.
-I would've returned immediately, but I didn't
-want to put my family at risk until travel
-became a little safer."
- 
-When asked about her daughters, Olana smiled
-"They love wandering the woods around here.
-Other than the occasional bandit group, things
-are usually much more peaceful around here than
-in Tulimshar.  I just hope they don't wander
-near these caves...I've heard many of them can
-be quite dangerous."
- 
-##2~ The Hurnscald Herald ~##0
- 
-##3June 2011##0
- 
-A large shipment of gold coins was plundered
-by pirates.  The shipment was to be sent to
-Tulimshar as part of their effort to control
-inflation.  "They seemed to just come out of
-no where!  They took the shipment and my pet
-squirrel Chompers!"  Captain Zierock reported
-while in tears.
- 
-It is believed the pirates divided the gold
-then went separate ways to spend their spoils.
-Ironically, these pirates were the target of
-monsters, who plundered them not just for
-their new found wealth, but also for their
-crunchy bones and sea salty flesh.
- 
-On that note, be on the lookout for Green Slimes,
-which have grown hostile as they evolve to the
-harsh Tonori desert, making them a threat to
-travel and trade.  It is believed many of the
-pirates attempted to cross the Snake Desert,
-where they met the Green Slimes...and their
-end.
- 
-In other news, Andra, a friend of Hinnak, has
-increased her agricultural knowledge and needs
-help keeping the soil around the farm fertile.
-Interested volunteers should speak with her
-about how to help.
- 
-Last, but certainly not least, Agostine has
-returned to Nivalis.  While he enjoyed his
-time in Tulimshar, mingling with other artisans,
-he has missed his home in Kaizei.  "I made this
-fabulous sweater, but nobody wanted to wear it
-in this hot and smelly desert.  That is when I
-decided enough was enough.  Sweat is just gross."
- 
-##2~ The Hurnscald Herald ~##0
- 
-##3May 2011##0
- 
-Many battle hardened warriors took some time
-during April and enjoyed helping the somewhat
-forgetful Easter Bunny make his baskets. The
-children surely must have enjoyed their sweets.
- 
-The demi-god Golbenez has finally made good on
-his promise to open a 'place of leisure' in
-the form of an inn. Youngsters beware, since
-the entrance to this inn is near the old
-graveyard and could be dangerous.
- 
-There have also been reports about a mysterious
-stranger roaming the beaches near Tulimshar.
-Be on the lookout if you are in the area.
- 
-##2~ The Hurnscald Herald ~##0
- 
-##3January 2011##0
- 
-Reports of bandit raids to the west of
-Hurnscald has mobilized the town.  Those
-injured by these bandits may have a long stay
-ahead of them in Hurnscald's hospital.
- 
-Shortly after Tulimshar loosened the tariff
-on travel, skill trainers have come to Mana.
-If one wants to improve themselves through
-acquiring skills, be on the lookout for these
-trainers.
- 
-In other news, Taro is still missing, but
-Diryn, an agent of Tulimshar, has established
-a connection with the Kaizei area, making
-travel to Nivalis possible again.  He still
-assists the battle hardened travel distant
-locations just outside of Hurnscald.  Getting
-back can be done by finding Frozenbeard, a
-pioneer who is mapping a trade route to get
-to Nivalis by ship.
- 
-Diryn's re-connection with Nivalis came none
-too soon.  Golbenez, a demi-god who demanded
-a half billion gold pieces for building some
-sort of leisure place, scrapped the idea and
-went for good old fashioned kidnapping to get
-whatever he wanted from the world of Mana.
-He kidnapped Santa Claus.  Fearful Santa may
- not gift the children of the world, wizards,
-warriors and archers rallied to pay the
-demi-god his demands.
- 
-Shortly after Santa was freed, something more
-sinister has come to Kaizei.  The yeti.
-Sightings of this beast returns with stories
-of them.  Though aggressive, their behavior
-seems out of place.  They've never been known
-as cave dwellers nor to kidnap people.
- 
-Last, but definitely not least, Dimond's Cove
-is observing "Burns' Supper" January 24-26th.
-Shanon is hosting the event, which he promises
-will be an excellent time for food, drink and
-poems.
- 
-##2~ The Hurnscald Herald ~##0
- 
-##3Countless candy-concerning complaints: council##0
-##3consequently considers citizen-composed cleanup crew##0
-##3Eighteenth of November 2010##0
- 
-Recently, the ancient tradition of Hallowe'en
-was celebrated across Argaes, Tonori and other
-continents. Estimated tons of sweets were given
-out to happy trick-or-treaters, and as with
-most other years a lot of this vast total was
-dropped on the night. Even a week and a half
-after Hallowe'en, many kilograms of sweets
-still litter our pleasant woodlands.
- 
-After dozens of letters regarding the situation,
-the Hurnscald Council has said that the best
-solution would be to organise a team of
-volunteers to work on collecting dropped sweets
-and disposing of them - but it has yet to
-organise any such thing.
- 
-In the meantime, why not do your bit and collect
-some sweets for yourself? If you don't mind them
-being a bit old, you could be able to make the
-biggest Hallowe'en haul in history.
- 
-Additionally, we've been getting some reports of
-a rather creepy skeleton hanging around the
-woodland. He doesn't appear to be aggressive,
-but he chatters unintelligibly at passers-by.
- 
-
-##3Rollback##0
-2010-11-17
- 
-Everything should now be running from a
-complete save state (including storage, banks,
-parties etc) that is even two days more recent
-than what we were temporarilyrunning on before.
-All credit to Platyna for speedy recovery and
-even more recent backups. :)
- 
-##3Server outage##0
-2010-11-16
- 
-Things running on the four day old backups,
-restricted to account save info and character
-save info for now while we try to get other
-databases working.
- 
-This means no party data or storage data for
-now, we'll try to recover that along with
-everything else, as we should be able to get
-a full saved state from within the past week.
- 
-The current setup is more to have something
-partially up, and so that people know what's
-going on while we try to fix things; any
-in-game progress made right now ##1will not##0
-persist.
- 
-##3Server outage##0
-2010-11-16
- 
-Okay, apparently even that won't work right now.
-Servers will remain ##3offline##0 until we figure out
-what we can do.
- 
-##3Server outage##0
-2010-11-16
- 
-We've just had a serious server crash, and the
-databases seem to have been affected here. We're
-currently running on some four-day old backups;
-whether this will be a temporary measure or
-whether newer ones are usable is yet to be
-determined.
- 
-Please note that the current state may only
-be ##3temporary##0, and that if usable newer backups
-are found within the next 24 hours, those will
-be used instead, and any character progress
-made may be lost. If no usable backups are
-found during this time, the four-day rollback
-will have to be permanent.
- 
-More news updates will follow once we've
-investigated further; we're doing what we can...
- 
--##2Freeyorp##0
- 
  
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index 38851e5f..6aaae042 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -19,8 +19,8 @@
 001-1.gat,132,38,11,12|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
 001-1.gat,77,49,17,13|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
 001-1.gat,21,74,6,18|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
-001-1.gat,122,59,17,22|monster|Giant Maggot|1006,1,100000,30000,Mob001-1::On1006
-001-1.gat,137,25,15,7|monster|Fire Goblin|1011,1,61000,60000,Mob001-1::On1011
+001-1.gat,122,59,17,22|monster|GiantMaggot|1006,1,100000,30000,Mob001-1::On1006
+001-1.gat,137,25,15,7|monster|FireGoblin|1011,1,61000,60000,Mob001-1::On1011
 
 
 001-1.gat,0,0,0|script|Mob001-1|-1,{
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 16a8ae05..feea41c1 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -10,11 +10,11 @@
 002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,61,74,41,43|monster|Fire Goblin|1011,15,100000,30000,Mob002-1::On1011
+002-1.gat,61,74,41,43|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
 002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,27,82,22,43|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,95,75,15,17|monster|Black Scorpion|1009,1,100000,1800000,Mob002-1::On1009
+002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000,1800000,Mob002-1::On1009
 
 
 002-1.gat,0,0,0|script|Mob002-1|-1,{
diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index c3f36dda..dbd06f59 100644
--- a/world/map/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
@@ -1,20 +1,20 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Desert Mines mobs
 
-002-3.gat,39,37,15,11|monster|Cave Maggot|1056,5,100000,30000,Mob002-3::On1056
-002-3.gat,91,41,17,20|monster|Ice Goblin|1058,3,100000,30000,Mob002-3::On1058
-002-3.gat,71,35,25,17|monster|Cave Maggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,69,100,8,5|monster|Ice Goblin|1058,2,100000,30000,Mob002-3::On1058
-002-3.gat,68,57,26,24|monster|Angry Scorpion|1057,5,100000,30000,Mob002-3::On1057
-002-3.gat,49,58,4,15|monster|Angry Scorpion|1057,5,100000,30000,Mob002-3::On1057
-002-3.gat,38,76,15,22|monster|Angry Scorpion|1057,4,100000,30000,Mob002-3::On1057
-002-3.gat,58,78,6,17|monster|Cave Maggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,89,68,11,32|monster|Angry Scorpion|1057,4,100000,30000,Mob002-3::On1057
-002-3.gat,84,93,19,17|monster|Cave Maggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,72,77,21,14|monster|Ice Goblin|1058,3,100000,30000,Mob002-3::On1058
-002-3.gat,67,91,11,12|monster|Angry Scorpion|1057,4,100000,30000,Mob002-3::On1057
-002-3.gat,58,95,6,13|monster|Cave Maggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,63,100,2,5|monster|Angry Scorpion|1057,3,100000,30000,Mob002-3::On1057
+002-3.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000,30000,Mob002-3::On1056
+002-3.gat,91,41,17,20|monster|IceGoblin|1058,3,100000,30000,Mob002-3::On1058
+002-3.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,69,100,8,5|monster|IceGoblin|1058,2,100000,30000,Mob002-3::On1058
+002-3.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000,30000,Mob002-3::On1057
+002-3.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000,30000,Mob002-3::On1057
+002-3.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057
+002-3.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057
+002-3.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,72,77,21,14|monster|IceGoblin|1058,3,100000,30000,Mob002-3::On1058
+002-3.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057
+002-3.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-3::On1057
 
 
 002-3.gat,0,0,0|script|Mob002-3|-1,{
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index ff19bf7d..0f275e9f 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -1,23 +1,23 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Deep Desert Mines mobs
 
-002-4.gat,37,89,12,7|monster|Ice Goblin|1058,3,100000,30000,Mob002-4::On1058
-002-4.gat,33,76,3,11|monster|Cave Maggot|1056,3,100000,30000,Mob002-4::On1056
-002-4.gat,40,68,7,5|monster|Angry Scorpion|1057,3,100000,30000,Mob002-4::On1057
+002-4.gat,37,89,12,7|monster|IceGoblin|1058,3,100000,30000,Mob002-4::On1058
+002-4.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000,30000,Mob002-4::On1056
+002-4.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-4::On1057
 002-4.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-4::On1060
-002-4.gat,62,71,3,7|monster|Ice Goblin|1058,3,100000,30000,Mob002-4::On1058
+002-4.gat,62,71,3,7|monster|IceGoblin|1058,3,100000,30000,Mob002-4::On1058
 002-4.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,68,100,12,2|monster|Yellow Slime|1007,4,100000,30000,Mob002-4::On1007
+002-4.gat,68,100,12,2|monster|YellowSlime|1007,4,100000,30000,Mob002-4::On1007
 002-4.gat,92,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
 002-4.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
 002-4.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-4::On1060
 002-4.gat,94,71,2,6|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,91,64,8,2|monster|Yellow Slime|1007,1,100000,30000,Mob002-4::On1007
+002-4.gat,91,64,8,2|monster|YellowSlime|1007,1,100000,30000,Mob002-4::On1007
 002-4.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
 002-4.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
 002-4.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
 002-4.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,93,39,8,2|monster|Yellow Slime|1007,2,100000,30000,Mob002-4::On1007
+002-4.gat,93,39,8,2|monster|YellowSlime|1007,2,100000,30000,Mob002-4::On1007
 
 
 002-4.gat,0,0,0|script|Mob002-4|-1,{
diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
index 0120bde8..4bbca634 100644
--- a/world/map/npc/003-1/_mobs.txt
+++ b/world/map/npc/003-1/_mobs.txt
@@ -1,12 +1,12 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Beach mobs
 
-003-1.gat,158,68,28,96|monster|Giant Maggot|1006,10,100000,30000,Mob003-1::On1006
-003-1.gat,0,0,0,0|monster|Sea Slime|1033,15,100000,30000,Mob003-1::On1033
-003-1.gat,120,31,22,22|monster|Sea Slime|1033,5,100000,30000,Mob003-1::On1033
-003-1.gat,119,68,105,101|monster|Green Slime|1005,35,100000,30000,Mob003-1::On1005
-003-1.gat,134,69,76,71|monster|Red Scorpion|1004,20,100000,30000,Mob003-1::On1004
-003-1.gat,35,25,10,3|monster|Mountain Snake|1026,1,700000,600000,Mob003-1::On1026
+003-1.gat,158,68,28,96|monster|GiantMaggot|1006,10,100000,30000,Mob003-1::On1006
+003-1.gat,0,0,0,0|monster|SeaSlime|1033,15,100000,30000,Mob003-1::On1033
+003-1.gat,120,31,22,22|monster|SeaSlime|1033,5,100000,30000,Mob003-1::On1033
+003-1.gat,119,68,105,101|monster|GreenSlime|1005,35,100000,30000,Mob003-1::On1005
+003-1.gat,134,69,76,71|monster|RedScorpion|1004,20,100000,30000,Mob003-1::On1004
+003-1.gat,35,25,10,3|monster|MountainSnake|1026,1,700000,600000,Mob003-1::On1026
 
 
 003-1.gat,0,0,0|script|Mob003-1|-1,{
diff --git a/world/map/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt
index 874fd792..e64585d8 100644
--- a/world/map/npc/004-1/_mobs.txt
+++ b/world/map/npc/004-1/_mobs.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Beach mobs
 
-004-1.gat,39,57,8,29|monster|Sea Slime|1033,5,100000,30000,Mob004-1::On1033
-004-1.gat,33,83,9,40|monster|Sea Slime|1033,11,100000,30000,Mob004-1::On1033
-004-1.gat,28,103,11,14|monster|Sea Slime|1033,7,100000,30000,Mob004-1::On1033
-004-1.gat,71,104,27,20|monster|Giant Maggot|1006,5,100000,30000,Mob004-1::On1006
-004-1.gat,76,68,21,49|monster|Red Scorpion|1004,13,100000,30000,Mob004-1::On1004
-004-1.gat,68,25,19,10|monster|Giant Maggot|1006,2,100000,30000,Mob004-1::On1006
-004-1.gat,93,27,2,3|monster|Black Scorpion|1009,1,120000,60000,Mob004-1::On1009
+004-1.gat,39,57,8,29|monster|SeaSlime|1033,5,100000,30000,Mob004-1::On1033
+004-1.gat,33,83,9,40|monster|SeaSlime|1033,11,100000,30000,Mob004-1::On1033
+004-1.gat,28,103,11,14|monster|SeaSlime|1033,7,100000,30000,Mob004-1::On1033
+004-1.gat,71,104,27,20|monster|GiantMaggot|1006,5,100000,30000,Mob004-1::On1006
+004-1.gat,76,68,21,49|monster|RedScorpion|1004,13,100000,30000,Mob004-1::On1004
+004-1.gat,68,25,19,10|monster|GiantMaggot|1006,2,100000,30000,Mob004-1::On1006
+004-1.gat,93,27,2,3|monster|BlackScorpion|1009,1,120000,60000,Mob004-1::On1009
 
 
 004-1.gat,0,0,0|script|Mob004-1|-1,{
diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
index 0244b5a5..7e6d30f5 100644
--- a/world/map/npc/005-1/_mobs.txt
+++ b/world/map/npc/005-1/_mobs.txt
@@ -5,11 +5,11 @@
 005-1.gat,0,0,0,0|monster|Snake|1010,1,100000,30000,Mob005-1::On1010
 005-1.gat,71,77,9,6|monster|Snake|1010,2,40000,50000,Mob005-1::On1010
 005-1.gat,92,25,8,5|monster|Snake|1010,3,40000,50000,Mob005-1::On1010
-005-1.gat,98,54,95,52|monster|Giant Maggot|1006,20,100000,30000,Mob005-1::On1006
-005-1.gat,91,18,66,23|monster|Black Scorpion|1009,7,100000,30000,Mob005-1::On1009
-005-1.gat,99,87,85,32|monster|Black Scorpion|1009,8,100000,30000,Mob005-1::On1009
-005-1.gat,30,42,20,23|monster|Green Slime|1005,3,100000,30000,Mob005-1::On1005
-005-1.gat,118,70,3,2|monster|Green Slime|1005,2,100000,30000,Mob005-1::On1005
+005-1.gat,98,54,95,52|monster|GiantMaggot|1006,20,100000,30000,Mob005-1::On1006
+005-1.gat,91,18,66,23|monster|BlackScorpion|1009,7,100000,30000,Mob005-1::On1009
+005-1.gat,99,87,85,32|monster|BlackScorpion|1009,8,100000,30000,Mob005-1::On1009
+005-1.gat,30,42,20,23|monster|GreenSlime|1005,3,100000,30000,Mob005-1::On1005
+005-1.gat,118,70,3,2|monster|GreenSlime|1005,2,100000,30000,Mob005-1::On1005
 005-1.gat,163,71,32,65|monster|Snake|1010,8,100000,30000,Mob005-1::On1010
 005-1.gat,96,49,103,48|monster|Maggot|1002,20,100000,30000,Mob005-1::On1002
 
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index d251f37b..386ed695 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -3,18 +3,18 @@
 
 006-1.gat,25,34,12,31|monster|Snake|1010,3,100000,30000,Mob006-1::On1010
 006-1.gat,36,29,9,16|monster|Snake|1010,1,100000,30000,Mob006-1::On1010
-006-1.gat,34,41,4,6|monster|Mountain Snake|1026,1,30000,75000,Mob006-1::On1026
-006-1.gat,55,37,27,23|monster|Mountain Snake|1026,3,150000,10000,Mob006-1::On1026
-006-1.gat,89,26,33,13|monster|Mountain Snake|1026,5,15000,75000,Mob006-1::On1026
-006-1.gat,118,43,22,40|monster|Mountain Snake|1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,115,49,6,3|monster|Mountain Snake|1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,88,47,36,11|monster|Mountain Snake|1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,105,72,25,16|monster|Mountain Snake|1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,75,106,16,22|monster|Mountain Snake|1026,4,15000,75000,Mob006-1::On1026
-006-1.gat,102,97,36,29|monster|Mountain Snake|1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,65,65,49,30|monster|Mountain Snake|1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,95,120,38,13|monster|Mountain Snake|1026,5,15000,75000,Mob006-1::On1026
-006-1.gat,54,120,29,7|monster|Mountain Snake|1026,4,15000,75000,Mob006-1::On1026
+006-1.gat,34,41,4,6|monster|MountainSnake|1026,1,30000,75000,Mob006-1::On1026
+006-1.gat,55,37,27,23|monster|MountainSnake|1026,3,150000,10000,Mob006-1::On1026
+006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000,75000,Mob006-1::On1026
+006-1.gat,118,43,22,40|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026
+006-1.gat,115,49,6,3|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026
+006-1.gat,88,47,36,11|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026
+006-1.gat,105,72,25,16|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026
+006-1.gat,75,106,16,22|monster|MountainSnake|1026,4,15000,75000,Mob006-1::On1026
+006-1.gat,102,97,36,29|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026
+006-1.gat,65,65,49,30|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026
+006-1.gat,95,120,38,13|monster|MountainSnake|1026,5,15000,75000,Mob006-1::On1026
+006-1.gat,54,120,29,7|monster|MountainSnake|1026,4,15000,75000,Mob006-1::On1026
 006-1.gat,36,98,33,35|monster|Scorpion|1003,10,100000,30000,Mob006-1::On1003
 
 
diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt
index 30b5427e..84b288ef 100644
--- a/world/map/npc/006-3/_mobs.txt
+++ b/world/map/npc/006-3/_mobs.txt
@@ -1,32 +1,32 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Desert Mountain Cave mobs
 
-006-3.gat,108,25,36,8|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
-006-3.gat,99,50,14,13|monster|Mountain Snake|1026,1,15000,90000,Mob006-3::On1026
-006-3.gat,89,63,14,11|monster|Mountain Snake|1026,2,15000,90000,Mob006-3::On1026
-006-3.gat,86,90,29,9|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
-006-3.gat,109,78,12,9|monster|Mountain Snake|1026,1,15000,90000,Mob006-3::On1026
-006-3.gat,119,117,15,14|monster|Mountain Snake|1026,4,15000,90000,Mob006-3::On1026
-006-3.gat,106,64,14,17|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
-006-3.gat,65,71,31,35|monster|Mountain Snake|1026,10,15000,90000,Mob006-3::On1026
-006-3.gat,57,105,27,30|monster|Mountain Snake|1026,8,15000,90000,Mob006-3::On1026
-006-3.gat,73,120,16,5|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
-006-3.gat,117,54,11,9|monster|Mountain Snake|1026,4,15000,90000,Mob006-3::On1026
-006-3.gat,123,62,10,5|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
-006-3.gat,72,36,24,25|monster|Mountain Snake|1026,10,15000,90000,Mob006-3::On1026
-006-3.gat,84,27,5,7|monster|Mountain Snake|1026,1,15000,90000,Mob006-3::On1026
-006-3.gat,40,40,36,28|monster|Mountain Snake|1026,8,15000,90000,Mob006-3::On1026
-006-3.gat,34,60,27,11|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
-006-3.gat,87,74,26,9|monster|Red Slime|1008,3,15000,10000,Mob006-3::On1008
-006-3.gat,120,76,9,21|monster|Red Slime|1008,3,15000,10000,Mob006-3::On1008
-006-3.gat,101,85,14,8|monster|Red Slimes|1008,4,15000,10000,Mob006-3::On1008
-006-3.gat,44,124,29,7|monster|Mountain Snake|1026,5,15000,90000,Mob006-3::On1026
-006-3.gat,90,125,17,7|monster|Mountain Snake|1026,5,15000,90000,Mob006-3::On1026
-006-3.gat,30,88,13,20|monster|Red Slime|1008,3,90000,30000,Mob006-3::On1008
+006-3.gat,108,25,36,8|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026
+006-3.gat,99,50,14,13|monster|MountainSnake|1026,1,15000,90000,Mob006-3::On1026
+006-3.gat,89,63,14,11|monster|MountainSnake|1026,2,15000,90000,Mob006-3::On1026
+006-3.gat,86,90,29,9|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026
+006-3.gat,109,78,12,9|monster|MountainSnake|1026,1,15000,90000,Mob006-3::On1026
+006-3.gat,119,117,15,14|monster|MountainSnake|1026,4,15000,90000,Mob006-3::On1026
+006-3.gat,106,64,14,17|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026
+006-3.gat,65,71,31,35|monster|MountainSnake|1026,10,15000,90000,Mob006-3::On1026
+006-3.gat,57,105,27,30|monster|MountainSnake|1026,8,15000,90000,Mob006-3::On1026
+006-3.gat,73,120,16,5|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026
+006-3.gat,117,54,11,9|monster|MountainSnake|1026,4,15000,90000,Mob006-3::On1026
+006-3.gat,123,62,10,5|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026
+006-3.gat,72,36,24,25|monster|MountainSnake|1026,10,15000,90000,Mob006-3::On1026
+006-3.gat,84,27,5,7|monster|MountainSnake|1026,1,15000,90000,Mob006-3::On1026
+006-3.gat,40,40,36,28|monster|MountainSnake|1026,8,15000,90000,Mob006-3::On1026
+006-3.gat,34,60,27,11|monster|MountainSnake|1026,3,15000,90000,Mob006-3::On1026
+006-3.gat,87,74,26,9|monster|RedSlime|1008,3,15000,10000,Mob006-3::On1008
+006-3.gat,120,76,9,21|monster|RedSlime|1008,3,15000,10000,Mob006-3::On1008
+006-3.gat,101,85,14,8|monster|RedSlime|1008,4,15000,10000,Mob006-3::On1008
+006-3.gat,44,124,29,7|monster|MountainSnake|1026,5,15000,90000,Mob006-3::On1026
+006-3.gat,90,125,17,7|monster|MountainSnake|1026,5,15000,90000,Mob006-3::On1026
+006-3.gat,30,88,13,20|monster|RedSlime|1008,3,90000,30000,Mob006-3::On1008
 006-3.gat,122,98,10,16|monster|Spider|1012,3,90000,30000,Mob006-3::On1012
 006-3.gat,112,104,7,13|monster|Spider|1012,1,90000,30000,Mob006-3::On1012
 006-3.gat,103,108,9,9|monster|Spider|1012,1,90000,30000,Mob006-3::On1012
-006-3.gat,83,107,13,14|monster|Yellow slime|1007,6,90000,30000,Mob006-3::On1007
+006-3.gat,83,107,13,14|monster|YellowSlime|1007,6,90000,30000,Mob006-3::On1007
 
 
 006-3.gat,0,0,0|script|Mob006-3|-1,{
diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt
index 64e64fd6..4e1d7488 100644
--- a/world/map/npc/007-1/_mobs.txt
+++ b/world/map/npc/007-1/_mobs.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland mobs
 
-007-1.gat,0,0,0,0|monster|Pink Flower|1014,17,100000,30000,Mob007-1::On1014
-007-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,15,100000,30000,Mob007-1::On1019
+007-1.gat,0,0,0,0|monster|PinkFlower|1014,17,100000,30000,Mob007-1::On1014
+007-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,100000,30000,Mob007-1::On1019
 007-1.gat,0,0,0,0|monster|Snail|1041,25,100000,30000,Mob007-1::On1041
-007-1.gat,0,0,0,0|monster|Mauve Herb|1029,3,270000,180000,Mob007-1::On1029
-007-1.gat,0,0,0,0|monster|Gamboge|1031,1,2700000,1800000,Mob007-1::On1031
+007-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000,180000,Mob007-1::On1029
+007-1.gat,0,0,0,0|monster|GambogePlant|1031,1,2700000,1800000,Mob007-1::On1031
 007-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob007-1::On1035
-007-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob007-1::On1037
+007-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob007-1::On1037
 007-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob007-1::On1038
 007-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob007-1::On1055
 
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index 7361a1bf..19468e6b 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -4,8 +4,8 @@ map: 008-1.gat
 npc: npc/008-1/_mobs.txt
 npc: npc/008-1/_warps.txt
 npc: npc/008-1/andra.txt
+npc: npc/008-1/annualeaster.txt
 npc: npc/008-1/diryn.txt
 npc: npc/008-1/dock.txt
 npc: npc/008-1/george.txt
 npc: npc/008-1/hinnak.txt
-npc: npc/008-1/annualeaster.txt
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 579027c5..433f4ee4 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hurnscald Outskirts mobs
 
-008-1.gat,0,0,0,0|monster|Pink Flower|1014,10,20,0,Mob008-1::On1014
+008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20,0,Mob008-1::On1014
 008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20,0,Mob008-1::On1018
-008-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,18,20,0,Mob008-1::On1019
+008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20,0,Mob008-1::On1019
 008-1.gat,0,0,0,0|monster|Snail|1041,5,30,0,Mob008-1::On1041
-008-1.gat,0,0,0,0|monster|Mauve Herb|1029,2,270000,180000,Mob008-1::On1029
+008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000,180000,Mob008-1::On1029
 008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob008-1::On1035
-008-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob008-1::On1037
+008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob008-1::On1037
 008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30,20,Mob008-1::On1038
 008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob008-1::On1055
 
diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index 1a9cae57..f3cac242 100644
--- a/world/map/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hurnscald mobs
 
-009-1.gat,74,32,2,1|monster|Clover Patch|1037,1,100000,120000,Mob009-1::On1037
-009-1.gat,29,44,9,13|monster|Pink Flower|1014,2,0,250,Mob009-1::On1014
+009-1.gat,74,32,2,1|monster|CloverPatch|1037,1,100000,120000,Mob009-1::On1037
+009-1.gat,29,44,9,13|monster|PinkFlower|1014,2,0,250,Mob009-1::On1014
 009-1.gat,88,51,15,4|monster|Squirrel|1038,2,0,5000,Mob009-1::On1038
 009-1.gat,80,38,5,5|monster|Squirrel|1038,1,0,5000,Mob009-1::On1038
 009-1.gat,0,0,0,0|monster|Butterfly|1055,5,30,20,Mob009-1::On1055
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 2a48b62a..aa3760dc 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hurnscald Cave mobs
 
-009-3.gat,0,0,0,0|monster|Yellow Slime|1007,20,0,0,Mob009-3::On1007
-009-3.gat,0,0,0,0|monster|Black Scorpion|1009,25,0,0,Mob009-3::On1009
-009-3.gat,0,0,0,0|monster|Red Slime|1008,35,0,0,Mob009-3::On1008
+009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0,0,Mob009-3::On1007
+009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0,0,Mob009-3::On1009
+009-3.gat,0,0,0,0|monster|RedSlime|1008,35,0,0,Mob009-3::On1008
 
 
 009-3.gat,0,0,0|script|Mob009-3|-1,{
diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index fdbd4472..fcae92f7 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -2,8 +2,8 @@
 // Orum Caves mobs
 
 009-4.gat,117,97,24,15|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
-009-4.gat,115,98,24,15|monster|Cave Snake|1021,5,20000,14000,Mob009-4::On1021
-009-4.gat,103,28,24,15|monster|Cave Snake|1021,3,20000,14000,Mob009-4::On1021
+009-4.gat,115,98,24,15|monster|CaveSnake|1021,5,20000,14000,Mob009-4::On1021
+009-4.gat,103,28,24,15|monster|CaveSnake|1021,3,20000,14000,Mob009-4::On1021
 009-4.gat,106,27,24,15|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
 009-4.gat,119,45,12,10|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
 009-4.gat,72,130,24,15|monster|Maggot|1002,3,20000,14000,Mob009-4::On1002
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 9bc486d9..78635c54 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -15,11 +15,11 @@ L_Error:
 function|script|SetBarrierColor|{
     if (@Barrier < 0 || @Barrier > 2)
         goto L_Error;
-    if (@Color < 0 || @Color > 12)
+    if (@BarrierColor <= 0 || @BarrierColor > 12)
         goto L_Error2;
 
     set @Mask, (15 << (4 * @Barrier));
-    set OrumQuestBarrier, (OrumQuestBarrier & (~(@Mask))) | @Color << (4 * @Barrier);
+    set OrumQuestBarrier, (OrumQuestBarrier & (~(@Mask))) | @BarrierColor << (4 * @Barrier);
     return;
 
 L_Error:
diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index c7c6eb55..8ee21c7c 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -210,62 +210,36 @@ L_Setup_Lair:
     set OrumQuest, 2;
 
     // Second Barrier
-    set @temp, rand(1,6);
-    set @Color, 1;
-    if (@temp == 1 || @temp == 4)
-        set @Color, 1;
-    if (@temp == 2 || @temp == 5)
-        set @Color, 5;
-    if (@temp == 3 || @temp == 6)
-        set @Color, 9;
+    set @BarrierColor, 1 + rand(3) * 4;
     set @Barrier, 0;
-    callfunc("SetBarrierColor");
+    callfunc "SetBarrierColor";
+
+    set @TorchIntensity, 0;
 
     set @Torch, 0;
-    set @Color, rand(1, 12);
-    set @Intensity, 0;
-    callfunc("SetTorchColor");
-    callfunc("SetTorchIntensity");
+    set @TorchColor, rand(1, 12);
+    callfunc "SetTorchColor";
+    callfunc "SetTorchIntensity";
 
     // Third Barrier
-    set @temp, rand(1,6);
-    set @Color, 3;
-    if (@temp == 1 || @temp == 4)
-        set @Color, 3;
-    if (@temp == 2 || @temp == 5)
-        set @Color, 7;
-    if (@temp == 3 || @temp == 6)
-        set @Color, 11;
+    set @BarrierColor, 3 + rand(3) * 4;
     set @Barrier, 1;
-    callfunc("SetBarrierColor");
+    callfunc "SetBarrierColor";
 
     set @Torch, 1;
-    set @Color, rand(1, 12);
-    callfunc("SetTorchColor");
-    callfunc("SetTorchIntensity");
+    set @TorchColor, rand(1, 12);
+    callfunc "SetTorchColor";
+    callfunc "SetTorchIntensity";
 
     // End Barrier
-    set @temp, rand(1,12);
-    set @Color, 2;
-    if (@temp == 1 || @temp == 7)
-        set @Color, 2;
-    if (@temp == 2 || @temp == 8)
-        set @Color, 4;
-    if (@temp == 3 || @temp == 9)
-        set @Color, 6;
-    if (@temp == 4 || @temp == 10)
-        set @Color, 8;
-    if (@temp == 5 || @temp == 11)
-        set @Color, 10;
-    if (@temp == 6 || @temp == 12)
-        set @Color, 12;
+    set @BarrierColor, 2 + rand(6) * 2;
     set @Barrier, 2;
-    callfunc("SetBarrierColor");
+    callfunc "SetBarrierColor";
 
     set @Torch, 2;
-    set @Color, rand(1, 12);
-    callfunc("SetTorchColor");
-    callfunc("SetTorchIntensity");
+    set @TorchColor, rand(1, 12);
+    callfunc "SetTorchColor";
+    callfunc "SetTorchIntensity";
     goto L_Close;
 
 L_Use_First_Barrier:
@@ -577,10 +551,9 @@ L_Close:
 
     set @EXP_BREAK_BARRIERS, 0;
 
-    set @temp, 0;
-    set @Color, 0;
     set @Barrier, 0;
+    set @BarrierColor, 0;
     set @Torch, 0;
-    set @Intensity, 0;
+    set @TorchColor, 0;
     close;
 }
diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt
index be8ae0e7..858e0ea0 100644
--- a/world/map/npc/009-4/orum_warps.txt
+++ b/world/map/npc/009-4/orum_warps.txt
@@ -1,4 +1,4 @@
-009-3.gat,162,113,0|script|#OrumQuestEnter|0,0,0,{
+009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0,{
     if (OrumQuest >= 12) goto L_Second_Entrance;
     warp "009-4.gat", 37, 113;
     close;
@@ -7,7 +7,7 @@ L_Second_Entrance:
     warp "009-4.gat", 72, 126;
     close;
 }
-009-4.gat,36,26,0|script|#LairExit|0,0,0,{
+009-4.gat,36,26,0|script|#LairExit|45,0,0,{
     if (OrumQuest >= 12) goto L_Second_Entrance;
     warp "009-4.gat", 37, 122;
     close;
@@ -17,7 +17,7 @@ L_Second_Entrance:
     close;
 }
 
-009-4.gat,51,47,0|script|#CavernEnter|0,0,0,{
+009-4.gat,51,47,0|script|#CavernEnter|45,0,0,{
     if (OrumQuest >= 14) goto L_Second_Cavern;
     if (OrumQuest < 12) goto L_See_Orum;
     warp "009-4.gat", 103, 23;
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 842183b1..86dd95fe 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -15,10 +15,10 @@ L_Error:
 
 function|script|SetTorchColor|{
     if (@Torch < 0 || @Torch > 2) goto L_Error;
-    if (@Color < 1 || @Color > 12) goto L_Error2;
+    if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2;
 
     set @Mask, (15 << (4 * @Torch));
-    set OrumQuestTorch, (OrumQuestTorch & (~(@Mask))) | @Color << (4 * @Torch);
+    set OrumQuestTorch, (OrumQuestTorch & (~(@Mask))) | @TorchColor << (4 * @Torch);
     return;
 
 L_Error:
@@ -45,10 +45,10 @@ L_Error:
 
 function|script|SetTorchIntensity|{
     if (@Torch < 0 || @Torch > 2) goto L_Error;
-    if (@Intensity < 0 || @Intensity > 2) goto L_Error2;
+    if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2;
 
     set @Mask, (15 << (4 * (@Torch + 3)));
-    set OrumQuestTorch, (OrumQuestTorch & (~(@Mask))) | @Intensity << (4 * (@Torch + 3));
+    set OrumQuestTorch, (OrumQuestTorch & (~(@Mask))) | @TorchIntensity << (4 * (@Torch + 3));
     return;
 
 L_Error:
@@ -99,23 +99,23 @@ function|script|InRangeTorch3|{
     close;
 }
 
-// First Torch
-009-4.gat,68,21,0|script|Torch|400,{
-    callfunc "InRangeTorch1";
-    callfunc "DoneWithTorches";
-
-    set @Torch, 0;
-    callfunc("GetTorchColor");
-    callfunc("GetTorchIntensity");
-
-    set @lastColor, @TorchColor;
-    setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
-    setarray @intensities$,"calm","bright","blinding";
+function|script|TorchLoop|{
+    // Variables used here:
+    // @Torch - pass before calling
+    // @TorchColor - initialized here, updated throughout
+    // @TorchIntensity - initialized here, updated throughout
+    callfunc "GetTorchColor";
+    callfunc "GetTorchIntensity";
+
+    setarray @colors$, "transparent",
+        "red", "dark orange", "orange", "light orange",
+        "yellow", "light green", "green", "dark green",
+        "blue", "dark purple", "purple", "light purple";
+    setarray @intensities$, "calm", "bright", "blinding";
     mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + " tint to it.";
     goto L_Color_Loop;
 
 L_Color_Loop:
-    callfunc("GetTorchColor");
     menu
         "Add Red Powder", L_Use_Red,
         "Add Yellow Powder", L_Use_Yellow,
@@ -127,66 +127,123 @@ L_Color_Loop:
 L_Use_Red:
     if (countitem("RedPowder") < 1)
         goto L_No_Powder;
-    if (@TorchColor > 6 && @TorchColor < 12)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor < 6 && @TorchColor > 1)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor == 12)
-        set @Color, 1;
-    if (@TorchColor == 0)
-        set @Color, 1;
-    callfunc("SetTorchColor");
     delitem "RedPowder", 1;
+
+    // 0 1 2 3 4 5 6 7 8 9 a b c
+    // T R   o   Y   g   B   p
+    //   ^ < < < < , X . > > > >
+    if (@TorchColor == 1)
+        goto L_Wrong_Color;
+    if (2 <= @TorchColor && @TorchColor <= 5)
+        goto L_Color_Dec;
+    if (@TorchColor == 6)
+        goto L_Color_Dec_Wrong;
+    if (@TorchColor == 7)
+        goto L_Wrong_Color;
+    if (@TorchColor == 8)
+        goto L_Color_Inc_Wrong;
+    if (9 <= @TorchColor && @TorchColor <= 12)
+        goto L_Color_Inc;
+
+    // work around an old bug
+    if (@TorchColor == 0)
+        set @TorchColor, 1;
     goto L_Show_Color;
 
 L_Use_Yellow:
     if (countitem("YellowPowder") < 1)
         goto L_No_Powder;
-    if (@TorchColor < 10 && @TorchColor > 5)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor >= 1 && @TorchColor < 5)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor == 0)
-        set @Color, 5;
-    callfunc("SetTorchColor");
     delitem "YellowPowder", 1;
+
+    // 0 1 2 3 4 5 6 7 8 9 a b c
+    // T R   o   Y   g   B   p
+    //   > > > > ^ < < < < , X .
+    if (1 <= @TorchColor && @TorchColor <= 4)
+        goto L_Color_Inc;
+    if (@TorchColor == 5)
+        goto L_Wrong_Color;
+    if (6 <= @TorchColor && @TorchColor <= 9)
+        goto L_Color_Dec;
+    if (@TorchColor == 10)
+        goto L_Color_Dec_Wrong;
+    if (@TorchColor == 11)
+        goto L_Wrong_Color;
+    if (@TorchColor == 12)
+        goto L_Color_Inc_Wrong;
+
+    // work around an old bug
+    if (@TorchColor == 0)
+        set @TorchColor, 5;
     goto L_Show_Color;
 
 L_Use_Blue:
     if (countitem("BluePowder") < 1)
         goto L_No_Powder;
-    if (@TorchColor > 4 && @TorchColor < 9)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor <= 12 && @TorchColor > 9)
-        set @Color, @TorchColor - 1;
+    delitem "BluePowder", 1;
+
+    // 0 1 2 3 4 5 6 7 8 9 a b c
+    // T R   o   Y   g   B   p
+    //   < , X . > > > > ^ < < <
     if (@TorchColor == 1)
-        set @Color, 12;
+        goto L_Color_Dec;
+    if (@TorchColor == 2)
+        goto L_Color_Dec_Wrong;
+    if (@TorchColor == 3)
+        goto L_Wrong_Color;
+    if (@TorchColor == 4)
+        goto L_Color_Inc_Wrong;
+    if (5 <= @TorchColor && @TorchColor <= 8)
+        goto L_Color_Inc;
+    if (@TorchColor == 9)
+        goto L_WrongColor;
+    if (10 <= @TorchColor && @TorchColor <= 12)
+        goto L_Color_Dec;
+
+    // work around an old bug
     if (@TorchColor == 0)
-        set @Color, 9;
-    callfunc("SetTorchColor");
-    delitem "BluePowder", 1;
+        set @TorchColor, 9;
     goto L_Show_Color;
 
 L_No_Powder:
     mes "You notice you're all out of that color of powder. Perhaps Orum can make you some more.";
     close;
 
+L_Color_Dec:
+    set @TorchColor, @TorchColor - 1;
+    if (@TorchColor == 0)
+        set @TorchColor, 12;
+    goto L_Show_Color;
+
+L_Color_Dec_Wrong:
+    set @TorchColor, @TorchColor - 1;
+    if (@TorchColor == 0)
+        set @TorchColor, 12;
+    goto L_Wrong_Color;
+
+L_Color_Inc_Wrong:
+    set @TorchColor, @TorchColor + 1;
+    if (@TorchColor == 13)
+        set @TorchColor, 1;
+    goto L_Wrong_Color;
+
+L_Color_Inc:
+    set @TorchColor, @TorchColor + 1;
+    if (@TorchColor == 13)
+        set @TorchColor, 1;
+    goto L_Show_Color;
+
 L_Show_Color:
-    callfunc("GetTorchColor");
-    callfunc("GetTorchIntensity");
-    if (@TorchColor == @lastColor)
-        goto L_Wrong_Color;
+    callfunc "SetTorchColor";
     misceffect 5;
-    set @lastColor, @TorchColor;
     mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
     goto L_Color_Loop;
 
 L_Wrong_Color:
-    set @Intensity, @TorchIntensity + 1;
-    if (@Intensity > 2)
+    callfunc "SetTorchColor";
+    set @TorchIntensity, @TorchIntensity + 1;
+    if (@TorchIntensity > 2)
         goto L_Failed;
-    callfunc("SetTorchIntensity");
-    callfunc("GetTorchIntensity");
+    callfunc "SetTorchIntensity";
     misceffect 5;
     mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
     goto L_Color_Loop;
@@ -195,210 +252,38 @@ L_Failed:
     mes "As you pour the powder into the flame it flares violently before bursting into your face!";
     misceffect 5;
     misceffect 16;
-    set @Intensity, 0;
-    callfunc("SetTorchIntensity");
+    set @TorchIntensity, 0;
+    callfunc "SetTorchIntensity";
     heal -Hp, 0;
     close;
 }
 
+// First Torch
+009-4.gat,68,21,0|script|Torch|400,{
+    callfunc "InRangeTorch1";
+    callfunc "DoneWithTorches";
+
+    set @Torch, 0;
+    callfunc "TorchLoop";
+    // unreachable
+}
+
 // Second Torch
 009-4.gat,67,42,0|script|Torch|400,{
     callfunc "InRangeTorch2";
     callfunc "DoneWithTorches";
 
     set @Torch, 1;
-    callfunc("GetTorchColor");
-    callfunc("GetTorchIntensity");
-
-    set @lastColor, @TorchColor;
-    setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
-    mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + " tint to it.";
-    goto L_Color_Loop;
-
-L_Color_Loop:
-    callfunc("GetTorchColor");
-    menu
-        "Add Red Powder", L_Use_Red,
-        "Add Yellow Powder", L_Use_Yellow,
-        "Add Blue Powder", L_Use_Blue,
-        "Leave it alone.", -;
-    mes "The flame flickers as if it's laughing at you.";
-    close;
-
-L_Use_Red:
-    if (countitem("RedPowder") < 1)
-        goto L_No_Powder;
-    if (@TorchColor > 6 && @TorchColor < 12)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor < 6 && @TorchColor > 1)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor == 12)
-        set @Color, 1;
-    if (@TorchColor == 0)
-        set @Color, 1;
-    callfunc("SetTorchColor");
-    delitem "RedPowder", 1;
-    goto L_Show_Color;
-
-L_Use_Yellow:
-    if (countitem("YellowPowder") < 1)
-        goto L_No_Powder;
-    if (@TorchColor < 10 && @TorchColor > 5)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor >= 1 && @TorchColor < 5)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor == 0)
-        set @Color, 5;
-    callfunc("SetTorchColor");
-    delitem "YellowPowder", 1;
-    goto L_Show_Color;
-
-L_Use_Blue:
-    if (countitem("BluePowder") < 1)
-        goto L_No_Powder;
-    if (@TorchColor > 4 && @TorchColor < 9)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor <= 12 && @TorchColor > 9)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor == 1)
-        set @Color, 12;
-    if (@TorchColor == 0)
-        set @Color, 9;
-    callfunc("SetTorchColor");
-    delitem "BluePowder", 1;
-    goto L_Show_Color;
-
-L_No_Powder:
-    mes "You notice you're all out of that color powder. Perhaps Orum can make you some more.";
-    close;
-
-L_Show_Color:
-    callfunc("GetTorchColor");
-    callfunc("GetTorchIntensity");
-    if (@TorchColor == @lastColor)
-        goto L_Wrong_Color;
-    misceffect 5;
-    set @lastColor, @TorchColor;
-    mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
-    goto L_Color_Loop;
-
-L_Wrong_Color:
-    set @Intensity, @TorchIntensity + 1;
-    if (@Intensity > 2)
-        goto L_Failed;
-    callfunc("SetTorchIntensity");
-    callfunc("GetTorchIntensity");
-    misceffect 5;
-    mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
-    goto L_Color_Loop;
-
-L_Failed:
-    mes "As you pour the powder into the flame it flares violently before bursting into your face!";
-    misceffect 5;
-    misceffect 16;
-    set @Intensity, 0;
-    callfunc("SetTorchIntensity");
-    heal -Hp, 0;
-    close;
+    callfunc "TorchLoop";
+    // unreachable
 }
 
-
 // Third Torch
 009-4.gat,33,86,0|script|Torch|400,{
     callfunc "InRangeTorch3";
     callfunc "DoneWithTorches";
 
     set @Torch, 2;
-    callfunc("GetTorchColor");
-    callfunc("GetTorchIntensity");
-
-    set @lastColor, @TorchColor;
-    setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
-    setarray @intensities$,"calm","bright","blinding";
-    mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + " tint to it.";
-    goto L_Color_Loop;
-
-L_Too_Far:
-    mes "You're too far away to do anything with that torch.";
-    close;
-
-L_Color_Loop:
-    callfunc("GetTorchColor");
-    menu
-        "Add Red Powder", L_Use_Red,
-        "Add Yellow Powder", L_Use_Yellow,
-        "Add Blue Powder", L_Use_Blue,
-        "Leave it alone.", -;
-    mes "The flame flickers as if it's laughing at you.";
-    close;
-
-L_Use_Red:
-    if (countitem("RedPowder") < 1)
-        goto L_No_Powder;
-    if (@TorchColor > 6 && @TorchColor < 12)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor < 6 && @TorchColor > 1)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor == 12)
-        set @Color, 1;
-    callfunc("SetTorchColor");
-    delitem "RedPowder", 1;
-    goto L_Show_Color;
-
-L_Use_Yellow:
-    if (countitem("YellowPowder") < 1)
-        goto L_No_Powder;
-    if (@TorchColor < 10 && @TorchColor > 5)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor >= 1 && @TorchColor < 5)
-        set @Color, @TorchColor + 1;
-    callfunc("SetTorchColor");
-    delitem "YellowPowder", 1;
-    goto L_Show_Color;
-
-L_Use_Blue:
-    if (countitem("BluePowder") < 1)
-        goto L_No_Powder;
-    if (@TorchColor > 4 && @TorchColor < 9)
-        set @Color, @TorchColor + 1;
-    if (@TorchColor <= 12 && @TorchColor > 9)
-        set @Color, @TorchColor - 1;
-    if (@TorchColor == 1)
-        set @Color, 12;
-    callfunc("SetTorchColor");
-    delitem "BluePowder", 1;
-    goto L_Show_Color;
-
-L_No_Powder:
-    mes "You notice you're all out of that color powder. Perhaps Orum can make you some more.";
-    close;
-
-L_Show_Color:
-    callfunc("GetTorchColor");
-    callfunc("GetTorchIntensity");
-    if (@TorchColor == @lastColor)
-        goto L_Wrong_Color;
-    misceffect 5;
-    set @lastColor, @TorchColor;
-    mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
-    goto L_Color_Loop;
-
-L_Wrong_Color:
-    set @Intensity, @TorchIntensity + 1;
-    if (@Intensity > 2)
-        goto L_Failed;
-    callfunc("SetTorchIntensity");
-    callfunc("GetTorchIntensity");
-    misceffect 5;
-    mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
-    goto L_Color_Loop;
-
-L_Failed:
-    mes "As you pour the powder into the flame it flares violently before bursting into your face!";
-    misceffect 5;
-    misceffect 16;
-    set @Intensity, 0;
-    callfunc("SetTorchIntensity");
-    heal -Hp, 0;
-    close;
+    callfunc "TorchLoop";
+    // unreachable
 }
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index df914e52..c373522a 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -88,6 +88,7 @@ L_Explain:
     warp "008-1.gat", 65, 90;
     getexp @EXP_LEARNED_ALOT, 0;
     mes "You awake on your back with a squirrel sitting on top of you arranging it's acorns. It quickly gathers them up and runs off as it sees you looking at it them.";
+    monster "008-1.gat", 65, 90, "Squirrel", 1038, 1;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index f001efa4..881a7b4d 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -87,7 +87,15 @@ L_Item:
         goto L_Wait;
     if (countitem(@brodomir_item$) < @brodomir_item_amount)
         goto L_NoItem;
-    delitem @brodomir_item$, @brodomir_item_amount;
+
+    // we need this loop because for items that can't be stacked, delitem can only delete a single one
+    set @loopcounter, @brodomir_item_amount;
+L_Delitem:
+    delitem @brodomir_item$, 1;
+    set @loopcounter, @loopcounter - 1;
+    if (@loopcounter > 0)
+        goto L_Delitem;
+
     set $@BRODOMIR_SPONSOR, getcharid(3);
     goto L_Go;
 
@@ -162,10 +170,19 @@ L_Warp:
 
 L_Warpfail:
     mapannounce "009-6.gat", "There are not enough players around to start!", 0;
-    if ($@BRODOMIR_ITEM_AMOUNT == 0)
+    if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "")
         goto L_Cleanup;
-    if (attachrid($@BRODOMIR_SPONSOR) != 0)
-        getitem $@BRODOMIR_ITEM$, $@BRODOMIR_ITEM_AMOUNT;
+    if (attachrid($@BRODOMIR_SPONSOR) == 0)
+        goto L_SkipItemback;
+
+    // we need this loop because for items that can't be stacked, getitem will stack them nevertheless
+L_GetitemLoop:
+    getitem $@BRODOMIR_ITEM$, 1;
+    set $@BRODOMIR_ITEM_AMOUNT, $@BRODOMIR_ITEM_AMOUNT - 1;
+    if ($@BRODOMIR_ITEM_AMOUNT > 0)
+        goto L_GetitemLoop;
+
+L_SkipItemback:
     set $@BRODOMIR_ITEM_AMOUNT, 0;
     set $@BRODOMIR_ITEM$, "";
     set $@BRODOMIR_SPONSOR, 0;
@@ -182,8 +199,17 @@ onReward:
         goto L_Dead;
     message strcharinfo(0), "Congratulations you won!";
     set Zeny, Zeny + ($@BRODOMIR_MONEY + 150 * $@BRODOMIR_PLAYERS);
-    getitem $@BRODOMIR_ITEM$, $@BRODOMIR_ITEM_AMOUNT;
-    set $@BRODOMIR_ITEM_AMOUNT, 0;
+    if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "")
+        goto L_SkipItem;
+
+    // we need this loop because for items that can't be stacked, getitem will stack them nevertheless
+L_Getitem:
+    getitem $@BRODOMIR_ITEM$, 1;
+    set $@BRODOMIR_ITEM_AMOUNT, $@BRODOMIR_ITEM_AMOUNT - 1;
+    if ($@BRODOMIR_ITEM_AMOUNT > 0)
+        goto L_Getitem;
+
+L_SkipItem:
     set $@BRODOMIR_ITEM$, "";
     set $@BRODOMIR_SPONSOR, 0;
     set $@BRODOMIR_MONEY, 0;
diff --git a/world/map/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt
index ca430c25..6ad04c83 100644
--- a/world/map/npc/010-1/_mobs.txt
+++ b/world/map/npc/010-1/_mobs.txt
@@ -2,16 +2,16 @@
 // Woodland mobs
 
 010-1.gat,82,63,19,19|monster|Scorpion|1003,1,100000,30000,Mob010-1::On1003
-010-1.gat,49,71,31,19|monster|Spiky Mushroom|1019,1,100000,30000,Mob010-1::On1019
-010-1.gat,0,0,0,0|monster|Pink Flower|1014,30,50,0,Mob010-1::On1014
+010-1.gat,49,71,31,19|monster|SpikyMushroom|1019,1,100000,30000,Mob010-1::On1019
+010-1.gat,0,0,0,0|monster|PinkFlower|1014,30,50,0,Mob010-1::On1014
 010-1.gat,0,0,0,0|monster|Snail|1041,20,50,0,Mob010-1::On1041
-010-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,45,50,0,Mob010-1::On1019
-010-1.gat,0,0,0,0|monster|Log Head|1025,40,100,0,Mob010-1::On1025
+010-1.gat,0,0,0,0|monster|SpikyMushroom|1019,45,50,0,Mob010-1::On1019
+010-1.gat,0,0,0,0|monster|LogHead|1025,40,100,0,Mob010-1::On1025
 010-1.gat,0,0,0,0|monster|Mouboo|1028,15,0,10,Mob010-1::On1028
-010-1.gat,0,0,0,0|monster|Mauve Herb|1029,3,270000,180000,Mob010-1::On1029
-010-1.gat,0,0,0,0|monster|Cobalt Herb|1030,1,2700000,1800000,Mob010-1::On1030
+010-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000,180000,Mob010-1::On1029
+010-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,2700000,1800000,Mob010-1::On1030
 010-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob010-1::On1035
-010-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob010-1::On1037
+010-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob010-1::On1037
 010-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob010-1::On1038
 010-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob010-1::On1055
 
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index f3b22c63..978c3712 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -92,7 +92,7 @@ L_agostine_1:
         close;
     mes "[Lora Tay the Seamstress]";
     mes "She glares at your boots, her lips forming barely more than a thin line.  Deep furrows form above her brows.";
-    mes "\"I can't believe it!  He copied Illana's design but used fluffy fur in place of ice wolf fur-- Fluffy fur!  Of all things!  Who would wear such an atrocity of fashion!  Everyone knows that you need ice-white, not pale-white, to go with such leather!\"";
+    mes "\"I can't believe it!  He copied Illana's design but used fluffy fur in place of ice wolvern fur-- Fluffy fur!  Of all things!  Who would wear such an atrocity of fashion!  Everyone knows that you need ice-white, not pale-white, to go with such leather!\"";
     next;
     mes "[Lora Tay the Seamstress]";
     mes "She looks at them more closely.";
diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index 277d938d..8c14da07 100644
--- a/world/map/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
@@ -1,15 +1,15 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland mobs
 
-011-1.gat,0,0,0,0|monster|Evil Mushroom|1013,30,0,0,Mob011-1::On1013
-011-1.gat,0,0,0,0|monster|Pink Flower|1014,20,0,0,Mob011-1::On1014
-011-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,5,0,0,Mob011-1::On1019
+011-1.gat,0,0,0,0|monster|EvilMushroom|1013,30,0,0,Mob011-1::On1013
+011-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob011-1::On1014
+011-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0,0,Mob011-1::On1019
 011-1.gat,0,0,0,0|monster|Snail|1041,1,0,0,Mob011-1::On1041
 011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob011-1::On1028
-011-1.gat,0,0,0,0|monster|Mauve Herb|1029,3,270000,180000,Mob011-1::On1029
-011-1.gat,0,0,0,0|monster|Alizarin Herb|1032,1,2700000,1800000,Mob011-1::On1032
+011-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000,180000,Mob011-1::On1029
+011-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,2700000,1800000,Mob011-1::On1032
 011-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob011-1::On1035
-011-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob011-1::On1037
+011-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob011-1::On1037
 011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob011-1::On1038
 011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob011-1::On1055
 011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob011-1::On1028
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 66b909f9..6da0b1dc 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -775,7 +775,7 @@ L_component_quest_0:
     delitem "MauveHerb", 20;
     set Zeny, Zeny + 2500;
     mes "[Auldsbel the Wizard]";
-    mes "\"Well done, my young friend!  Here are 2,500 GP to compensate you for your efforts.\"";
+    mes "\"Well done, my young friend!  Here is 2,500 GP to compensate you for your efforts.\"";
     mes "[You gain 250 experience points]";
     getexp 250, 0;
     set @Q_component_quest, 1;
@@ -808,7 +808,7 @@ L_component_quest_1:
     delitem "ConcentrationPotion", 1;
     set Zeny, Zeny + 2500;
     mes "[Auldsbel the Wizard]";
-    mes "\"Ah, excellent, excellent!  These are precisely what I needed.  Here are another 2,500 GP to compensate you for your efforts.\"";
+    mes "\"Ah, excellent, excellent!  These are precisely what I needed.  Here is another 2,500 GP to compensate you for your efforts.\"";
     mes "[You gain 500 experience points]";
     getexp 500, 0;
     set @Q_component_quest, 2;
@@ -821,7 +821,7 @@ L_component_quest_2:
     mes "\"Ah!  Excellent!  Yes, yes, indeed I need help.  I have managed to transmute the components you brought me into a liquid that I believe to be a demetamorphosis stock, but it seems that the details still need some fine-tuning, and I am out of silk cocoons...\"";
     next;
     mes "[Auldsbel the Wizard]";
-    mes "\"I would like to run the next batch of experiments on a larger scale, though.  Would you be so kind as to fetch me some one hundred silk cocoons, please?\"";
+    mes "\"I would like to run the next batch of experiments on a larger scale, though.  Would you be so kind as to fetch me one hundred silk cocoons, please?\"";
     next;
     menu
         "One hundred cocoons, here you are.", -,
@@ -831,7 +831,7 @@ L_component_quest_2:
     delitem "SilkCocoon", 100;
     set Zeny, Zeny + 5000;
     mes "[Auldsbel the Wizard]";
-    mes "\"Splendid, splendid!  Here are 5,000 GP for you.\"";
+    mes "\"Splendid, splendid!  Here is 5,000 GP for you.\"";
     mes "Auldsbel attempts to cram the cocoons into his pockets, with little success.  Finally he gives up and takes them into his hut.";
     mes "[You gain 2,000 experience points]";
     getexp 2000, 0;
@@ -875,7 +875,7 @@ L_component_quest_4:
     mes "\"But I was wondering whether creatures that already can auto-transmute-- or metamorphose, as some people call it-- might not allow themselves to be subjected to magical transmutation more easily... Still, all of my demetamorphosis attempts so far have failed.\"";
     next;
     mes "[Auldsbel the Wizard]";
-    mes "\"I am thinking of injecting the life force of another creature, perhaps using some astral channelling.  Snakes sound most promising, as they have a similar physical shape but a strong life force.\"";
+    mes "\"I am thinking of injecting the life force of another creature, perhaps using some astral channeling.  Snakes sound most promising, as they have a similar physical shape but a strong life force.\"";
     next;
     mes "[Auldsbel the Wizard]";
     mes "\"Could you get me twenty regular, cave, and mountain snake tongues, please?  So a total of sixty tongues.  This is where most of their life force is concentrated, incidentally.\"";
@@ -902,7 +902,7 @@ L_component_quest_4:
     callsub S_update_var;
     next;
     mes "[Auldsbel the Wizard]";
-    mes "Auldsbel focuses on the bundle of snake tongues, which begin to assume a bright red colour, then start to glow.  Yellow sparks drop to the ground, as Auldsbel rolls the tongues into a ball.";
+    mes "Auldsbel focuses on the bundle of snake tongues, which begins to assume a bright red colour, then start to glow.  Yellow sparks drop to the ground, as Auldsbel rolls the tongues into a ball.";
     next;
     mes "[Auldsbel the Wizard]";
     mes "He tosses in a cocoon, then squeezes everything together.  A bright red flash blinds you momentarily.";
@@ -927,7 +927,7 @@ L_component_quest_5:
     delitem "GrassSnakeTongue", 50;
     set Zeny, Zeny + 10000;
     mes "[Auldsbel the Wizard]";
-    mes "\"Excellent!  Here are 10,000 GP for you, and now let's see how this goes.\"";
+    mes "\"Excellent!  Here is 10,000 GP for you, and now let's see how this goes.\"";
     mes "[You gain 100,000 experience points]";
     getexp 100000, 0;
     set @Q_component_quest, 6;
@@ -1098,7 +1098,7 @@ LL_student_start:
     mes "\"Now, listen carefully:  to make a short tank top out of three pieces of cloth, you must use the invocation '" + getspellinvocation("make-short-tanktop") + "'.\"";
     next;
     mes "[Auldsbel the Wizard]";
-    mes "\"But be careful; transmutations can go wrong, and that can injure you.  When you have some more overall spellcasting practice, come back to me.\"";
+    mes "\"But be careful; transmutations can go wrong, and that can injure you.  When you have more overall spellcasting practice, come back to me.\"";
     next;
     goto L_main_menu;
 
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index 7f233015..1e013fcc 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Lake Cave mobs
 
-011-4.gat,52,30,39,39|monster|Spiky Mushroom|1019,1,100000,30000,Mob011-4::On1019
-011-4.gat,93,114,39,39|monster|Cave Snake|1021,1,100000,30000,Mob011-4::On1021
-011-4.gat,0,0,0,0|monster|Cave Snake|1021,40,0,0,Mob011-4::On1021
-011-4.gat,0,0,0,0|monster|Spiky Mushroom|1019,15,0,0,Mob011-4::On1019
+011-4.gat,52,30,39,39|monster|SpikyMushroom|1019,1,100000,30000,Mob011-4::On1019
+011-4.gat,93,114,39,39|monster|CaveSnake|1021,1,100000,30000,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0,0,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob011-4::On1019
 
 
 011-4.gat,0,0,0|script|Mob011-4|-1,{
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index 013ea725..69867dee 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -19,35 +19,35 @@
 011-6.gat,167,110,87,13|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
 011-6.gat,75,70,104,96|monster|Bat|1017,23,30000,100000,Mob011-6::On1017
 011-6.gat,78,195,129,97|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,168,109,36,37|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,199,76,36,37|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,88,163,29,27|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,48,113,35,19|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,177,94,20,28|monster|Evil Mushroom|1013,4,30000,100000,Mob011-6::On1013
-011-6.gat,194,49,20,28|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,51,115,47,24|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,63,169,13,17|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,100,226,29,14|monster|Spiky Mushroom|1019,3,30000,100000,Mob011-6::On1019
-011-6.gat,260,44,53,16|monster|Spiky Mushroom|1019,3,30000,100000,Mob011-6::On1019
-011-6.gat,272,48,21,28|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,95,78,31,25|monster|Yellow Slime|1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,59,36,19,25|monster|Yellow Slime|1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,26,69,19,25|monster|Yellow Slime|1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,61,101,14,10|monster|Yellow Slime|1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,50,61,9,12|monster|Yellow Slime|1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,128,39,9,12|monster|Yellow Slime|1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,41,178,9,12|monster|Yellow Slime|1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,70,229,9,12|monster|Yellow Slime|1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,20,204,9,12|monster|Yellow Slime|1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,114,190,9,12|monster|Yellow Slime|1007,4,30000,100000,Mob011-6::On1007
-011-6.gat,137,205,9,12|monster|Yellow Slime|1007,2,30000,100000,Mob011-6::On1007
-011-6.gat,79,220,29,14|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,115,210,29,14|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,41,193,31,31|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,70,143,31,31|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,97,183,29,14|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,172,252,9,12|monster|Cave Maggot|1056,4,30000,100000,Mob011-6::On1056
-011-6.gat,263,236,16,5|monster|Cave Maggot|1056,3,30000,100000,Mob011-6::On1056
+011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000,100000,Mob011-6::On1013
+011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000,100000,Mob011-6::On1019
+011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000,100000,Mob011-6::On1019
+011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000,100000,Mob011-6::On1007
+011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000,100000,Mob011-6::On1007
+011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000,100000,Mob011-6::On1056
+011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000,100000,Mob011-6::On1056
 
 
 011-6.gat,0,0,0|script|Mob011-6|-1,{
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index c1063285..1dc257ba 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -1,15 +1,15 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Hills mobs
 
-012-1.gat,0,0,0,0|monster|Pink Flower|1014,13,0,100,Mob012-1::On1014
-012-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,25,0,10,Mob012-1::On1019
+012-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob012-1::On1014
+012-1.gat,0,0,0,0|monster|SpikyMushroom|1019,25,0,10,Mob012-1::On1019
 012-1.gat,0,0,0,0|monster|Mouboo|1028,20,0,10,Mob012-1::On1028
-012-1.gat,0,0,0,0|monster|Mauve Herb|1029,5,2700000,1800000,Mob012-1::On1029
-012-1.gat,0,0,0,0|monster|Cobalt Herb|1030,2,2700000,1800000,Mob012-1::On1030
-012-1.gat,0,0,0,0|monster|Gamboge Herb|1031,2,2700000,1800000,Mob012-1::On1031
-012-1.gat,0,0,0,0|monster|Alizarin Herb|1032,2,2700000,1800000,Mob012-1::On1032
+012-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000,1800000,Mob012-1::On1029
+012-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob012-1::On1030
+012-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob012-1::On1031
+012-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob012-1::On1032
 012-1.gat,0,0,0,0|monster|Silkworm|1035,5,60000,30000,Mob012-1::On1035
-012-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob012-1::On1037
+012-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob012-1::On1037
 012-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob012-1::On1038
 012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob012-1::On1055
 
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index 6bc9664e..6b3af28e 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -16,7 +16,7 @@
 012-3.gat,188,52,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
 012-3.gat,165,106,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
 012-3.gat,0,0,0,0|monster|Bat|1017,100,0,0,Mob012-3::On1017
-012-3.gat,0,0,0,0|monster|Cave Snake|1021,75,0,0,Mob012-3::On1021
+012-3.gat,0,0,0,0|monster|CaveSnake|1021,75,0,0,Mob012-3::On1021
 
 
 012-3.gat,0,0,0|script|Mob012-3|-1,{
diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index 902dbe5f..31dafb3a 100644
--- a/world/map/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
@@ -17,31 +17,31 @@
 012-4.gat,274,79,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
 012-4.gat,268,91,24,15|monster|Moggun|1061,10,100000,30000,Mob012-4::On1061
 012-4.gat,209,146,69,55|monster|Spider|1012,50,100000,30000,Mob012-4::On1012
-012-4.gat,254,163,19,46|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,167,175,17,22|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,148,176,17,22|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
-012-4.gat,131,88,17,22|monster|Red Slime|1008,15,100000,30000,Mob012-4::On1008
-012-4.gat,140,131,17,22|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,42,128,17,9|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,254,163,19,46|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,167,175,17,22|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,148,176,17,22|monster|RedSlime|1008,20,100000,30000,Mob012-4::On1008
+012-4.gat,131,88,17,22|monster|RedSlime|1008,15,100000,30000,Mob012-4::On1008
+012-4.gat,140,131,17,22|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,42,128,17,9|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
 012-4.gat,64,62,25,30|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
-012-4.gat,69,89,17,21|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,69,89,17,21|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
 012-4.gat,34,45,17,33|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
 012-4.gat,64,36,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
 012-4.gat,100,115,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
-012-4.gat,90,137,17,22|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,59,113,14,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,90,137,17,22|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,59,113,14,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044
 012-4.gat,42,176,15,13|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
-012-4.gat,120,177,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
-012-4.gat,287,180,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,120,177,24,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,287,180,24,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044
 012-4.gat,340,175,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
 012-4.gat,390,156,69,54|monster|Spider|1012,40,100000,30000,Mob012-4::On1012
 012-4.gat,358,37,20,22|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
 012-4.gat,481,110,19,24|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
 012-4.gat,435,114,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
-012-4.gat,477,82,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
-012-4.gat,354,106,19,46|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,342,139,17,22|monster|Red Slime|1008,15,100000,30000,Mob012-4::On1008
-012-4.gat,389,81,33,15|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
+012-4.gat,477,82,24,17|monster|LadySkeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,354,106,19,46|monster|YellowSlime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,342,139,17,22|monster|RedSlime|1008,15,100000,30000,Mob012-4::On1008
+012-4.gat,389,81,33,15|monster|RedSlime|1008,20,100000,30000,Mob012-4::On1008
 012-4.gat,409,35,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
 012-4.gat,413,73,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
 012-4.gat,395,63,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
@@ -55,7 +55,7 @@
 012-4.gat,61,159,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
 012-4.gat,271,157,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
 012-4.gat,270,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,322,141,17,22|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
+012-4.gat,322,141,17,22|monster|RedSlime|1008,20,100000,30000,Mob012-4::On1008
 012-4.gat,451,111,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
 012-4.gat,422,50,11,32|monster|Spider|1012,10,100000,30000,Mob012-4::On1012
 012-4.gat,380,40,14,22|monster|Spider|1012,10,100000,30000,Mob012-4::On1012
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index e2c2b9b2..07a4df90 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -1,19 +1,19 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Hills mobs
 
-013-1.gat,0,0,0,0|monster|Pink Flower|1014,13,0,100,Mob013-1::On1014
-013-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,12,0,100,Mob013-1::On1019
+013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob013-1::On1014
+013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0,100,Mob013-1::On1019
 013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,100,Mob013-1::On1028
-013-1.gat,0,0,0,0|monster|Mauve Herb|1029,1,270,180,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|Mauve Herb|1029,4,2700000,1800000,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|Cobalt Herb|1030,1,270,180,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|Cobalt|1030,2,2700000,1800000,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|Gamboge Herb|1031,1,270,180,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|Gamboge Herb|1031,2,2700000,1800000,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|Alizarin Herb|1032,1,270,180,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|Alizarin Herb|1032,2,2700000,1800000,Mob013-1::On1032
+013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270,180,Mob013-1::On1029
+013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000,1800000,Mob013-1::On1029
+013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270,180,Mob013-1::On1030
+013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob013-1::On1030
+013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270,180,Mob013-1::On1031
+013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob013-1::On1031
+013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270,180,Mob013-1::On1032
+013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob013-1::On1032
 013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000,30000,Mob013-1::On1035
-013-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob013-1::On1037
+013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob013-1::On1037
 013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob013-1::On1038
 013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob013-1::On1055
 
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index 80b8f904..574a9d54 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -1,34 +1,34 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Hills Cave mobs
 
-013-3.gat,28,89,16,52|monster|Cave Snake|1021,10,120000,60000,Mob013-3::On1021
-013-3.gat,61,22,2,2|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
-013-3.gat,81,22,2,2|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024
-013-3.gat,109,31,6,22|monster|Black Scorpion|1009,20,50000,25000,Mob013-3::On1009
+013-3.gat,28,89,16,52|monster|CaveSnake|1021,10,120000,60000,Mob013-3::On1021
+013-3.gat,61,22,2,2|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023
+013-3.gat,81,22,2,2|monster|PoisonSkull|1024,1,120000,60000,Mob013-3::On1024
+013-3.gat,109,31,6,22|monster|BlackScorpion|1009,20,50000,25000,Mob013-3::On1009
 013-3.gat,119,84,27,38|monster|Spider|1012,20,120000,40000,Mob013-3::On1012
 013-3.gat,176,23,5,6|monster|Spider|1012,10,100000,40000,Mob013-3::On1012
-013-3.gat,82,75,2,2|monster|Fire Skull|1023,1,180000,60000,Mob013-3::On1023
-013-3.gat,142,37,2,2|monster|Poison Skull|1024,1,180000,60000,Mob013-3::On1024
-013-3.gat,79,134,21,16|monster|Black Scorpion|1009,5,80000,40000,Mob013-3::On1009
-013-3.gat,71,169,38,17|monster|Black Scorpion|1009,5,80000,40000,Mob013-3::On1009
-013-3.gat,64,85,9,21|monster|Black Scorpion|1009,10,80000,40000,Mob013-3::On1009
-013-3.gat,81,92,3,20|monster|Black Scorpion|1009,10,80000,40000,Mob013-3::On1009
+013-3.gat,82,75,2,2|monster|FireSkull|1023,1,180000,60000,Mob013-3::On1023
+013-3.gat,142,37,2,2|monster|PoisonSkull|1024,1,180000,60000,Mob013-3::On1024
+013-3.gat,79,134,21,16|monster|BlackScorpion|1009,5,80000,40000,Mob013-3::On1009
+013-3.gat,71,169,38,17|monster|BlackScorpion|1009,5,80000,40000,Mob013-3::On1009
+013-3.gat,64,85,9,21|monster|BlackScorpion|1009,10,80000,40000,Mob013-3::On1009
+013-3.gat,81,92,3,20|monster|BlackScorpion|1009,10,80000,40000,Mob013-3::On1009
 013-3.gat,163,84,33,37|monster|Snake|1010,30,120000,50000,Mob013-3::On1010
 013-3.gat,162,85,33,37|monster|Spider|1012,30,120000,50000,Mob013-3::On1012
-013-3.gat,172,77,18,25|monster|Black Scorpion|1009,15,120000,50000,Mob013-3::On1009
-013-3.gat,145,36,20,15|monster|Red Slime|1008,25,80000,40000,Mob013-3::On1008
+013-3.gat,172,77,18,25|monster|BlackScorpion|1009,15,120000,50000,Mob013-3::On1009
+013-3.gat,145,36,20,15|monster|RedSlime|1008,25,80000,40000,Mob013-3::On1008
 013-3.gat,167,37,23,11|monster|Snake|1010,20,120000,40000,Mob013-3::On1010
-013-3.gat,165,25,16,11|monster|Black Scorpion|1009,15,120000,40000,Mob013-3::On1009
+013-3.gat,165,25,16,11|monster|BlackScorpion|1009,15,120000,40000,Mob013-3::On1009
 013-3.gat,71,39,2,3|monster|Snake|1010,2,40000,20000,Mob013-3::On1010
-013-3.gat,159,102,3,5|monster|Yellow Slime|1007,2,80000,40000,Mob013-3::On1007
+013-3.gat,159,102,3,5|monster|YellowSlime|1007,2,80000,40000,Mob013-3::On1007
 013-3.gat,67,22,2,2|monster|Maggot|1002,2,40000,20000,Mob013-3::On1002
 013-3.gat,75,22,2,2|monster|Maggot|1002,2,40000,20000,Mob013-3::On1002
-013-3.gat,76,39,7,4|monster|Black Scorpion|1009,8,40000,20000,Mob013-3::On1009
-013-3.gat,65,39,7,4|monster|Red Slime|1008,8,40000,20000,Mob013-3::On1008
-013-3.gat,62,33,2,1|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024
-013-3.gat,80,33,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
-013-3.gat,75,46,2,1|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024
-013-3.gat,67,46,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
+013-3.gat,76,39,7,4|monster|BlackScorpion|1009,8,40000,20000,Mob013-3::On1009
+013-3.gat,65,39,7,4|monster|RedSlime|1008,8,40000,20000,Mob013-3::On1008
+013-3.gat,62,33,2,1|monster|PoisonSkull|1024,1,120000,60000,Mob013-3::On1024
+013-3.gat,80,33,2,1|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023
+013-3.gat,75,46,2,1|monster|PoisonSkull|1024,1,120000,60000,Mob013-3::On1024
+013-3.gat,67,46,2,1|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023
 
 
 013-3.gat,0,0,0|script|Mob013-3|-1,{
diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt
index 815d7e94..371dc4d1 100644
--- a/world/map/npc/014-1/_mobs.txt
+++ b/world/map/npc/014-1/_mobs.txt
@@ -1,20 +1,20 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland mobs
 
-014-1.gat,0,0,0,0|monster|Evil Mushroom|1013,20,0,0,Mob014-1::On1013
-014-1.gat,0,0,0,0|monster|Pink Flower|1014,25,0,0,Mob014-1::On1014
-014-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,15,0,0,Mob014-1::On1019
+014-1.gat,0,0,0,0|monster|EvilMushroom|1013,20,0,0,Mob014-1::On1013
+014-1.gat,0,0,0,0|monster|PinkFlower|1014,25,0,0,Mob014-1::On1014
+014-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob014-1::On1019
 014-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob014-1::On1028
-014-1.gat,0,0,0,0|monster|Mauve Herb|1029,1,270,180,Mob014-1::On1029
-014-1.gat,0,0,0,0|monster|Mauve Herb|1029,5,2700000,1800000,Mob014-1::On1029
-014-1.gat,0,0,0,0|monster|Cobalt Herb|1030,1,270,180,Mob014-1::On1030
-014-1.gat,0,0,0,0|monster|Cobalt Herb|1030,2,2700000,1800000,Mob014-1::On1030
-014-1.gat,0,0,0,0|monster|Gamboge Herb|1031,1,270,180,Mob014-1::On1031
-014-1.gat,0,0,0,0|monster|Gamboge Herb|1031,2,2700000,1800000,Mob014-1::On1031
-014-1.gat,0,0,0,0|monster|Alizarin Herb|1032,1,270,180,Mob014-1::On1032
-014-1.gat,0,0,0,0|monster|Alizarin Herb|1032,2,2700000,1800000,Mob014-1::On1032
+014-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270,180,Mob014-1::On1029
+014-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000,1800000,Mob014-1::On1029
+014-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270,180,Mob014-1::On1030
+014-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob014-1::On1030
+014-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270,180,Mob014-1::On1031
+014-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob014-1::On1031
+014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270,180,Mob014-1::On1032
+014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob014-1::On1032
 014-1.gat,0,0,0,0|monster|Silkworm|1035,4,6000,3000,Mob014-1::On1035
-014-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob014-1::On1037
+014-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob014-1::On1037
 014-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob014-1::On1038
 014-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob014-1::On1055
 
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index e1153c95..ba3d41d2 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -1,16 +1,16 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland mobs
 
-015-1.gat,0,0,0,0|monster|Clover Patch|1037,2,100000,1000,Mob015-1::On1037
+015-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000,1000,Mob015-1::On1037
 015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob015-1::On1055
 015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob015-1::On1038
-015-1.gat,0,0,0,0|monster|Log Head|1025,40,0,0,Mob015-1::On1025
-015-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,20,0,0,Mob015-1::On1019
-015-1.gat,0,0,0,0|monster|Pink Flower|1014,20,0,0,Mob015-1::On1014
-015-1.gat,0,0,0,0|monster|Gamboge Herb|1031,5,0,0,Mob015-1::On1031
-015-1.gat,0,0,0,0|monster|Alizarin Herb|1032,5,0,0,Mob015-1::On1032
+015-1.gat,0,0,0,0|monster|LogHead|1025,40,0,0,Mob015-1::On1025
+015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0,0,Mob015-1::On1019
+015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob015-1::On1014
+015-1.gat,0,0,0,0|monster|GambogePlant|1031,5,0,0,Mob015-1::On1031
+015-1.gat,0,0,0,0|monster|AlizarinPlant|1032,5,0,0,Mob015-1::On1032
 015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000,7000,Mob015-1::On1035
-015-1.gat,0,0,0,0|monster|Mauve Herb|1029,4,270000,180000,Mob015-1::On1029
+015-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob015-1::On1029
 
 
 015-1.gat,0,0,0|script|Mob015-1|-1,{
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index e9e8dcde..c0f03028 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -1,16 +1,16 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland mobs
 
-016-1.gat,0,0,0,0|monster|Clover|1037,2,100000,30000,Mob016-1::On1037
+016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000,30000,Mob016-1::On1037
 016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob016-1::On1055
 016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob016-1::On1038
 016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob016-1::On1028
 016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0,0,Mob016-1::On1003
-016-1.gat,0,0,0,0|monster|Mauve|1029,3,0,0,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|Cobalt|1030,3,0,0,Mob016-1::On1030
-016-1.gat,0,0,0,0|monster|Butterfly|1029,4,270000,180000,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|Silkworn|1035,7,150000,7000,Mob016-1::On1035
+016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0,0,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0,0,Mob016-1::On1030
+016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000,7000,Mob016-1::On1035
 
 
 016-1.gat,0,0,0|script|Mob016-1|-1,{
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index 36eeaaf4..07fede56 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -1,23 +1,22 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Hills mobs
 
-017-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob017-1::On1037
-017-1.gat,99,30,2,1|monster|Clover Patch|1037,1,0,15000,Mob017-1::On1037
-017-1.gat,98,30,3,1|monster|Clover Patch|1037,1,0,15000,Mob017-1::On1037
-017-1.gat,29,29,19,12|monster|Gamboge Herb|1031,1,0,25000,Mob017-1::On1031
-017-1.gat,91,25,76,8|monster|Log Head|1025,3,5000,60000,Mob017-1::On1025
-017-1.gat,31,48,19,12|monster|Log Head|1025,3,5000,60000,Mob017-1::On1025
+017-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob017-1::On1037
+017-1.gat,99,30,2,1|monster|CloverPatch|1037,1,150000,50000,Mob017-1::On1037
+017-1.gat,29,29,19,12|monster|GambogePlant|1031,1,0,25000,Mob017-1::On1031
+017-1.gat,91,25,76,8|monster|LogHead|1025,3,5000,60000,Mob017-1::On1025
+017-1.gat,31,48,19,12|monster|LogHead|1025,3,5000,60000,Mob017-1::On1025
 017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob017-1::On1055
 017-1.gat,0,0,0,0|monster|Bat|1017,5,0,0,Mob017-1::On1017
-017-1.gat,0,0,0,0|monster|Fire Goblin|1011,5,0,0,Mob017-1::On1011
+017-1.gat,0,0,0,0|monster|FireGoblin|1011,5,0,0,Mob017-1::On1011
 017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob017-1::On1028
-017-1.gat,0,0,0,0|monster|Pink Flower|1014,5,0,0,Mob017-1::On1014
-017-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,5,0,0,Mob017-1::On1019
-017-1.gat,0,0,0,0|monster|Evil Mushroom|1013,10,0,0,Mob017-1::On1013
-017-1.gat,0,0,0,0|monster|Alizarin Herb|1032,3,0,0,Mob017-1::On1032
-017-1.gat,0,0,0,0|monster|Gamboge Herb|1031,3,0,0,Mob017-1::On1031
-017-1.gat,0,0,0,0|monster|Cobalt Herb|1030,3,0,0,Mob017-1::On1030
-017-1.gat,0,0,0,0|monster|Mauve Herb|1029,5,0,0,Mob017-1::On1029
+017-1.gat,0,0,0,0|monster|PinkFlower|1014,5,0,0,Mob017-1::On1014
+017-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0,0,Mob017-1::On1019
+017-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,0,0,Mob017-1::On1013
+017-1.gat,0,0,0,0|monster|AlizarinPlant|1032,3,0,0,Mob017-1::On1032
+017-1.gat,0,0,0,0|monster|GambogePlant|1031,3,0,0,Mob017-1::On1031
+017-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0,0,Mob017-1::On1030
+017-1.gat,0,0,0,0|monster|MauvePlant|1029,5,0,0,Mob017-1::On1029
 017-1.gat,0,0,0,0|monster|Silkworm|1035,10,0,0,Mob017-1::On1035
 017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob017-1::On1038
 
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index 334b02bb..78f9caec 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -1,31 +1,31 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Mining Camp mobs
 
-018-1.gat,136,79,9,41|monster|Sea Slime|1033,10,100000,30000,Mob018-1::On1033
-018-1.gat,108,87,53,25|monster|Log Head|1025,10,100000,30000,Mob018-1::On1025
-018-1.gat,116,44,6,7|monster|Sea Slime|1033,3,100000,30000,Mob018-1::On1033
-018-1.gat,119,56,13,6|monster|Pink Flower|1014,2,100000,30000,Mob018-1::On1014
-018-1.gat,175,28,17,19|monster|Jack O|1022,1,180000,120000,Mob018-1::On1022
-018-1.gat,78,59,3,1|monster|Yellow Slime|1007,1,100000,30000,Mob018-1::On1007
+018-1.gat,136,79,9,41|monster|SeaSlime|1033,10,100000,30000,Mob018-1::On1033
+018-1.gat,108,87,53,25|monster|LogHead|1025,10,100000,30000,Mob018-1::On1025
+018-1.gat,116,44,6,7|monster|SeaSlime|1033,3,100000,30000,Mob018-1::On1033
+018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000,30000,Mob018-1::On1014
+018-1.gat,175,28,17,19|monster|JackO|1022,1,180000,120000,Mob018-1::On1022
+018-1.gat,78,59,3,1|monster|YellowSlime|1007,1,100000,30000,Mob018-1::On1007
 018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000,30000,Mob018-1::On1035
 018-1.gat,43,63,31,28|monster|Bat|1017,10,100000,30000,Mob018-1::On1017
-018-1.gat,134,39,18,10|monster|Grass Snake|1034,4,100000,50000,Mob018-1::On1034
-018-1.gat,124,42,9,11|monster|Grass Snake|1034,2,100000,50000,Mob018-1::On1034
-018-1.gat,124,19,22,9|monster|Grass Snake|1034,3,100000,50000,Mob018-1::On1034
-018-1.gat,122,29,19,9|monster|Grass Snake|1034,2,100000,50000,Mob018-1::On1034
+018-1.gat,134,39,18,10|monster|GrassSnake|1034,4,100000,50000,Mob018-1::On1034
+018-1.gat,124,42,9,11|monster|GrassSnake|1034,2,100000,50000,Mob018-1::On1034
+018-1.gat,124,19,22,9|monster|GrassSnake|1034,3,100000,50000,Mob018-1::On1034
+018-1.gat,122,29,19,9|monster|GrassSnake|1034,2,100000,50000,Mob018-1::On1034
 018-1.gat,149,45,10,8|monster|Bat|1017,5,100000,30000,Mob018-1::On1017
-018-1.gat,169,47,20,10|monster|Red Slime|1008,4,120000,30000,Mob018-1::On1008
+018-1.gat,169,47,20,10|monster|RedSlime|1008,4,120000,30000,Mob018-1::On1008
 018-1.gat,136,49,13,8|monster|Bat|1017,4,100000,30000,Mob018-1::On1017
-018-1.gat,166,49,13,9|monster|Clover Patch|1037,1,100000,30000,Mob018-1::On1037
+018-1.gat,166,49,13,9|monster|CloverPatch|1037,1,100000,30000,Mob018-1::On1037
 018-1.gat,111,62,5,2|monster|Silkworm|1035,1,60000,30000,Mob018-1::On1035
-018-1.gat,117,50,4,3|monster|Sea Slime|1033,1,120000,60000,Mob018-1::On1033
-018-1.gat,96,47,18,11|monster|Red Slime|1008,3,100000,50000,Mob018-1::On1008
-018-1.gat,106,52,15,6|monster|Cobalt Herb|1030,1,240000,120000,Mob018-1::On1030
-018-1.gat,78,55,37,6|monster|Red Slime|1008,7,100000,50000,Mob018-1::On1008
-018-1.gat,145,24,10,9|monster|Red Slime|1008,3,100000,50000,Mob018-1::On1008
+018-1.gat,117,50,4,3|monster|SeaSlime|1033,1,120000,60000,Mob018-1::On1033
+018-1.gat,96,47,18,11|monster|RedSlime|1008,3,100000,50000,Mob018-1::On1008
+018-1.gat,106,52,15,6|monster|CobaltPlant|1030,1,240000,120000,Mob018-1::On1030
+018-1.gat,78,55,37,6|monster|RedSlime|1008,7,100000,50000,Mob018-1::On1008
+018-1.gat,145,24,10,9|monster|RedSlime|1008,3,100000,50000,Mob018-1::On1008
 018-1.gat,68,89,14,17|monster|Bat|1017,3,100000,50000,Mob018-1::On1017
-018-1.gat,160,31,11,18|monster|Red Slime|1008,5,100000,50000,Mob018-1::On1008
-018-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob018-1::On1037
+018-1.gat,160,31,11,18|monster|RedSlime|1008,5,100000,50000,Mob018-1::On1008
+018-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob018-1::On1037
 018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob018-1::On1055
 
 
diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index 253058d8..5e24ee51 100644
--- a/world/map/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Mining Camp Indoor mobs
 
-018-2.gat,114,21,4,3|monster|Yellow Slime|1007,1,100000,30000,Mob018-2::On1007
+018-2.gat,114,21,4,3|monster|YellowSlime|1007,1,100000,30000,Mob018-2::On1007
 
 
 018-2.gat,0,0,0|script|Mob018-2|-1,{
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index 9b201828..51689cd4 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -2,26 +2,26 @@
 // Northern Mines mobs
 
 018-3.gat,48,29,57,19|monster|Bat|1017,10,100000,30000,Mob018-3::On1017
-018-3.gat,35,144,31,48|monster|Evil Mushroom|1013,10,120000,30000,Mob018-3::On1013
+018-3.gat,35,144,31,48|monster|EvilMushroom|1013,10,120000,30000,Mob018-3::On1013
 018-3.gat,35,65,28,22|monster|Spider|1012,20,100000,50000,Mob018-3::On1012
-018-3.gat,28,157,3,2|monster|Pink Flower|1014,1,60000,30000,Mob018-3::On1014
-018-3.gat,99,111,17,41|monster|Yellow Slime|1007,10,90000,30000,Mob018-3::On1007
+018-3.gat,28,157,3,2|monster|PinkFlower|1014,1,60000,30000,Mob018-3::On1014
+018-3.gat,99,111,17,41|monster|YellowSlime|1007,10,90000,30000,Mob018-3::On1007
 018-3.gat,134,140,12,8|monster|Maggot|1002,3,80000,40000,Mob018-3::On1002
 018-3.gat,132,137,15,25|monster|Spider|1012,8,300000,120000,Mob018-3::On1012
-018-3.gat,102,172,131,13|monster|Black Scorpion|1009,20,60000,10000,Mob018-3::On1009
-018-3.gat,174,37,10,31|monster|Yellow Slime|1007,5,180000,120000,Mob018-3::On1007
+018-3.gat,102,172,131,13|monster|BlackScorpion|1009,20,60000,10000,Mob018-3::On1009
+018-3.gat,174,37,10,31|monster|YellowSlime|1007,5,180000,120000,Mob018-3::On1007
 018-3.gat,87,153,78,22|monster|Snake|1010,10,60000,10000,Mob018-3::On1010
 018-3.gat,148,148,13,24|monster|Bat|1017,3,180000,40000,Mob018-3::On1017
-018-3.gat,153,97,18,22|monster|Yellow Slime|1007,6,80000,40000,Mob018-3::On1007
-018-3.gat,81,77,27,21|monster|Red Slime|1008,15,80000,40000,Mob018-3::On1008
-018-3.gat,111,80,5,6|monster|Black Scorpion|1009,10,80000,40000,Mob018-3::On1009
+018-3.gat,153,97,18,22|monster|YellowSlime|1007,6,80000,40000,Mob018-3::On1007
+018-3.gat,81,77,27,21|monster|RedSlime|1008,15,80000,40000,Mob018-3::On1008
+018-3.gat,111,80,5,6|monster|BlackScorpion|1009,10,80000,40000,Mob018-3::On1009
 018-3.gat,175,122,5,40|monster|Snake|1010,15,40000,20000,Mob018-3::On1010
-018-3.gat,98,75,1,2|monster|Fire Skull|1023,1,120000,30000,Mob018-3::On1023
-018-3.gat,100,75,1,2|monster|Poison Skull|1024,1,120000,30000,Mob018-3::On1024
-018-3.gat,171,95,15,19|monster|Black Scorpion|1009,5,60000,30000,Mob018-3::On1009
-018-3.gat,134,87,17,7|monster|Red Slime|1008,10,60000,30000,Mob018-3::On1008
+018-3.gat,98,75,1,2|monster|FireSkull|1023,1,120000,30000,Mob018-3::On1023
+018-3.gat,100,75,1,2|monster|PoisonSkull|1024,1,120000,30000,Mob018-3::On1024
+018-3.gat,171,95,15,19|monster|BlackScorpion|1009,5,60000,30000,Mob018-3::On1009
+018-3.gat,134,87,17,7|monster|RedSlime|1008,10,60000,30000,Mob018-3::On1008
 018-3.gat,59,95,11,8|monster|Spider|1012,15,60000,30000,Mob018-3::On1012
-018-3.gat,77,92,23,7|monster|Black Scorpion|1009,15,60000,30000,Mob018-3::On1009
+018-3.gat,77,92,23,7|monster|BlackScorpion|1009,15,60000,30000,Mob018-3::On1009
 018-3.gat,94,55,16,8|monster|Snake|1010,5,60000,30000,Mob018-3::On1010
 018-3.gat,133,39,12,17|monster|Spider|1012,10,60000,30000,Mob018-3::On1012
 018-3.gat,111,33,30,16|monster|Snake|1010,15,60000,30000,Mob018-3::On1010
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index 5606f37a..fb76550e 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -3,7 +3,7 @@
 
 019-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob019-1::On1020
 019-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000,30000,Mob019-1::On1094
-019-1.gat,0,0,0,0|monster|White Bell|1095,5,100000,30000,Mob019-1::On1095
+019-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob019-1::On1095
 
 
 019-1.gat,0,0,0|script|Mob019-1|-1,{
diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt
index 3b950e30..d1686d01 100644
--- a/world/map/npc/019-4/_mobs.txt
+++ b/world/map/npc/019-4/_mobs.txt
@@ -2,9 +2,9 @@
 // Deeper Snow Cave mobs
 
 019-4.gat,0,0,0,0|monster|Moggun|1061,12,45000,30000,Mob019-4::On1061
-019-4.gat,47,67,15,9|monster|White Slime|1093,5,45000,45000,Mob019-4::On1093
+019-4.gat,47,67,15,9|monster|WhiteSlime|1093,5,45000,45000,Mob019-4::On1093
 019-4.gat,0,0,0,0|monster|Bat|1017,15,45000,25000,Mob019-4::On1017
-019-4.gat,0,0,0,0|monster|Blue Slime|1091,7,45000,30000,Mob019-4::On1091
+019-4.gat,0,0,0,0|monster|BlueSlime|1091,7,45000,30000,Mob019-4::On1091
 
 
 019-4.gat,0,0,0|script|Mob019-4|-1,{
diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt
index 9d266c49..8bba5b8b 100644
--- a/world/map/npc/020-1/_mobs.txt
+++ b/world/map/npc/020-1/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Nivalis mobs
 
-020-1.gat,0,0,0,0|monster|White Bell|1095,3,100000,30000,Mob020-1::On1095
+020-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000,30000,Mob020-1::On1095
 
 
 020-1.gat,0,0,0|script|Mob020-1|-1,{
diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
index f205507a..7878ff89 100644
--- a/world/map/npc/021-1/_mobs.txt
+++ b/world/map/npc/021-1/_mobs.txt
@@ -5,7 +5,7 @@
 021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
 021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
 021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000,30000,Mob021-1::On1002
-021-1.gat,98,24,2,2|monster|Sea Slime|1033,1,150000,100000,Mob021-1::On1033
+021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000,100000,Mob021-1::On1033
 
 
 021-1.gat,0,0,0|script|Mob021-1|-1,{
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 4d4820d2..75df89e0 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,7 +3,7 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,136,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+021-1.gat,136,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
 
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
index cffd26aa..3e8c406e 100644
--- a/world/map/npc/024-1/_mobs.txt
+++ b/world/map/npc/024-1/_mobs.txt
@@ -4,9 +4,9 @@
 024-1.gat,89,52,3,2|monster|Maggot|1002,2,100000,30000,Mob024-1::On1002
 024-1.gat,40,45,3,2|monster|Maggot|1002,2,100000,30000,Mob024-1::On1002
 024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000,30000,Mob024-1::On1002
-024-1.gat,96,25,3,10|monster|Sea Sime|1033,1,100000,30000,Mob024-1::On1033
-024-1.gat,33,45,24,20|monster|Black Scorpion|1009,3,100000,30000,Mob024-1::On1009
-024-1.gat,93,35,5,6|monster|Giant Maggot|1006,1,100000,30000,Mob024-1::On1006
+024-1.gat,96,25,3,10|monster|SeaSlime|1033,1,100000,30000,Mob024-1::On1033
+024-1.gat,33,45,24,20|monster|BlackScorpion|1009,3,100000,30000,Mob024-1::On1009
+024-1.gat,93,35,5,6|monster|GiantMaggot|1006,1,100000,30000,Mob024-1::On1006
 024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000,30000,Mob024-1::On1002
 
 
diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt
index 09e14b8a..32d4ee65 100644
--- a/world/map/npc/025-1/_mobs.txt
+++ b/world/map/npc/025-1/_mobs.txt
@@ -1,14 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Swamp mobs
 
-025-1.gat,100,60,56,79|monster|Clover Patch|1037,3,30000,10000,Mob025-1::On1037
-025-1.gat,56,96,13,5|monster|Clover Patch|1037,1,1200000,10000,Mob025-1::On1037
-025-1.gat,56,35,77,33|monster|Alizarin Herb|1032,2,240000,12000,Mob025-1::On1032
+025-1.gat,100,60,56,79|monster|CloverPatch|1037,3,30000,10000,Mob025-1::On1037
+025-1.gat,56,96,13,5|monster|CloverPatch|1037,1,1200000,10000,Mob025-1::On1037
+025-1.gat,56,35,77,33|monster|AlizarinPlant|1032,2,240000,12000,Mob025-1::On1032
 025-1.gat,55,62,24,13|monster|Snail|1041,7,30000,12000,Mob025-1::On1041
 025-1.gat,38,84,37,31|monster|Silkworm|1035,18,40000,300,Mob025-1::On1035
-025-1.gat,96,47,63,55|monster|Log Head|1025,14,18000,3000,Mob025-1::On1025
-025-1.gat,0,0,0,0|monster|Pink Flower|1014,34,20000,5000,Mob025-1::On1014
-025-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,40,90000,500,Mob025-1::On1019
+025-1.gat,96,47,63,55|monster|LogHead|1025,14,18000,3000,Mob025-1::On1025
+025-1.gat,0,0,0,0|monster|PinkFlower|1014,34,20000,5000,Mob025-1::On1014
+025-1.gat,0,0,0,0|monster|SpikyMushroom|1019,40,90000,500,Mob025-1::On1019
 025-1.gat,101,53,55,65|monster|Squirrel|1038,18,60000,9000,Mob025-1::On1038
 025-1.gat,26,61,15,85|monster|Scorpion|1003,12,100000,50000,Mob025-1::On1003
 
diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index 82ee3e08..73bf37fa 100644
--- a/world/map/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Rossy Main Hall mobs
 
-025-3.gat,0,0,0,0|monster|Cave Maggot|1056,100,0,100,Mob025-3::On1056
+025-3.gat,0,0,0,0|monster|CaveMaggot|1056,100,0,100,Mob025-3::On1056
 025-3.gat,0,0,0,0|monster|Archant|1060,20,0,100,Mob025-3::On1060
-025-3.gat,0,0,0,0|monster|Angry Scorpion|1057,25,0,100,Mob025-3::On1057
+025-3.gat,0,0,0,0|monster|AngryScorpion|1057,25,0,100,Mob025-3::On1057
 025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0,30000,Mob025-3::On1043
 
 
diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt
index fcf82719..e8bd7b59 100644
--- a/world/map/npc/025-4/_mobs.txt
+++ b/world/map/npc/025-4/_mobs.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Rossy Battle Caves mobs
 
-025-4.gat,29,31,20,14|monster|Cave Maggot|1056,3,0,100,Mob025-4::On1056
-025-4.gat,94,24,20,21|monster|Cave Maggot|1056,5,0,100,Mob025-4::On1056
+025-4.gat,29,31,20,14|monster|CaveMaggot|1056,3,0,100,Mob025-4::On1056
+025-4.gat,94,24,20,21|monster|CaveMaggot|1056,5,0,100,Mob025-4::On1056
 
 
 025-4.gat,0,0,0|script|Mob025-4|-1,{
diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index d92d8e46..c65da2e6 100644
--- a/world/map/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
@@ -7,8 +7,8 @@
 026-1.gat,0,0,0,0|monster|Silkworm|1035,10,300000,60000,Mob026-1::On1035
 026-1.gat,0,0,0,0|monster|Scorpion|1003,15,300000,30000,Mob026-1::On1003
 026-1.gat,0,0,0,0|monster|Skeleton|1043,5,900000,10000,Mob026-1::On1043
-026-1.gat,0,0,0,0|monster|Lady Skeleton|1044,5,900000,20000,Mob026-1::On1044
-026-1.gat,0,0,0,0|monster|Log Head|1025,8,300000,40000,Mob026-1::On1025
+026-1.gat,0,0,0,0|monster|LadySkeleton|1044,5,900000,20000,Mob026-1::On1044
+026-1.gat,0,0,0,0|monster|LogHead|1025,8,300000,40000,Mob026-1::On1025
 
 
 026-1.gat,0,0,0|script|Mob026-1|-1,{
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 22342bd7..ba3024ac 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -4,21 +4,21 @@
 027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000,60000,Mob027-1::On1047
 027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000,60000,Mob027-1::On1042
 027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000,60000,Mob027-1::On1040
-027-1.gat,54,53,66,46|monster|Fire Skull|1023,2,60000,20000,Mob027-1::On1023
-027-1.gat,54,53,66,46|monster|Poison Skull|1024,1,60000,20000,Mob027-1::On1024
+027-1.gat,54,53,66,46|monster|FireSkull|1023,2,60000,20000,Mob027-1::On1023
+027-1.gat,54,53,66,46|monster|PoisonSkull|1024,1,60000,20000,Mob027-1::On1024
 027-1.gat,54,53,66,46|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
-027-1.gat,54,53,66,46|monster|Lady Skeleton|1044,2,60000,8000,Mob027-1::On1044
+027-1.gat,54,53,66,46|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
 027-1.gat,71,41,31,22|monster|Skeleton|1043,2,175000,20000,Mob027-1::On1043
-027-1.gat,71,41,31,22|monster|Lady Skeleton|1044,2,175000,20000,Mob027-1::On1044
-027-1.gat,37,41,33,22|monster|Fire Skull|1023,2,200000,10000,Mob027-1::On1023
-027-1.gat,37,41,33,22|monster|Poison Skull|1024,2,200000,10000,Mob027-1::On1024
+027-1.gat,71,41,31,22|monster|LadySkeleton|1044,2,175000,20000,Mob027-1::On1044
+027-1.gat,37,41,33,22|monster|FireSkull|1023,2,200000,10000,Mob027-1::On1023
+027-1.gat,37,41,33,22|monster|PoisonSkull|1024,2,200000,10000,Mob027-1::On1024
 027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000,20000,Mob027-1::On1043
-027-1.gat,37,41,33,22|monster|Lady Skeleton|1044,4,180000,20000,Mob027-1::On1044
-027-1.gat,105,40,32,21|monster|Fire Skull|1023,1,28000,25000,Mob027-1::On1023
-027-1.gat,105,40,32,21|monster|Poison Skull|1024,1,30000,20000,Mob027-1::On1024
+027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000,20000,Mob027-1::On1044
+027-1.gat,105,40,32,21|monster|FireSkull|1023,1,28000,25000,Mob027-1::On1023
+027-1.gat,105,40,32,21|monster|PoisonSkull|1024,1,30000,20000,Mob027-1::On1024
 027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000,20000,Mob027-1::On1043
-027-1.gat,105,40,32,21|monster|Lady Skeleton|1044,3,33000,25000,Mob027-1::On1044
-027-1.gat,28,67,2,1|monster|Jack O|1022,1,265000,200000,Mob027-1::On1022
+027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000,25000,Mob027-1::On1044
+027-1.gat,28,67,2,1|monster|JackO|1022,1,265000,200000,Mob027-1::On1022
 
 
 027-1.gat,0,0,0|script|Mob027-1|-1,{
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index 4f2819c6..b0c56143 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -1,12 +1,12 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Graveyard Indoor mobs
 
-027-2.gat,81,41,11,9|monster|Drunken Skeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,91,38,11,9|monster|Tipsy Skeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,110,26,11,11|monster|Tipsy Skeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,104,28,11,9|monster|Drunken Skeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,89,34,11,9|monster|Drunken Lady Skeleton|1079,1,100000,30000,Mob027-2::On1079
-027-2.gat,116,26,11,9|monster|Drunken Lady Skeleton|1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,91,38,11,9|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
 
 
 027-2.gat,0,0,0|script|Mob027-2|-1,{
diff --git a/world/map/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt
index ee65d710..36b20533 100644
--- a/world/map/npc/027-2/barman.txt
+++ b/world/map/npc/027-2/barman.txt
@@ -1,9 +1,9 @@
 027-2.gat,103,22,0|script|Bennet|310,{
     mes "[Bennet]";
-    mes "\"Hi there stranger!  My name is Bennet, the bartender here.\"";
+    mes "\"Hi there, stranger!  My name is Bennet, the bartender here.\"";
     next;
     mes "[Bennet]";
-    mes "\"If you are planning to stick around for a while, please check back with me later.  I might have some work for you.\"";
-    mes "\"In the meanwhile, enjoy your stay!\"";
+    mes "\"If you're planning to stick around for a while, please check back with me later.  I might have some work for you.\"";
+    mes "\"In the meantime, enjoy your stay!\"";
     close;
 }
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index d9bd17df..c3959604 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -15,22 +15,22 @@ L_Begin:
     if (QUEST_Graveyard_Caretaker == 5) goto L_Has_Letter;
 
     mes "[Caretaker]";
-    mes "\"...Another adventurer comes to slay the already dead.\"";
+    mes "\"...another adventurer comes to slay the already dead.\"";
     next;
     menu
         "And what are you?", L_Who,
-        "Thats right, so move and let me kill that demon behind you.", -;
+        "That's right, so move and let me kill that demon behind you.", -;
     close;
 
 L_Who:
     mes "[Caretaker]";
-    mes "\"I was once the caretaker to these cemetery grounds, but look at what they have become.";
-    mes "I now care only for my wife. I watch over her... make sure that nobody ever does her harm.\"";
+    mes "\"I was once the caretaker of these cemetery grounds, but look at what they have become.";
+    mes "Now, I care only for my wife. I watch over her... make sure that nobody ever does her harm.\"";
     next;
     menu
         "You guard her corpse day and night?", -;
     mes "[Caretaker]";
-    mes "\"I am bound to this place by the very same spell that was cast to keep the undead from leaving. Until the day that this cemetery is cured of its curse, I remain within these gates.\"";
+    mes "\"I am bound to this wretched place by the very same spell that was cast to keep the undead from leaving. Until the day that this cemetery is free from its curse, I shall remain within these gates.\"";
     set QUEST_Graveyard_Caretaker, 1;
     close;
 
@@ -40,15 +40,15 @@ L_Return_Dialog:
     mes "Perhaps you can do me a favor?\"";
     next;
     menu
-        "What is the favor?", L_Favor,
+        "What's the favor?", L_Favor,
         "I'm sure I can, for a price.", L_Favor,
         "Sorry, I am busy.", -;
     close;
 
 L_Favor:
     mes "[Caretaker]";
-    mes "\"I have not seen my daughter since I was cursed to stay in this cemetery 25 years ago.";
-    mes "We communicate now through letters. Would you please take this to her?";
+    mes "\"I have not seen my daughter since I was cursed to stay in this cemetery, twenty-five years ago.";
+    mes "We communicate through letters, now. Would you please take this to her?";
     mes "I am sure she will compensate you for your trouble.\"";
     next;
     menu
@@ -59,7 +59,7 @@ L_Favor:
 
 L_Receive:
     set QUEST_Graveyard_Caretaker, 2;
-    mes "You receive the letter and put it in a special place so it doesn't get lost among your inventory.";
+    mes "You receive the letter and put it in a special place so it doesn't get lost in your inventory.";
     if (@menu == 2)
         goto L_Location;
     close;
@@ -69,7 +69,7 @@ L_Location:
 
 L_Location_Real:
     mes "[Caretaker]";
-    mes "\"Her name is Airlia. She works at the city hall in Hurnscald. Thank you for your help.\"";
+    mes "\"Her name is Airlia. She works at the town hall in Hurnscald. Thank you for your help.\"";
     close;
 
 L_Has_Letter:
@@ -77,7 +77,7 @@ L_Has_Letter:
     mes "\"Have you found my daughter?\"";
     next;
     menu
-        "Not Yet.", -,
+        "Not yet.", -,
         "I'll get there when I get there.", -,
         "Where did you say I could find her?", L_Location_Real;
     close;
@@ -104,7 +104,7 @@ L_Give_New_Letter:
 
 L_Give_New_Letter_Real:
     set QUEST_Graveyard_Caretaker, 5;
-    mes "You receive the letter and put it in a special place so it doesn't get lost among your inventory.";
+    mes "You receive the letter and put it in a special place so it doesn't get lost in your inventory.";
     next;
     mes "[Caretaker]";
     mes "\"Thank you.\"";
diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt
index 83598354..6f453835 100644
--- a/world/map/npc/027-2/cerhan.txt
+++ b/world/map/npc/027-2/cerhan.txt
@@ -2,7 +2,7 @@
 
 027-2.gat,70,77,0|script|Cerhan|311,{
     mes "[Cerhan]";
-    mes "\"Ah, hello! It is good to see another normal human at this strange place!\"";
+    mes "\"Ah, hello! It's good to see another normal human at this strange place!\"";
     next;
     menu
         "That's true. What are you doing here?",L_Story,
@@ -11,25 +11,25 @@
 
 L_Story:
     mes "[Cerhan]";
-    mes "\"I came from Thermin, a town in Kazei area.\"";
+    mes "\"I came from Thermin, a town in the Kazei area.\"";
     next;
-    mes "\"I'm an experienced weapon master and thinking about establishing a smithy here. But I'll need some more equipment.\"";
+    mes "\"I'm an experienced weapon master and I was thinking about establishing a smithy here. I'll need some more equipment, though.\"";
     next;
     if (countitem("MylarinDust") > 0)
         menu
             "Do you know something about 'Mylarin Dust'?", L_Mylarin,
             "Good luck with that.",-;
     mes "[Cerhan]";
-    mes "\"If you are interested in weapons and armor, you may want to come back later.\"";
+    mes "\"If you're interested in weapons and armor, you may want to come back later.\"";
     goto L_Close;
 
 L_Mylarin:
     mes "[Cerhan]";
     mes "\"Mylarin dust?! Where did you get that? That's amazing!\"";
     next;
-    mes "\"I can craft you an amazing strong armor with that - uhm, well, I first need to set up my smithy here.\"";
+    mes "\"I can craft you an amazing strong armor with that - uhm, well, first I need to set up my smithy here.\"";
     next;
-    mes "\"Please come back, when I'm ready with that. Mylarin dust... amazing.\"";
+    mes "\"Please come back, when I'm ready for that. Mylarin dust... amazing.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index 54b05120..f6df816c 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -42,7 +42,7 @@ L_intro:
     next;
     mes "\"Waaahhhaaa!\"";
     next;
-    mes "You bend your knees near the child, trying to gain his confidence and ask why he is crying. But looking closely, you are surprised to see that his skin color is an awful cadaveric grey...";
+    mes "You bend your knees near the child, trying to gain his confidence and ask why he is crying. But looking closely, you are surprised to see that his skin color is an awful, cadaveric grey...";
     menu
         "Calm down kid, what happened?",-,
         "Leave the kid alone.",L_Close;
@@ -50,45 +50,45 @@ L_intro:
     mes "\"Oh, what? Who are you "+@madamsir$+", what are you doing here?\"";
     next;
     menu
-        "My name is "+strcharinfo(0)+". I heard you cry and decided to ask if you need help.",-;
+        "My name is "+strcharinfo(0)+". I heard you cry and decided to check if you needed any help.",-;
     mes "The child looks at you from head to toe and says: \"" +@madamsir$+ ", aren't you scared of me?\"";
     next;
     menu
         "No... Why would I be scared of you?",-;
     mes "[Crying Child]";
-    mes "\"I am, you know... dead. And Mom and dad, and a lot of people in this inn... But most of them don't like to talk about it.\"";
+    mes "\"I am, you know... dead. Like Mom and Dad, and a lot of other people in this inn... But most of them don't like to talk about it.\"";
     menu
         "You are a brave and smart kid... I have nothing to be afraid of.",-;
     mes "[Crying Child]";
-    mes "\"It is nice to talk to you. I don't have any friends and Mom is always sad and Dad is always angry with something I don't know... and... Did you see the man in the room next to me? The one with horns? Ohh, I don't like him! \"";
+    mes "\"It's nice to talk to you. I don't have any friends and Mom is always sad and Dad is always angry about something I don't know... and... Did you see the man in the room next to me? The one with horns? Oh, I don't like him! \"";
     next;
     mes "[Crying Child]";
-    mes "\"My parents told me not to talk to strangers... But you look nice... I guess I can trust you... I'm Aldred and we live here, my parents and me. This is our inn.\"";
+    mes "\"My parents told me not to talk to strangers... But you look nice... I guess I can trust you... I'm Aldred and we live here, my parents and I. This is our inn.\"";
     next;
     mes "[Aldred]";
     mes "\"You asked why I was crying. My problem is... I don't know what to do... My dad will be so angry with me... He used to be very nice, but now... if you do something wrong... he... Waaaaa!\"";
     next;
     menu
-        "Here, here, don't cry... What did you do?",-;
+        "There, there. Don't cry... What did you do?",-;
     mes "[Aldred]";
-    mes "\"Err.. I was looking at my parents stuff and I found this funny thing! It looked like a normal ring, but with a round empty space... I thought it would be fun to take it with me and maybe look for a stone or a gem to fill the empty space. But I... I lost it...\"";
+    mes "\"Umm... I was looking at my parents' stuff and I found this funny thing! It looked like a normal ring, but with a round empty space... I thought it would be fun to take it with me and maybe look for a stone or a gem to fit into the empty space. But I... I lost it...\"";
     next;
-    mes "\"I don't know what happened. I was in this room and... I heard some very loud noises, people screaming, cracking sounds... and a smell, a terrible smell, like something rotten. And then I can't remember anything else!\"";
+    mes "\"I don't know what happened. I was in this room and... I heard some very loud noises, people screaming, cracking sounds... and a smell, a terrible smell, like something rotten. And then... I can't remember anything else!\"";
     next;
-    mes "\"I think it was something very bad, because, after all that, I woke up the way I am now and I couldn't find the ring in my pocket. Oh, and my parents are acting like they are not themselves. I don't know what happened, maybe it was my fault... I shouldn't have played with that ring... \"";
+    mes "\"I think it was something very bad, because, after all that, I woke up the way I am now and I couldn't find the ring in my pocket. Oh, and my parents are acting like they're not themselves. I don't know what happened, maybe it was my fault... I shouldn't have played with that ring... \"";
     next;
     menu
         "Don't worry, I will look around. Maybe I can find it for you...",-,
-        "Hey, you messed up, now you deal with this.",L_Close;
+        "Hey, you messed up. Deal with it.",L_Close;
     mes "[Aldred]";
-    mes "\"Thank you " +strcharinfo(0)+"! Find it for me, pleeeease! Ohh, and don't tell my parents I lost their ring, okay?\"";
+    mes "\"Thank you " +strcharinfo(0)+"! Find it for me, pleeeease! Oh, and don't tell my parents that I lost their ring, okay?\"";
     set @state, 1;
     callsub S_Update_Mask;
     goto L_Close;
 
 L_return:
     mes "[Aldred]";
-    mes "\"Please, help me " +@madamsir$+ ". If you find that ring I think things can be a little better between me and my parents.\"";
+    mes "\"Please, help me " +@madamsir$+ ". If you find that ring, I think things will be a little better between me and my parents.\"";
     goto L_Close;
 
 
@@ -96,17 +96,17 @@ L_return1:
     menu
         "Hi Aldred. I found the ring!",-;
     mes "[Aldred]";
-    mes "\"Great! You are the best! Where did you find it?\"";
+    mes "\"Great! You're the best! Where did you find it?\"";
     next;
     menu
-        "It was easy, it was with one of the monsters outside.",-;
+        "It was easy, I found it on one of the monsters outside.",-;
     mes "[Aldred]";
-    mes "\"Ohh.. a monster? He must be a fine monster since he returned it so easily to you!\"";
+    mes "\"Ohh.. a monster? It must've been a nice monster since it returned it so easily to you!\"";
     next;
     menu
         "Err... kind of...",-;
     mes "[Aldred]";
-    mes "\"Now I will put this thing back in its proper place... Thank you!\"";
+    mes "\"Now, I'll put this thing back in its proper place... Thank you!\"";
     set @state, 3;
     callsub S_Update_Mask;
     goto L_Close;
@@ -118,7 +118,7 @@ L_return2:
     menu
         "Don't worry, you don't need to give me anything...",-;
     mes "[Aldred]";
-    mes "\"Are you serious? That is why you are so great! But hey, I have an idea. What if you talk to my parents about this thing? If it is not important or valuable, I don't think it would be a problem to let you keep it. And I really want to know if they are acting all weird because I lost it. Would you do this for me?\"";
+    mes "\"Are you sure? That's why you're so great! But hey, I have an idea. What if you talk to my parents about this thing? If it's not important or valuable, I don't think it would be a problem to let you keep it. And I really want to know if they're acting all weird because I lost it. Would you do this for me?\"";
     next;
     menu
         "Sounds interesting... But who are your parents?",-,
@@ -126,15 +126,15 @@ L_return2:
     set @state, 4;
     callsub S_Update_Mask;
     mes "[Aldred]";
-    mes "\"Ok, great... But please, don't tell them about it. I don't want my parents to know I was playing with their stuff. My father is always carrying a lantern... I guess he is still afraid of the dark. My mother is the innkeeper. She is very beautiful and she is wearing a red dress.\"";
+    mes "\"Okay, great... But please, don't tell them about it. I don't want my parents to know I was playing with their stuff. My father is always carrying a lantern... I guess he's still afraid of the dark. My mother is the innkeeper. She's very beautiful and she's wearing a red dress.\"";
     next;
-    mes "\"Don't forget to come back with the ring after you talk to my parents.\"";
-    message strcharinfo(0), "Aldred hands you the ring and you keep it in a small pocket of your backpack";
+    mes "\"Don't forget to come back with the ring after you've talked to my parents.\"";
+    message strcharinfo(0), "Aldred hands you the ring and you keep it in a small pocket on your backpack.";
     goto L_Close;
 
 L_return3:
     mes "[Aldred]";
-    mes "\"I hope this ring doesn't mean a lot to my parents. This way you can keep it as a gift and I won't feel guilty about taking it.\"";
+    mes "\"I hope this ring doesn't mean a lot to my parents. That way you can keep it as a gift and I won't feel guilty about taking it.\"";
     goto L_Close;
 
 L_return4:
@@ -143,26 +143,26 @@ L_return4:
     mes "[Aldred]";
     mes "\"Really? What did my father say about it?\"";
     menu
-        "He said it is just a cheap ring. And it does not belong to him.",-;
+        "He said it's just a cheap ring. And it doesn't belong to him.",-;
     mes "[Aldred]";
     mes "\"And what did my mother say?\"";
     menu
-        "She said it was a gift to her, but she doesn't want it anymore.",-;
+        "She said it was a gift, but she doesn't want it anymore.",-;
     mes "[Aldred]";
-    mes "\"Really? A gift? And why she doesn't want it?\"";
+    mes "\"Really? A gift? And why doesn't she want it anymore?\"";
     next;
     menu
         "She said it makes her sad.",-;
-    mes "\"Ohh... really? I don't like when my mother gets sad... If this ring is making her feel bad, I should keep it away from her. \"";
+    mes "\"Ohh... really? I don't like it when my mother gets sad... If this ring is making her feel bad, I should keep it away from her. \"";
     next;
-    mes "\"Well, I guess you can keep it, but don't show it to my mother again, she is already very sad. But now I am really curious, who else would give a gift to my mother? There are so many strange things happening lately...\"";
+    mes "\"Well, I guess you can keep it, but don't show it to my mother again, she's already very sad. But now I'm really curious. Who else would give a gift to my mother? There are so many strange things happening lately...\"";
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_full;
     getitem "SimpleRing", 1;
     set @state, 7;
     callsub S_Update_Mask;
-    mes "\"I will tell my parents how great and helpful you are. Maybe they can even let you stay here at the inn for free!\"";
+    mes "\"I'll tell my parents how great and helpful you are. Maybe they can even let you stay here at the inn for free!\"";
     goto L_Close;
 
 L_return5:
diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt
index 06a8d067..bfef84a6 100644
--- a/world/map/npc/027-2/diary.txt
+++ b/world/map/npc/027-2/diary.txt
@@ -11,24 +11,24 @@
     end;
 
 L_Diary:
-    mes "You pull out Reid's diary from behind a huge poem book. In the back of the book, you find some entries which seem to be about Savaric.";
+    mes "You pull out Reid's diary from behind a huge poetry book. Towards the end of the diary, you find some entries which seem to be about Savaric.";
     next;
-    mes "'Savaric keeps confusing me - one time he is so flirty and slinky, another time he is cold and unfriendly. What is it with this man?'";
+    mes "'Savaric keeps confusing me - one time he is so flirtatious and smooth, another time he is cold and unfriendly. What is it with this man?'";
     next;
-    mes "'I need to stay away from him! It's not right, what I am feeling. It seems Hamond doesn't suspect anything of my feelings - but I know, it's just a matter of time. I need to come to my senses again!'";
+    mes "'I need to stay away from him! It's not right, what I am feeling. It seems Hamond doesn't suspect anything about my feelings - but I know, it's just a matter of time. I need to come to my senses again!'";
     next;
-    mes "'Oh, this chaos between Savaric and me is getting serious. I was in his room today and he put his arms around me - I wanted to push him away, but I couldn't move. It was such a sweet feeling. I was torn between my brain saying 'No!' and my body wanting to feel his touch. Then Aldred showed up and Savaric let me go.'";
+    mes "'Oh, this chaotic situation between Savaric and me is getting serious. I was in his room today and he put his arms around me - I wanted to push him away, but I couldn't move. It was such a sweet feeling. I was torn between my brain saying 'No!' and my body wanting to feel his touch. Then, Aldred showed up and Savaric let me go.'";
     next;
-    mes "The next part is blurred - it seems Reid was crying while writing.";
-    mes "'Savaric was talking again about leaving, because he can't find the mana seed. The thought that I would never see him again made me feel like I was falling into a big black hole! I need to decide what to do. But Hamond - I owe him so much. And what about Aldred?'";
+    mes "The next part is blurred - it seems Reid was crying while writing it.";
+    mes "'Savaric was talking again about leaving, because he can't find the mana seed. The thought that I would never see him again made me feel like I was falling into a dark abyss! I need to decide what to do. But Hamond - I owe him so much. And what about Aldred?'";
     next;
-    mes "'We kissed each other - oh, I'm feeling so bad. I'm a disloyal slut. But I want it to happen again.'";
+    mes "'We kissed each other - oh, I'm feeling so bad. I'm an unfaithful slut. But I want it to happen again, so badly.'";
     next;
-    mes "'I told Savaric we have to stop with it - he was very understanding. But then he started to hold me again and I couldn't resist. I completely don't know what to do! His touch at my waist, even though over my clothes, made me feel hotter than Hamonds touch ever did.'";
+    mes "'I told Savaric we have to stop with this - he was very understanding. But then he started to hold me again and I couldn't resist. I don't know what to do, at all! His touch on my waist, even through my clothes, made me feel more excited than Hamond's touch ever did.'";
     next;
-    mes "'I don't know if Hamond suspects us - he was holding me tight all through the night, whispering declarations of love in my ears. Oh, I'm feeling so bad.'";
+    mes "'I don't know if Hamond suspects us - he was holding me tight all through the night, whispering declarations of love in my ears. Oh, I feel so bad.'";
     next;
-    mes "'Hamond won't be here tomorrow night - he needs to visit our wine supplier to negotiate the prices. Savaric knows this. I'm feeling so excited - I should go with Hamond, but I told him I need to take care of the inn while he's away. Savaric.. '";
+    mes "'Hamond won't be here tomorrow night - he needs to visit our wine supplier to negotiate the prices. Savaric knows this. I'm feeling so excited - I should go with Hamond, but I told him I need to take care of the inn while he's away. Savaric... '";
     next;
     mes "This is the last entry.";
     if (@reid != 6)
diff --git a/world/map/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt
index 276cc3c1..bbb349df 100644
--- a/world/map/npc/027-2/evil_guard.txt
+++ b/world/map/npc/027-2/evil_guard.txt
@@ -4,10 +4,10 @@
     mes "The guard glares at you, silently daring you to try something.";
     next;
     mes "[Evil Guard]";
-    mes "\"I give you warning young human.  My master will suffer no fools here.\"";
+    mes "\"Heed my warning, young human.  My master will suffer no fools here.\"";
     next;
     mes "[Evil Guard]";
-    mes "\"He created this as a place of leisure, and we are here to ensure that it stays that way.\"";
+    mes "\"He created this as a place of leisure, and we are here to ensure that it remains undisturbed.\"";
     close;
 }
 
@@ -18,9 +18,9 @@
     mes "[Evil Guard]";
     mes "\"I am your father...\"";
     next;
-    mes "There is an awkward pause, and the guard bursts out laughing.";
+    mes "There is an awkward pause, and then the guard bursts out laughing.";
     mes "";
     mes "[Evil Guard]";
-    mes "\"Just kidding! Can you imagine Golbenez' reaction if we had such puny offspring?\"";
+    mes "\"Just kidding! Can you imagine Golbenez's reaction if we had such puny offspring?\"";
     close;
 }
diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index 42cc120e..75836658 100644
--- a/world/map/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
@@ -54,7 +54,7 @@
         "You look different here. Nice horns.",L_Horns,
         "I'm enjoying myself, thanks for asking.",L_Close;
     mes "[Golbenez]";
-    mes "\"Mortal, this is way over your head. Don't worry about that and enjoy your time.\"";
+    mes "\"Mortal, this is beyond your comprehension. Do not worry about it and enjoy your time.\"";
 
     if (@lover < 2)
         goto L_Close;
@@ -64,17 +64,17 @@
     mes "[Golbenez]";
     mes "\"Fine.\"";
     next;
-    mes "\"This place was a normal inn many, many of your years ago. I found it by chance and it became one of my most favorite playgrounds ever.\"";
+    mes "\"This place was a normal inn many, many of your years ago. Chance brought me here and it became one of my favorite playgrounds.\"";
     next;
     mes "Golbenez laughs in a way which really gives you the creeps.";
     next;
     mes "[Golbenez]";
-    mes "\"Unfortunately - it got destroyed. So I took the memories of the dead and recreated this place.\"";
+    mes "\"Unfortunately, it got destroyed. I had no choice but to take the memories from the dead and recreate this place.\"";
     menu
         "What do you mean by 'playground?'",-,
-        "Recreated? What do you mean by that?",-;
+        "Recreate? What do you mean by that?",-;
     mes "[Golbenez]";
-    mes "\"As I said, you don't understand. You start to bore me. Leave.\"";
+    mes "\"As I said, you do not understand. You are starting to bore me. Leave.\"";
 
     set @state, 1;
     callsub S_Update_Mask;
@@ -84,21 +84,21 @@
 L_Back:
     if (@lover >= 3)
         goto L_Memory;
-    mes "Golbenez decides to ignore your presence.";
+    mes "Golbenez ignores your presence.";
     goto L_Close;
 
 L_Memory:
     mes "[Golbenez]";
-    mes "\"Mortal, you're back. Are you going to bore me with other stupid questions?\"";
+    mes "\"Mortal, you are back. Are you going to bore me with other stupid questions?\"";
     menu
-        "I want to know what happened in the inn before it was destroyed.",-,
+        "I want to know what happened in the inn, before it was destroyed.",-,
         "Nevermind.",L_Close;
     if ((@woman >= 7)
         && (@lover >= 3)
         && (@husband >= 4))
             goto L_Detective;
     mes "[Golbenez]";
-    mes "\"I was watching you playing detective. It is amusing. Play it a little longer and I may show you some of the memories from that time.\"";
+    mes "\"I was watching you play detective. I find it amusing. Play it a little longer and I may show you some of the memories from that time.\"";
     goto L_Close;
 
 L_Detective:
@@ -107,16 +107,16 @@ L_Detective:
     next;
     mes "\"I can show you all their memories. Would you like that?\"";
     next;
-    mes "\"The only thing you'd have to do is promise me your soul.\"";
+    mes "\"The only thing you would have to do is promise me your soul.\"";
     menu
         "No!",-,
         "That's too expensive. Make another offer.",-,
         "My soul?!",-;
-    mes "Golbenez giggles, which looks strange on such an intimidating being as he is.";
+    mes "Golbenez giggles, a strange and somewhat unnerving sound from such a being.";
     mes "[Golbenez]";
     mes "\"You should have seen your face. Really, mortals can be so funny.\"";
     next;
-    mes "\"Ok, I'll show you the birdbrained womans memories if you bring me " + @ROTTENRAGS_AMOUNT + " Rotten Rags. And an Orange Cake.\"";
+    mes "\"Very well, I will show you the birdbrained woman's memories if you bring me " + @ROTTENRAGS_AMOUNT + " Rotten Rags. And an Orange Cake.\"";
     set @state, 2;
     callsub S_Update_Mask;
     goto L_Close;
@@ -140,9 +140,9 @@ L_Reid:
     getexp @ROTTENRAGS_EXP, 0;
 
     mes "[Golbenez]";
-    mes "\"Very nice. I will show you the womans memories of that night. Come closer.\"";
+    mes "\"Very nice. I will show you the woman's memories of that night. Come closer.\"";
     next;
-    mes "\"You're hesitating but then take a step towards Golbenez. He grabs your head with his claw-like fingers.\"";
+    mes "\"You hesitate but then take a step towards Golbenez. He grabs your head with his claw-like fingers.\"";
     next;
     callsub S_Reidsmem;
     set @state, 3;
@@ -151,10 +151,10 @@ L_Reid:
         "Can I see it again?",-,
         "Wow, that was interesting.",-,
         "Why do you collect such personal memories?",-;
-    mes "Golbenez takes an amused look at you.";
+    mes "Golbenez throws you an amused look.";
     next;
     mes "[Golbenez]";
-    mes "\"I'll explain the deal to you. Once you have paid for a memory, you can come and see it again as often as you like. And I collect whatever memory I want to. Mortals can be very amusing.\"";
+    mes "\"I will explain the deal to you. Once you have paid for a memory, you can come and see it again as often as you like. And I collect whatever memory I want to. Mortals are a constant source of amusement for me.\"";
     next;
     mes "\"I have more memories you might want to see. Bring me "+ @UNDEADEAR_AMOUNT + " Undead Ears. And a Chocolate Cake.\"";
     goto L_Close;
@@ -164,11 +164,11 @@ L_Hamond:
     mes "\"Ah, mortal. Do you have the " + @UNDEADEAR_AMOUNT + " Undead Ears I want?\"";
     if (countitem("UndeadEar") < @UNDEADEAR_AMOUNT)
         menu
-            "I want to see Reids memory again.",L_R_Again,
+            "I want to see Reid's memory again.",L_R_Again,
             "What will you do with them?",L_Why_Stuff,
             "Not yet.",L_Close;
     menu
-        "I want to see Reids memory again.",L_R_Again,
+        "I want to see Reid's memory again.",L_R_Again,
         "I have what you want.",-,
         "I'm working on that.",L_Close;
     if (countitem("ChocolateCake") < 1)
@@ -179,14 +179,14 @@ L_Hamond:
     delitem "ChocolateCake", 1;
     getexp @UNDEADEAR_EXP, 0;
     mes "[Golbenez]";
-    mes "\"Good. I'll show you the memories of the dumb husband now. Come to me.\"";
+    mes "\"Good. I will show you the memories of the dumb husband now. Come to me.\"";
     next;
     mes "You step closer to Golbenez and he holds your head again.";
     callsub S_Hamondsmem;
     set @state, 4;
     callsub S_Update_Mask;
     mes "[Golbenez]";
-    mes "\"It's really interesting how illogical humans behave.\"";
+    mes "\"It is really interesting how illogical humans behave.\"";
     next;
     mes "\"And how predictable they are. I can see in your eyes that you want to know how this drama went on.\"";
     next;
@@ -198,13 +198,13 @@ L_Savaric:
     mes "\"I hope you are bringing me the " + @UNDEADEYE_AMOUNT + " Undead Eyes I want.\"";
     if (countitem("UndeadEye") < @UNDEADEYE_AMOUNT)
         menu
-            "I want to see Reids memory again.",L_R_Again,
-            "I want to see Hamonds memory again.",L_H_Again,
+            "I want to see Reid's memory again.",L_R_Again,
+            "I want to see Hamond's memory again.",L_H_Again,
             "I really wonder what you do with the stuff I bring you.",L_Why_Stuff,
             "They're hard to get. I'm still working on that.",L_Close;
     menu
-        "I want to see Reids memory again.",L_R_Again,
-        "I want to see Hamonds memory again.",L_H_Again,
+        "I want to see Reid's memory again.",L_R_Again,
+        "I want to see Hamond's memory again.",L_H_Again,
         "I got what you want.",-,
         "I'm working on that.",L_Close;
     if (countitem("AppleCake") < 1)
@@ -215,9 +215,9 @@ L_Savaric:
     delitem "AppleCake", 1;
     getexp @UNDEADEYE_EXP, 0;
     mes "[Golbenez]";
-    mes "\"Very Good. Now I'll show you the pitiful mages memory.\"";
+    mes "\"Very good. Now I will show you the pitiful mage's memory.\"";
     next;
-    mes "He holds your head and everything grows black again.";
+    mes "He holds your head and everything goes black again.";
     callsub S_Savaricsmem;
     set @state, 5;
     callsub S_Update_Mask;
@@ -226,7 +226,7 @@ L_Savaric:
     menu
         "YOU CRUEL MONSTER!",-,
         "I agree. What a bunch of idiots.",-;
-    mes "Golbenez smiles";
+    mes "Golbenez's mouth twists into something resembling a smile.";
     mes "[Golbenez]";
     mes "\"Oh, thank you.\"";
     goto L_Close;
@@ -237,24 +237,24 @@ L_All:
     mes "[Golbenez]";
     mes "\"Did you come back to see the memories again?\"";
     menu
-        "I want to see Reids memory again.",L_R_Again,
-        "I want to see Hamonds memory again.",L_H_Again,
-        "I want to see Savarics memory again.",L_S_Again,
+        "I want to see Reid's memory again.",L_R_Again,
+        "I want to see Hamond's memory again.",L_H_Again,
+        "I want to see Savaric's memory again.",L_S_Again,
         "Nevermind.",L_Close;
     goto L_Close;
 
 L_Negotiate:
-    mes "Golbenez eyes are glowing greedily.";
+    mes "Golbenez's eyes are glowing greedily.";
     mes "[Golbenez]";
     mes "\"Did you come back to see the memories again? Or are you going to offer me another deal?\"";
     menu
-        "I want Savarics soul back.",-,
-        "I want to see Reids memory again.",L_R_Again,
-        "I want to see Hamonds memory again.",L_H_Again,
-        "I want to see Savarics memory again.",L_S_Again,
+        "I want Savaric's soul back.",-,
+        "I want to see Reid's memory again.",L_R_Again,
+        "I want to see Hamond's memory again.",L_H_Again,
+        "I want to see Savaric's memory again.",L_S_Again,
         "Nevermind.",L_Close;
     mes "[Golbenez]";
-    mes "\"Savarics soul, yes. It is a pretty nice soul, you know. From a mage... no, even better... from a loving mage. It is valuable.\"";
+    mes "\"Savaric's soul, yes. It is a pretty nice soul, you know. From a mage... no, even better... from a lovestruck mage. It is valuable.\"";
     next;
     mes "\"Why do you think it would be easy to get it back? Do you have anything of equal worth to offer?\"";
     next;
@@ -263,7 +263,7 @@ L_Negotiate:
         "I'm not sure. What do you want?",-,
         "No.",L_Close;
     mes "[Golbenez]";
-    mes "\"Bring me a soul of at least equal power to the mage. I don't care where you get it.\"";
+    mes "\"Bring me a soul of at least equal power to the mage's. I do not care about its origin.\"";
     set @state, 6;
     callsub S_Update_Mask;
     goto L_Close;
@@ -287,7 +287,7 @@ L_Soul_Try:
     if (@soul == 0)
         goto L_Soul_Success;
     mes "[Golbenez]";
-    mes "\"No, this one isn't as powerful as the mage. Bring me another one of them.\"";
+    mes "\"No, this one is not as powerful as the mage's. Bring me another one of those.\"";
     getexp @JACKOSOUL_EXP, 0;
     goto L_Soul_Try;
 
@@ -296,7 +296,7 @@ L_Soul_Success:
     mes "[Golbenez]";
     mes "\"Yes! This one is full of energy.\"";
     next;
-    mes "\"So be it, mortal. I'll release Savarics soul in exchange for this one.\"";
+    mes "\"So be it, mortal. I will release Savaric's soul in exchange for this one.\"";
     set @state, 7;
     callsub S_Update_Mask;
     goto L_Close;
@@ -306,14 +306,14 @@ L_Done:
     mes "\"I hope you enjoyed your little detective game. I certainly did.\"";
     menu
         "You're cruel.",L_Close,
-        "I want to see Reids memory again.",L_R_Again,
-        "I want to see Hamonds memory again.",L_H_Again,
-        "I want to see Savarics memory again.",L_S_Again;
+        "I want to see Reid's memory again.",L_R_Again,
+        "I want to see Hamond's memory again.",L_H_Again,
+        "I want to see Savaric's memory again.",L_S_Again;
 
 L_Cake:
     mes "Golbenez laughs.";
     mes "[Golbenez]";
-    mes "\"That's why I like you - also you're a human, you have a nice sense of humor.\"";
+    mes "\"This is why I like you. Despite being human, you have a delightful sense of humor.\"";
     goto L_Close;
 
 L_S_Again:
@@ -324,13 +324,13 @@ L_S_Again:
 
 L_R_Again:
     callsub S_Reidsmem;
-    mes "\"This memory seems to be exciting to you. Interesting.\"";
+    mes "\"This memory seems to excite you. Interesting.\"";
     goto L_Close;
 
 L_H_Again:
     callsub S_Hamondsmem;
     mes "[Golbenez]";
-    mes "\"Humans can be so stupid, can't they?\"";
+    mes "\"Humans can be so stupid, have you noticed that?\"";
     goto L_Close;
 
 L_Horns:
@@ -347,7 +347,7 @@ L_Why_Stuff:
 
 L_Betray:
     mes "[Golbenez]";
-    mes "\"I'm warning you, mortal. Don't try to betray me!\"";
+    mes "\"I am warning you, mortal. Do not try to betray me!\"";
     goto L_Close;
 
 L_No_Cake:
@@ -380,54 +380,54 @@ L_Close:
 
 S_Reidsmem:
     mes "[Golbenez]";
-    mes "\"I'll send her memories into your brain now. Don't collapse or do something similarly foolish.\"";
+    mes "\"I will send her memories into your brain now. Do not collapse or do something equally foolish.\"";
     next;
     mes "Everything turns black. Then, slowly, you see something. You're standing outside and watching an alive-looking Hamond ride away on a carriage drawn by a mouboo.\"";
     next;
     mes "\"You turn back and enter a nice looking building. It seems to be the inn.";
     next;
-    mes "Obviously you are watching Reids memories out of her eyes. You're getting excited. Or is it Reid who feels excited? You're not sure.";
+    mes "Obviously, you are watching Reid's memories through her eyes. You're getting excited. Or is it Reid who feels excited? You're not sure.";
     next;
-    mes "You-Reid walks up the stairs and stops in front of the door you recognize as Savarics room. You get a twisted feeling, something between desire, guilt and despair.";
+    mes "You-Reid walks up the stairs and stops in front of the door you recognize as Savaric's room. You get a twisting feeling, something between desire, guilt and despair.";
     next;
-    mes "It seems you're not only seeing Reids memories but also feeling them!";
+    mes "It seems you're not only seeing Reid's memories, but also feeling them!";
     next;
-    mes "Reid turns away from Savarics door and walks to her rooms quickly. She is shivering. You feel her heart pounding.";
+    mes "Reid turns away from Savaric's door and walks to her rooms quickly. She is shivering. You feel her heart pounding.";
     next;
-    mes "She enters the room and pulls the red dress you already recognize from her ghost out of a chest and changes her clothes. Her heart is pounding even faster.";
+    mes "She enters the room and pulls a red dress out of a chest and changes into it. As you feel her heart pounding even faster, you recognize the dress as the one her ghost is wearing.";
     next;
     mes "She sits down on the bed holding her head in her hands.";
     next;
     mes "[Reid]";
     mes "\"This is wrong...\"";
     next;
-    mes "Then she stands up and returns to Savarics door. She is hesitating again. Suddenly the door opens, Savaric standing there, smiling.";
+    mes "Then she stands up and returns to Savaric's door. She hesitates again. Suddenly the door opens, Savaric standing there, smiling.";
     next;
     mes "[Savaric]";
     mes "\"I was hoping you would come.\"";
     next;
-    mes "He reaches out his hands and you feel Reid getting dizzy.";
+    mes "He reaches out with his hands and you feel Reid getting dizzy.";
     next;
-    mes "You enter his room together. There is only one candle on the table, so the light is dimmed.";
+    mes "You enter his room together. There is only one candle on the table, providing a dim light.";
     next;
     mes "[Reid]";
     mes "\"I- we- Savaric- this is not right- we shouldn't do this.\"";
     next;
     mes "[Savaric]";
-    mes "\"But you came. Sh, don't worry. Let me hold you.\"";
+    mes "\"But you came. Shh, don't worry. Let me hold you.\"";
     next;
-    mes "Savaric puts his arms around Reid and lead her to the bed. You feel a flush of sexual arousal.";
+    mes "Savaric puts his arms around Reid and leads her to the bed. You feel a rush of sexual desire.";
     next;
-    mes "He starts to caress Reids face with his lips while his hands slip her dress from her shoulders.";
+    mes "He starts to caress Reid's face with his lips, as his hands slip the dress from her shoulders.";
     next;
-    mes "Reids feelings are like a firestorm and it's hard for you to concentrate on what is happening.";
+    mes "Reid's feelings are like a firestorm and it's hard for you to concentrate on what is happening.";
     next;
-    mes "Savaric touches her body and - you suddenly stand in front of Golbenez again, wobbling around and then fall to the ground.";
+    mes "Savaric touches her body and - you suddenly stand in front of Golbenez again, wobbling around for a moment, before falling to the ground.";
     next;
     mes "[Golbenez]";
     mes "\"I told you not to collapse!\"";
     next;
-    mes "\"It seems Reids feelings were too strong for you to withstand.\"";
+    mes "\"It seems Reid's feelings were too strong for you to withstand.\"";
     next;
     mes "Golbenez grins.";
     next;
@@ -439,56 +439,56 @@ S_Reidsmem:
 S_Hamondsmem:
     mes "The darkness vanishes and you see the back of a mouboo pulling the carriage you're sitting on. Or better to say, Hamond is sitting on.";
     next;
-    mes "You feel very very nervous and worried.";
+    mes "You feel very, very nervous and worried.";
     next;
     mes "[Hamond]";
     mes "\"I shouldn't leave her alone with that debaucher. But she loves me. She won't give in to such a dandy. I believe in her. I trust her.\"";
     next;
-    mes "The carriage reaches a river, but it seems the bridge is damaged. A group of people is standing at the riverside. There is one little boat, taking the people across one by one.";
+    mes "The carriage reaches a river, but it seems the bridge is damaged. A group of people is standing on the riverside. There is one little boat, taking the people across, one by one.";
     next;
-    mes "You feel a great surge of relief growing in Hamonds chest.";
+    mes "You feel a great surge of relief growing in Hamond's chest.";
     next;
-    mes "He shakes the reins and gets his carriage turned around. Obviously this is a great excuse for him to return to Reid at once.";
+    mes "He shakes the reins and turns his carriage around. Obviously this is a great excuse for him to return to Reid at once.";
     next;
-    mes "When he returns to the inn, sunset is already near. He tells the stableboy to take care of the mouboo and carriage, then rushes up the stairs heading to his and Reids rooms. You can feel his heart pounding.";
+    mes "When he returns to the inn, the sun is already low on the horizon. He tells the stableboy to take care of the mouboo and carriage, then rushes up the stairs heading to his and Reid's rooms. You can feel his heart pounding.";
     next;
     mes "He rips the door open and the room is empty. A cold feeling grows in his chest. He turns around and sees Reid standing in front of him, wearing her best dress. The red one which makes her look so beautiful - you feel a sharp sting in Hamonds heart.";
     next;
-    mes "The dress is crumpled and seems to be put on in haste. Her hair is in total chaos on her head.";
+    mes "The dress is crumpled and seems to have been put on in haste. Her hair is in a disarray.";
     next;
     mes "[Reid]";
     mes "\"Hamond! What are you doing here? Why are you already back?\"";
     next;
     mes "You feel a burning rage growing in Hamond.";
     mes "[Hamond]";
-    mes "\"You're not happy to see me, are you? Would you prefer me to run this inn for you but not bother you about your cockish behavior?!\"";
+    mes "\"You're not happy to see me, are you? Would you prefer me to run this inn for you but ignore your cockish behavior?!\"";
     next;
-    mes "The shocked and painful but guilty look on Reids face fills Hamond with a strange mixture of pain and gratification.";
+    mes "The shocked, painful, and obviously guilty look on Reid's face fills Hamond with a strange mixture of pain and gratification.";
     next;
-    mes "He grabs her arm, pulls her into the room and slams the door shut behind them. You see a fearful look on Reids face.";
+    mes "He grabs her arm, pulls her into the room and slams the door shut behind them. You see a fearful look on Reid's face.";
     next;
     mes "[Reid]";
     mes "\"Hamond! Please, calm down!\"";
     next;
-    mes "The feeling of broken trust and disappoinment seems to drive you..Hamond..crazy.";
+    mes "The feeling of broken trust and disappoinment seems to drive you... Hamond... crazy.";
     next;
     mes "Hamond slaps her across the face.";
     next;
     mes "[Hamond]";
-    mes "\"You are MY WIFE! I'll teach you what this means!\"";
+    mes "\"You are MY WIFE! I'll teach you what that means!\"";
     next;
-    mes "As Hamond grabs Reid roughly and holds her tight, you can smell her sweat and fear, but under that is the smell of another man! Hamonds vision goes red.";
+    mes "As Hamond grabs Reid roughly and holds her tight, you can smell her sweat and fear, but under that is the smell of another man! Hamond's vision goes red.";
     next;
     mes "[Hamond]";
     mes "\"You dirty slut! I did everything for you!\"";
     next;
-    mes "Reid is struggling wildly to get out of Hamonds hold. She is surprisingly strong and both are falling against the table.";
+    mes "Reid is struggling wildly to get out of Hamond's hold. She is surprisingly strong and together they fall onto the table.";
     next;
-    mes "The next thing you see is a teapot smashing into Hamonds face. He stumbles back.";
+    mes "The next thing you see is a teapot smashing into Hamond's face. He stumbles back.";
     next;
-    mes "You see Reid running to the door, where she pauses and has a look back. Then she runs out of the room.";
+    mes "You see Reid running to the door, where she pauses and throws a look over her shoulder. Then she runs out of the room.";
     next;
-    mes "Her face was drowned with tears, her lips bloody and her eye was already turning black.";
+    mes "Her face was wet with tears, her lips bloody and her eye was already turning black.";
     next;
     mes "You feel shock and regret.";
     mes "[Hamond]";
@@ -499,13 +499,13 @@ S_Hamondsmem:
     return;
 
 S_Savaricsmem:
-    mes "As you gain your eyesight again, you find yourself bustling back and forth in Savarics room.";
+    mes "As you gain your eyesight again, you find yourself bustling back and forth in Savaric's room.";
     next;
     mes "The mixture of feelings you sense is very confusing. Worry, guilt, craving and below all that a deep feeling of luck and satisfaction.";
     next;
     mes "Then you hear steps outside the room. Savaric turns to the door quickly, then Reid breaks into the room.";
     next;
-    mes "She looks totally tattered, her dress is ripped, her lips are bleeding, she has a black eye and she is sobbing uncontrollably. It takes Savaric less than a second to reach her and put his arms around her carefully.";
+    mes "She looks utterly tattered, her dress ripped and her lips bleeding. She has a black eye and she is sobbing uncontrollably. It takes Savaric less than a second to reach her and put his arms around her carefully.";
     next;
     mes "You feel a deep, cold anger.";
     next;
@@ -514,58 +514,58 @@ S_Savaricsmem:
     next;
     mes "Savaric leads Reid to his bed and covers her gently. Then he holds and rocks her until she falls asleep. You notice Savaric is only wearing his underpants.";
     next;
-    mes "After Reids breathing has calmed down and her oppressed face looks peaceful again, he stands up and his cold burning anger comes back.";
+    mes "After Reid's breathing has calmed down and her abused face looks peaceful again, he stands up and his cold burning anger comes back.";
     next;
     mes "[Savaric]";
     mes "\"I won't let him get away with that!\"";
     next;
-    mes "Savaric pulls some things out of a chest and puts them on the table. He lights some candles and begins to mix together some powders and fluids. You can feel his concentration, but below that also a great anger which restrains you from clear thought.";
+    mes "Savaric pulls some things out of a chest and puts them on the table. He lights some candles and begins to mix together some powders and fluids. You can feel his concentration, but below that is a great anger keeping clear thoughts at bay.";
     next;
-    mes "Savaric seems to be ready with his magic ingredients and takes what he mixed together. You feel rising power inside of you. The moment you think you can't stand it anymore, the tension disappears and a purple light fills the room for a moment.";
+    mes "Savaric seems to be done with his magic ingredients and takes what he mixed together. You feel rising power inside of you. The moment you think you can't stand it anymore, the tension disappears and a purple light fills the room for a moment.";
     next;
     mes "Golbenez is standing in front of you.";
     next;
     mes "[Golbenez]";
     mes "\"Mortal! It was very rude of you to force me to this place with that spell - are you aware of the power you are playing around with?!\"";
     next;
-    mes "Fear is rising inside of you, but also excitement and a feeling of power.";
+    mes "Fear is rising inside of you, but also excitement accompanied by a feeling of power.";
     next;
     mes "[Savaric]";
     mes "\"I called you to get rid of the person who did this to this adorable woman.\"";
     mes "He points at Reid";
     next;
     mes "[Savaric]";
-    mes "\"Tell me your charge.\"";
+    mes "\"Tell me your price.\"";
     next;
-    mes "Golbenez' behavior changes immediately and he suddenly seems much friendlier.";
+    mes "Golbenez's behavior changes immediately and he suddenly seems much friendlier.";
     next;
     mes "[Golbenez]";
-    mes "\"Ah, you're offering me a deal. That's something else. Let me see. I can free her from all pain and anything or anyone causing her trouble.\"";
+    mes "\"Ah, you are offering me a deal. That is something completely different. Let me see... I can free her from all pain and anything or anyone causing her trouble.\"";
     next;
-    mes "You feel Savarics heart pounding.";
+    mes "You feel Savaric's heart pounding.";
     mes "[Savaric]";
     mes "\"Yes. That's what I want. I want her to be safe from any harm.\"";
     next;
-    mes "Golbenez' face turns into a smile.";
+    mes "Golbenez's face turns into a smile.";
     mes "[Golbenez]";
     mes "\"This requires some effort. It will have a remarkable price. I want your soul in exchange.\"";
     next;
-    mes "The feeling of power disappears and is replaced with uncertainty.";
+    mes "The feeling of power disappears, giving place to uncertainty.";
     mes "[Savaric]";
     mes "\"My - soul? Can't it be something else?\"";
     next;
     mes "[Golbenez]";
     mes "\"Think about what you get! This woman will never feel any pain again!\"";
     next;
-    mes "Savarics hesitation vanishes.";
+    mes "Savaric's hesitation vanishes.";
     mes "[Savaric]";
     mes "\"So be it. Take my soul and prevent Reid from feeling pain ever again.\"";
     next;
-    mes "Golbenez' smile changes to an ugly grin of malice. He reaches out to Savaric and seems to pull something out of him. Suddenly, you feel very weak and empty.";
+    mes "Golbenez's smile changes to an ugly grin filled with malice. He reaches out to Savaric and seems to pull something out of him. Suddenly, you feel very weak and empty.";
     next;
-    mes "In the next moment, you're laying on the ground and see Golbenez raising his arms. You sense an unbelievable magic force - what is he doing?";
+    mes "In the next moment, you're lying on the ground and see Golbenez raising his arms. You sense an unbelievable magic force - what is he doing?";
     next;
-    mes "Undead are entering the room and one of them steps to the bed and breaks Reid neck with a quick movement. A dark and black feeling of despair is rising inside of you.";
+    mes "Undead enter the room and one of them walks to the bed and breaks Reid's neck with a quick movement. A dark and black feeling of despair rises inside of you.";
     next;
     mes "[Savaric]";
     mes "\"NO!! What are you doing?\"";
@@ -573,9 +573,9 @@ S_Savaricsmem:
     mes "[Golbenez]";
     mes "\"She will never feel pain anymore. Just like everyone else in this inn - besides you, foolish mortal.\"";
     next;
-    mes "Golbenez leaves the room and you feel Savaric giving in to his pain. He is laying on the floor and trying to understand what he did.";
+    mes "Golbenez leaves the room and you feel Savaric giving in to his pain. He is lying on the floor and trying to understand what he did.";
     next;
-    mes "After a few moments of only feeling his suffering, Savaric finally manages to stand up again. He can't stand to see Reids dead body anymore and stumbles out of the room.";
+    mes "After a few moments of only feeling his suffering, Savaric finally manages to stand up again. He can't stand to see Reid's dead body anymore and stumbles out of the room.";
     next;
     mes "But what you can see in the rest of the inn isn't able to ease the suffering you're feeling. The undead have slaughtered every person in the inn, leaving only Savaric alive.";
     next;
@@ -590,7 +590,7 @@ S_Savaricsmem:
     mes "[Savaric]";
     mes "\"Now there's only one thing left for me to do.\"";
     next;
-    mes "Your vision turns black again and you're standing in front of Golbenez.";
+    mes "Your vision turns black again and you find yourself standing in front of Golbenez.";
     return;
 
 S_Update_Mask:
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 982b001b..4298106f 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -28,8 +28,8 @@
     set @cost, 1000;
 
     mes "[" + @npcname$ + "]";
-    mes "\"Don't be shy darling.";
-    mes "\"Come on in and have a nice long ... long slumber ...";
+    mes "\"Don't be shy, darling.";
+    mes "\"Come on in and have a nice long... long slumber...";
     next;
     callfunc "Inn";
 }
diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt
index 048e2f68..0ca1da2c 100644
--- a/world/map/npc/028-1/_mobs.txt
+++ b/world/map/npc/028-1/_mobs.txt
@@ -1,13 +1,13 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Easter Island mobs
 
-028-1.gat,121,75,27,25|monster|Spiky Mushroom|1019,18,20000,15000,Mob028-1::On1019
+028-1.gat,121,75,27,25|monster|SpikyMushroom|1019,18,20000,15000,Mob028-1::On1019
 028-1.gat,89,72,25,19|monster|Bat|1017,18,100000,10000,Mob028-1::On1017
 028-1.gat,99,36,48,32|monster|Wisp|1040,8,200000,15000,Mob028-1::On1040
 028-1.gat,99,36,46,34|monster|Spectre|1042,8,200000,15000,Mob028-1::On1042
 028-1.gat,99,36,44,36|monster|Poltergeist|1047,8,200000,15000,Mob028-1::On1047
-028-1.gat,41,67,38,9|monster|Sea Slime|1033,18,100000,25000,Mob028-1::On1033
-028-1.gat,51,78,22,10|monster|Sea Slime|1033,15,100000,25000,Mob028-1::On1033
+028-1.gat,41,67,38,9|monster|SeaSlime|1033,18,100000,25000,Mob028-1::On1033
+028-1.gat,51,78,22,10|monster|SeaSlime|1033,15,100000,25000,Mob028-1::On1033
 028-1.gat,29,104,1,1|monster|Squirrel|1038,1,300000,50000,Mob028-1::On1038
 028-1.gat,74,98,71,18|monster|Wisp|1040,8,200000,15000,Mob028-1::On1040
 028-1.gat,82,103,93,16|monster|Spectre|1042,8,200000,15000,Mob028-1::On1042
diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt
index 5556ef9d..4c74a41a 100644
--- a/world/map/npc/028-3/_mobs.txt
+++ b/world/map/npc/028-3/_mobs.txt
@@ -2,8 +2,8 @@
 // Easter Island Cave mobs
 
 028-3.gat,51,49,22,15|monster|Silkworm|1035,10,30000,3000,Mob028-3::On1035
-028-3.gat,43,35,1,1|monster|Evil Mushroom|1013,3,40000,5000,Mob028-3::On1013
-028-3.gat,27,31,1,1|monster|Evil Mushroom|1013,3,40000,5000,Mob028-3::On1013
+028-3.gat,43,35,1,1|monster|EvilMushroom|1013,3,40000,5000,Mob028-3::On1013
+028-3.gat,27,31,1,1|monster|EvilMushroom|1013,3,40000,5000,Mob028-3::On1013
 028-3.gat,50,49,61,60|monster|Bat|1017,10,60000,10000,Mob028-3::On1017
 
 
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index cfa726b8..50ba01a1 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -1,12 +1,12 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Candor Island mobs
 
-029-1.gat,69,65,12,13|monster|Evil Mushroom|1013,4,20000,60000,Mob029-1::On1013
+029-1.gat,69,65,12,13|monster|EvilMushroom|1013,4,20000,60000,Mob029-1::On1013
 029-1.gat,32,33,12,13|monster|Squirrel|1038,3,30000,60000,Mob029-1::On1038
-029-1.gat,46,48,4,1|monster|Clover Patch|1037,1,10000,120000,Mob029-1::On1037
-029-1.gat,37,60,22,20|monster|Spiky Mushroom|1019,5,10000,30000,Mob029-1::On1019
+029-1.gat,46,48,4,1|monster|CloverPatch|1037,1,10000,120000,Mob029-1::On1037
+029-1.gat,37,60,22,20|monster|SpikyMushroom|1019,5,10000,30000,Mob029-1::On1019
 029-1.gat,54,36,17,18|monster|Bat|1017,4,25000,30000,Mob029-1::On1017
-029-1.gat,59,51,13,9|monster|Log Head|1025,2,25000,30000,Mob029-1::On1025
+029-1.gat,59,51,13,9|monster|LogHead|1025,2,25000,30000,Mob029-1::On1025
 
 
 029-1.gat,0,0,0|script|Mob029-1|-1,{
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index dae60167..868a9a32 100644
--- a/world/map/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
@@ -3,7 +3,7 @@
 
 030-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob030-1::On1038
 030-1.gat,0,0,0,0|monster|Fluffy|1020,15,100000,30000,Mob030-1::On1020
-030-1.gat,0,0,0,0|monster|White Bell|1095,4,100000,30000,Mob030-1::On1095
+030-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob030-1::On1095
 
 
 030-1.gat,0,0,0|script|Mob030-1|-1,{
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 6fc42566..690b0456 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -3,8 +3,8 @@
 
 031-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob031-1::On1038
 031-1.gat,0,0,0,0|monster|Fluffy|1020,15,100000,30000,Mob031-1::On1020
-031-1.gat,76,26,10,5|monster|White Slime|1093,7,100000,30000,Mob031-1::On1093
-031-1.gat,0,0,0,0|monster|White Bell|1095,4,100000,30000,Mob031-1::On1095
+031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000,30000,Mob031-1::On1093
+031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob031-1::On1095
 
 
 031-1.gat,0,0,0|script|Mob031-1|-1,{
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index 4da9f6fb..a73d190f 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Ice Labyrinth mobs
 
-031-3.gat,230,279,25,26|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,195,277,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,195,277,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
 031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
 031-3.gat,37,213,27,23|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
 031-3.gat,35,212,27,23|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
@@ -12,19 +12,19 @@
 031-3.gat,36,148,64,43|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
 031-3.gat,97,277,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
 031-3.gat,148,282,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
-031-3.gat,145,293,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,99,214,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
-031-3.gat,198,144,29,53|monster|Ice Goblin|1058,4,100000,30000,Mob031-3::On1058
+031-3.gat,145,293,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,99,214,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,198,144,29,53|monster|IceGoblin|1058,4,100000,30000,Mob031-3::On1058
 031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
-031-3.gat,278,282,33,14|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,285,218,8,75|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,285,218,8,75|monster|IceElement|1071,2,100000,30000,Mob031-3::On1071
 031-3.gat,283,217,41,64|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
 031-3.gat,282,237,63,20|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
 031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
 031-3.gat,229,226,27,34|monster|Yeti|1072,3,100000,30000,Mob031-3::On1072
-031-3.gat,230,227,12,42|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,230,227,12,42|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
 031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
 031-3.gat,193,216,12,17|monster|Yeti|1072,1,100000,30000,Mob031-3::On1072
 031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
@@ -43,53 +43,53 @@
 031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000,30000,Mob031-3::On1061
 031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000,30000,Mob031-3::On1072
 031-3.gat,121,131,82,24|monster|Yeti|1072,8,100000,30000,Mob031-3::On1072
-031-3.gat,107,130,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,145,160,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,94,167,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,282,37,31,28|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
-031-3.gat,213,36,64,32|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
-031-3.gat,228,83,31,28|monster|Ice Element|1071,3,100000,30000,Mob031-3::On1071
-031-3.gat,283,138,15,13|monster|Ice Element|1071,1,100000,30000,Mob031-3::On1071
-031-3.gat,198,83,31,28|monster|Ice Element|1071,3,100000,30000,Mob031-3::On1071
-031-3.gat,214,75,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,107,130,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,145,160,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,94,167,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,282,37,31,28|monster|IceElement|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,213,36,64,32|monster|IceElement|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,228,83,31,28|monster|IceElement|1071,3,100000,30000,Mob031-3::On1071
+031-3.gat,283,138,15,13|monster|IceElement|1071,1,100000,30000,Mob031-3::On1071
+031-3.gat,198,83,31,28|monster|IceElement|1071,3,100000,30000,Mob031-3::On1071
+031-3.gat,214,75,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
 031-3.gat,217,37,66,43|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
 031-3.gat,39,52,64,56|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
 031-3.gat,39,274,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
 031-3.gat,119,51,39,64|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
-031-3.gat,119,50,57,51|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,119,50,57,51|monster|IceElement|1071,5,100000,30000,Mob031-3::On1071
 031-3.gat,120,79,20,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,37,284,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,28,255,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
-031-3.gat,212,277,14,9|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,289,295,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,292,288,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
-031-3.gat,296,233,7,6|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,271,222,7,6|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,281,215,55,21|monster|Blue Slime|1091,5,100000,30000,Mob031-3::On1091
-031-3.gat,126,35,6,5|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,143,124,34,22|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
-031-3.gat,48,65,14,9|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,37,113,5,13|monster|Blue Slime|1091,1,100000,30000,Mob031-3::On1091
-031-3.gat,136,227,14,9|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,152,218,13,17|monster|Blue Slime|1091,4,100000,30000,Mob031-3::On1091
-031-3.gat,135,206,9,6|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,154,202,7,7|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,136,216,6,4|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
-031-3.gat,112,276,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,143,294,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,149,268,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,136,264,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,157,283,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,139,264,25,19|monster|Blue Slime|1091,4,100000,30000,Mob031-3::On1091
-031-3.gat,24,265,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,52,280,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,37,254,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,24,290,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,48,298,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,53,260,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
-031-3.gat,23,275,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
-031-3.gat,37,272,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
-031-3.gat,52,285,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,37,284,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,28,255,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,212,277,14,9|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,289,295,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,292,288,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,296,233,7,6|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,271,222,7,6|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,281,215,55,21|monster|BlueSlime|1091,5,100000,30000,Mob031-3::On1091
+031-3.gat,126,35,6,5|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,143,124,34,22|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,48,65,14,9|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,37,113,5,13|monster|BlueSlime|1091,1,100000,30000,Mob031-3::On1091
+031-3.gat,136,227,14,9|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,152,218,13,17|monster|BlueSlime|1091,4,100000,30000,Mob031-3::On1091
+031-3.gat,135,206,9,6|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,154,202,7,7|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,136,216,6,4|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,112,276,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,143,294,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,149,268,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,136,264,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,157,283,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,139,264,25,19|monster|BlueSlime|1091,4,100000,30000,Mob031-3::On1091
+031-3.gat,24,265,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,52,280,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,37,254,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,24,290,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,48,298,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,53,260,6,4|monster|WhiteSlime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,23,275,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,37,272,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,52,285,14,9|monster|BlueSlime|1091,2,100000,30000,Mob031-3::On1091
 
 
 031-3.gat,0,0,0|script|Mob031-3|-1,{
diff --git a/world/map/npc/032-1/_mobs.txt b/world/map/npc/032-1/_mobs.txt
index b557274a..dc68e34b 100644
--- a/world/map/npc/032-1/_mobs.txt
+++ b/world/map/npc/032-1/_mobs.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Outback mobs
 
-032-1.gat,47,64,27,15|monster|Black Scorpion|1009,5,30000,100000,Mob032-1::On1009
-032-1.gat,24,72,27,24|monster|Black Scorpion|1009,5,30000,100000,Mob032-1::On1009
-032-1.gat,24,48,25,21|monster|Black Scorpion|1009,5,30000,100000,Mob032-1::On1009
+032-1.gat,47,64,27,15|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009
+032-1.gat,24,72,27,24|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009
+032-1.gat,24,48,25,21|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009
 032-1.gat,57,44,23,18|monster|Snake|1010,13,30000,100000,Mob032-1::On1010
 032-1.gat,77,76,34,27|monster|Snake|1010,13,30000,100000,Mob032-1::On1010
 
diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt
index 42d920b4..05ff2049 100644
--- a/world/map/npc/032-3/_mobs.txt
+++ b/world/map/npc/032-3/_mobs.txt
@@ -2,14 +2,14 @@
 // Outback Cave mobs
 
 032-3.gat,90,44,9,10|monster|Skeleton|1043,3,30000,100000,Mob032-3::On1043
-032-3.gat,44,23,29,22|monster|Mountain Snake|1026,7,30000,100000,Mob032-3::On1026
-032-3.gat,125,46,35,75|monster|Mountain Snake|1010,13,30000,100000,Mob032-3::On1010
-032-3.gat,80,44,9,10|monster|Black Scorpion|1009,5,30000,100000,Mob032-3::On1009
+032-3.gat,44,23,29,22|monster|MountainSnake|1026,7,30000,100000,Mob032-3::On1026
+032-3.gat,125,46,35,75|monster|Snake|1010,13,30000,100000,Mob032-3::On1010
+032-3.gat,80,44,9,10|monster|BlackScorpion|1009,5,30000,100000,Mob032-3::On1009
 032-3.gat,85,33,9,10|monster|Spider|1012,5,30000,100000,Mob032-3::On1012
 032-3.gat,83,18,37,9|monster|Archant|1060,8,30000,100000,Mob032-3::On1060
 032-3.gat,78,76,24,21|monster|Archant|1060,8,30000,100000,Mob032-3::On1060
-032-3.gat,25,76,24,21|monster|Yellow Slime|1007,11,300000,1000000,Mob032-3::On1007
-032-3.gat,46,51,34,18|monster|Cave Maggot|1056,11,30000,100000,Mob032-3::On1056
+032-3.gat,25,76,24,21|monster|YellowSlime|1007,11,300000,1000000,Mob032-3::On1007
+032-3.gat,46,51,34,18|monster|CaveMaggot|1056,11,30000,100000,Mob032-3::On1056
 032-3.gat,0,0,0,0|monster|Bat|1017,25,30000,100000,Mob032-3::On1017
 
 
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 37c16e11..560442e6 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -4,7 +4,7 @@
 033-1.gat,73,49,10,18|monster|Wolvern|1090,2,100000,30000,Mob033-1::On1090
 033-1.gat,33,38,15,49|monster|Reinboo|1094,3,100000,30000,Mob033-1::On1094
 033-1.gat,56,87,50,42|monster|Squirrel|1038,15,100000,30000,Mob033-1::On1038
-033-1.gat,0,0,0,0|monster|White Bell|1095,3,100000,30000,Mob033-1::On1095
+033-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000,30000,Mob033-1::On1095
 
 
 033-1.gat,0,0,0|script|Mob033-1|-1,{
diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index 816a6c58..b6137fa8 100644
--- a/world/map/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
@@ -3,7 +3,7 @@
 
 034-1.gat,0,0,0,0|monster|Reinboo|1094,40,100000,30000,Mob034-1::On1094
 034-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob034-1::On1020
-034-1.gat,0,0,0,0|monster|White Bell|1095,5,100000,30000,Mob034-1::On1095
+034-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob034-1::On1095
 034-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000,30000,Mob034-1::On1038
 
 
diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
index deb8bc50..9ae0a1c1 100644
--- a/world/map/npc/041-1/_mobs.txt
+++ b/world/map/npc/041-1/_mobs.txt
@@ -5,13 +5,13 @@
 041-1.gat,101,67,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
 041-1.gat,100,84,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
 041-1.gat,61,34,13,20|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,55,30,10,48|monster|Sea Slime|1033,3,100000,30000,Mob041-1::On1033
+041-1.gat,55,30,10,48|monster|SeaSlime|1033,3,100000,30000,Mob041-1::On1033
 041-1.gat,59,13,10,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,60,7,3,2|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
-041-1.gat,66,49,3,2|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
-041-1.gat,95,75,21,9|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
-041-1.gat,100,57,18,9|monster|Red Scorpion|1004,3,100000,30000,Mob041-1::On1004
-041-1.gat,83,64,18,9|monster|Red Scorpion|1004,3,100000,30000,Mob041-1::On1004
+041-1.gat,60,7,3,2|monster|BlackScorpion|1009,1,100000,30000,Mob041-1::On1009
+041-1.gat,66,49,3,2|monster|BlackScorpion|1009,1,100000,30000,Mob041-1::On1009
+041-1.gat,95,75,21,9|monster|BlackScorpion|1009,1,100000,30000,Mob041-1::On1009
+041-1.gat,100,57,18,9|monster|RedScorpion|1004,3,100000,30000,Mob041-1::On1004
+041-1.gat,83,64,18,9|monster|RedScorpion|1004,3,100000,30000,Mob041-1::On1004
 
 
 041-1.gat,0,0,0|script|Mob041-1|-1,{
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index a5df688d..15b4d2e9 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -3,9 +3,9 @@
 
 042-1.gat,100,97,31,15|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002
 042-1.gat,65,88,27,15|monster|Maggot|1002,7,100000,30000,Mob042-1::On1002
-042-1.gat,95,127,55,11|monster|Black Scorpion|1009,25,100000,30000,Mob042-1::On1009
+042-1.gat,95,127,55,11|monster|BlackScorpion|1009,25,100000,30000,Mob042-1::On1009
 042-1.gat,95,128,53,8|monster|Scorpion|1003,10,100000,30000,Mob042-1::On1003
-042-1.gat,62,81,42,50|monster|Fire Goblin|1011,2,100000,30000,Mob042-1::On1011
+042-1.gat,62,81,42,50|monster|FireGoblin|1011,2,100000,30000,Mob042-1::On1011
 
 
 042-1.gat,0,0,0|script|Mob042-1|-1,{
diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt
index 71551d2a..2ae40c5b 100644
--- a/world/map/npc/044-1/_mobs.txt
+++ b/world/map/npc/044-1/_mobs.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Snow Hills mobs
 
-044-1.gat,37,175,3,2|monster|White Slime|1093,7,100000,30000,Mob044-1::On1093
-044-1.gat,45,75,2,2|monster|Blue Slime|1091,1,100000,30000,Mob044-1::On1091
+044-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000,30000,Mob044-1::On1093
+044-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000,30000,Mob044-1::On1091
 044-1.gat,0,0,0,0|monster|Reinboo|1094,50,100000,30000,Mob044-1::On1094
 044-1.gat,0,0,0,0|monster|Fluffy|1020,60,100000,30000,Mob044-1::On1020
 044-1.gat,0,0,0,0|monster|Squirrel|1038,60,100000,30000,Mob044-1::On1038
@@ -13,10 +13,10 @@
 044-1.gat,58,71,48,31|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090
 044-1.gat,113,67,23,62|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090
 044-1.gat,110,173,25,20|monster|Wolvern|1090,6,100000,30000,Mob044-1::On1090
-044-1.gat,108,168,3,2|monster|White Slime|1093,7,100000,30000,Mob044-1::On1093
-044-1.gat,108,158,3,2|monster|Blue Slime|1091,1,100000,30000,Mob044-1::On1091
-044-1.gat,101,146,10,5|monster|Ice Goblin|1058,4,100000,30000,Mob044-1::On1058
-044-1.gat,0,0,0,0|monster|White Bell|1095,10,100000,30000,Mob044-1::On1095
+044-1.gat,108,168,3,2|monster|WhiteSlime|1093,7,100000,30000,Mob044-1::On1093
+044-1.gat,108,158,3,2|monster|BlueSlime|1091,1,100000,30000,Mob044-1::On1091
+044-1.gat,101,146,10,5|monster|IceGoblin|1058,4,100000,30000,Mob044-1::On1058
+044-1.gat,0,0,0,0|monster|WhiteBell|1095,10,100000,30000,Mob044-1::On1095
 
 
 044-1.gat,0,0,0|script|Mob044-1|-1,{
diff --git a/world/map/npc/044-3/_mobs.txt b/world/map/npc/044-3/_mobs.txt
index 4454ccaf..8a491d3e 100644
--- a/world/map/npc/044-3/_mobs.txt
+++ b/world/map/npc/044-3/_mobs.txt
@@ -1,27 +1,27 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Snow Hills Cave mobs
 
-044-3.gat,56,135,9,8|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
-044-3.gat,35,153,6,6|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
-044-3.gat,39,104,9,8|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
-044-3.gat,73,153,9,8|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
-044-3.gat,64,104,3,3|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
-044-3.gat,24,168,6,4|monster|Blue Slime|1091,2,100000,30000,Mob044-3::On1091
-044-3.gat,87,134,5,3|monster|Blue Slime|1091,2,100000,30000,Mob044-3::On1091
-044-3.gat,55,122,5,3|monster|Blue Slime|1091,2,100000,30000,Mob044-3::On1091
-044-3.gat,35,128,5,3|monster|Blue Slime|1091,2,100000,30000,Mob044-3::On1091
-044-3.gat,53,84,5,3|monster|Blue Slime|1091,2,100000,30000,Mob044-3::On1091
+044-3.gat,56,135,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,35,153,6,6|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,39,104,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,73,153,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,64,104,3,3|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,24,168,6,4|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091
+044-3.gat,87,134,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091
+044-3.gat,55,122,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091
+044-3.gat,35,128,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091
+044-3.gat,53,84,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091
 044-3.gat,75,136,21,26|monster|Moggun|1061,5,100000,30000,Mob044-3::On1061
 044-3.gat,39,31,42,21|monster|Moggun|1061,12,100000,30000,Mob044-3::On1061
-044-3.gat,40,31,5,3|monster|Ice Goblin|1058,2,100000,30000,Mob044-3::On1058
+044-3.gat,40,31,5,3|monster|IceGoblin|1058,2,100000,30000,Mob044-3::On1058
 044-3.gat,122,157,21,16|monster|Yeti|1072,2,100000,30000,Mob044-3::On1072
-044-3.gat,102,166,15,13|monster|Ice Goblin|1058,5,100000,30000,Mob044-3::On1058
-044-3.gat,109,81,15,13|monster|Ice Element|1071,1,100000,30000,Mob044-3::On1071
-044-3.gat,123,90,5,3|monster|Blue Slime|1091,2,100000,30000,Mob044-3::On1091
-044-3.gat,109,97,9,8|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,102,166,15,13|monster|IceGoblin|1058,5,100000,30000,Mob044-3::On1058
+044-3.gat,109,81,15,13|monster|IceElement|1071,1,100000,30000,Mob044-3::On1071
+044-3.gat,123,90,5,3|monster|BlueSlime|1091,2,100000,30000,Mob044-3::On1091
+044-3.gat,109,97,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
 044-3.gat,119,41,42,21|monster|Moggun|1061,8,100000,30000,Mob044-3::On1061
-044-3.gat,51,94,39,14|monster|Ice Goblin|1058,5,100000,30000,Mob044-3::On1058
-044-3.gat,121,172,9,8|monster|White Slime|1093,7,100000,30000,Mob044-3::On1093
+044-3.gat,51,94,39,14|monster|IceGoblin|1058,5,100000,30000,Mob044-3::On1058
+044-3.gat,121,172,9,8|monster|WhiteSlime|1093,7,100000,30000,Mob044-3::On1093
 
 
 044-3.gat,0,0,0|script|Mob044-3|-1,{
diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt
index fa531bab..c82f58f5 100644
--- a/world/map/npc/045-1/_mobs.txt
+++ b/world/map/npc/045-1/_mobs.txt
@@ -12,7 +12,7 @@
 045-1.gat,0,0,0,0|monster|Squirrel|1038,40,100000,30000,Mob045-1::On1038
 045-1.gat,0,0,0,0|monster|Reinboo|1094,30,100000,30000,Mob045-1::On1094
 045-1.gat,0,0,0,0|monster|Fluffy|1020,40,100000,30000,Mob045-1::On1020
-045-1.gat,0,0,0,0|monster|White Bell|1095,5,100000,30000,Mob045-1::On1095
+045-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob045-1::On1095
 
 
 045-1.gat,0,0,0|script|Mob045-1|-1,{
diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt
index 4cc8d70d..b2ab1634 100644
--- a/world/map/npc/046-1/_mobs.txt
+++ b/world/map/npc/046-1/_mobs.txt
@@ -7,7 +7,7 @@
 046-1.gat,44,28,52,20|monster|Moggun|1061,12,100000,30000,Mob046-1::On1061
 046-1.gat,0,0,0,0|monster|Yeti|1072,2,100000,30000,Mob046-1::On1072
 046-1.gat,87,94,23,13|monster|Wolvern|1090,5,100000,30000,Mob046-1::On1090
-046-1.gat,0,0,0,0|monster|White Bell|1095,9,100000,30000,Mob046-1::On1095
+046-1.gat,0,0,0,0|monster|WhiteBell|1095,9,100000,30000,Mob046-1::On1095
 046-1.gat,72,52,15,12|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090
 046-1.gat,36,105,10,9|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090
 046-1.gat,115,33,45,33|monster|Wolvern|1090,7,100000,30000,Mob046-1::On1090
diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt
index 7e61d36e..307cf285 100644
--- a/world/map/npc/046-3/_mobs.txt
+++ b/world/map/npc/046-3/_mobs.txt
@@ -2,19 +2,19 @@
 // Frosty Underground mobs
 
 046-3.gat,68,101,12,8|monster|Yeti|1072,2,100000,30000,Mob046-3::On1072
-046-3.gat,0,0,0,0|monster|Ice Goblin|1058,20,100000,30000,Mob046-3::On1058
+046-3.gat,0,0,0,0|monster|IceGoblin|1058,20,100000,30000,Mob046-3::On1058
 046-3.gat,55,61,25,26|monster|Moggun|1061,14,100000,30000,Mob046-3::On1061
-046-3.gat,119,104,5,4|monster|Ice Element|1071,1,100000,30000,Mob046-3::On1071
-046-3.gat,132,71,9,7|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093
-046-3.gat,107,85,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091
-046-3.gat,98,77,6,4|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093
-046-3.gat,70,82,6,4|monster|White Slime|1093,6,100000,30000,Mob046-3::On1093
-046-3.gat,106,34,6,4|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093
-046-3.gat,33,37,6,4|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093
-046-3.gat,144,105,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091
-046-3.gat,152,55,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091
-046-3.gat,84,53,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091
-046-3.gat,47,23,15,10|monster|Ice Element|1071,2,100000,30000,Mob046-3::On1071
+046-3.gat,119,104,5,4|monster|IceElement|1071,1,100000,30000,Mob046-3::On1071
+046-3.gat,132,71,9,7|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093
+046-3.gat,107,85,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091
+046-3.gat,98,77,6,4|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093
+046-3.gat,70,82,6,4|monster|WhiteSlime|1093,6,100000,30000,Mob046-3::On1093
+046-3.gat,106,34,6,4|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093
+046-3.gat,33,37,6,4|monster|WhiteSlime|1093,4,100000,30000,Mob046-3::On1093
+046-3.gat,144,105,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091
+046-3.gat,152,55,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091
+046-3.gat,84,53,14,9|monster|BlueSlime|1091,2,100000,30000,Mob046-3::On1091
+046-3.gat,47,23,15,10|monster|IceElement|1071,2,100000,30000,Mob046-3::On1071
 046-3.gat,113,48,12,8|monster|Yeti|1072,2,100000,30000,Mob046-3::On1072
 
 
diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt
index d3c3b4a8..2151fb1e 100644
--- a/world/map/npc/047-1/_mobs.txt
+++ b/world/map/npc/047-1/_mobs.txt
@@ -3,7 +3,7 @@
 
 047-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000,30000,Mob047-1::On1094
 047-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,Mob047-1::On1020
-047-1.gat,0,0,0,0|monster|White Bell|1095,4,100000,30000,Mob047-1::On1095
+047-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob047-1::On1095
 047-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000,30000,Mob047-1::On1038
 047-1.gat,24,57,1,1|monster|Yeti|1072,1,100000,30000,Mob047-1::On1072
 047-1.gat,111,26,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090
diff --git a/world/map/npc/048-1/_mobs.txt b/world/map/npc/048-1/_mobs.txt
index 94c84611..953e1932 100644
--- a/world/map/npc/048-1/_mobs.txt
+++ b/world/map/npc/048-1/_mobs.txt
@@ -4,14 +4,14 @@
 048-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000,30000,Mob048-1::On1094
 048-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,Mob048-1::On1020
 048-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000,30000,Mob048-1::On1038
-048-1.gat,0,0,0,0|monster|White Bell|1095,5,100000,30000,Mob048-1::On1095
-048-1.gat,68,40,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093
-048-1.gat,72,61,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091
-048-1.gat,48,37,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093
-048-1.gat,72,30,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093
-048-1.gat,61,50,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091
-048-1.gat,61,35,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091
-048-1.gat,42,25,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093
+048-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob048-1::On1095
+048-1.gat,68,40,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093
+048-1.gat,72,61,4,5|monster|BlueSlime|1091,2,100000,30000,Mob048-1::On1091
+048-1.gat,48,37,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093
+048-1.gat,72,30,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093
+048-1.gat,61,50,4,5|monster|BlueSlime|1091,2,100000,30000,Mob048-1::On1091
+048-1.gat,61,35,4,5|monster|BlueSlime|1091,2,100000,30000,Mob048-1::On1091
+048-1.gat,42,25,2,2|monster|WhiteSlime|1093,4,100000,30000,Mob048-1::On1093
 
 
 048-1.gat,0,0,0|script|Mob048-1|-1,{
diff --git a/world/map/npc/051-1/_mobs.txt b/world/map/npc/051-1/_mobs.txt
index 4635bed0..32dc8bbb 100644
--- a/world/map/npc/051-1/_mobs.txt
+++ b/world/map/npc/051-1/_mobs.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Illia outskirts mobs
 
-051-1.gat,42,35,42,24|monster|Log Head|1025,30,100000,30000,Mob051-1::On1025
-051-1.gat,42,35,41,22|monster|Spiky Mushroom|1019,10,100000,30000,Mob051-1::On1019
+051-1.gat,42,35,42,24|monster|LogHead|1025,30,100000,30000,Mob051-1::On1025
+051-1.gat,42,35,41,22|monster|SpikyMushroom|1019,10,100000,30000,Mob051-1::On1019
 
 
 051-1.gat,0,0,0|script|Mob051-1|-1,{
diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt
index 115593af..867b98f4 100644
--- a/world/map/npc/051-3/_mobs.txt
+++ b/world/map/npc/051-3/_mobs.txt
@@ -1,22 +1,22 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Illia Bandit Cave mobs
 
-051-3.gat,31,52,21,13|monster|Red Slime|1008,8,100000,30000,Mob051-3::On1008
-051-3.gat,31,52,19,14|monster|Cave Maggot|1056,3,100000,30000,Mob051-3::On1056
+051-3.gat,31,52,21,13|monster|RedSlime|1008,8,100000,30000,Mob051-3::On1008
+051-3.gat,31,52,19,14|monster|CaveMaggot|1056,3,100000,30000,Mob051-3::On1056
 051-3.gat,56,102,3,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012
 051-3.gat,61,102,2,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012
 051-3.gat,65,102,2,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012
-051-3.gat,71,109,4,2|monster|Black Scorpion|1009,1,100000,250000,Mob051-3::On1009
+051-3.gat,71,109,4,2|monster|BlackScorpion|1009,1,100000,250000,Mob051-3::On1009
 051-3.gat,59,56,12,36|monster|Bandit|1064,47,100000,10000,Mob051-3::On1064
-051-3.gat,59,44,13,13|monster|Bandit Lord|1065,4,100000,20000,Mob051-3::On1065
-051-3.gat,60,69,18,9|monster|Bandit Lord|1065,4,100000,20000,Mob051-3::On1065
-051-3.gat,63,94,0,0|monster|Sleeping Bandit|1099,1,100000,60000,Mob051-3::On1099
-051-3.gat,53,93,0,0|monster|Sleeping Bandit|1099,1,100000,60000,Mob051-3::On1099
-051-3.gat,48,71,0,0|monster|Sleeping Bandit|1099,1,100000,60000,Mob051-3::On1099
+051-3.gat,59,44,13,13|monster|BanditLord|1065,4,100000,20000,Mob051-3::On1065
+051-3.gat,60,69,18,9|monster|BanditLord|1065,4,100000,20000,Mob051-3::On1065
+051-3.gat,63,94,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099
+051-3.gat,53,93,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099
+051-3.gat,48,71,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099
 051-3.gat,38,30,17,12|monster|Bandit|1064,12,100000,10000,Mob051-3::On1064
-051-3.gat,39,33,11,8|monster|Bandit Lord|1065,2,100000,20000,Mob051-3::On1065
-051-3.gat,80,101,10,12|monster|Copper Slime|1098,7,100000,60000,Mob051-3::On1098
-051-3.gat,60,94,18,5|monster|Copper Slime|1098,7,100000,60000,Mob051-3::On1098
+051-3.gat,39,33,11,8|monster|BanditLord|1065,2,100000,20000,Mob051-3::On1065
+051-3.gat,80,101,10,12|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098
+051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098
 
 
 051-3.gat,0,0,0|script|Mob051-3|-1,{
diff --git a/world/map/npc/052-1/_mobs.txt b/world/map/npc/052-1/_mobs.txt
index 81068dd7..c955142f 100644
--- a/world/map/npc/052-1/_mobs.txt
+++ b/world/map/npc/052-1/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Illia archipelago mobs
 
-052-1.gat,55,29,43,39|monster|Azul Slime|1100,18,100000,20000,Mob052-1::On1100
+052-1.gat,55,29,43,39|monster|AzulSlime|1100,18,100000,20000,Mob052-1::On1100
 
 
 052-1.gat,0,0,0|script|Mob052-1|-1,{
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index 8ab9f6d0..0c1623be 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -5,19 +5,19 @@
 055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000,85000,Mob055-1::On1035
 055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000,45000,Mob055-1::On1038
 055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000,85000,Mob055-1::On1028
-055-1.gat,91,49,6,4|monster|Clover Patch|1037,1,10000,180000,Mob055-1::On1037
-055-1.gat,103,54,5,3|monster|Clover Patch|1037,1,10000,180000,Mob055-1::On1037
-055-1.gat,64,75,27,16|monster|Clover Patch|1037,1,10000,120000,Mob055-1::On1037
-055-1.gat,80,34,82,25|monster|snail|1041,3,10000,85000,Mob055-1::On1041
-055-1.gat,70,72,17,24|monster|Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
-055-1.gat,81,32,81,22|monster|Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
-055-1.gat,0,0,0,0|monster|Mauve Plant|1029,7,10000,55000,Mob055-1::On1029
-055-1.gat,0,0,0,0|monster|Cobalt Plant|1030,3,10000,60000,Mob055-1::On1030
-055-1.gat,0,0,0,0|monster|Gamboge Plant|1031,2,10000,60000,Mob055-1::On1031
-055-1.gat,116,60,4,2|monster|Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,97,60,4,2|monster|Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,64,73,23,17|monster|Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,7,10000,60000,Mob055-1::On1019
+055-1.gat,91,49,6,4|monster|CloverPatch|1037,1,10000,180000,Mob055-1::On1037
+055-1.gat,103,54,5,3|monster|CloverPatch|1037,1,10000,180000,Mob055-1::On1037
+055-1.gat,64,75,27,16|monster|CloverPatch|1037,1,10000,120000,Mob055-1::On1037
+055-1.gat,80,34,82,25|monster|Snail|1041,3,10000,85000,Mob055-1::On1041
+055-1.gat,70,72,17,24|monster|AlizarinPlant|1032,2,10000,60000,Mob055-1::On1032
+055-1.gat,81,32,81,22|monster|AlizarinPlant|1032,2,10000,60000,Mob055-1::On1032
+055-1.gat,0,0,0,0|monster|MauvePlant|1029,7,10000,55000,Mob055-1::On1029
+055-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000,60000,Mob055-1::On1030
+055-1.gat,0,0,0,0|monster|GambogePlant|1031,2,10000,60000,Mob055-1::On1031
+055-1.gat,116,60,4,2|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,97,60,4,2|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,64,73,23,17|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,0,0,0,0|monster|SpikyMushroom|1019,7,10000,60000,Mob055-1::On1019
 
 
 055-1.gat,0,0,0|script|Mob055-1|-1,{
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
index de075d1b..d7be296c 100644
--- a/world/map/npc/055-3/_mobs.txt
+++ b/world/map/npc/055-3/_mobs.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Cave mobs
 
-055-3.gat,45,44,20,14|monster|Red Slime|1008,13,10000,60000,Mob055-3::On1008
+055-3.gat,45,44,20,14|monster|RedSlime|1008,13,10000,60000,Mob055-3::On1008
 055-3.gat,0,0,1,1|monster|Bat|1017,20,10000,45000,Mob055-3::On1017
-055-3.gat,53,75,28,40|monster|Yellow Slime|1007,13,10000,60000,Mob055-3::On1007
-055-3.gat,0,0,1,1|monster|Black Scorpion|1009,10,10000,35000,Mob055-3::On1009
+055-3.gat,53,75,28,40|monster|YellowSlime|1007,13,10000,60000,Mob055-3::On1007
+055-3.gat,0,0,1,1|monster|BlackScorpion|1009,10,10000,35000,Mob055-3::On1009
 055-3.gat,0,0,1,1|monster|Spider|1012,10,10000,35000,Mob055-3::On1012
 055-3.gat,0,0,1,1|monster|Snake|1010,3,10000,20000,Mob055-3::On1010
 
diff --git a/world/map/npc/056-1/_mobs.txt b/world/map/npc/056-1/_mobs.txt
index e9840dce..f6ca686f 100644
--- a/world/map/npc/056-1/_mobs.txt
+++ b/world/map/npc/056-1/_mobs.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woods mobs
 
-056-1.gat,0,0,0,0|monster|Evil Mushroom|1013,10,10000,45000,Mob056-1::On1013
-056-1.gat,0,0,0,0|monster|Log Head|1025,10,10000,45000,Mob056-1::On1025
-056-1.gat,0,0,0,0|monster|Mauve Plant|1029,2,10000,85000,Mob056-1::On1029
+056-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,10000,45000,Mob056-1::On1013
+056-1.gat,0,0,0,0|monster|LogHead|1025,10,10000,45000,Mob056-1::On1025
+056-1.gat,0,0,0,0|monster|MauvePlant|1029,2,10000,85000,Mob056-1::On1029
 
 
 056-1.gat,0,0,0|script|Mob056-1|-1,{
diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt
index 18cbc40a..a51bf07a 100644
--- a/world/map/npc/057-1/_mobs.txt
+++ b/world/map/npc/057-1/_mobs.txt
@@ -1,23 +1,23 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland mobs
 
-057-1.gat,0,0,0,0|monster|Mauve Plant|1029,5,45000,45000,Mob057-1::On1029
-057-1.gat,0,0,0,0|monster|Cobalt|1030,3,10000,65000,Mob057-1::On1030
-057-1.gat,0,0,0,0|monster|Gamboge|1031,5,10000,45000,Mob057-1::On1031
-057-1.gat,0,0,0,0|monster|Alizarin|1032,7,10000,70000,Mob057-1::On1032
+057-1.gat,0,0,0,0|monster|MauvePlant|1029,5,45000,45000,Mob057-1::On1029
+057-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000,65000,Mob057-1::On1030
+057-1.gat,0,0,0,0|monster|GambogePlant|1031,5,10000,45000,Mob057-1::On1031
+057-1.gat,0,0,0,0|monster|AlizarinPlant|1032,7,10000,70000,Mob057-1::On1032
 057-1.gat,0,0,0,0|monster|Mouboo|1028,14,10000,45000,Mob057-1::On1028
 057-1.gat,95,42,29,9|monster|Butterfly|1055,3,10000,40000,Mob057-1::On1055
 057-1.gat,25,48,11,46|monster|Silkworm|1035,7,10000,15000,Mob057-1::On1035
-057-1.gat,99,40,22,16|monster|Pink Flower|1014,2,10000,45000,Mob057-1::On1014
+057-1.gat,99,40,22,16|monster|PinkFlower|1014,2,10000,45000,Mob057-1::On1014
 057-1.gat,100,30,19,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
 057-1.gat,83,64,12,12|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
 057-1.gat,59,34,8,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
 057-1.gat,32,45,8,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
 057-1.gat,144,35,12,12|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
-057-1.gat,104,67,12,11|monster|Pink Flower|1014,2,10000,45000,Mob057-1::On1014
-057-1.gat,135,53,12,11|monster|Pink Flower|1014,2,10000,45000,Mob057-1::On1014
-057-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,10,10000,45000,Mob057-1::On1019
-057-1.gat,0,0,0,0|monster|Clover Patch|1037,3,10000,180000,Mob057-1::On1037
+057-1.gat,104,67,12,11|monster|PinkFlower|1014,2,10000,45000,Mob057-1::On1014
+057-1.gat,135,53,12,11|monster|PinkFlower|1014,2,10000,45000,Mob057-1::On1014
+057-1.gat,0,0,0,0|monster|SpikyMushroom|1019,10,10000,45000,Mob057-1::On1019
+057-1.gat,0,0,0,0|monster|CloverPatch|1037,3,10000,180000,Mob057-1::On1037
 057-1.gat,27,46,14,52|monster|Squirrel|1038,6,10000,50000,Mob057-1::On1038
 
 
diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt
index 2e919a15..01fc163c 100644
--- a/world/map/npc/functions/game_rules.txt
+++ b/world/map/npc/functions/game_rules.txt
@@ -30,17 +30,16 @@ L_English:
     goto L_End;
 
 L_German:
-    mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch.";
     mes "Wir bitten um das Einhalten der folgenden Regeln:";
-    mes "1. Keine Beleidigungen, Schimpfwoerter, Schmaehungen oder Rufmord.";
-    mes "2. Keine 'bots' (automatisierte Spieler). Dies beinhaltet JEGLICHE Teilnahme am Spiel waehrend der Abwesenheit des Spielers.";
+    mes "1. Keine Beleidigungen, Schimpfwörter, Schmähungen oder Rufmord.";
+    mes "2. Keine 'bots' (automatisierte Spieler). Dies beinhaltet JEGLICHE Teilnahme am Spiel während der Abwesenheit des Spielers. Es beinhaltet auch das automatisierte Folgen anderer Spieler.";
     mes "3. Kein 'spamming' oder 'flooding' (schnelles Wiederholen von Nachrichten oder Aufforderungen zum Warenhandel).";
     mes "4. Kein Betteln.";
-    mes "5. Englisch ist die einzige zulaessige Sprache im oeffentlichen Raum.";
+    mes "5. Englisch ist die einzige zulässige Sprache im öffentlichen Raum.";
     mes "6. Behandelt andere so, wie Ihr behandelt werden wollt.";
-    mes "Jegliche Regelverstoesse koennen bestraft werden, entweder durch ein Zuruecksetzen der Charaktereigenschaften und -besitztuemer auf den Ausgangszustand, oder durch einen temporaeren oder permanenten Ausschluss aus dem Spiel.";
+    mes "Jegliche Regelverstöße können bestraft werden, entweder durch ein Zurücksetzen der Charaktereigenschaften und -besitztümer auf den Ausgangszustand, oder durch einen temporären oder permanenten Ausschluss aus dem Spiel.";
     next;
-    mes "Automatisiertes Spielverhalten liegt vor, wenn ein sich bewegender/kaempfender Spieler nicht intelligent auf Gespraechsaufforderungen reagiert.";
+    mes "Automatisiertes Spielverhalten liegt vor, wenn ein sich bewegender/kämpfender Spieler nicht intelligent auf Gesprächsaufforderungen reagiert.";
     next;
     goto L_End;
author	Jessica Tölke <jtoelke@mail.upb.de>	2013-05-10 20:31:40 +0200
committer	Jessica Tölke <jtoelke@mail.upb.de>	2013-05-10 20:31:40 +0200
commit	dfa96a49bbdcb0938746adf8d2da7ffac00a6222 (patch)
tree	6baedebcd87a44cac5f8b4fb15ed0a016fc58d26 /world/map
parent	6f2c9210413a68524aaebe2c1a0bd9a54dbcd74a (diff)
parent	262912f0c8545a82fe2fbf68699cc53d65384b1d (diff)
download	serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.gz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.bz2 serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.xz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.zip