Merge branch 'master' into magicv2008.12.25

72 files changed, 958 insertions, 419 deletions

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..fe6efdac
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Dennis Friis <peavey@inspircd.org>
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..5b6e7c66
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/changelog.txt b/changelog.txt
deleted file mode 100644
index 35ef899c..00000000
--- a/changelog.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-18.02.06: * Platyna: Created a new script to control the server.
-19.02.06: * Platyna: Cleaned up some not needed files.
-	  * Platyna: Reordered NPCs by maps, started to clean up config files.
-	  * Platyna: Added fire goblin.
-	  * Platyna: Increased amount of santa slimes on Xmas map.
-
-20.02.06: * Platyna: Removed NPC Dark Mage.
-	  * Platyna: Added NPC Snowman.
-	  * Platyna: Moved NPC Vincent.
-	  * Platyna: All quests can be done only once.
-	  * Platyna: Maggots doesn't drop daggers anymore.
-	  * Platyna: Monsters stats had been changed - see Wiki.
-	  * Platyna: Added map 4-1 (Hermit Cave) and NPC Hermit.
-
-21.02.06: * Platyna: Removed some more not needed files.
-	  * Platyna: Added more black scorpions in Tulimshar.
-	  * Platyna: Fixed entrance from Woodland to Hermitt's cave.
-	  * Platyna: Moved NPC Sandra.
-	  * Platyna: Changed the Snowman quest items.
-	  * Platyna: Added Fire Goblins in Hermitt's cave.
-	  * Platyna: Adjusted high level monsters exp (see Wiki).
-
-09.03.06: * Umperio: Updated small cave walkmap.
-	  * Umperio: Updated barber script.
-
-10.03.06: * Platyna: Added eathena-monitor daemon for better control of
-	             eAthena processes.
-	  * Platyna: Adopted athena.sh script to locally control eAthena
-	             processes (start/stop/restart the eathena-monitor when
-	             needed so there is no need of root access anymore).
-	  * Platyna: Added more Red Scorpions on Western Desert.
-	  * Platyna: Removed Fire Goblins from the Hermit's Cave and added Bats.
-
-12.06.07: * Trapdoor: Updated casino script to allow for aces to be 1 and 11.
-
-06.08.07: * Crush: Enabled woodland village maps.
-	  * Crush: Added woodland village indoor passages and NPCs.
-	  * Crush: Added tree stump monster.
-	  * Crush: Added chainmail and platemail armor.
-
-30.08.07: * b_lindeijer: Adapted View IDs to the new merged item database.
-	  * Platyna: Reverted new View IDs since they should be below 256.
-
-12.09.07: * b_lindeijer: Solved View ID conflicts in item_db.txt.
-
-12.09.07: * Crush: Fixed the collision layer problems on new_14-1
-
-02.10.07: * b_lindeijer: Fixed a typo.
-
-07.10.07: * Crush: Fixed some collision layer problems on new_18-1
-
-31.10.07: * b_lindeijer: Fixed prices of standard and silk headband.
-	  * b_lindeijer: Small language fixes in forest bow quest.
-
-15.11.07: * b_lindeijer: Replaced 0-percent droppable 909 items with 0 in an
-	                 attempt to solve the unknown item problem.
-	  * b_lindeijer: Reverted View ID changes (again), so see if the
-	                 damage problems go away.
-	  * b_lindeijer: Committed the new dark crystal item.
-
-20.11.07: * Crush: Updated walkmaps for new versions of desert maps.
-
-03.12.07: * Crush: Added test version of christmas event scripts.
-
-14.12.07: * Crush: Added new christmas items to item database.
-
-17.12.07: * b_lindeijer: Ishi now gives cotton pants instead of Xmas hat.
-
-19.12.07: * Crush: Fixed a map bug (monster trap) on map 18 (woodland
-	    village surrounding)
-
-22.12.07: * Crush: Rewrote barber NPC for new hairstyles and colors.
-
-29.12.07: * Crush: Added eastern desert snake dungeon
-
-14.02.08: * Crush: Added new versions of snow maps.
-
-26.01.08: * Crush: Fixed warp from desert to woodland.
-
-08.02.08: * Crush: Added server files for Dimonds Cove Restaurant
-
-13.02.08: * Crush: Added new headgears by QOAL (item_db only, no way to
-                   get them yet)
-
-23.02.08: * Crush: Added quest to obtain helmets by QOAL.
-            Crush: Map fixes by QOAL.
-
-26.02.08: * Crush: Fixed some monster traps in southwest woodland.
-
-08.03.08: * Crush: Fixed walkmaps of woodland maps.
-
-17.03.08: * Crush: Added server files for chaps.
-
-19.03.08: * Crush: Updated woodland walkmaps.
-
-20.03.08: * Crush: Server files for easter event.
-
-01.04.08: * b_lindeijer: Spell checked the guide in Tulimshar.
-
-03.04.08: * Crush: Added golden platemail.
-
-04.04.08: * Crush: Added developers cap and crown.
-
-04.04.08: * Crush: Added savepoint scripts.
-
-22.04.08: * Crush: Changed resetter script as discussed on irc.
-
-05.05.08: * Crush: Added clothdyer script (not enabled yet)
-
-21.08.08: * Crush: Two new maps and changes at Tulimshar and Hurnscald by Jaxad
-
-29.08.08: * Crush: Scripts, "monsters" and items for the alchemy system.
\ No newline at end of file
diff --git a/conf/char_local.conf.example b/conf/char_local.conf.example
index 163f97c6..1d55c977 100644
--- a/conf/char_local.conf.example
+++ b/conf/char_local.conf.example
@@ -4,7 +4,7 @@
 userid: s1
 passwd: p1
 
-// Server name, use alternative character such as ASCII 160 for spaces.
+// Server name, no more than 19 characters
 server_name: The Mana World
 
 // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 82e8c08b..f03c0123 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -13,5 +13,7 @@ mapreg_txt: save/mapreg.txt
 
 import: npc/scripts.conf
 
+gm_log: gm.log
+
 // local settings for this server in this file
 import: conf/map_local.conf
diff --git a/data/004-2.wlk b/data/004-2.wlk
new file mode 100644
index 00000000..6248acc5
--- /dev/null
+++ b/data/004-2.wlk
diff --git a/data/009-1.wlk b/data/009-1.wlk
index 32a3777c..87fa7a02 100644
--- a/data/009-1.wlk
+++ b/data/009-1.wlk
diff --git a/data/010-2.wlk b/data/010-2.wlk
index 94fb92cd..880a6dfb 100644
--- a/data/010-2.wlk
+++ b/data/010-2.wlk
diff --git a/data/018-3.wlk b/data/018-3.wlk
index ca2476bd..654c6bbc 100644
--- a/data/018-3.wlk
+++ b/data/018-3.wlk
diff --git a/data/020-1.wlk b/data/020-1.wlk
index ce86eb9a..68949359 100644
--- a/data/020-1.wlk
+++ b/data/020-1.wlk
diff --git a/data/021-1.wlk b/data/021-1.wlk
new file mode 100644
index 00000000..0a56c731
--- /dev/null
+++ b/data/021-1.wlk
diff --git a/data/022-1.wlk b/data/022-1.wlk
new file mode 100644
index 00000000..1e728154
--- /dev/null
+++ b/data/022-1.wlk
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 9a330350..c7c65430 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -7,6 +7,7 @@
 002-4.gat#002-4.wlk#
 003-1.gat#003-1.wlk#
 004-1.gat#004-1.wlk#
+004-2.gat#004-2.wlk#
 005-1.gat#005-1.wlk#
 005-3.gat#005-3.wlk#
 006-1.gat#006-1.wlk#
@@ -39,3 +40,6 @@
 020-2.gat#020-2.wlk#
 020-3.gat#020-3.wlk#
 020-4.gat#020-4.wlk#
+021-1.gat#021-1.wlk#
+021-2.gat#021-2.wlk#
+022-1.gat#022-1.wlk#
diff --git a/db/item_db.txt b/db/item_db.txt
index d430a954..ee68f152 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -86,7 +86,7 @@
 582,	StaffOfFire,		Staff of Fire,			4,	8000,	4000,	100,	100,	,	1,	,	0,	10477567,	2,	2,	1,	1,	1,	{},					{}
 583,	StaffOfIce,		Staff of Ice,			4,	8000,	4000,	100,	100,	,	1,	,	0,	10477567,	2,	2,	1,	1,	1,	{},					{}
 584,	Jackal,			Jackal,				4,	8000,	4000,	100,	100,	,	1,	,	0,	10477567,	2,	2,	1,	1,	1,	{},					{}
-585,	Scarabarmelt,		Scarab Armlet,			5,	8000,	4000,	100,	,	0,	,	5,	0,	10477567,	2,	32,	,	1,	1,	{},					{}
+585,	ScarabArmlet,		Scarab Armlet,			5,	8000,	4000,	100,	,	0,	,	5,	0,	10477567,	2,	32,	,	1,	1,	{},					{}
 586,	CottonShorts,		Cotton Shorts,			5,	1000,	500,	10,	,	2,	,	-4,	0,	10477567,	2,	1,	,	1,	0,	{},					{}
 // A bunch of unfinished weapons
 
@@ -199,14 +199,14 @@
 707,	MonsterOilPotion,	Monster Oil Potion,		3,	10000,	2000,	50,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
 708,	LeatherPatch,		Leather Patch,			3,	300,	150,	18,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
 709,	BlackScorpionStinger,	Black Scorpion Stinger,		3,	250,	100,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-710,	SnakeTongue,		Snake Tongue,			3,	120,	60,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-711,	MountainSnakeTongue,	Mountain Snake Tongue,		3,	160,	80,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-712,	GrassSnakeTongue,	Grass Snake Tongue,		3,	240,	120,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-713,	CaveSnakeTongue,	Cave Snake Tongue,		3,	240,	120,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-714,	SnakeEgg,		Snake Egg,			0,	100,	50,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 30,5; },			{}
-715,	MountainSnakeEgg,	Mountain Snake Egg,		0,	150,	75,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 40,5; },			{}
-716,	GrassSnakeEgg,		Grass Snake Egg,		0,	200,	100,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 50,5; },			{}
-717,	CaveSnakeEgg,		Cave Snake Egg,			0,	50,	25,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 20,5; },			{}
+710,	SnakeTongue,		Snake Tongue,			3,	60,	30,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
+711,	MountainSnakeTongue,	Mountain Snake Tongue,		3,	80,	40,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
+712,	GrassSnakeTongue,	Grass Snake Tongue,		3,	160,	80,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
+713,	CaveSnakeTongue,	Cave Snake Tongue,		3,	120,	60,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
+714,	SnakeEgg,		Snake Egg,			0,	50,	25,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 30,5; },			{}
+715,	MountainSnakeEgg,	Mountain Snake Egg,		0,	80,	40,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 40,5; },			{}
+716,	GrassSnakeEgg,		Grass Snake Egg,		0,	100,	50,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 50,5; },			{}
+717,	CaveSnakeEgg,		Cave Snake Egg,			0,	60,	30,	4,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 20,5; },			{}
 718,	SilkCocoon,		Silk Cocoon,			3,	200,	3,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
 // RESERVED
 720,	SilkRobe,		Silk Robe,			5,	8000,	4000,	5,	,	5,	,	0,	0,	10477567,	2,	512,	,	0,	0,	{},					{}
