* Don't log SQL char actions if log_char is not enabled in char_athena.conf

* Updated shop_exp's calculation to give more exp
* Some item and mob DB updates
* Added Einbech/Einbroch warps

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1249 54d463be-8e91-2dee-dedb-b68131a5f0ec

10 files changed, 214 insertions, 87 deletions

diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 06e094517..6b5236995 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,6 +1,9 @@
 Date	Added
 
 03/18
+        * Don't log SQL char actions if log_char is not enabled in char_athena.conf
+          [celest]
+        * Updated shop_exp's calculation to give more exp, thanks to tcdiem [celest]
         * Fixed the bDamageWhenUnequip effect dealing damage when unequipping unrelated
           items [celest]
         * Fixed compile errors in SQL char.c [celest]
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 44b59f0b2..7922a9040 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -6,6 +6,8 @@
 	Skill databases == celest working on them i believe.
 
 03/18
+        * Updated item prices for Niflheim drops [celest]
+        * Updated some Ayothaya mob stats [celest]
         * Fixed Incantation Samurai card reducing HP too quickly - the time should
           be in milliseconds ^^; [celest]
 	* Added ~86 new cards. Fixed, optimized [Lupus]
diff --git a/db/item_db.txt b/db/item_db.txt
index a4135aa77..fb0094679 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1642,7 +1642,7 @@
 7166,Soft_Silk_Fabric,Soft Silk Fabric,3,1200,0,10,,,,,,,,,,,{},{}
 7167,Strange_Piece_of_Iron,Strange Piece of Iron,3,430,0,10,,,,,,,,,,,{},{}
 7168,Big_Wing_of_Butterfly,Big Wing of Butterfly,3,614,0,10,,,,,,,,,,,{},{}
-7169,Tae_Guk_Tablet,Tae Guk Tablet,3,20,0,10,,,,,,,,,,,{},{}
+7169,Tae_Guk_Tablet,Tae Guk Tablet,3,280,0,10,,,,,,,,,,,{},{}
 7170,Tuxedo,Tuxedo,5,43000,0,10,,0,,0,10477566,1,16,,0,0,{},{ changebase 22; }
 7171,Skin_of_Panther,Skin of Panther,3,282,0,10,,,,,,,,,,,{},{}
 7172,Claw_of_Panther,Claw of Panther,3,290,0,10,,,,,,,,,,,{},{}
@@ -1659,46 +1659,46 @@
 7183,Letter_of_Younger_Sister,Letter of Younger Sister,3,20,0,10,,,,,,,,,,,{},{}
 7184,Piano_Key,Piano Key,3,20,0,10,,,,,,,,,,,{},{}
 7185,Quiz_Participation_Ticket,Quiz Participation Ticket,3,20,0,10,,,,,,,,,,,{},{}
-7186,Thin_Trunk,Thin Trunk,3,20,0,10,,,,,,,,,,,{},{}
-7187,Festival_Mask,Festival Mask,3,20,0,10,,,,,,,,,,,{},{}
-7188,Brown_Root,Brown_Root,3,20,0,10,,,,,,,,,,,{},{}
-7189,Wooden_Heart,Wooden Heart,3,20,0,10,,,,,,,,,,,{},{}
-7190,Hard_Back_Shell,Hard Back Shell,3,20,0,10,,,,,,,,,,,{},{}
+7186,Thin_Trunk,Thin Trunk,3,218,0,10,,,,,,,,,,,{},{}
+7187,Festival_Mask,Festival Mask,3,100,0,10,,,,,,,,,,,{},{}
+7188,Brown_Root,Brown_Root,3,560,0,10,,,,,,,,,,,{},{}
+7189,Wooden_Heart,Wooden Heart,3,680,0,10,,,,,,,,,,,{},{}
+7190,Hard_Back_Shell,Hard Back Shell,3,140,0,10,,,,,,,,,,,{},{}
 7191,Paper_Lantern,Paper Lantern,3,20,0,10,,,,,,,,,,,{},{}
-7192,Pin_Wheel,Pin Wheel,3,20,0,10,,,,,,,,,,,{},{}
-7193,Sprout,Sprout,3,20,0,10,,,,,,,,,,,{},{}
-7194,Soft_Grass_Leaf,Soft Grass Leaf,3,20,0,10,,,,,,,,,,,{},{}
-7195,Slingshot,Slingshot,3,20,0,10,,,,,,,,,,,{},{}
-7196,Shoulder_Guard,Shoulder Guard,3,20,0,10,,,,,,,,,,,{},{}
-7197,Durable_Vine,Durable Vine,3,20,0,10,,,,,,,,,,,{},{}
-7198,Huge_Leaf,Huge Leaf,3,20,0,10,,,,,,,,,,,{},{}
+7192,Pin_Wheel,Pin Wheel,3,160,0,10,,,,,,,,,,,{},{}
+7193,Sprout,Sprout,3,230,0,10,,,,,,,,,,,{},{}
+7194,Soft_Grass_Leaf,Soft Grass Leaf,3,400,0,10,,,,,,,,,,,{},{}
+7195,Slingshot,Slingshot,3,210,0,10,,,,,,,,,,,{},{}
+7196,Shoulder_Guard,Shoulder Guard,3,230,0,10,,,,,,,,,,,{},{}
+7197,Durable_Vine,Durable Vine,3,500,0,10,,,,,,,,,,,{},{}
+7198,Huge_Leaf,Huge Leaf,3,610,0,10,,,,,,,,,,,{},{}
 7199,Hieroglyphic,Hieroglyphic,3,20,0,10,,,,,,,,,,,{},{}
