Merge branch 'master' of the testing branch

Conflicts:
	conf/magic.conf
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

Eliminated conf/magic.conf.  Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.

1 files changed, 22 insertions, 15 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index c008f8fe..3d8d417b 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1,7 +1,7 @@
 #ID,Name,Label,Type,Price,Sell,Weight,ATK,DEF,Range,Mbonus,Slot,Gender,Loc,wLV,eLV,View,{UseScript},{EquipScript},,
 0,DEFAULT,Default,0,20,10,10,,,,,,2,,,,,{},{},,
 501,CactusDrink,Cactus Drink,0,50,25,70,,,,,,2,,,0,,{ itemheal 15,0; },{},
-502,CactusPotion,Cactus Potion,0,70,35,70,,,,,,2,,,0,,{ itemheal 25,10; },{},
+502,CactusPotion,Cactus Potion,0,70,35,70,,,,,,2,,,0,,{ itemheal 25,0; },{},
 503,CasinoCoins,Casino Coins,3,20,10,1,,,,,,,,,,,{},{},,
 504,DecorCandy,Decor Candy,3,25,10,10,,,,,,,,,,,{},{},,
 505,MaggotSlime,Maggot Slime,3,8,4,10,,,,,,,,,,,{},{},,
@@ -33,7 +33,7 @@
 531,MinerGloves,Miner Gloves,5,3000,1000,20,,2,,-10,0,2,4,,0,0,{},{},,
 532,LeatherGloves,Leather Gloves,5,6000,2000,30,,4,,-20,0,2,4,,0,0,{},{},,
 533,RoastedMaggot,Roasted Maggot,0,110,55,5,,,,,,2,,,0,,{ itemheal 150,0; },{},
-534,OrangeCupcake,Orange Cupcake,0,90,45,5,,,,,,2,,,0,,{ itemheal 100,10; },{},
+534,OrangeCupcake,Orange Cupcake,0,90,45,5,,,,,,2,,,0,,{ itemheal 100,0; },{},
 535,Apple,Apple,0,10,5,5,,,,,,2,,,0,,{ itemheal 50,0; },{},
 536,ShortSword,Short Sword,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 537,TreasureKey,Treasure Key,3,100,50,5,,,,,,,,,,,{},{},,
@@ -61,13 +61,13 @@
 559,OrangeHint,Orange Hint,3,20,0,10,,,,,,,,,,,{},{},,
 560,GrayHint,Gray Hint,3,20,0,10,,,,,,,,,,,{},{},,
 561,Sabre,Sabre,4,10000,5000,100,100,,1,,0,2,2,1,1,1,{},{},,
-562,ChickenLeg,Chicken Leg,0,250,125,10,,,,,,2,,,0,,{ itemheal 500,5; },{},
+562,ChickenLeg,Chicken Leg,0,250,125,10,,,,,,2,,,0,,{ itemheal 500,0; },{},
 563,WinterGloves,Winter Gloves,5,6000,3000,20,,3,,-15,0,2,4,,0,0,{},{},,
 564,TurtleneckSweater,Turtleneck Sweater,5,2000,1000,10,,6,,-18,0,2,512,,0,0,{},{},,
-565,Petal,Petal,0,50,25,10,,,,,,2,,,0,,{ itemheal 50,5; },{},
-566,SmallMushroom,Small Mushroom,0,50,25,10,,,,,,2,,,0,,{ itemheal 50,5; },{},
-567,IronPotion,Iron Potion,0,500,250,10,,,,,,2,,,0,,{ sc_start 185,90, 60; },{}
-568,ConcentrationPotion,Concentration Potion,0,500,250,10,,,,,,2,,,0,,{ sc_start 37,90, 30; },{}
+565,Petal,Petal,0,50,25,10,,,,,,2,,,0,,{ itemheal 50,0; },{},
+566,SmallMushroom,Small Mushroom,0,50,25,10,,,,,,2,,,0,,{ itemheal 50,0; },{},
+567,IronPotion,Iron Potion,0,500,250,10,,,,,,2,,,0,,{ sc_start 185,60, 60; },{}
+568,ConcentrationPotion,Concentration Potion,0,500,250,10,,,,,,2,,,0,,{ sc_start 37,60, 30; },{}
 569,RawLog,Raw Log,3,20,10,10,,,,,,,,,,,{},{},,
 570,BoneKnife,Bone Knife,4,10000,6000,120,115,,1,,0,2,2,1,1,1,{},{},,
 571,Setzer,Setzer,4,20000,8000,80,110,,1,,0,2,2,1,1,3,{},{},,
@@ -186,7 +186,7 @@
 702,WeddingRing,Wedding Ring,5,1000,1,1,,0,,1,0,2,128,,0,0,{},{},,
 703,SulphurPowder,Sulphur Powder,3,1000,100,2,,,,,,2,,,0,,{},{},,
 704,IronPowder,Iron Powder,3,800,80,3,,,,,,2,,,0,,{},{},,