@@ -352,7 +352,7 @@
 2138,	PurpleDesertHat,	Purple Desert Hat,		5,	5000,	1000,	10,	,	3,	,	-1,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 2139,	DarkGreenDesertHat,	Dark Green Desert Hat,		5,	5000,	1000,	10,	,	3,	,	-1,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 
-#ID,	Name,			Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
+#ID,	Name,				Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
 2140,	RedCottonHeadBand,		Red Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 2141,	GreenCottonHeadBand,		Green Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 2142,	DarkBlueCottonHeadBand,		Dark Blue Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 44b22f17..59d90ecd 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1,39 +1,44 @@
-# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per
-1002,	Maggot,		Maggot,			5,	50,	0,	10,	2,	1,	5,	10,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	21,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		400,		533,		150,		502,		70,		522,		10,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1003,	Scorpion,	Scorpion,		10,	100,	0,	25,	4,	1,	10,	15,	0,	5,	1,	1,	1,	0,	15,	30,	1,	1,	1,	3,	20,		129,	2000,	1872,	672,		480,		507,		700,		510,		100,		509,		50,		518,		700,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1004,	RedScorpion,	Red Scorpion,		90,	550,	0,	200,	145,	1,	50,	55,	4,	6,	8,	8,	10,	10,	30,	10,	1,	1,	1,	0,	20,		129,	1000,	1872,	672,		480,		517,		2000,		509,		100,		518,		500,		1200,		10,		1199,		760,		1201,		540,		524,		25,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1005,	GreenSlime,	Green Slime,		40,	300,	0,	80,	8,	1,	25,	30,	2,	7,	1,	25,	1,	0,	30,	30,	1,	1,	1,	0,	21,		131,	1500,	1872,	672,		480,		502,		200,		513,		100,		501,		100,		521,		100,		522,		190,		526,		10,		503,		500,		535,		750,		0,	0,	0,	0,	,	,		,	,		,
-1006,	GiantMaggot,	Giant Maggot,		80,	500,	0,	180,	16,	2,	45,	50,	2,	7,	8,	6,	2,	1,	22,	1,	2,	2,	1,	0,	41,		129,	2000,	1872,	672,		480,		1199,		900,		519,		100,		518,		750,		501,		5000,		502,		3000,		503,		11,		526,		20,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1007,	YellowSlime,	Yellow Slime,		60,	400,	0,	140,	2,	1,	35,	40,	2,	7,	9,	6,	2,	1,	34,	1,	1,	1,	1,	0,	21,		131,	1400,	1800,	672,		480,		534,		200,		519,		100,		501,		350,		502,		250,		522,		10,		640,		150,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1008,	RedSlime,	Red Slime,		70,	450,	0,	160,	56,	1,	40,	45,	2,	7,	12,	8,	2,	1,	25,	1,	1,	1,	1,	0,	21,		135,	1300,	1500,	672,		480,		1201,		300,		509,		110,		521,		200,		523,		80,		525,		80,		535,		750,		528,		250,		531,		150,		0,	0,	0,	0,	,	,		,	,		,
-1009,	BlackScorpion,	Black Scorpion,		100,	600,	0,	270,	70,	1,	60,	65,	4,	6,	16,	10,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		523,		150,		509,		100,		518,		800,		709,		800,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1010,	Snake,		Snake,			115,	850,	0,	400,	100,	1,	75,	90,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		524,		300,		638,		20,		714,		400,		714,		400,		710,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
+#-- Regular mobs --
+# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
+1002,	Maggot,		Maggot,			5,	50,	0,	10,	2,	1,	5,	10,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	21,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		400,		533,		150,		502,		70,		522,		10,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
+1003,	Scorpion,	Scorpion,		10,	100,	0,	20,	4,	1,	10,	15,	0,	5,	1,	1,	1,	0,	15,	30,	1,	1,	1,	3,	20,		129,	2000,	1872,	672,		480,		507,		700,		510,		100,		509,		50,		518,		700,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
+1017,	Bat,		Bat,			20,	150,	0,	25,	2,	1,	7,	10,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	24,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		400,		533,		150,		521,		70,		522,		1,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	50
+1011,	FireGoblin,	Fire Goblin,		20,	220,	0,	35,	2,	1,	15,	20,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	23,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		800,		502,		150,		521,		70,		522,		10,		701,		500,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	20
+1019,	SpikyMushroom,	Spiky Mushroom,		30,	300,	0,	50,	4,	1,	10,	13,	0,	5,	1,	1,	1,	0,	10,	10,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		567,		800,		501,		150,		518,		50,		613,		150,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	25
+1020,	Fluffy,		Fluffy,			30,	500,	0,	60,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		611,		800,		527,		150,		535,		400,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	20
+1005,	GreenSlime,	Green Slime,		40,	300,	0,	70,	8,	1,	25,	30,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		131,	1500,	1872,	672,		480,		502,		200,		513,		100,		501,		100,		521,		100,		522,		190,		526,		10,		503,		500,		535,		750,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	20
+1016,	RudolphSlime,	Rudolph Slime,		50,	350,	0,	95,	16,	1,	30,	35,	10,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		131,	1000,	1872,	672,		480,		504,		800,		506,		500,		508,		200,		509,		300,		510,		600,		515,		800,		516,		500,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	50
+1007,	YellowSlime,	Yellow Slime,		60,	400,	0,	95,	2,	1,	35,	40,	2,	7,	9,	6,	2,	1,	34,	1,	1,	1,	1,	0,	21,		131,	1400,	1800,	672,		480,		534,		200,		519,		100,		501,		350,		502,		250,		522,		10,		640,		150,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
+1008,	RedSlime,	Red Slime,		70,	450,	0,	120,	56,	1,	40,	45,	2,	7,	12,	8,	2,	1,	25,	1,	1,	1,	1,	0,	21,		135,	1300,	1500,	672,		480,		1201,		300,		509,		110,		521,		200,		523,		80,		525,		80,		535,		750,		528,		250,		531,		150,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
 
-1011,	FireGoblin,	Fire Goblin,		20,	200,	0,	40,	2,	1,	15,	20,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	23,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		800,		502,		150,		521,		70,		522,		10,		701,		500,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1012,	Spider,		Spider,			130,	800,	0,	375,	280,	1,	70,	85,	4,	6,	14,	13,	10,	10,	35,	10,	1,	1,	1,	0,	25,		175,	1000,	1500,	672,		480,		537,		500,		535,		100,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1013,	EvilMushroom,	Evil Mushroom,		110,	650,	0,	350,	110,	1,	65,	70,	4,	6,	16,	12,	10,	10,	35,	10,	1,	1,	1,	3,	22,		137,	800,	1800,	672,		480,		535,		500,		540,		10,		534,		100,		566,		500,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1014,	Flower,		Flower,			115,	700,	0,	375,	110,	2,	70,	75,	0,	5,	16,	12,	20,	20,	20,	20,	2,	2,	1,	3,	22,		128,	800,	800,	672,		480,		535,		100,		540,		10,		1199,		100,		526,		400,		565,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1015,	SantaSlime,	Santa Slime,		120,	750,	0,	325,	0,	1,	75,	80,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		161,	1500,	1872,	672,		480,		512,		800,		513,		700,		514,		600,		519,		500,		527,		400,		538,		500,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1016,	RudolphSlime,	Rudolph Slime,		50,	350,	0,	120,	16,	1,	30,	35,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		131,	1000,	1872,	672,		480,		504,		800,		506,		500,		508,		200,		509,		300,		510,		600,		515,		800,		516,		500,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
+# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
+1006,	GiantMaggot,	Giant Maggot,		80,	500,	0,	130,	16,	2,	45,	50,	2,	7,	8,	6,	2,	1,	22,	1,	2,	2,	1,	0,	41,		129,	2000,	1872,	672,		480,		1199,		900,		519,		100,		518,		750,		501,		5000,		502,		3000,		503,		11,		526,		20,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	40
+1004,	RedScorpion,	Red Scorpion,		90,	550,	0,	145,	145,	1,	50,	55,	4,	6,	8,	8,	10,	10,	30,	10,	1,	1,	1,	0,	20,		129,	1000,	1872,	672,		480,		517,		2000,		509,		100,		518,		500,		1200,		10,		1199,		760,		1201,		540,		524,		25,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	60
+1009,	BlackScorpion,	Black Scorpion,		100,	600,	0,	170,	70,	1,	60,	65,	4,	6,	16,	12,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		523,		150,		509,		100,		518,		800,		709,		800,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	50
+1014,	Flower,		Flower,			115,	700,	0,	170,	110,	2,	70,	75,	0,	5,	16,	12,	20,	20,	20,	20,	2,	2,	1,	3,	22,		128,	800,	800,	672,		480,		535,		100,		540,		10,		1199,		100,		526,		400,		565,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	10
+1013,	EvilMushroom,	Evil Mushroom,		110,	650,	0,	200,	110,	1,	65,	70,	4,	6,	16,	12,	10,	10,	35,	10,	1,	1,	1,	3,	22,		137,	800,	1800,	672,		480,		535,		500,		540,		10,		534,		100,		566,		500,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
+1015,	SantaSlime,	Santa Slime,		120,	750,	0,	225,	0,	1,	75,	80,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		161,	1500,	1872,	672,		480,		512,		800,		513,		700,		514,		600,		519,		500,		527,		400,		538,		500,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	40
+1012,	Spider,		Spider,			125,	800,	0,	235,	280,	1,	70,	85,	4,	6,	14,	13,	10,	10,	35,	10,	1,	1,	1,	0,	25,		175,	1000,	1500,	672,		480,		537,		500,		535,		100,		638,		20,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	50
+1010,	Snake,		Snake,			115,	850,	0,	250,	100,	1,	75,	90,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	900,	1300,	672,		480,		524,		300,		0,		0,		714,		400,		714,		400,		710,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	40
+1026,	MountainSnake,	Mountain Snake,		130,	900,	0,	300,	100,	1,	80,	95,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		532,		20,		641,		150,		715,		400,		715,		400,		711,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	40
+1034,	GrassSnake,	Grass Snake,		140,	1000,	0,	450,	100,	1,	80,	120,	2,	10,	20,	40,	10,	10,	40,	50,	1,	1,	1,	0,	20,		133,	500,	1100,	672,		480,		716,		400,		716,		400,		712,		500,		676,		500,		660,		350,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	50
 
-# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per
-1017,	Bat,		Bat,			20,	150,	0,	55,	2,	1,	7,	10,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	24,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		400,		533,		150,		521,		70,		522,		1,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1018,	Pinkie,		Pinkie,			30,	500,	0,	75,	3,	2,	7,	10,	0,	5,	1,	1,	1,	0,	20,	25,	2,	2,	1,	3,	20,		129,	800,	1872,	672,		480,		614,		800,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1019,	SpikyMushroom,	Spiky Mushroom,		30,	300,	0,	65,	4,	1,	10,	13,	0,	5,	1,	1,	1,	0,	10,	10,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		567,		800,		501,		150,		518,		50,		613,		150,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1020,	Fluffy,		Fluffy,			30,	500,	0,	75,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		611,		800,		527,		150,		535,		400,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1021,	CaveSnake,	Cave Snake,		30,	1000,	0,	120,	5,	1,	20,	15,	1,	5,	10,	1,	1,	0,	10,	10,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		612,		800,		610,		40,		713,		500,		717,		400,		717,		400,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1022,	JackO,		Jack O,			300,	10000,	0,	5000,	5000,	2,	150,	200,	35,	20,	35,	30,	25,	25,	35,	15,	1,	1,	1,	0,	20,		133,	250,	1500,	672,		480,		617,		300,		622,		400,		624,		400,		620,		400,		615,		300,		1203,		400,		1198,		10000,		616,		600,		0,	0,	0,	0,	,	,		,	,		,
-1023,	FireSkull,	Fire Skull,		200,	5000,	0,	1000,	100,	2,	100,	175,	30,	15,	30,	30,	20,	20,	25,	10,	1,	1,	1,	3,	23,		175,	600,	1600,	672,		480,		631,		1000,		701,		5000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1024,	PoisonSkull,	Poison Skull,		200,	5000,	0,	1000,	100,	2,	100,	175,	30,	15,	30,	30,	20,	20,	25,	10,	1,	1,	1,	3,	25,		175,	600,	1600,	672,		480,		631,		1000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1025,	LogHead,	Log Head,		30,	500,	0,	75,	30,	1,	7,	10,	50,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	22,		129,	800,	1872,	672,		480,		569,		2000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
+# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
+1023,	FireSkull,	Fire Skull,		180,	5000,	0,	2500,	100,	2,	100,	175,	35,	15,	30,	30,	20,	20,	25,	10,	1,	1,	1,	3,	23,		175,	600,	1600,	672,		480,		631,		1000,		701,		5000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
+1024,	PoisonSkull,	Poison Skull,		180,	5000,	0,	2500,	100,	2,	100,	175,	35,	15,	30,	30,	20,	20,	25,	10,	1,	1,	1,	3,	25,		175,	600,	1600,	672,		480,		631,		1000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
+1022,	JackO,		Jack O,			250,	10000,	0,	10000,	5000,	2,	150,	220,	40,	20,	35,	40,	25,	25,	35,	15,	1,	1,	1,	0,	20,		133,	250,	1500,	672,		480,		617,		300,		622,		400,		624,		400,		620,		400,		615,		300,		1203,		400,		1198,		10000,		616,		600,		0,	0,	0,	0,	,	,		,	,		,	,	 4,	20
 
-1026,	MountainSnake,	Mountain Snake,		140,	900,	0,	500,	100,	1,	80,	95,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		532,		20,		641,		150,		715,		400,		715,		400,		711,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1027,	EasterFluffy,	Easter Fluffy,		30,	500,	0,	55,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		1208,		2000,		1209,		2000,		1210,		2000,		1211,		1000,		1212,		1000,		1213,		200,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1028,	Mouboo,		Mouboo,			85,	1200,	0,	600,	40,	2,	55,	75,	40,	5,	15,	5,	15,	0,	25,	10,	2,	2,	1,	3,	20,		129,	600,	1872,	672,		480,		660,		200,		660,		100,		541,		750,		660,		10,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1029,	MauvePlant,	Mauve Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		680,		3000,		680,		3000,		680,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1030,	CobaltPlant,	Cobalt Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		681,		3000,		681,		3000,		681,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1031,	GambogePlant,	Gamboge Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		682,		3000,		682,		3000,		682,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1032,	AlizarinPlant,	Alizarin Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		683,		3000,		683,		3000,		683,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1033,	SeaSlime,	Sea Slime,		70,	600,	0,	90,	9,	1,	30,	40,	3,	7,	1,	25,	1,	0,	30,	30,	1,	1,	1,	0,	41,		131,	1500,	1872,	672,		480,		535,		800,		657,		800,		518,		500,		510,		1000,		700,		100,		1199,		5000,		568,		100,		541,		50,		0,	0,	0,	0,	,	,		,	,		,
-1034,	GrassSnake,	Grass Snake,		150,	1000,	0,	700,	100,	1,	80,	120,	2,	10,	20,	40,	10,	10,	40,	50,	1,	1,	1,	0,	20,		133,	500,	1100,	672,		480,		716,		400,		716,		400,		712,		500,		676,		500,		660,		350,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1035,	Silkworm,	Silkworm,		20,	1,	0,	1,	1,	1,	0,	0,	2,	10,	20,	11,	10,	10,	40,	10,	1,	1,	1,	0,	20,		129,	1300,	1100,	672,		480,		718,		5000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
+
+#-- Resource mobs --
+# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
+1027,	EasterFluffy,	Easter Fluffy,		30,	500,	0,	45,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		1208,		2000,		1209,		2000,		1210,		2000,		1211,		1000,		1212,		1000,		1213,		200,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	50
+1018,	Pinkie,		Pinkie,			30,	500,	0,	60,	3,	2,	7,	10,	0,	5,	1,	1,	1,	0,	20,	25,	2,	2,	1,	3,	20,		129,	800,	1872,	672,		480,		614,		800,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	30
+1021,	CaveSnake,	Cave Snake,		30,	1000,	0,	125,	5,	1,	20,	15,	1,	5,	10,	1,	1,	0,	10,	10,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		612,		800,		610,		40,		713,		500,		717,		400,		717,		400,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	40
+1025,	LogHead,	Log Head,		30,	500,	0,	100,	30,	1,	7,	10,	50,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	22,		129,	800,	1872,	672,		480,		569,		2000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	30
+1033,	SeaSlime,	Sea Slime,		70,	600,	0,	100,	9,	1,	30,	40,	3,	7,	1,	25,	1,	0,	30,	30,	1,	1,	1,	0,	41,		131,	1500,	1872,	672,		480,		535,		800,		657,		800,		518,		500,		510,		1000,		700,		100,		1199,		5000,		568,		100,		541,		50,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	60
+1029,	MauvePlant,	Mauve Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		680,		3000,		680,		3000,		680,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
+1030,	CobaltPlant,	Cobalt Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		681,		3000,		681,		3000,		681,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
+1031,	GambogePlant,	Gamboge Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		682,		3000,		682,		3000,		682,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
+1032,	AlizarinPlant,	Alizarin Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		683,		3000,		683,		3000,		683,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
+1035,	Silkworm,	Silkworm,		20,	1,	0,	1,	1,	1,	0,	0,	2,	10,	20,	11,	10,	10,	40,	10,	1,	1,	1,	0,	20,		129,	1300,	1100,	672,		480,		718,		5000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	40
+1028,	Mouboo,		Mouboo,			85,	1200,	0,	350,	40,	2,	55,	75,	40,	5,	15,	5,	15,	0,	25,	10,	2,	2,	1,	3,	20,		129,	600,	1872,	672,		480,		660,		200,		660,		100,		541,		750,		660,		10,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	40
diff --git a/news.txt b/news.txt
index bdd12c82..4f61db67 100644
--- a/news.txt
+++ b/news.txt
@@ -1,3 +1,21 @@
+##3 Monster Mutations and Experience Point Changes
+##3 2008-12-10
+
+##0 We have rebalanced monster experience points
+##0 and added two new mechanisms to make the game
+##0 more challenging:  monster mutations, by which
+##0 monster attributes (and experience points) are
+##0 slightly modified for each individual monster,
+##0 and increased boni for shared kills:  killing a
+##0 monster with a group of fighters now yields
+##0 significantly more experience points than
+##0 killing it alone.  To adjust for the latter
+##0 increase, we have reduced base experience points
+##0 for low and medium-level monsters, though we
+##0 expect levelling to be easier overall.
+
+##2 The TMW development team
+
 ##3 Mines and weddings!
 ##3 2008-10-11
  
diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index 1efc79fe..d4367616 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -140,12 +140,7 @@ L_Key:
 
 L_Laws:
 	mes "[Ian the Guide]";
-        mes "\"Lady Platyna, the Overseer, has decreed the following rules:";
-        mes "1. Do not abuse others (insult, swear etc.)";
-        mes "2. No bots.";
-        mes "3. No spamming/flooding.";
-        mes "4. No begging.";
-        mes "5. Speak English.";
+        mes "\"The constable can help you with them.\"";
         next;
 	goto L_Menu_A;
         
@@ -153,12 +148,20 @@ L_Know:
 	close;
 
 S_Grad:
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 	mes "[Ian the Guide]";
 	mes "\"Hey, you've been doing good, let me give you this.\"";
-	next;
 
 	getitem 675, 1;
 	set TUT_var, TUT_var | 2;
+	next;
+
+	return;
 
+L_TooMany:
+	mes "[Ian the Guide]";
+	mes "\"I wanted to give you something, but you don't have room for it.\"";
+	next;
 	return;
 }
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index eb1ebdf0..048bfa19 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -1,83 +1,102 @@
 //
 
 001-1.gat,110,71,0	script	Sandra	114,{
-	if(Scorp == 2) goto done;
-	if(Scorp == 1) goto reas;
+	if(Scorp == 2) goto L_Done;
+	if(Scorp == 1) goto L_Progress;
+
 	set @TEMP,rand(3);
-	if(@TEMP == 1) goto L_1;
-	if(@TEMP == 2) goto L_2;
-	if(@TEMP == 3) goto L_3;
-	if(@TEMP == 0) goto L_4;
-L_1:
+	if(@TEMP == 1) goto L_Opening1;
+	if(@TEMP == 2) goto L_Opening2;
+	if(@TEMP == 3) goto L_Opening3;
+	if(@TEMP == 0) goto L_Opening4;
+
+L_Opening1:
 	mes "[Sandra]";
-	mes "\"In the outskirts of Tulimshar, there wanders a red scorpion. I need a favor, please help me.\"";
+	mes "\"In the outskirts of Tulimshar, there wanders a red scorpion. I need a favor, please help me. Will you?\"";
 	next;
-	goto red;
-L_2:
+	goto L_Ask;
+
+L_Opening2:
 	mes "[Sandra]";
 	mes "\"When you venture in the outskirts of Tulimshar, you can spot a red scorpion. Will you help me kill one?\"";
 	next;
-	goto red;
-L_3:
+	goto L_Ask;
+
+L_Opening3:
 	mes "[Sandra]";
-	mes "\"The red scorpion stinger carries many properties used in potions.\"";
+	mes "\"The red scorpion stinger carries many properties used in potions. Will you get some for me?\"";
 	next;
-	goto red;
-L_4:
+	goto L_Ask;
+
+L_Opening4:
 	mes "[Sandra]";
 	mes "\"You look sturdy enough, will you help me get something?\"";
 	next;
-	goto red;
-red:
-	menu "Yes",L_kl,"No",L_N;
-L_kl:
-	if(@TEMP == 1) goto K_1;
-	if(@TEMP == 2) goto K_2;
-	if(@TEMP == 3) goto K_3;
-	if(@TEMP == 0) goto K_1;
-K_1:
+	goto L_Ask;
+
+L_Ask:
+	menu
+		"Yes", L_Yes,
+		"No", L_No;
+
+L_Yes:
+	if(@TEMP == 1) goto L_Req1;
+	if(@TEMP == 2) goto L_Req2;
+	if(@TEMP == 3) goto L_Req3;
+	if(@TEMP == 0) goto L_Req1;
+
+L_Req1:
 	mes "[Sandra]";
 	mes "\"I need you to slaughter the red scorpion found outside of Tulimshar and bring me 5 [Red Stingers].\"";
 	next;
-	goto set1;
-K_2:
+	goto L_Set;
+
+L_Req2:
 	mes "[Sandra]";
 	mes "\"I heard a while ago that the stinger of a red scorpion can be used for medical purposes. I need you to help me get 5 [Red Stingers].\"";
 	next;
-	goto set1;
-K_3:
+	goto L_Set;
+
+L_Req3:
 	mes "[Sandra]";
 	mes "\"Bring me 5 [Red Stingers] and i will reward you greatly.\"";
 	next;
-	goto set1;
-set1:
+	goto L_Set;
+
+L_Set:
 	set Scorp,1;
 	mes "[Sandra]";
 	mes "\"Please bring me them!\"";
 	close;
-reas:
-	if(countitem(517) >= 5) goto have;
+
+L_Progress:
+	if (countitem(517) >= 5) goto L_Have;
 	mes "[Sandra]";
 	mes "\"Please hurry and bring me 5 [Red Stingers].\"";
 	close;
-have:
+
+L_Have:
 	mes "[Sandra]";
 	mes "\"Excellent!";
 	mes "You brought me 5 [Red Stingers]!\"";
-	delitem 517,5;
-	next;
-	mes "[Sandra]";
-	mes "\"Here you go, your reward!\"";
-	mes "+Got Bow";
-	mes "+Got Arrows 100";
-	getitem 1200,1;
-	getitem 1199,100;
-	set Scorp,2;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(517) > 5) goto L_TooMany;
+	delitem 517, 5;
+	getitem 1200, 1;
+	getitem 1199, 100;
+	set Scorp, 2;
 	close;