-7200,Elastic_Band,Elastic Band,3,20,0,10,,,,,,,,,,,{},{}
-7201,Log,Log,3,20,0,10,,,,,,,,,,,{},{}
-7202,Insect_Pinchers,Insect Pinchers,3,20,0,10,,,,,,,,,,,{},{}
-7203,Healthy_Branch,Healthy Branch,3,20,0,10,,,,,,,,,,,{},{}
+7200,Elastic_Band,Elastic Band,3,380,0,10,,,,,,,,,,,{},{}
+7201,Log,Log,3,250,0,10,,,,,,,,,,,{},{}
+7202,Insect_Pinchers,Insect Pinchers,3,290,0,10,,,,,,,,,,,{},{}
+7203,Healthy_Branch,Healthy Branch,3,190,0,10,,,,,,,,,,,{},{}
 7204,Gun_Powder,Gun Powder,3,20,0,10,,,,,,,,,,,{},{}
-7205,Black_Piece_of_Cloth,Black Piece of Cloth,3,20,0,10,,,,,,,,,,,{},{}
-7206,Cat_Doll,Black Cat Doll,3,20,0,10,,,,,,,,,,,{},{}
-7207,Old_Mantle,Old Mantle,3,20,0,10,,,,,,,,,,,{},{}
-7208,Rusted_Knife,Rusted Knife,3,20,0,10,,,,,,,,,,,{},{}
-7209,Dullahan's_Helm,Dullahan's Helm,3,20,0,10,,,,,,,,,,,{},{}
-7210,Piece_of_Dullahan's_Armor,Dullahan's Armor Piece,3,20,0,10,,,,,,,,,,,{},{}
-7211,Rosetta_Stone_Fragment,Rosetta Stone Fragment,3,20,0,10,,,,,,,,,,,{},{}
-7212,Hanging_Doll,Hanging Doll,3,20,0,10,,,,,,,,,,,{},{}
-7213,Pin_Cusion,Pin Cusion,3,20,0,10,,,,,,,,,,,{},{}
-7214,Bat_Cage,Bat Cage,3,20,0,10,,,,,,,,,,,{},{}
-7215,Broken_Needle,Broken Needle,3,20,0,10,,,,,,,,,,,{},{}
-7216,Red_Scarf,Red Scarf,3,20,0,10,,,,,,,,,,,{},{}
-7217,Spool_of_Thread,Spool of Thread,3,20,0,10,,,,,,,,,,,{},{}
-7218,Rotted_Rope,Rotted Rope,3,20,0,10,,,,,,,,,,,{},{}
-7219,Striped_Socks,Striped Socks,3,20,0,10,,,,,,,,,,,{},{}
-7220,Ectoplasm,Ectoplasm,3,20,0,10,,,,,,,,,,,{},{}
-7221,Chains,Chains,3,20,0,10,,,,,,,,,,,{},{}
-7222,Old_Tree_Branch,Old Tree Branch,3,20,0,10,,,,,,,,,,,{},{}
-7223,Ruined_Self_Portrait,Ruined Self Portrait,3,20,0,10,,,,,,,,,,,{},{}
+7205,Black_Piece_of_Cloth,Black Piece of Cloth,3,526,0,10,,,,,,,,,,,{},{}
+7206,Cat_Doll,Black Cat Doll,3,1440,0,10,,,,,,,,,,,{},{}
+7207,Old_Mantle,Old Mantle,3,1050,0,10,,,,,,,,,,,{},{}
+7208,Rusted_Knife,Rusted Knife,3,1780,0,10,,,,,,,,,,,{},{}
+7209,Dullahan's_Helm,Dullahan's Helm,3,1350,0,10,,,,,,,,,,,{},{}
+7210,Piece_of_Dullahan's_Armor,Dullahan's Armor Piece,3,750,0,10,,,,,,,,,,,{},{}
+7211,Rosetta_Stone_Fragment,Rosetta Stone Fragment,3,2600,0,10,,,,,,,,,,,{},{}
+7212,Hanging_Doll,Hanging Doll,3,1020,0,10,,,,,,,,,,,{},{}
+7213,Pin_Cusion,Pin Cusion,3,832,0,10,,,,,,,,,,,{},{}
+7214,Bat_Cage,Bat Cage,3,880,0,10,,,,,,,,,,,{},{}
+7215,Broken_Needle,Broken Needle,3,690,0,10,,,,,,,,,,,{},{}
+7216,Red_Scarf,Red Scarf,3,660,0,10,,,,,,,,,,,{},{}
+7217,Spool_of_Thread,Spool of Thread,3,424,0,10,,,,,,,,,,,{},{}
+7218,Rotted_Rope,Rotted Rope,3,390,0,10,,,,,,,,,,,{},{}
+7219,Striped_Socks,Striped Socks,3,920,0,10,,,,,,,,,,,{},{}
+7220,Ectoplasm,Ectoplasm,3,332,0,10,,,,,,,,,,,{},{}
+7221,Chains,Chains,3,740,0,10,,,,,,,,,,,{},{}
+7222,Old_Tree_Branch,Old Tree Branch,3,468,0,10,,,,,,,,,,,{},{}
+7223,Ruined_Self_Portrait,Ruined Self Portrait,3,2032,0,10,,,,,,,,,,,{},{}
 7224,Philosophers_Stone,Philosopher's Stone,3,20,0,10,,,,,,,,,,,{},{}
-7225,Silk_Lantern,Silk Lantern,3,20,0,10,,,,,,,,,,,{},{}
+7225,Silk_Lantern,Silk Lantern,3,486,0,10,,,,,,,,,,,{},{}
 7226,Hallucination_Pill,Hallucination Pill,3,20,0,10,,,,,,,,,,,{},{}
 7227,TCG_Card,TCG Card,3,20,0,10,,,,,,,,,,,{},{}
 7228,Gold_Nugget,Gold Nugget,3,20,0,300,,,,,,,,,,,{},{}