-// RESERVED,,,,,,,,,,,,,,,,,,,,
+705,ManaPotion,Mana Potion,0,2000,300,50,,,,,,2,,,0,,{ itemheal 0, 10; callfunc "MagicGainBasic"; },{},
 706,GoldenScorpionStinger,Golden Scorpion Stinger,3,2000,500,2,,,,,,,,,,,{},{},,
 707,MonsterOilPotion,Monster Oil Potion,3,10000,2000,50,,,,,,,,,,,{},{},,
 708,LeatherPatch,Leather Patch,3,300,150,18,,,,,,,,,,,{},{},,
@@ -195,10 +195,10 @@
 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,,,,,,2,,,0,,{ itemheal 30,5; },{},
-715,MountainSnakeEgg,Mountain Snake Egg,0,80,40,4,,,,,,2,,,0,,{ itemheal 40,5; },{},
-716,GrassSnakeEgg,Grass Snake Egg,0,100,50,4,,,,,,2,,,0,,{ itemheal 50,5; },{},
-717,CaveSnakeEgg,Cave Snake Egg,0,60,30,4,,,,,,2,,,0,,{ itemheal 20,5; },{},
+714,SnakeEgg,Snake Egg,0,50,25,4,,,,,,2,,,0,,{ itemheal 30,0; },{},
+715,MountainSnakeEgg,Mountain Snake Egg,0,80,40,4,,,,,,2,,,0,,{ itemheal 40,0; },{},
+716,GrassSnakeEgg,Grass Snake Egg,0,100,50,4,,,,,,2,,,0,,{ itemheal 50,0; },{},
+717,CaveSnakeEgg,Cave Snake Egg,0,60,30,4,,,,,,2,,,0,,{ itemheal 20,0; },{},
 718,SilkCocoon,Silk Cocoon,3,200,3,1,,,,,,,,,,,{},{},,
 // RESERVED,,,,,,,,,,,,,,,,,,,,
 720,SilkRobe,Silk Robe,5,8000,4000,5,,5,,0,0,2,512,,0,0,{},{},,
@@ -209,9 +209,12 @@
 725,GMCap,GM Cap,5,2000,500,10,,5,,5,0,2,256,,0,0,{},{},,
 726,GMRobe,GM Robe,5,8000,4000,5,,5,,0,0,2,512,,0,0,{},{},,
 727,Iten,Iten,3,0,0,100,,,,,,,,,,,{},{},,
-// RESERVED,,,,,,,,,,,,,,,,,,,,
+728,MoubooFigurine,Mouboo Figurine,3,0,0,1,,,,,,,,,,,{},{},,
+729,WarpedLog,Warped Log,3,0,0,2,,,,,,,,,,,{},{},,
+730,Lifestone,Lifestone,3,0,0,1,,,,,,,,,,,{},{},,
 731,AssassinPants,Assassin Pants,5,10000,3000,10,,5,,-5,0,2,1,,0,0,{},{},,
-// RESERVED,,,,,,,,,,,,,,,,,,,,
+732,DruidTreeBranch,Druid Tree Branch,3,0,0,2,,,,,,,,,,,{},{},,
+733,PurificationPotion,Purification Potion,0,0,0,5,,,,,,2,,,,,{ callfunc "usePurificationPotion"; },{},,
 734,BlackBoots,Black Boots,5,20000,3000,35,,4,,-10,0,2,64,,0,0,{},{},,
 735,CottonBoots,Cotton Boots,5,2000,500,10,,1,,1,0,2,64,,0,0,{},{},,
 736,WhiteCake,White Cake,0,500,100,10,,,,,,2,,,0,,{ itemheal 10,0; },{},
@@ -222,7 +225,11 @@
 741,CottonGloves,Cotton Gloves,5,2000,500,20,,1,,-10,0,2,4,,0,0,{},{},,
 742,FourLeafClover,Four-Leaf Clover,5,10000,5000,1,,,,5,0,2,8,,0,0,{},{ bonus bLuk, 1; },
 743,Acorn,Acorn,0,50,10,1,,,,,,2,,,0,,{ itemheal 3,0; },{},
-// RESERVED
+744,DilutedConcentrationPotion,Diluted Concentration Potion,0,250,100,10,,,,,,2,,,0,,{ sc_start 37,30, 20; },{}
+745,DarkConcentrationPotion,Dark Concentration Potion,0,50,25,10,,,,,,2,,,0,,{ sc_start 37,10, 40; sc_start sc_poison, 1, 50;},{}
+746,MopoxCurePotion,Mopox Cure Potion,3,0,0,5,,,,,,2,,,,,{},{},,
+747,LacedChocolateCake,Laced Chocolate Cake,0,550,125,10,,,,,,2,,,0,,{ itemheal 11,0; },{},
+748,LacedOrangeCupcake,Laced Orange Cupcake,0,90,45,5,,,,,,2,,,0,,{ itemheal 100,0; },{},
 749,Towel,Towel,5,800,250,1,,,,5,0,2,8,,0,0,{},{},
 ,,,,,,,,,,,,,,,,,,,,
 1198,JackOSoul,Jack O Soul,3,100000,1,1,,,,,,,,,,,{},{},,