-done:
+
+L_Done:
 	mes "[Sandra]";
 	mes "\"Thank you for all your help!\"";
 	close;
-L_N:
+
+L_No:
 	close;
+
+L_TooMany:
+	next;
+	mes "[Sandra]";
+	mes "\"You don't have room for my reward. I'll wait until you do.\"";
 }
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index ef17ba18..b0412517 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -1,32 +1,33 @@
 //
 
 001-1.gat,135,42,0	script	Vincent	113,{
-	if(Bugleg == 1) goto L_Reas;
 	if(Bugleg == 2) goto L_Done;
+	if(Bugleg == 1) goto L_Progress;
+
 	set @TEMP, rand(4);
-	if(@TEMP == 0) goto L_1;
-	if(@TEMP == 1) goto L_2;
-	if(@TEMP == 2) goto L_3;
-	if(@TEMP == 3) goto L_4;
+	if(@TEMP == 0) goto L_Opening1;
+	if(@TEMP == 1) goto L_Opening2;
+	if(@TEMP == 2) goto L_Opening3;
+	if(@TEMP == 3) goto L_Opening4;
 
-L_1:
+L_Opening1:
 	mes "[Vincent]";
 	mes "\"I just need 30 more [Bug Legs] to finish my action figure!\"";
 	next;
 	goto L_Ask;
 
-L_2:
+L_Opening2:
 	mes "[Vincent]";
 	mes "\"This maggot action figure is awesome! I just need to attach [30 Part A{Bug Leg}]\"";
 	next;
 	goto L_Ask;
 
-L_3:
+L_Opening3:
 	mes "[Vincent]";
 	mes "\"This is a great action figure! A must have! All I need is a few parts...\"";
 	goto L_Ask;
 
-L_4:
+L_Opening4:
 	mes "[Vincent]";
 	mes "\"Can you get me 30 [Bug Legs]? I need them to replace the action figure parts.\"";
 	next;
@@ -44,30 +45,30 @@ L_Ask:
 L_Sure:
 	set Bugleg, 1;
 	set @TEMP,rand(4);
-	if(@TEMP == 0) goto J_1;
-	if(@TEMP == 1) goto J_2;
-	if(@TEMP == 2) goto J_3;
-	if(@TEMP == 3) goto J_4;
+	if(@TEMP == 0) goto L_Req1;
+	if(@TEMP == 1) goto L_Req2;
+	if(@TEMP == 2) goto L_Req3;
+	if(@TEMP == 3) goto L_Req4;
 
-J_1:
+L_Req1:
 	mes "[Vincent]";
 	mes "\"Thank you!\"";
 	next;
 	goto L_Wait;
 
-J_2:
+L_Req2:
 	mes "[Vincent]";
 	mes "\"I don't know how to thank you enough!\"";
 	next;
 	goto L_Wait;
 
-J_3:
+L_Req3:
 	mes "[Vincent]";
 	mes "\"I will thank you when I get them!\"";
 	next;
 	goto L_Wait;
 
-J_4:
+L_Req4:
 	mes "[Vincent]";
 	mes "\"I'm sure I will give a small reward. :D\"";
 	next;
@@ -78,7 +79,7 @@ L_Wait:
 	mes "\"Now please go get me 30 [Bug Legs]\"";
 	close;
 
-L_Reas:
+L_Progress:
 	if(countitem(518) >= 30) goto L_Have;
 	mes "[Vincent]";
 	mes "\"Please help me collect 30 [Bug Legs]!\"";
diff --git a/npc/001-2_Tulimshar/troupe_leader.txt b/npc/001-2_Tulimshar/troupe_leader.txt
index 1114de56..d5c8bbfd 100644
--- a/npc/001-2_Tulimshar/troupe_leader.txt
+++ b/npc/001-2_Tulimshar/troupe_leader.txt
@@ -32,12 +32,19 @@ L_NohMask_Accuse:
 L_NohMask_Found:
 	mes "[Troupe Leader]";
 	mes "\"Thank you for finding the mask. You did such a good job, you should keep it.\"";
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_NohMask_TooMany;
 	mes "[1500 experience points]";
 	getexp 1500, 0;
-	next;
 	set Inspector, 14;
 	getitem 678, 1;
+	next;
 	mes "[Troupe Leader]";
 	mes "\"We don't need it anymore. We're doing different shows here.\"";
 	close;
+
+L_NohMask_TooMany:
+	next;
+	mes "[Troupe Leader]";
+	mes "\"Except, you don't seem to have any room for it. I'll hold onto it for you until you do have room.\"";
 }
diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt
index c3e2c188..e76332fd 100644
--- a/npc/002-4_Desert_mines/chest.txt
+++ b/npc/002-4_Desert_mines/chest.txt
@@ -13,14 +13,17 @@
 
 L_Yes:
 	if(countitem(537) < 3) goto L_Not_Enough;
-	delitem 537, 3;
-	getitem 536, 1;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(537) > 3) goto L_TooMany;
 	mes "[Chest]";
 	mes "You opened it and found a short sword!";
+	delitem 537, 3;
+	getitem 536, 1;
 	set ChestQuest, ChestQuest | 1;
 	close;
 
 L_Not_Enough:
+        mes "[Chest]";
 	mes "It seems that this is not the right key...";
 	close;
 
@@ -28,4 +31,9 @@ L_Finished:
         mes "[Chest]";
         mes "You already opened this chest.";
         close;
+
+L_TooMany:
+        mes "[Chest]";
+        mes "You don't have room for what ever is inside. Maybe you should try again later.";
+	close;
 }
diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1_Beach/_import.txt
index 0b1dba07..7bd39a8b 100644
--- a/npc/004-1_Beach/_import.txt
+++ b/npc/004-1_Beach/_import.txt
@@ -1,4 +1,3 @@
 map: 004-1.gat
 npc: npc/004-1_Beach/_mobs.txt
 npc: npc/004-1_Beach/_warps.txt
-npc: npc/004-1_Beach/monsters.txt
diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt
index b6ccc7d0..97af769d 100644
--- a/npc/004-1_Beach/_warps.txt
+++ b/npc/004-1_Beach/_warps.txt
@@ -2,3 +2,5 @@
 
 004-1.gat,84,113	warp	ToSandstorm	1,-1,002-1.gat,29,15
 004-1.gat,37,111	warp	ToBeach	1,-1,003-1.gat,141,21
+004-1.gat,80,31	warp	ToHouse	-1,-1,004-2.gat,21,28
+004-1.gat,86,27	warp	To2ndFloor	-1,-1,004-2.gat,57,65
diff --git a/npc/004-1_Beach/monsters.txt b/npc/004-1_Beach/monsters.txt
deleted file mode 100644
index 8056eead..00000000
--- a/npc/004-1_Beach/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: 004-1
-// This is the Beach west of Tulimshar.
-//
-
-004-1.gat,0,0,0,0     monster SeaSlime        1033,30,0,0,Mob34::OnSeaSlime
-004-1.gat,0,0,0,0     monster GiantMaggot     1006,10,0,0,Mob34::OnGiantMaggot
-004-1.gat,0,0,0,0     monster RedScorpion     1004,12,0,0,Mob34::OnRedScorpion
-
-004-1.gat,0,0,0	script	Mob34	-1,{
-OnSeaSlime:
-	set @mobID, 1033;
-	callfunc "MobPoints";
-	break;
-
-OnGiantMaggot:
-	set @mobID, 1006;
-	callfunc "MobPoints";
-	break;
-
-OnRedScorpion:
-	set @mobID, 1004;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/004-2_Beach_House/_import.txt b/npc/004-2_Beach_House/_import.txt
new file mode 100644
index 00000000..32725dc8
--- /dev/null
+++ b/npc/004-2_Beach_House/_import.txt
@@ -0,0 +1,3 @@
+map: 004-2.gat
+npc: npc/004-2_Beach_House/_mobs.txt
+npc: npc/004-2_Beach_House/_warps.txt
diff --git a/npc/004-2_Beach_House/_mobs.txt b/npc/004-2_Beach_House/_mobs.txt
new file mode 100644
index 00000000..fada1e0d
--- /dev/null
+++ b/npc/004-2_Beach_House/_mobs.txt
@@ -0,0 +1,7 @@
+// 004-2 Beach House mobs
+
+
+
+004-2.gat,0,0,0	script	Mob004-2	-1,{
+	end;
+}
diff --git a/npc/004-2_Beach_House/_warps.txt b/npc/004-2_Beach_House/_warps.txt
new file mode 100644
index 00000000..8a1e4047
--- /dev/null
+++ b/npc/004-2_Beach_House/_warps.txt
@@ -0,0 +1,10 @@
+// 004-2 Beach House warps
+
+004-2.gat,39,20	warp	ToRoom	0,-1,004-2.gat,75,29
+004-2.gat,75,30	warp	ToRoom	0,-1,004-2.gat,38,21
+004-2.gat,21,29	warp	ToOutside	-1,-1,004-1.gat,80,32
+004-2.gat,62,28	warp	ToBasement	-1,-1,004-2.gat,21,62
+004-2.gat,20,62	warp	To1stFloor	-1,-1,004-2.gat,63,28
+004-2.gat,68,66	warp	To1stFloor	0,-1,004-2.gat,35,21
+004-2.gat,36,20	warp	To2ndFloor	0,-1,004-2.gat,68,65
+004-2.gat,57,66	warp	ToOutside	-1,-1,004-1.gat,86,28
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index 15d1610c..51c2d3b2 100644
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ b/npc/006-1_Desert_mountains/pachua.txt
@@ -134,11 +134,13 @@ L_leather_patch:
         next;
 
         menu	"Here you are.", -,
-		"OK, I'll be back later.", L_end,
+		"OK, I'll be back later.", L_End,
 		"That's too expensive!.", L_NoDeal;
 
 	if (countitem(@SNAKE_SKIN) < 1) goto L_NoSkins;
 	if (zeny < @LEATHER_PATCH_PRICE) goto L_NoMoney;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@SNAKE_SKIN) > 1) goto L_TooMany;
 
         set zeny, zeny - @LEATHER_PATCH_PRICE;
         delitem @SNAKE_SKIN, 1;
@@ -189,6 +191,10 @@ L_WearingChaps:
 	next;
 	goto L_Check_Shops;
 
-L_end:
+L_End:
 	close;
+
+L_TooMany:
+	mes "[Chief Pachua]";
+	mes "\"You don't have room for a leather patch. Come back later.\"";
 }
diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt
index 27dcd677..ce0af655 100644
--- a/npc/008-1_Hurnscald_outskirts/hinnak.txt
+++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt
@@ -53,7 +53,7 @@ L_Reward:
 
 L_Exchange:
 	mes "[Farmer Hinnak]";
-	mes "Have you got the 10 antennae?";
+	mes "\"Have you got the 10 antennae?\"";
 	next;
 
 	if (countitem(614) < 10) goto L_Exchange_Notenough;
@@ -64,6 +64,9 @@ L_Exchange:
 	close;
 
 L_Exchange_Exchange:
+	if (countitem(614) < 10) goto L_Exchange_Notenough;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Exchange_TooMany;
 	delitem 614, 10;
 	getitem 623, 1;
 	set QUEST_Scythe_state, 2;
@@ -72,13 +75,18 @@ L_Exchange_Exchange:
 	close;
 
 L_Exchange_Notenough:
-	menu
-		"Not yet, but I am working on it.", -;
+	mes "[Farmer Hinnak]";
+	mes "\"It doesn't look like you do.\"";
+	close;
+
+L_Exchange_TooMany:
+	mes "[Farmer Hinnak]";
+	mes "\"Looks like you don't have room for this. Come back later to receive your reward. Hold on to the antennea until then.\"";
 	close;
 
 L_ThanksAgain:
 	mes "[Farmer Hinnak]";
-	mes "Thanks again for helping me with the pinkies.";
+	mes "\"Thanks again for helping me with the pinkies.\"";
 	close;
 
 L_NohMask:
@@ -97,4 +105,4 @@ L_NohMask_Satchel:
 	mes "[Farmer Hinnak]";
 	mes "\"Yes, I saw someone with a large sack on their back go to the minning camp.\"";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt
index ed90135a..84dc15d9 100644
--- a/npc/009-1_Hurnscald/jack.txt
+++ b/npc/009-1_Hurnscald/jack.txt
@@ -110,7 +110,7 @@ L_Bow_state_2:
 	if (@Q_Forestbow > 3) goto L_Bow_state_4;
 
 	mes "\"Good luck hunting those tree monsters - you will need it.\"";
-	if (Inspector == 1) goto L_NohMask_Ask;
+	if (Inspector == 1) callsub S_NohMask_Ask;
 	close;
 
 L_Bow_state_4:
@@ -183,6 +183,8 @@ L_Shield_state_2:
 
 	if (countitem(@RAWLOG) < @RAWLOGS_AMOUNT) goto L_Not_enough_logs;
 	if (zeny < @SHIELD_COST) goto L_Not_enough_money;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 
 	delitem @RAWLOG, @RAWLOGS_AMOUNT;
 	set zeny, zeny - @SHIELD_COST;
@@ -223,16 +225,24 @@ L_Not_enough_money:
 	mes "\"You don't have enough gold, I'm afraid.  I need " + @SHIELD_COST + " GP to finish your shield.\"";
 	close;
 
+L_TooMany:
+	mes "[Jack Lumber]";
+	mes "\"You don't have enough room for the shield. Come back when you do.\"";
+	close;
+
 L_Shield_state_3:
 	mes "[Jack Lumber]";
 	mes "\"I hope that my shield will serve you well!\"";
+	next;
+
 	if (Inspector == 1)
 		menu
 			"Me too.", -,
 			"Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
 	close;
 
-L_NohMask_Ask:
+S_NohMask_Ask:
+	next;
 	menu
 		"I'll keep that in mind.", -,
 		"Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
diff --git a/npc/009-1_Hurnscald/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt
index 5198f8ab..9f3d26ec 100644
--- a/npc/009-1_Hurnscald/old_woman.txt
+++ b/npc/009-1_Hurnscald/old_woman.txt
@@ -36,7 +36,7 @@ L_NohMask_Alibi:
 
 L_NohMask_Fake:
 	if (Inspector == 9) goto L_NohMask_Fake_Satchel;
-	if (Inspector >= 3 && Inspector <= 6) got L_NohMask_Filler;
+	if (Inspector >= 3 && Inspector <= 6) goto L_NohMask_Filler;
 
 	mes "[Old Woman]";
 	mes "\"I saw someone sneaking around town wearing a theater mask. It looked like one of the masks used by the troupe that was in town recently.\"";
diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2_Hurnscald/alan.txt
index 0235ad33..6d8a1770 100644
--- a/npc/009-2_Hurnscald/alan.txt
+++ b/npc/009-2_Hurnscald/alan.txt
@@ -174,6 +174,8 @@ L_State_4:
 
 L_State_4_pay:
 	if (zeny < 10000) goto L_State_4_nocash;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_State_4_TooMany;
 	set zeny, zeny - 10000;
 	getitem 545, 1;
 	set @Q_status, 5;
@@ -187,6 +189,11 @@ L_State_4_nocash:
 	mes "\"Seems like you are out of cash.\"";
 	close;
 
+L_State_4_TooMany:
+	mes "[Alan]";
+	mes "\"Seems like you don't have room for this bow. Come back later.\"";
+	close;
+
 L_State_5:
 	mes "[Alan]";
 	mes "\"I hope you are statisfied with your forest bow. It is one of my best works.\"";
diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index cd5bc3b7..f24d2071 100644
--- a/npc/009-2_Hurnscald/kfahr.txt
+++ b/npc/009-2_Hurnscald/kfahr.txt
@@ -810,12 +810,19 @@ L_knife_quest_completecheck:
 	mes "I had the nomads make me a few of them, and I hardly use them nowadays, so I think I can part with this one.";
 	next;
 
+	if (countitem(@BLACK_STINGER) < @BLACK_STINGERS_NR)
+		goto L_knife_quest_missing_stingers_2;
+
+	if (countitem(@MUSHROOM) < @MUSHROOMS_NR)
+		goto L_knife_quest_missing_mushrooms_2;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Knife_TooMany;
+
 	mes "[Kfahr the Warrior]";
 	mes "He hands you the knife.";
 	mes "\"Oh, and I think I'll keep those in return; I know someone who will trade them for antidote potions.\"";
 	mes "He pockets the stingers and mushrooms.";
 	mes "[" + @KNIFE_QUEST_XP + " experience points]";
-	next;
 
 	set @Q_status, @QS_KNIFE_QUEST_DONE;
 	callsub L_Update_Var;
@@ -824,10 +831,15 @@ L_knife_quest_completecheck:
 	delitem @MUSHROOM, @MUSHROOMS_NR;
 	getexp @KNIFE_QUEST_XP, 0;
 	getitem @BONE_KNIFE, 1;
-
+        next;
 
 	goto L_main_menu;
 
+L_Knife_TooMany:
+	mes "[Kfahr the Warrior]";
+	mes "\"You don't have room for this. Come back when you do.\"";
+	close;
+
 L_knife_quest_missing_stingers:
 	mes "[Kfahr the Warrior]";
 	mes "\"No, no... I said " + @BLACK_STINGERS_NR + " black scorpion stingers.";
@@ -838,6 +850,16 @@ L_knife_quest_missing_stingers:
 	next;
 	close;
 
+L_knife_quest_missing_stingers_2:
+	mes "[Kfahr the Warrior]";
+	mes "\"You just had " + @BLACK_STINGERS_NR + " black scorpion stingers. What happened to them?";
+	if (countitem(@BLACK_STINGER))
+		mes "You will need " + (@BLACK_STINGERS_NR - (countitem (@BLACK_STINGER))) + " more of those.\"";
+	if (countitem(@BLACK_STINGER) == 0)
+		mes "You didn't bring even a single one!\"";
+	next;
+	close;
+
 L_knife_quest_missing_mushrooms:
 	mes "[Kfahr the Warrior]";
 	mes "\"No, no... I said " + @MUSHROOMS_NR + " small mushrooms.";
@@ -848,6 +870,16 @@ L_knife_quest_missing_mushrooms:
 	next;
 	close;
 
+L_knife_quest_missing_mushrooms_2:
+	mes "[Kfahr the Warrior]";
+	mes "\"You just had " + @MUSHROOMS_NR + " small mushrooms. What happened to them?";
+	if (countitem(@MUSHROOM))
+		mes "You will need " + (@MUSHROOMS_NR - (countitem (@MUSHROOM))) + " more of those.\"";
+	if (countitem(@MUSHROOM) == 0)
+		mes "You didn't bring me even a single little mushroom!\"";
+	next;
+	close;
+
 L_stinger_quest_check:
 	mes "[Kfahr the Warrior]";
 	mes "Kfahr grins at you.";
@@ -863,6 +895,8 @@ L_stinger_quest_check:
 L_snakeskins_completecheck:
 	if (countitem(@SNAKE_SKIN) < @SNAKE_SKINS_NR)
 		goto L_snakeskins_missing;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_SnakeSkins_TooMany;
 
 	delitem @SNAKE_SKIN, @SNAKE_SKINS_NR;
 	getitem @GOLDEN_STINGER, 1;
@@ -890,6 +924,10 @@ L_snakeskins_missing:
 	next;
 	close;
 
+L_SnakeSkins_TooMany:
+	mes "[Kfahr the Warrior]";
+	mes "\"YOu don't have room for this. Come back when you do.\"";
+	close;
 
 L_give_beer:
 	if (countitem(@BEER) < 1)
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 30d48594..349593db 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -189,13 +189,17 @@ L_NoMoney:
 
 L_YesKnight:
 	if (zeny < 10000) goto L_NoMoney;
-	set zeny, zeny-10000;
-	delitem @IRON_ORE,5;
-	getitem 637,1;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
+	set zeny, zeny - 10000;
+	delitem @IRON_ORE, 5;
+	getitem 637, 1;
 	goto L_Done;
 
 L_YesCrusade:
 	if (zeny < 10000) goto L_NoMoney;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
 	delitem @IRON_ORE,10;
 	getitem 639,1;
@@ -203,6 +207,8 @@ L_YesCrusade:
 
 L_YesWarlord:
 	if (zeny < 10000) goto L_NoMoney;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
 	delitem @IRON_ORE,15;
 	getitem 636,1;
@@ -238,6 +244,7 @@ L_YesShield:
 	if (countitem(@INFANTRY) < 2) goto L_ShieldNoInfantry;
 	if (countitem(@IRON_ORE) < 10) goto L_ShieldNoOre;
 	if (countitem(@LEATHER_PATCH) < 1) goto L_ShieldNoLeatherPatch;
+	// No inventory check needed, as infantry helms are removed, opening two slots
 
         mes "[Nicholas]";
         mes "\"Yes, it looks as if you have all that is needed!\"";
@@ -326,6 +333,7 @@ L_SetzerQuest:
 	if (countitem(@IRON_ORE) < 5) goto L_SetzerNoOre;
 	if (countitem(@MONSTER_OIL) < 1) goto L_SetzerNoMonsterOil;
 	if (countitem(@SHORT_SWORD) < 1) goto L_SetzerNoSword;
+	// No inventory check needed, as the short sword is removed, opening a slot
 
         mes "[Nicholas]";
         mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  Before your eyes it turns thinner and flatter.  Finally he pours the monster oil over it, heats it up again and douses it in water.";
@@ -401,4 +409,8 @@ L_Update_Var:
                 | (@Q_SHIELD_status << @Q_SHIELD_SHIFT)
                 | (@Q_SETZER_status << @Q_SETZER_SHIFT));
         return;