@@ -1729,7 +1729,7 @@
 7250,Spirit_of_Glory,Spirit of Glory,3,20,0,10,,,,,,,,,,,{},{}
 7251,Spirit_of_Victory,Spirit of Victory,3,20,0,10,,,,,,,,,,,{},{}
 
-//Gonryun Items
+//Louyang Items
 //===================================================================
 7252,Chinese_Medicine,Chinese Medicine,3,20,0,10,,,,,,,,,,,{},{}
 7253,Golden_Flag,Golden Flag,3,20,0,10,,,,,,,,,,,{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index a369612a8..1695fcc67 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -142,22 +142,22 @@
 1140,MARDUK,Marduk,40,4214,0,1238,752,1,315,382,0,60,1,40,20,79,78,20,10,12,2,7,23,149,300,1540,840,504,994,35,1045,4500,1608,10,2617,1,1614,3,1006,8,642,20,0,0,0,0,4112,1,0,0,0,0,0,0,0,0
 1141,MARINA,Marina,21,2087,0,218,140,1,84,106,0,5,1,21,21,1,36,10,10,12,0,3,41,129,400,2280,1080,864,1052,5000,938,1500,991,45,995,2,717,200,631,20,0,0,0,0,0,0,4055,1,0,0,0,0,0,0,0,0
 1142,MARINE_SPHERE,Marine Sphere,28,3518,0,461,284,1,120,320,0,40,1,28,28,1,33,50,10,12,0,3,21,0,800,1201,1,1,1050,5500,1051,500,1520,10,720,10,717,150,10003,10,0,0,0,0,0,0,4084,3,0,0,0,0,0,0,0,0
-1143,MARIONETTE,Marionette,41,3222,0,1078,1276,1,355,422,0,25,1,62,36,44,69,45,10,12,0,6,68,149,300,1480,480,1056,1060,5500,2294,5,2605,1,1008,10,1520,15,2407,1,656,200,0,0,0,0,4113,1,0,0,0,0,0,0,0,0,,,,,,
-1144,MARSE,Marse,31,5034,0,586,370,1,211,252,0,5,1,31,25,5,52,30,10,12,0,5,41,145,300,1956,756,528,1024,5500,962,3000,717,200,720,10,995,12,1007,5,656,200,0,0,0,0,4095,2,0,0,0,0,0,0,0,0,,,,,,
-1145,MARTIN,Martin,18,1109,0,134,86,1,52,63,0,5,1,18,30,15,15,5,10,12,0,2,42,129,300,1480,480,480,1017,6500,1018,500,1251,10,2225,5,5009,1,10010,10,2224,15,0,0,0,0,4046,2,0,0,0,0,0,0,0,0,,,,,,
-1146,MATYR,Matyr,31,2585,0,967,407,1,134,160,0,0,1,47,38,5,64,5,10,12,1,2,27,149,150,432,432,360,2618,10,528,5000,919,5500,537,400,757,100,656,200,0,0,0,0,0,0,4097,1,0,0,0,0,0,0,0,0,,,,,,
-1147,MAYA,Maya,81,169000,0,42900,17875,1,1800,2070,60,25,1,97,76,95,82,105,10,12,2,4,82,181,100,864,1000,480,10006,500,2615,200,2234,200,639,500,7020,10,985,3500,984,2500,0,0,0,0,4146,1,10500,5000,730,2000,603,3000,617,2000,,,,,,
-1148,MEDUSA,Medusa,79,22408,0,6876,4697,1,827,1100,48,38,1,74,50,57,77,69,10,12,1,6,40,149,180,2000,1000,500,1048,6000,522,2500,702,200,2610,150,722,250,7062,3500,1007,3,0,0,0,0,4124,1,0,0,0,0,0,0,0,0,,,,,,
-1149,MINOROUS,Minorous,52,7431,0,2750,1459,1,590,770,15,5,1,42,61,66,52,25,10,12,2,2,43,149,200,1360,960,432,941,5500,756,196,1361,2,1005,10,516,1500,1301,200,657,150,0,0,0,0,4126,1,0,0,0,0,0,0,0,0,,,,,,
-1150,MOONLIGHT,Moonlight Flower,67,120000,0,27500,14300,1,1200,1700,10,55,1,99,55,82,95,120,10,10,1,6,63,181,150,1276,576,288,5008,1000,1234,100,1525,150,10008,500,985,2600,984,1900,638,500,0,0,0,0,4131,1,1250,5000,1022,5000,504,1500,728,500,,,,,,
-1151,MYST,Myst,38,3745,0,1391,688,1,365,445,0,40,1,38,18,1,53,10,10,12,2,0,25,149,200,1576,576,384,5005,2,1019,800,10005,10,756,65,757,97,605,20,0,0,0,0,0,0,4108,2,0,0,0,0,0,0,0,0,,,,,,
-1152,ORC_SKELETON,Orc Skeleton,28,2278,0,315,194,1,190,236,10,10,1,14,18,1,30,15,10,12,1,1,29,133,200,2420,720,648,922,5500,932,3500,757,80,2299,2,1358,10,506,50,0,0,0,0,0,0,4085,1,0,0,0,0,0,0,0,0,,,,,,
-1153,ORC_ZOMBIE,Orc Zombie,24,1568,0,196,120,1,151,184,5,10,1,12,24,1,24,5,10,12,1,1,29,133,400,2852,1152,840,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,2,0,0,0,0,0,0,0,0,,,,,,
-1154,PASANA,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,69,43,10,12,1,7,43,149,165,1700,1000,500,7110,4500,7121,2500,757,20,1105,500,1217,150,0,0,0,0,0,0,0,0,4099,1,0,0,0,0,0,0,0,0,,,,,,
-1155,PETIT,Earth Petite,44,6881,0,1677,1034,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,149,200,1624,620,384,1035,5500,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1,0,0,0,0,0,0,0,0,,,,,,
-1156,PETIT_,Sky Petite,45,5747,0,1758,1075,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,149,150,1420,1080,528,1036,5500,1037,300,985,61,509,1000,602,500,912,1500,606,15,0,0,0,0,4120,1,0,0,0,0,0,0,0,0,,,,,,
-1157,PHARAOH,Pharaoh,93,445997,0,114990,41899,1,2267,3015,67,70,1,93,100,104,89,112,10,12,2,7,67,181,125,2000,1000,500,7113,6000,7114,2500,1136,100,2327,150,5002,500,1552,300,984,4500,0,0,0,0,4148,1,4060,5000,607,6000,526,2000,732,1000,,,,,,
-1158,PHEN,Phen,26,3347,0,357,226,1,138,150,0,15,1,26,26,1,88,75,10,12,1,5,41,145,150,2544,1344,1152,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1,0,0,0,0,0,0,0,0,,,,,,
+1143,MARIONETTE,Marionette,41,3222,0,1078,1276,1,355,422,0,25,1,62,36,44,69,45,10,12,0,6,68,149,300,1480,480,1056,1060,5500,2294,5,2605,1,1008,10,1520,15,2407,1,656,200,0,0,0,0,4113,1,0,0,0,0,0,0,0,0
+1144,MARSE,Marse,31,5034,0,586,370,1,211,252,0,5,1,31,25,5,52,30,10,12,0,5,41,145,300,1956,756,528,1024,5500,962,3000,717,200,720,10,995,12,1007,5,656,200,0,0,0,0,4095,2,0,0,0,0,0,0,0,0
+1145,MARTIN,Martin,18,1109,0,134,86,1,52,63,0,5,1,18,30,15,15,5,10,12,0,2,42,129,300,1480,480,480,1017,6500,1018,500,1251,10,2225,5,5009,1,10010,10,2224,15,0,0,0,0,4046,2,0,0,0,0,0,0,0,0
+1146,MATYR,Matyr,31,2585,0,967,407,1,134,160,0,0,1,47,38,5,64,5,10,12,1,2,27,149,150,432,432,360,2618,10,528,5000,919,5500,537,400,757,100,656,200,0,0,0,0,0,0,4097,1,0,0,0,0,0,0,0,0
+1147,MAYA,Maya,81,169000,0,42900,17875,1,1800,2070,60,25,1,97,76,95,82,105,10,12,2,4,82,181,100,864,1000,480,10006,500,2615,200,2234,200,639,500,7020,10,985,3500,984,2500,0,0,0,0,4146,1,10500,5000,730,2000,603,3000,617,2000
+1148,MEDUSA,Medusa,79,22408,0,6876,4697,1,827,1100,48,38,1,74,50,57,77,69,10,12,1,6,40,149,180,2000,1000,500,1048,6000,522,2500,702,200,2610,150,722,250,7062,3500,1007,3,0,0,0,0,4124,1,0,0,0,0,0,0,0,0
+1149,MINOROUS,Minorous,52,7431,0,2750,1459,1,590,770,15,5,1,42,61,66,52,25,10,12,2,2,43,149,200,1360,960,432,941,5500,756,196,1361,2,1005,10,516,1500,1301,200,657,150,0,0,0,0,4126,1,0,0,0,0,0,0,0,0
+1150,MOONLIGHT,Moonlight Flower,67,120000,0,27500,14300,1,1200,1700,10,55,1,99,55,82,95,120,10,10,1,6,63,181,150,1276,576,288,5008,1000,1234,100,1525,150,10008,500,985,2600,984,1900,638,500,0,0,0,0,4131,1,1250,5000,1022,5000,504,1500,728,500
+1151,MYST,Myst,38,3745,0,1391,688,1,365,445,0,40,1,38,18,1,53,10,10,12,2,0,25,149,200,1576,576,384,5005,2,1019,800,10005,10,756,65,757,97,605,20,0,0,0,0,0,0,4108,2,0,0,0,0,0,0,0,0
+1152,ORC_SKELETON,Orc Skeleton,28,2278,0,315,194,1,190,236,10,10,1,14,18,1,30,15,10,12,1,1,29,133,200,2420,720,648,922,5500,932,3500,757,80,2299,2,1358,10,506,50,0,0,0,0,0,0,4085,1,0,0,0,0,0,0,0,0
+1153,ORC_ZOMBIE,Orc Zombie,24,1568,0,196,120,1,151,184,5,10,1,12,24,1,24,5,10,12,1,1,29,133,400,2852,1152,840,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,2,0,0,0,0,0,0,0,0
+1154,PASANA,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,69,43,10,12,1,7,43,149,165,1700,1000,500,7110,4500,7121,2500,757,20,1105,500,1217,150,0,0,0,0,0,0,0,0,4099,1,0,0,0,0,0,0,0,0
+1155,PETIT,Earth Petite,44,6881,0,1677,1034,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,149,200,1624,620,384,1035,5500,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1,0,0,0,0,0,0,0,0
+1156,PETIT_,Sky Petite,45,5747,0,1758,1075,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,149,150,1420,1080,528,1036,5500,1037,300,985,61,509,1000,602,500,912,1500,606,15,0,0,0,0,4120,1,0,0,0,0,0,0,0,0
+1157,PHARAOH,Pharaoh,93,445997,0,114990,41899,1,2267,3015,67,70,1,93,100,104,89,112,10,12,2,7,67,181,125,2000,1000,500,7113,6000,7114,2500,1136,100,2327,150,5002,500,1552,300,984,4500,0,0,0,0,4148,1,4060,5000,607,6000,526,2000,732,1000
+1158,PHEN,Phen,26,3347,0,357,226,1,138,150,0,15,1,26,26,1,88,75,10,12,1,5,41,145,150,2544,1344,1152,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1,0,0,0,0,0,0,0,0
 1159,PHREEONI,Phreeoni,69,188000,0,32175,16445,1,880,1530,10,20,1,85,78,35,130,60,10,10,2,2,60,181,200,1020,1020,288,1015,10000,1223,500,1236,150,1014,5000,2288,300,985,2900,984,2100,0,0,0,0,4121,1,2700,5000,1008,500,730,1000,1000,4000
 1160,PIERE,Piere,18,733,0,122,78,1,64,75,15,0,1,18,26,20,27,15,10,12,0,4,22,139,200,1288,288,576,955,5700,910,1100,938,600,992,15,1001,5,1002,500,757,31,0,0,0,0,4043,1,0,0,0,0,0,0,0,0
 1161,PLANKTON,Plankton,10,354,0,23,18,1,26,31,0,5,1,10,10,1,15,1,10,12,0,3,61,129,400,2208,1008,324,1052,5500,910,300,938,700,970,2,713,1000,630,20,645,50,0,0,0,0,4024,1,0,0,0,0,0,0,0,0
@@ -505,16 +505,16 @@
 1509,LUDE,Lude,36,3214,0,392,247,3,164,287,14,10,1,59,60,18,36,21,10,12,0,1,29,149,150,1152,960,752,1059,5500,7220,5500,7225,1000,2282,2,2274,1,0,0,0,0,0,0,0,0,4193,1,0,0,0,0,0,0,0,0
 1510,HYLOZOIST,Hylozoist,51,7186,0,2314,1297,3,181,317,16,51,1,28,26,47,66,14,10,12,0,1,47,149,155,1152,1536,969,7217,5500,7215,2000,7213,1000,7220,1000,740,200,757,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1511,AMON_RA,Amon Ra,88,1214138,0,87264,35891,1,1647,2576,26,52,1,1,90,124,74,45,10,12,2,7,62,181,200,1872,672,480,7211,8000,984,2000,0,0,607,3000,616,450,5053,250,1552,5,2615,100,0,0,0,0,8000,3000,7114,10,617,100,0,0
-1512,HYEGUN,Hyegun,56,9981,0,2199,1032,3,318,710,12,10,1,40,36,10,73,15,10,12,1,1,49,133,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,617,10,2614,5,616,10,0,0,4328,1,0,0,0,0,0,0,0,0
-1513,CIVIL_SERVANT,Civil Servant,62,14390,0,4023,2750,3,360,650,42,5,1,15,20,60,80,50,10,12,1,2,44,133,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4202,1,0,0,0,0,0,0,0,0
-1514,DANCING_DRAGON,Dancing Dragon,54,9136,0,3030,769,3,239,550,39,10,1,62,55,25,72,22,10,12,1,9,44,131,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4272,1,0,0,0,0,0,0,0,0
-1515,GARM_BABY,Hatii Baby,61,20119,0,1022,2980,3,499,680,34,13,1,30,56,55,85,30,10,12,1,2,41,133,300,1152,1152,384,512,0,0,0,0,0,0,0,0,0,617,10,1305,15,616,10,0,0,0,0,0,0,0,0,0,0,0,0
-1516,INCREASE_SOIL,Increase Soil,51,8230,0,2760,2110,3,140,560,30,12,1,45,23,12,69,12,10,12,1,0,62,145,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1517,LI_ME_MANG_RYANG,Li Me Mang Ryang,48,5920,0,1643,1643,3,199,434,23,16,1,51,19,8,57,30,10,12,1,6,62,133,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1518,BACSOJIN,Bacsojin,75,218652,0,33095,18214,1,1219,2169,10,51,1,85,78,85,150,60,10,12,2,1,67,181,200,1152,1152,480,1164,2,1165,2,999,500,984,1000,985,1000,607,500,7151,2000,504,500,0,0,0,0,5000,1000,607,500,608,500,985,500
-1519,Chung_E,Chung E,33,5628,0,739,455,1,210,251,0,10,1,33,33,10,58,15,10,12,1,6,21,145,300,2112,912,576,1020,5500,1049,50,2277,1,2504,5,1217,5,501,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1520,Boiled_Rice,Boiled Rice,14,344,0,81,44,1,59,72,0,10,1,14,14,0,19,15,10,12,1,3,25,131,300,1672,672,480,564,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1582,DEVILING,Deviling,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1512,HYEGUN,Hyegun,56,9981,0,2199,1032,3,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,133,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,617,10,2614,5,616,10,0,0,4328,1,0,0,0,0,0,0,0,0
+1513,CIVIL_SERVANT,Civil Servant,62,14390,0,4023,2750,3,650,1010,42,5,58,15,20,60,80,50,10,12,1,2,44,133,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4202,1,0,0,0,0,0,0,0,0
+1514,DANCING_DRAGON,Dancing Dragon,54,9136,0,3030,769,3,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,131,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4272,1,0,0,0,0,0,0,0,0
+1515,GARM_BABY,Hatii Baby,61,20119,0,1022,2980,3,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,133,300,1152,1152,384,512,0,0,0,0,0,0,0,0,0,617,10,1305,15,616,10,0,0,0,0,0,0,0,0,0,0,0,0
+1516,INCREASE_SOIL,Increase Soil,51,8230,0,2760,2110,3,560,700,30,12,40,45,23,12,69,12,10,12,1,0,62,145,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1517,LI_ME_MANG_RYANG,Li Me Mang Ryang,48,5920,0,1643,1643,3,434,633,23,16,46,51,19,8,57,30,10,12,2,6,62,133,200,1152,1152,384,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1518,BACSOJIN,Bacsojin,75,218652,0,33095,18214,1,1219,2169,10,51,1,85,78,85,150,60,10,12,2,7,67,181,200,1152,1152,480,1164,2,1165,2,999,500,984,1000,985,1000,607,500,7151,2000,504,500,0,0,0,0,5000,1000,607,500,608,500,985,500
+1519,Chung_E,Chung E,33,5628,0,739,455,1,210,251,0,10,1,33,33,10,58,15,10,12,1,7,25,145,300,2112,912,576,1020,5500,1049,50,2277,1,2504,5,1217,5,501,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1520,Boiled_Rice,Boiled Rice,14,344,0,81,44,1,59,72,0,10,1,14,14,0,19,15,10,12,1,6,21,131,300,1672,672,480,564,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1582,DEVILING,Deviling,31,64500,0,211,412,1,135,270,5,70,1,62,1,1,72,1,10,12,1,6,87,131,400,1872,672,480,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1583,TAO_GUNKA,Tao Gunka,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1584,TAMRUAN,Tamruan,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1585,MIME_MONKEY,Mime Monkey,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 855db9912..b1739129b 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,10 @@ Other Ppl
 Date		Added
 ======
 
+03/18
+        * Reduced label name length in heal_payment.txt [celest]
+        * Added Sara-chan's Einbroch/Einbech city warps [celest]
+
 03/17
         * Fixed more typos in /cities/payon.txt, thanks to TheUltimateEnd [celest]
 
diff --git a/npc/npcs_athena.conf b/npc/npcs_athena.conf
index c503dc65b..80e8b442f 100644
--- a/npc/npcs_athena.conf
+++ b/npc/npcs_athena.conf
@@ -443,6 +443,7 @@ npc: npc/warps/cities/aldebaran.txt
 npc: npc/warps/cities/amatsu.txt
 npc: npc/warps/ayothaya.txt
 npc: npc/warps/cities/comodo.txt
+npc: npc/warps/einbroch.txt
 npc: npc/warps/cities/geffen.txt
 npc: npc/warps/cities/gonryun.txt
 npc: npc/warps/cities/izlude.txt
diff --git a/npc/other/heal_payment.txt b/npc/other/heal_payment.txt
index 39a832985..96713e46a 100644
--- a/npc/other/heal_payment.txt
+++ b/npc/other/heal_payment.txt
@@ -42,7 +42,7 @@ prontera.gat,150,184,5	script	Healring#h2-1::Healring	1002,{
 		mes "Booiing Boooing: BoooiiinnnG (or healing and regeneration: "+(@tempHp+@tempSp)+" z)?";
 		mes "BOINNG: Booing (I use zenys for a good cause: my medicines and my Poring Food)!";
 		next;
-		menu "Only healings ("+@tempHp+"z)",HEALINGS,"Only a regeneration ("+@tempSp+"z)",REGENERATION,"Healings with regeneration ("+(@tempHp+@tempSp)+"z)",HEALINGS_AND_REGENERATION,"Nothing, thanks",CANCEL;
+		menu "Only healings ("+@tempHp+"z)",HEALINGS,"Only a regeneration ("+@tempSp+"z)",REGENERATION,"Healings with regeneration ("+(@tempHp+@tempSp)+"z)",HEALINGS_AND_REGEN,"Nothing, thanks",CANCEL;
 
 	ONLY_REGENERATION:
 		mes "[Healring]";
@@ -63,7 +63,7 @@ prontera.gat,150,184,5	script	Healring#h2-1::Healring	1002,{
 		heal 0,30000;
 		goto FIN;
 
-	HEALINGS_AND_REGENERATION:
+	HEALINGS_AND_REGEN:
 		if (Zeny < (@tempHp+@tempSp)) goto NO_ZENYS;
 		set Zeny, Zeny-(@tempHp+@tempSp);
 		heal 30000,30000;
diff --git a/npc/warps/einbroch.txt b/npc/warps/einbroch.txt
new file mode 100644
index 000000000..fd44d6047
--- /dev/null
+++ b/npc/warps/einbroch.txt
@@ -0,0 +1,111 @@
+//Einbroch and Einbech warps by Sara - Semi-final 2

+//Einbroch Field <-> Juno Field

+yuno_fild04.gat,251,21,0	warp	ein001	1,1,ein_fild06.gat,252,363

+ein_fild06.gat,252,365,0	warp	ein001a	1,1,yuno_fild04.gat,251,23

+yuno_fild07.gat,73,219,0	warp	ein002	1,1,ein_fild06.gat,338,170

+ein_fild06.gat,340,170,0	warp	ein002a	1,1,yuno_fild07.gat,75,219

+yuno_fild07.gat,56,76,0	warp	ein003	1,1,ein_fild06.gat,354,94

+ein_fild06.gat,356,94,0	warp	ein003a	1,1,yuno_fild07.gat,58,76

+yuno_fild11.gat,28,266,0	warp	ein004	1,1,ein_fild07.gat,380,263

+ein_fild07.gat,382,263,0	warp	ein004a	1,1,yuno_fild11.gat,30,266

+

+//Einbroch Field

+ein_fild06.gat,135,35,0	warp	ein005	1,1,ein_fild07.gat,147,360

+ein_fild07.gat,145,362,0	warp	ein005a	1,1,ein_fild07.gat,135,37

+ein_fild07.gat,191,42,0	warp	ein006	1,1,ein_fild10.gat,194,370

+ein_fild10.gat,194,372,0	warp	ein006a	1,1,ein_fild07.gat,191,44

+ein_fild10.gat,24,331,0	warp	ein007	1,1,ein_fild09.gat,327,346

+ein_fild09.gat,329,346,0	warp	ein007a	1,1,ein_fild10.gat,26,331

+ein_fild09.gat,34,132,0	warp	ein008	1,1,ein_fild08.gat,361,128

+ein_fild08.gat,363,128,0	warp	ein008a	1,1,ein_fild09.gat,36,132

+

+//Einbroch Field <-> Einbroch and Einbech

+ein_fild08.gat,164,381,0	warp	ein009	1,1,einbroch.gat,150,26

+einbroch.gat,150,24,0	warp	ein009a	1,1,ein_fild08.gat,164,379

+ein_fild09.gat,70,353,0	warp	ein010	1,1,einbech.gat,62,31

+einbech.gat,62,29,0	warp	ein010a	1,1,ein_fild09.gat,72,353

+

+//Dungeon Warps

+einbech.gat,139,253,0	warp	ein011	1,1,ein_dun01.gat,22,17

+ein_dun01.gat,22,15,0	warp	ein011a	1,1,einbech.gat,139,251

+ein_dun01.gat,262,256,0	warp	ein012	1,1,ein_dun02.gat,292,290

+ein_dun02.gat,292,292,0	warp	ein012a	1,1,ein_dun01.gat,262,258

+

+//Inside Warps

+ein_in01.gat,13,213,0	warp	ein013	1,1,einbroch.gat,131,80

+einbroch.gat,133,80,0	warp	ein013a	1,1,ein_in01.gat,15,213

+ein_in01.gat,110,267,0	warp	ein014	1,1,einbroch.gat,204,120

+einbroch.gat,202,120,0	warp	ein014a	1,1,ein_in01.gat,108,267

+ein_in01.gat,110,236,0	warp	ein015	1,1,einbroch.gat,204,100

+einbroch.gat,202,100,0	warp	ein015a	1,1,ein_in01.gat,108,236

+ein_in01.gat,80,199,0	warp	ein016	1,1,einbroch.gat,178,71

+einbroch.gat,178,73,0	warp	ein016a	1,1,ein_in01.gat,80,201

+ein_in01.gat,195,224,0	warp	ein017	1,1,einbroch.gat,255,200

+einbroch.gat,257,200,0	warp	ein017a	1,1,ein_in01.gat,197,224

+ein_in01.gat,211,232,0	warp	ein018	1,1,ein_in01.gat,273,232

+ein_in01.gat,271,232,0	warp	ein018a	1,1,ein_in01.gat,209,232

+ein_in01.gat,211,216,0	warp	ein019	1,1,ein_in01.gat,273,218

+ein_in01.gat,271,218,0	warp	ein019a	1,1,ein_in01.gat,209,216

+ein_in01.gat,181,277,0	warp	ein020	1,1,ein_in01.gat,281,224

+ein_in01.gat,283,224,0	warp	ein020a	1,1,ein_in01.gat,179,277

+ein_in01.gat,232,273,0	warp	ein021	1,1,ein_in01.gat,274,244

+ein_in01.gat,274,246,0	warp	ein021a	1,1,ein_in01.gat,232,275

+ein_in01.gat,273,273,0	warp	ein022	1,1,ein_in01.gat,264,244

+ein_in01.gat,264,246,0	warp	ein022a	1,1,ein_in01.gat,273,275

+ein_in01.gat,232,176,0	warp	ein023	1,1,ein_in01.gat,264,205

+ein_in01.gat,264,203,0	warp	ein023a	1,1,ein_in01.gat,232,174

+ein_in01.gat,274,176,0	warp	ein024	1,1,ein_in01.gat,274,205

+ein_in01.gat,274,203,0	warp	ein024a	1,1,ein_in01.gat,274,174

+

+//House with couches

+//- Bottom-left doorway

+//ein_in01.gat,11,147,0	warp	ein025	1,1,mapname.gat,x,y

+//mapname.gat,x,y,0	warp	ein025a	1,1,ein_in01.gat,13,147

+//- Top-right doorway

+//ein_in01.gat,26,131,0	warp	ein026	1,1,mapname.gat,x,y

+//mapname.gat,x,y,0	warp	ein026a	1,1,ein_in01.gat,26,133

+

+ein_in01.gat,145,152,0	warp	ein027	1,1,einbech.gat,253,110

+einbech.gat,255,110,0	warp	ein027a	1,1,ein_in01.gat,147,152

+ein_in01.gat,39,85,0	warp	ein028	1,1,ein_in01.gat,37,36

+ein_in01.gat,39,36,0	warp	ein028a	1,1,ein_in01.gat,37,85

+ein_in01.gat,14,13,0	warp	ein029	1,1,einbroch.gat,255,109

+einbroch.gat,255,107,0	warp	ein029a	1,1,ein_in01.gat,14,15

+

+//2 floor laboratory-ish house

+//- Left Exit

+//ein_in01.gat,103,95,0	warp	ein030	1,1,mapname.gat,x,y

+//mapname.gat,x,y,0	warp	ein030a	1,1,ein_in01.gat,105,95

+//- Right Exit

+//ein_in01.gat,120,77,0	warp	ein031	1,1,mapname.gat,x,y

+//mapname.gat,x,y,0	warp	ein031a	1,1,ein_in01.gat,120,79

+//- Elevator

+ein_in01.gat,126,88,0	warp	ein032	1,1,ein_in01.gat,100,140

+ein_in01.gat,100,142,0	warp	ein032a	1,1,ein_in01.gat,126,86

+

+//House

+//- Bottom-left doorway

+//ein_in01.gat,187,98,0	warp	ein033	1,1,mapname.gat,x,y

+//mapname.gat,x,y,0	warp	ein033a	1,1,ein_in01.gat,189,98

+//- Top-right doorway

+//ein_in01.gat,204,81,0	warp	ein034	1,1,mapname.gat,x,y

+//mapname.gat,x,y,0	warp	ein034a	1,1,ein_in01.gat,204,83

+

+ein_in01.gat,265,105,0	warp	ein035	1,1,einbech.gat,143,112

+einbech.gat,145,112,0	warp	ein035a	1,1,ein_in01.gat,267,105

+ein_in01.gat,288,89,0	warp	ein036	1,1,einbech.gat,155,106

+einbech.gat,153,106,0	warp	ein036a	1,1,ein_in01.gat,286,89

+ein_in01.gat,108,13,0	warp	ein037	1,1,einbroch.gat,217,212

+einbroch.gat,217,214,0	warp	ein037a	1,1,ein_in01.gat,108,15

+ein_in01.gat,200,32,0	warp	ein038	1,1,einbech.gat,170,144

+einbech.gat,170,146,0	warp	ein038a	1,1,ein_in01.gat,200,30

+ein_in01.gat,189,37,0	warp	ein039	1,1,einbech.gat,177,136

+einbech.gat,177,138,0	warp	ein039a	1,1,ein_in01.gat,189,35

+ein_in01.gat,288,25,0	warp	ein040	1,1,einbroch.gat,52,52

+einbroch.gat,50,52,0	warp	ein040a	1,1,ein_in01.gat,286,25

+airport.gat,125,14,0	warp	ein041	1,1,airport.gat,19,20

+airport.gat,19,18,0	warp	ein041a	1,1,airport.gat,123,14

+airport.gat,160,14,0	warp	ein042	1,1,airport.gat,48,20

+airport.gat,48,18,0	warp	ein042a	1,1,airport.gat,162,14

+einbroch.gat,64,208,0	warp	ein043	1,1,airport.gat,143,15

+airport.gat,143,13,0	warp	ein043a	1,1,einbroch.gat,64,206
\ No newline at end of file
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 65e388e3e..78467b579 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1143,17 +1143,19 @@ int make_new_char_sql(int fd, unsigned char *dat) {
 		// check individual stat value
 		for(i = 24; i <= 29; i++) {
 			if (dat[i] < 1 || dat[i] > 9) {
-                        printf("fail (aid: %d), stats error(bot cheat?!)\n", sd->account_id);
+				printf("fail (aid: %d), stats error(bot cheat?!)\n", sd->account_id);
         		return -2;
 			}
 		}
 
-		// char.log to charlog
-		sprintf(tmp_sql,"INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
-			"VALUES (NOW(), '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-			charlog_db,"make new char error", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
-		//query
-		mysql_query(&mysql_handle, tmp_sql);
+		if (log_char) {
+			// char.log to charlog
+			sprintf(tmp_sql,"INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
+				"VALUES (NOW(), '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+				charlog_db,"make new char error", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
+			//query
+			mysql_query(&mysql_handle, tmp_sql);
+		}
 		//printf("make new char error %d-%d %s %d, %d, %d, %d, %d, %d %d, %d" RETCODE,
 		//	fd, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
 		
@@ -1161,13 +1163,15 @@ int make_new_char_sql(int fd, unsigned char *dat) {
 		return -2;
 	}
 
-	// char.log to charlog
-	sprintf(tmp_sql,"INSERT INTO `%s`(`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
-		"VALUES (NOW(), '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-		charlog_db,"make new char", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
-	//query
-	if (mysql_query(&mysql_handle, tmp_sql)) {
-		printf("fail(log error), SQL error: %s\n", mysql_error(&mysql_handle));
+	if (log_char) {
+		// char.log to charlog
+		sprintf(tmp_sql,"INSERT INTO `%s`(`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
+			"VALUES (NOW(), '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+			charlog_db,"make new char", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
+		//query
+		if (mysql_query(&mysql_handle, tmp_sql)) {
+			printf("fail(log error), SQL error: %s\n", mysql_error(&mysql_handle));
+		}
 	}
 	//printf("make new char %d-%d %s %d, %d, %d, %d, %d, %d - %d, %d" RETCODE,
 	//	fd, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
@@ -2534,11 +2538,13 @@ int parse_char(int fd) {
 				break;
 			}
 
-			sprintf(tmp_sql,"INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
-				charlog_db, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
-			//query
-			if(mysql_query(&mysql_handle, tmp_sql)) {
-				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			if (log_char) {
+				sprintf(tmp_sql,"INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
+					charlog_db, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
+				//query
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+					printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 			}
 			printf("(\033[1;64m%d\033[0m) char selected (\033[1;32m%d\033[0m) \033[1;32m%s\033[0m" RETCODE, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
 
diff --git a/src/map/npc.c b/src/map/npc.c
index 409695996..018ceae01 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1106,7 +1106,7 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
 		if (sd->status.skill[MC_DISCOUNT].flag != 0)
 			skill = sd->status.skill[MC_DISCOUNT].flag - 2;
 		if (skill > 0) {
-			z = (log(z * (double)skill) * (double)battle_config.shop_exp/100.);
+			z = z * (double)skill * (double)battle_config.shop_exp/100.;
 			if (z < 1)
 				z = 1;
 			pc_gainexp(sd,0,(int)z);
@@ -1166,7 +1166,7 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
 		if (sd->status.skill[MC_OVERCHARGE].flag != 0)
 			skill = sd->status.skill[MC_OVERCHARGE].flag - 2;
 		if (skill > 0) {
-			z = (log(z * (double)skill) * (double)battle_config.shop_exp/100.);
+			z = z * (double)skill * (double)battle_config.shop_exp/100.;
 			if (z < 1)
 				z = 1;
 			pc_gainexp(sd,0,(int)z);