+
+L_TooMany:
+        mes "[Nicholas]";
+        mes "\"You don't have room for it. Come back later when you do.\"";
 }
diff --git a/npc/009-2_Hurnscald/waitress.txt b/npc/009-2_Hurnscald/waitress.txt
index cf2778fd..bcf2f434 100644
--- a/npc/009-2_Hurnscald/waitress.txt
+++ b/npc/009-2_Hurnscald/waitress.txt
@@ -2,6 +2,10 @@
 
 009-2.gat,60,52,0	script	Melinda	140,{
 	if (zeny < 180) goto L_NoMoney;
+	getinventorylist;
+	set @beerCount, countitem(539);
+	if (@inventorylist_count == 100 && beerCount < 0) goto L_TooMany;
+
 	mes "[Melinda]";
 	mes "\"Hi sweety! Want a fresh beer for 170gp?\"";
 	next;
@@ -46,6 +50,12 @@ L_No:
 	close;
 
 L_NoMoney:
+	mes "[Melinda]";
 	mes "\"You look broke. Don't think that you can dine and dash here!\"";
 	close;
+
+L_TooMany:
+	mes "[Melinda]";
+	mes "\"You don't have room for a beer!\"";
+	close;
 }
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt
index 559ba578..77336fb6 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2_Dimonds_Cove/loratay.txt
@@ -429,6 +429,8 @@ L_tanktop_menu:
 L_tanktop_short:
         if (countitem (@COTTON) < 5) goto L_tanktop_insufficient_cloth;
         if (zeny < 1000) goto L_tanktop_insufficient_zeny;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@COTTON) > 5) goto L_TooMany;
         set zeny, zeny - 1000;
         delitem @COTTON, 5;
         getitem 689, 1;
@@ -443,6 +445,8 @@ L_tanktop_short:
 L_tanktop_long:
         if (countitem (@COTTON) < 6) goto L_tanktop_insufficient_cloth;
         if (zeny < 1000) goto L_tanktop_insufficient_zeny;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@COTTON) > 6) goto L_TooMany;
         set zeny, zeny - 1000;
         delitem @COTTON, 6;
         getitem 688, 1;
@@ -519,6 +523,9 @@ L_robe_menu:
         if (zeny < @ROBE_ZENY)
 		goto L_robe_missing_zeny;
 
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@SILK_COCOON) > @ROBE_COCOONS_NR) goto L_TooMany;
+
         set zeny, zeny - @ROBE_ZENY;
         delitem @SILK_COCOON, @ROBE_COCOONS_NR;
         getitem @SILK_ROBE, 1;
@@ -688,5 +695,9 @@ L_SUB_choice_join:
         if (@menu >= @c) set @item, 0;
 
         return;
-}
 
+L_TooMany:
+        mes "[Lora Tay the Seamstress]";
+        mes "\"You don't have anywhere to put this. Come back when you have more room.\"";
+	close;
+}
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index 08ba6e41..6329a5d6 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -107,6 +107,8 @@ L_main_menu:
 
 L_iron:
   	if(countitem(566) < 20) goto L_no_iron;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(566) > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Iron potion.\"";
@@ -116,6 +118,8 @@ L_iron:
 
 L_concentration:
 	if(countitem(565) < 20) goto L_no_concentration;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(565) > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Concentration potion.\"";
@@ -259,6 +263,8 @@ L_ok:
 
 L_red:
 	if (countitem(@RED) < 10) goto L_red_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@RED) > 10) goto L_TooMany;
 	delitem @RED, 10;
 	getitem 690, 1;
 	goto L_ok;
@@ -277,6 +283,8 @@ L_d_red:
 
 L_yellow:
 	if (countitem(@YELLOW) < 10) goto L_yellow_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@YELLOW) > 10) goto L_TooMany;
 	delitem @YELLOW, 10;
 	getitem 693, 1;
 	goto L_ok;
@@ -295,6 +303,8 @@ L_d_yellow:
 
 L_light_blue:
 	if (countitem(@BLUE) < 10) goto L_light_blue_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 10) goto L_TooMany;
 	delitem @BLUE, 10;
 	getitem 694, 1;
 	goto L_ok;
@@ -314,6 +324,8 @@ L_d_light_blue:
 L_green:
 	if (countitem(@BLUE) < 20) goto L_green_fail;
 	if (countitem(@YELLOW) < 20) goto L_green_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 20 && countitem(@YELLOW) > 20) goto L_TooMany;
 	if (zeny < 1000) goto L_green_fail;
 	delitem @BLUE, 20;
 	delitem @YELLOW, 20;
@@ -342,6 +354,8 @@ L_orange:
 	if (countitem(@RED) < 10) goto L_orange_fail;
 	if (countitem(@YELLOW) < 10) goto L_orange_fail;
 	if (countitem(@ORE) < 2) goto L_orange_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@RED) > 10 && countitem(@YELLOW) > 10 && countitem(@ORE) > 2) goto L_TooMany;
 	if (zeny < 1000) goto L_orange_fail;
 	delitem @RED, 10;
 	delitem @YELLOW, 10;
@@ -367,6 +381,8 @@ L_pink:
 	if (countitem(@RED) < 10) goto L_pink_fail;
 	if (countitem(@PETAL) < 6) goto L_pink_fail;
 	if (zeny < 1000) goto L_pink_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@RED) > 10 && countitem(@PETAL) > 6) goto L_TooMany;
 	delitem @RED, 10;
 	delitem @PETAL, 6;
 	set zeny, zeny - 1000;
@@ -391,6 +407,8 @@ L_dark_blue:
 	if (countitem(@MAUVE) < 50) goto L_dark_blue_fail;
 	if (countitem(@PEARL) < 1) goto L_dark_blue_fail;
 	if (zeny < 10000) goto L_dark_blue_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 100 && countitem(@MAUVE) > 50 && countitem(@PEARL) > 1) goto L_TooMany;
 	delitem @BLUE, 100;
 	delitem @MAUVE, 50;
 	delitem @PEARL, 1;
@@ -417,6 +435,8 @@ L_purple:
 	if (countitem(@RED) < 100) goto L_purple_fail;
 	if (countitem(@MAUVE) < 20) goto L_purple_fail;
 	if (countitem(@PEARL) < 1) goto L_purple_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 100 && countitem(@RED) > 100 && countitem(@MAUVE) > 20 && countitem(@PEARL) > 1) goto L_TooMany;
 	if (zeny < 40000) goto L_purple_fail;
 	delitem @BLUE, 100;
 	delitem @RED, 100;
@@ -448,6 +468,8 @@ L_black:
 	if (countitem(@RED) < 40) goto L_black_fail;
 	if (countitem(@YELLOW) < 40) goto L_black_fail;
 	if (countitem(@MAUVE) < 40) goto L_black_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 40 && countitem(@RED) > 40 && countitem(@YELLOW) > 40 && countitem(@MAUVE) > 40) goto L_TooMany;
 	if (zeny < 20000) goto L_black_fail;
 	delitem @BLUE, 40;
 	delitem @RED, 40;
@@ -481,6 +503,8 @@ L_dark_green:
 	if (countitem(@MAUVE) < 10) goto L_dark_green_fail;
 	if (countitem(@MAGGOTSLIME) < 1) goto L_dark_green_fail;
 	if (zeny < 1000) goto L_dark_green_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 10 && countitem(@YELLOW) > 10 && countitem(@MAUVE) > 10 && countitem(@MAGGOTSLIME) > 1) goto L_TooMany;
 	delitem @BLUE, 10;
 	delitem @MAUVE, 10;
 	delitem @YELLOW, 10;
@@ -714,4 +738,8 @@ L_Update_Var:
 		(QUEST_Forestbow_state & ~(@Q_MASK)
 		| (@Q_status << @Q_SHIFT));
 	return;
+
+L_TooMany:
+	mes "[Rauk the Alchemist]";
+	mes "You don't have room for this.";
 }
diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt
index ce3db4ad..abb96e6b 100644
--- a/npc/013-2_Magic_house/apprentice.txt
+++ b/npc/013-2_Magic_house/apprentice.txt
@@ -1,58 +1,92 @@
 013-2.gat,25,37,0	script	Fabius	115,{
-    mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\"";
-    next;
-    menu
-    "Yes please!",yes,
-    "No thanks.",no,
-    "No way, I thought it was for free!",not_free;
-yes:
-    mes "\"So what would ya like, then?\"";
-    next;
-    menu
-    "A beer",beer,
-    "A milk",milk;
-no:
-    mes "\"Suit yourself.\"";
-    next;
-    goto at_end;
-not_free:
-    mes "\"Oh, you stupid git! ... But hey, let me tell ya something...\"";
-    next;
-    mes "\"There's notes flying around in the room up there. Did ya try reading some?\"";
-    close;
-beer:
-    mes "\"That'll be 175 GP.\"";
-    next;
-    menu "Here you are",beer_yes,
-         "No thanks",beer_no;
-milk:
-    mes "\"That'll be 300 GP.\"";
-    next;
-    menu "Here you are",milk_yes,
-         "No thanks",milk_no;
-beer_yes:
-    if (zeny < 175) goto low_money;
-    getitem 539, 1;
-    set zeny, zeny - 175;
-    goto at_end;
-beer_no:
-    mes "\"No beer, no civilization!\"";
-    next;
-    goto at_end;
-milk_yes:
-    if (zeny < 300) goto low_money;
-    getitem 527, 1;
-    set zeny, zeny - 300;
-    goto at_end;
-milk_no:
-    mes "\"Oh alright. Milk is a deadly poison anyway...\"";
-    next;
-    goto at_end;
-low_money:
-    mes "\"Aw, you don't have enough gold on you!\"";
-    next;
-at_end:
-    mes "\"By the way, have you seen those flying notes and the mirror in the room next door? They're WAY COOL! Try reading some of the notes!\"";
-    close;
-}
+	mes "[Fabius]";
+	mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\"";
+	next;
+	menu
+		"Yes please!", L_Yes,
+		"No thanks.", L_No,
+		"No way, I thought it was for free!", L_Not_Free;
+
+L_Yes:
+	mes "[Fabius]";
+	mes "\"So what would ya like, then?\"";
+	next;
+	menu
+		"A beer", L_Beer,
+		"A milk", L_Milk,
+		"Nevermind", -;
+
+L_No:
+	mes "[Fabius]";
+	mes "\"Suit yourself.\"";
+	next;
+	goto L_Finish;
+
+L_Not_Free:
+	mes "[Fabius]";
+	mes "\"Oh, you stupid git! ... But hey, let me tell ya something...\"";
+	next;
+	mes "[Fabius]";
+	mes "\"There's notes flying around in the room up there. Did ya try reading some?\"";
+	close;
+
+L_Beer:
+	mes "[Fabius]";
+	mes "\"That'll be 175 GP.\"";
+	next;
+	menu
+		"Here you are", L_Beer_yes,
+		"No thanks", L_Beer_no;
+
+L_Beer_yes:
+	if (zeny < 175) goto L_Low_money;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(539) == 0) goto L_TooMany;
+
+	getitem 539, 1;
+	set zeny, zeny - 175;
+	goto L_Finish;
 
+L_Beer_no:
+	mes "[Fabius]";
+	mes "\"No beer, no civilization!\"";
+	next;
+	goto L_Finish;
+
+L_Milk:
+	mes "[Fabius]";
+	mes "\"That'll be 300 GP.\"";
+	next;
+	menu
+		"Here you are", L_Milk_yes,
+		"No thanks", L_Milk_no;
+
+L_Milk_yes:
+	if (zeny < 300) goto L_Low_money;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(527) == 0) goto L_TooMany;
+	getitem 527, 1;
+	set zeny, zeny - 300;
+	goto L_Finish;
+
+L_Milk_no:
+	mes "[Fabius]";
+	mes "\"Oh alright. Milk is a deadly poison anyway...\"";
+	next;
+	goto L_Finish;
+
+L_Low_money:
+	mes "[Fabius]";
+	mes "\"Aw, you don't have enough gold on you!\"";
+	next;
+	goto L_Finish;
+
+L_Finish:
+	mes "[Fabius]";
+	mes "\"By the way, have you seen those flying notes and the mirror in the room next door? They're WAY COOL! Try reading some of the notes!\"";
+	close;
+
+L_TooMany:
+	mes "[Fabius]";
+	mes "\"You don't have room for it.\"";
+}
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
index dd0bc949..0da8bab9 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -30,30 +30,49 @@
 
 	if (countitem(541) == 0) goto L_No_water;
 
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(505) > 1 && countitem(518) > 1 && countitem(718) > 1
+					&& countitem(566) > 1 && countitem(565) > 1 && countitem(700) > 1
+					&& countitem(613) > 1 && countitem(569) > 1 && countitem(614) > 1
+					&& countitem(631) > 1 && countitem(640) > 1 && countitem(507) > 1
+					&& countitem(517) > 1 && countitem(709) > 1 && countitem(710) > 1
+					&& countitem(711) > 1 && countitem(712) > 1 && countitem(713) > 1
+					&& countitem(680) > 1 && countitem(681) > 1 && countitem(682) > 1
+					&& countitem(683) > 1 && countitem(537) > 1 && countitem(612) > 1
+					&& countitem(701) > 1 && countitem(541) > 1) goto L_TooMany;
+
 	delitem 505, 1;
 	delitem 518, 1;
 	delitem 718, 1;
+
 	delitem 566, 1;
 	delitem 565, 1;
 	delitem 700, 1;
+
 	delitem 613, 1;
 	delitem 569, 1;
 	delitem 614, 1;
+
 	delitem 631, 1;
 	delitem 640, 1;
 	delitem 507, 1;
+
 	delitem 517, 1;
 	delitem 709, 1;
 	delitem 710, 1;
+
 	delitem 711, 1;
 	delitem 712, 1;
 	delitem 713, 1;
+
 	delitem 680, 1;
 	delitem 681, 1;
 	delitem 682, 1;
+
 	delitem 683, 1;
 	delitem 537, 1;
 	delitem 612, 1;
+
 	delitem 701, 1;
 	delitem 541, 1;
 
@@ -148,4 +167,9 @@ L_Finished:
         mes "[Chest]";
         mes "You already opened this chest.";
         close;
+
+L_TooMany:
+        mes "[Chest]";
+        mes "You don't have room for what ever is inside. Maybe you should try again later.";
+	close;
 }
diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3_Cave/sword_chest.txt
index 1cac4879..c570bfcd 100644
--- a/npc/013-3_Cave/sword_chest.txt
+++ b/npc/013-3_Cave/sword_chest.txt
@@ -13,6 +13,8 @@
 
 L_Yes:
 	if(countitem(537) < 10) goto L_Not_Enough;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(537) > 10) goto L_TooMany;
 	delitem 537, 10;
 	getitem 536, 1;
 	mes "[Chest]";
@@ -28,4 +30,9 @@ L_Finished:
         mes "[Chest]";
         mes "You already opened this chest.";
         close;
+
+L_TooMany:
+        mes "[Chest]";
+        mes "You don't have room for what ever is inside. Maybe you should try again later.";
+	close;
 }
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 7a6e606b..26f2fc56 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -95,6 +95,8 @@ L_get_married:
            goto L_too_poor;
         if (BaseLevel < @WEDDING_MIN_LEVEL)
            goto L_too_young;
+	getinventorylist;
+	if (@inventorylist_count > 98) goto L_No_Room_For_Rings;
 
         set zeny, zeny - @WEDDING_FEE;
         getitem 702, 1;
@@ -243,4 +245,8 @@ L_do_divorce:
         mes "\"You are divorced now.  Thank you for your business.\"";
         next;
         close;
+
+L_No_Room_For_Rings:
+        mes "[Wedding Officiator]";
+        mes "\"You don't have room to carry the rings.\"";
 }
diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt
index b2e14e41..d176caa3 100644
--- a/npc/018-3_Cave/bookcase.txt
+++ b/npc/018-3_Cave/bookcase.txt
@@ -12,12 +12,12 @@
 	close;
 
 L_Search:
-	mes "After searching the bookcase, you were able to find a few pasages that you can read.";
+	mes "After searching the bookcase, you were able to find a few passages that you can read.";
 	next;
 
 	mes "One of the describes an ancient barrier that guards a great treasure.";
 	mes "";
-	mes "To get trough it, you need to consume the soul of a great pumpkin ghost.";
+	mes "To get through it, you need to consume the soul of a great pumpkin ghost.";
 	next;
 
 	mes "Another passage describes a ritual needed to open a certain cursed chest.";
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index 855671ad..e389a836 100644
--- a/npc/019-1_Snow_field/_import.txt
+++ b/npc/019-1_Snow_field/_import.txt
@@ -2,6 +2,6 @@ map: 019-1.gat
 npc: npc/019-1_Snow_field/_mobs.txt
 npc: npc/019-1_Snow_field/_warps.txt
 npc: npc/019-1_Snow_field/monsters.txt
-npc: npc/019-1_Snow_field/santa.txt
+npc: npc/019-1_Snow_field/santa_helper.txt
 npc: npc/019-1_Snow_field/snowman.txt
 npc: npc/019-1_Snow_field/taro.txt
diff --git a/npc/019-1_Snow_field/santa.txt b/npc/019-1_Snow_field/santa.txt
deleted file mode 100644
index 01481d67..00000000
--- a/npc/019-1_Snow_field/santa.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-019-1.gat,74,75,0	script	Santa	105,{
-if (ChristmasQuest2 == 1) goto done;
-mes "[Santa]";
-mes "Ho ho ho.";
-mes "Hello my young friend.";
-mes "Would you like to help me?";
-next;
-mes "Those monsters stolen my presents.";
-mes "If you help me, I'll give you something very nice";
-next;
-L_M:
-menu "I have some present boxes",L_Y,"Hmm, see you later",L_N,"What you need exactly?",L_R;
-	L_Y:
-		mes "[Santa]";
-		mes "Hmm, let me check what you have.";
-		next;
-		if(countitem(515)<25) goto NoItem;
-		if(countitem(516)<20) goto NoItem;
-		if(countitem(538)<5) goto NoItem;
-		mes "Great! Here is something for you";
-		delitem 515,25;
-		delitem 516,20;
-		delitem 538,5;
-		getitem 563+rand(2),1;
-		set ChristmasQuest2,1;
-		close;
-	L_R:
-		mes "[Santa]";
-		mes "I need:";
-		mes "25 purple present boxes";
-		mes "20 blue present boxes";
-		mes "5 green present boxes";
-		next;
-		goto L_M;
-	L_N:
-		mes "[Santa]";
-		mes "Enjoy your holidays and I wish you an happy Christmas!";
-		close;
-	NoItem:
-		mes "[Santa]";
-		mes "You dont seem to have enough presents.";
-		close;
-        done:
-                mes "[Santa]";
-		mes "All the children got their Christmas presents.";
-                mes "Thank you for your help.";
-                close;
-
-}
-
diff --git a/npc/019-1_Snow_field/santa_helper.txt b/npc/019-1_Snow_field/santa_helper.txt
new file mode 100644
index 00000000..a8a86af6
--- /dev/null
+++ b/npc/019-1_Snow_field/santa_helper.txt
@@ -0,0 +1,65 @@
+019-1.gat,74,75,0	script	Santa's Helper	105,{
+	if (ChristmasQuest2 == 1) goto L_Done;
+	mes "[Santa's Helper]";
+	mes "\"Hello my young friend.";
+	mes "Would you like to help me?\"";
+	next;
+	mes "[Santa's Helper]";
+	mes "\"Those monsters stole Santa's presents.";
+	mes "If you help me, I'll give you something very nice\"";
+	next;
+
+L_M:
+	menu
+		"I have some present boxes", L_Y,
+		"Hmm, see you later", L_N,
+		"What you need exactly?", L_R;
+
+L_Y:
+	mes "[Santa's Helper]";
+	mes "\"Hmm, let me check what you have.\"";
+	next;
+	if (countitem(515) < 25) goto L_NoItem;
+	if (countitem(516) < 20) goto L_NoItem;
+	if (countitem(538) < 5) goto L_NoItem;
+	getinventorylist;
+	if (@inventorylist_count > 99) goto L_TooMany;
+	mes "[Santa's Helper]";
+	mes "\"Great! Here is something for you\"";
+	delitem 515, 25;
+	delitem 516, 20;
+	delitem 538, 5;
+	getitem 564, 1;
+	set ChristmasQuest2,1;
+	close;
+
+L_R:
+	mes "[Santa's Helper]";
+	mes "\"I need:";
+	mes "25 purple present boxes";
+	mes "20 blue present boxes";
+	mes "5 green present boxes\"";
+	next;
+	goto L_M;
+
+L_N:
+	mes "[Santa's Helper]";
+	mes "\"Enjoy your holidays and I wish you an happy Christmas!\"";
+	close;
+
+L_NoItem:
+	mes "[Santa's Helper]";
+	mes "\"You dont seem to have enough presents.\"";
+	close;
+
+L_Done:
+        mes "[Santa's Helper]";
+	mes "\"All the children got their Christmas presents.";
+        mes "Thank you for your help.\"";
+        close;
+
+L_TooMany:
+        mes "[Santa's Helper]";
+	mes "\"It doesn't look like you have room for this. Come back later.\"";
+        close;
+}
diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1_Snow_field/snowman.txt
index 1f56e4f2..ca8c1f09 100644
--- a/npc/019-1_Snow_field/snowman.txt
+++ b/npc/019-1_Snow_field/snowman.txt
@@ -24,6 +24,8 @@ L_Sure:
 	if(countitem(510) < 15) goto L_NoItem;
 	if(countitem(509) < 10) goto L_NoItem;
 	if(countitem(502) < 5) goto L_NoItem;
+	getinventorylist;
+	if (@inventorylist_count > 99) goto L_TooMany;
 	delitem 510, 15;
 	delitem 509, 10;
 	delitem 502, 5;
@@ -51,4 +53,9 @@ L_Done:
 	mes "[Snowman]";
 	mes "\"Thank you for help!\"";
 	close;
+
+L_TooMany:
+	mes "[Snowman]";
+	mes "\"It doesn't look like you have room for this. Come back later.\"";
+	close;
 }
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
deleted file mode 100644
index 2565ac9d..00000000
--- a/npc/020-1/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-map: 020-1.gat
-npc: npc/020-1/_mobs.txt
-npc: npc/020-1/_warps.txt
-npc: npc/020-1/amrak.txt
-npc: npc/020-1/monsters.txt
-npc: npc/020-1/sexchanger.txt
-npc: npc/020-1/soul-menhir.txt
-npc: npc/020-1/startrek.txt
diff --git a/npc/020-1/monsters.txt b/npc/020-1/monsters.txt
deleted file mode 100644
index fc33da8c..00000000
--- a/npc/020-1/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 020-1
-// This is Snow Town.
-//
-
-020-1.gat,56,63,1,1	monster	Maggot	1002,2,0,0,Mob11::OnMaggot
-
-020-1.gat,0,0,0	script	Mob11	-1,{
-OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
new file mode 100644
index 00000000..0e18f3ac
--- /dev/null
+++ b/npc/020-1_Nivalis/_import.txt
@@ -0,0 +1,7 @@
+map: 020-1.gat
+npc: npc/020-1_Nivalis/_mobs.txt
+npc: npc/020-1_Nivalis/_warps.txt
+npc: npc/020-1_Nivalis/amrak.txt
+npc: npc/020-1_Nivalis/sexchanger.txt
+npc: npc/020-1_Nivalis/soul-menhir.txt
+npc: npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-1/_mobs.txt b/npc/020-1_Nivalis/_mobs.txt
index fa94c232..64a7e46c 100644
--- a/npc/020-1/_mobs.txt
+++ b/npc/020-1_Nivalis/_mobs.txt
@@ -1,4 +1,4 @@
-// 020-1 mobs
+// 020-1 Nivalis mobs
 
 
 
diff --git a/npc/020-1/_warps.txt b/npc/020-1_Nivalis/_warps.txt
index 36e0449a..c9578dfc 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1_Nivalis/_warps.txt
@@ -1,4 +1,4 @@
-// 020-1 warps
+// 020-1 Nivalis warps
 
 020-1.gat,76,38	warp	ToIceCave	1,-1,020-3.gat,31,28
 020-1.gat,47,48	warp	ToClothesShop	-1,-1,020-2.gat,25,33
diff --git a/npc/020-1/amrak.txt b/npc/020-1_Nivalis/amrak.txt
index 19979ca0..19979ca0 100644
--- a/npc/020-1/amrak.txt
+++ b/npc/020-1_Nivalis/amrak.txt
diff --git a/npc/020-1/sexchanger.txt b/npc/020-1_Nivalis/sexchanger.txt
index 168f47a3..168f47a3 100644
--- a/npc/020-1/sexchanger.txt
+++ b/npc/020-1_Nivalis/sexchanger.txt
diff --git a/npc/020-1/soul-menhir.txt b/npc/020-1_Nivalis/soul-menhir.txt
index 3d0bc82a..3d0bc82a 100644
--- a/npc/020-1/soul-menhir.txt
+++ b/npc/020-1_Nivalis/soul-menhir.txt
diff --git a/npc/020-1/startrek.txt b/npc/020-1_Nivalis/startrek.txt
index 5c8847ad..5c8847ad 100644
--- a/npc/020-1/startrek.txt
+++ b/npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
deleted file mode 100644
index f71241f7..00000000
--- a/npc/020-2/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-map: 020-2.gat
-npc: npc/020-2/_mobs.txt
-npc: npc/020-2/_warps.txt
-npc: npc/020-2/furquest.txt
-npc: npc/020-2/shops.txt
diff --git a/npc/020-2_Nivalis/_import.txt b/npc/020-2_Nivalis/_import.txt
new file mode 100644
index 00000000..159d1e61
--- /dev/null
+++ b/npc/020-2_Nivalis/_import.txt
@@ -0,0 +1,5 @@
+map: 020-2.gat
+npc: npc/020-2_Nivalis/_mobs.txt
+npc: npc/020-2_Nivalis/_warps.txt
+npc: npc/020-2_Nivalis/furquest.txt
+npc: npc/020-2_Nivalis/shops.txt
diff --git a/npc/020-2/_mobs.txt b/npc/020-2_Nivalis/_mobs.txt
index 4289bb7e..1b1c6e2b 100644
--- a/npc/020-2/_mobs.txt
+++ b/npc/020-2_Nivalis/_mobs.txt
@@ -1,4 +1,4 @@
-// 020-2 mobs
+// 020-2 Nivalis mobs
 
 
 
diff --git a/npc/020-2/_warps.txt b/npc/020-2_Nivalis/_warps.txt
index 2306316d..47f71d27 100644
--- a/npc/020-2/_warps.txt
+++ b/npc/020-2_Nivalis/_warps.txt
@@ -1,4 +1,4 @@
-// 020-2 warps
+// 020-2 Nivalis warps
 
 020-2.gat,25,35	warp	ToOutside	-1,-1,020-1.gat,47,50
 020-2.gat,64,25	warp	ToOutside	-1,-1,020-1.gat,55,90
diff --git a/npc/020-2/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index 4d67f8c4..67a6eb10 100644
--- a/npc/020-2/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
@@ -222,6 +222,8 @@ L_State_5:
 
 L_State_5_pay:
 	if (zeny < 15000) goto L_State_5_nocash;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-15000;
 	getitem 563, 1;
 	set QUEST_WG_state, 6;
@@ -307,6 +309,7 @@ L_State_12:
 L_State_12_pay:
 	if (zeny < 15000) goto L_State_12_missing;
 	if (countitem(528) < 1) goto L_State_12_missing;
+	// No inventory check needed, as boots are removed, opening a slot
 	set zeny, zeny-15000;
 	delitem 528, 1;
 	getitem 655, 1;
@@ -326,4 +329,8 @@ L_State_13:
 	mes "\"You are so glamourous, my dear friend!";
 	mes "I have done a very good job on your clothes!\"";
 	close;
+
+L_TooMany:
+	mes "[Agostine, The Legendary Tailor]";
+	mes "\"You don't have anywhere to put them. Come back when you do.";
 }
diff --git a/npc/020-2/shops.txt b/npc/020-2_Nivalis/shops.txt
index f3d9dedc..f3d9dedc 100644
--- a/npc/020-2/shops.txt
+++ b/npc/020-2_Nivalis/shops.txt
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
index 27ebcad7..81e7f2df 100644
--- a/npc/021-1_Tulimshar/_import.txt
+++ b/npc/021-1_Tulimshar/_import.txt
@@ -1,3 +1,3 @@
 map: 021-1.gat
-npc: npc/021-1_Tulimshar/_warps.txt
 npc: npc/021-1_Tulimshar/_mobs.txt
+npc: npc/021-1_Tulimshar/_warps.txt
diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt
new file mode 100644
index 00000000..b098b11d
--- /dev/null
+++ b/npc/021-2_Tulimshar/_import.txt
@@ -0,0 +1,3 @@
+map: 021-2.gat
+npc: npc/021-2_Tulimshar/_mobs.txt
+npc: npc/021-2_Tulimshar/_warps.txt
diff --git a/npc/021-2_Tulimshar/_mobs.txt b/npc/021-2_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..140d3395
--- /dev/null
+++ b/npc/021-2_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 021-2 Tulimshar mobs
+
+
+
+021-2.gat,0,0,0	script	Mob021-2	-1,{
+	end;
+}
diff --git a/npc/021-2_Tulimshar/_warps.txt b/npc/021-2_Tulimshar/_warps.txt
new file mode 100644
index 00000000..982c026b
--- /dev/null
+++ b/npc/021-2_Tulimshar/_warps.txt
@@ -0,0 +1,2 @@
+// 021-2 Tulimshar warps
+
diff --git a/npc/022-1_Beach_Cliffs/_import.txt b/npc/022-1_Beach_Cliffs/_import.txt
new file mode 100644
index 00000000..6dab9d52
--- /dev/null
+++ b/npc/022-1_Beach_Cliffs/_import.txt
@@ -0,0 +1,3 @@
+map: 022-1.gat
+npc: npc/022-1_Beach_Cliffs/_mobs.txt
+npc: npc/022-1_Beach_Cliffs/_warps.txt
diff --git a/npc/022-1_Beach_Cliffs/_mobs.txt b/npc/022-1_Beach_Cliffs/_mobs.txt
new file mode 100644
index 00000000..7dfedcec
--- /dev/null
+++ b/npc/022-1_Beach_Cliffs/_mobs.txt
@@ -0,0 +1,7 @@
+// 022-1 Beach Cliffs mobs
+
+
+
+022-1.gat,0,0,0	script	Mob022-1	-1,{
+	end;
+}
diff --git a/npc/022-1_Beach_Cliffs/_warps.txt b/npc/022-1_Beach_Cliffs/_warps.txt
new file mode 100644
index 00000000..c856a583
--- /dev/null
+++ b/npc/022-1_Beach_Cliffs/_warps.txt
@@ -0,0 +1,4 @@
+// 022-1 Beach Cliffs warps
+
+022-1.gat,84,113	warp	ToSandstorm	1,-1,002-1.gat,29,15
+022-1.gat,37,111	warp	ToBeach	1,-1,003-1.gat,141,21
diff --git a/npc/_import.txt b/npc/_import.txt
index df218035..74464305 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -6,6 +6,7 @@ import: npc/002-3_Desert_mines/_import.txt
 import: npc/002-4_Desert_mines/_import.txt
 import: npc/003-1_Beach/_import.txt
 import: npc/004-1_Beach/_import.txt
+import: npc/004-2_Beach_House/_import.txt
 import: npc/005-1_Snake_desert/_import.txt
 import: npc/005-3_Snake_pit/_import.txt
 import: npc/006-1_Desert_mountains/_import.txt
@@ -34,7 +35,10 @@ import: npc/018-1_Woodland_mining_camp/_import.txt
 import: npc/018-2_Woodland_minning_camp/_import.txt
 import: npc/018-3_Cave/_import.txt
 import: npc/019-1_Snow_field/_import.txt
-import: npc/020-1/_import.txt
-import: npc/020-2/_import.txt
+import: npc/020-1_Nivalis/_import.txt
+import: npc/020-2_Nivalis/_import.txt
 import: npc/020-3_Ice_cave/_import.txt
 import: npc/020-4_Ice_cave/_import.txt
+import: npc/021-1_Tulimshar/_import.txt
+import: npc/021-2_Tulimshar/_import.txt
+import: npc/022-1_Beach_Cliffs/_import.txt
diff --git a/npc/functions/game_rules.txt b/npc/functions/game_rules.txt
index 83e69d73..d486e6f9 100644
--- a/npc/functions/game_rules.txt
+++ b/npc/functions/game_rules.txt
@@ -1,6 +1,8 @@
 //
 
 function	script	GameRules	{
+	set @read, 0;
+
 	menu
 		"English", L_English,
 		"Deutsch (German)", L_German,
@@ -132,6 +134,7 @@ L_Polish:
 	goto L_End;
 
 L_End:
+	set @read, 1;
 	set TUT_var, TUT_var | 1;
 	return;
 }
diff --git a/tools/tmwcon/build.xml b/tools/tmwcon/build.xml
index 6edf8477..b2937e66 100755
--- a/tools/tmwcon/build.xml
+++ b/tools/tmwcon/build.xml
@@ -1,4 +1,4 @@
-<project name="The Mana World Workshop" default="dist">
+<project name="TMWServ to eAthena Converter" default="dist">
   <description>
     A tool to convert map data from TMWServ format to eAthena format
   </description>
diff --git a/tools/tmwcon/src/converter/Main.java b/tools/tmwcon/src/converter/Main.java
index c48ca286..0b4c67aa 100644
--- a/tools/tmwcon/src/converter/Main.java
+++ b/tools/tmwcon/src/converter/Main.java
@@ -10,7 +10,7 @@ import java.util.*;
 
 import tiled.io.xml.*;
 
-public class Main extends Thread {
+public class Main {
     public static XMLMapTransformer reader = null;
 
     private static tiled.core.Map loadMap(File file) {