Merge branch 'master' of https://github.com/HerculesWS/Hercules

8 files changed, 65 insertions, 41 deletions

diff --git a/conf/messages.conf b/conf/messages.conf
index f9dc5edd4..8b3daa684 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1520,6 +1520,7 @@
 
 //src/map/pc.c::pc_isUseitem
 1474: You cannot use this item while sitting
+1475: You cannot use this item while storage is open
 
 1476: You are already mounting something else
 
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index af919f037..2b0ce1586 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -18884,6 +18884,7 @@ item_db: (
 	Script: <"
 		bonus bFlee,5;
 		bonus bAgi,1;
+		skill ALL_CATCRY, 1;
 	">
 },
 {
@@ -22080,6 +22081,7 @@ item_db: (
 	Buy: 20
 	Loc: 136
 	Refine: false
+	Script: <" skill ALL_DREAM_SUMMERNIGHT,1; ">
 },
 */
 {
@@ -54234,7 +54236,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 20
-	Script: <" getitem rand(7361,7370),1; ">
+	Script: <" getrandgroupitem 12035,1; ">
 },
 {
 	Id: 12036
@@ -54243,7 +54245,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 20
-	Script: <" getitem rand(7371,7380),1; ">
+	Script: <" getrandgroupitem 12036,1; ">
 },
 {
 	Id: 12037
@@ -54252,7 +54254,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 20
-	Script: <" getitem rand(7381,7390),1; ">
+	Script: <" getrandgroupitem 12037,1; ">
 },
 {
 	Id: 12038
@@ -54270,7 +54272,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 20
-	Script: <" getitem rand(7542,7546),1; ">
+	Script: <" getrandgroupitem 12039,1; ">
 },
 {
 	Id: 12040
@@ -57076,6 +57078,7 @@ item_db: (
 	Name: "Guardian Angel"
 	Type: 2
 	Buy: 0
+	Script: <" itemskill ALL_ANGEL_PROTECT,1; ">
 },
 {
 	Id: 12314
@@ -57447,6 +57450,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 10
+	Script: <" callfunc "F_CashDungeon",3; ">
 },
 {
 	Id: 12353
@@ -72302,7 +72306,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 10
-	Script: <" callfunc "F_CashDungeon"; ">
+	Script: <" callfunc "F_CashDungeon",1; ">
 },
 {
 	Id: 14528
@@ -72892,7 +72896,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 10
-	Script: <" callfunc "F_CashDungeon"; ">
+	Script: <" callfunc "F_CashDungeon",2; ">
 },
 {
 	Id: 14582
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index e31ffd339..25f9302e0 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -4701,6 +4701,7 @@ Candy_Holder: (
 )
 */
 Lotto_Box01: (
+	"Lotto01",
 	"Lotto02",
 	"Lotto03",
 	"Lotto04",
@@ -4709,6 +4710,7 @@ Lotto_Box01: (
 	"Lotto07",
 	"Lotto08",
 	"Lotto09",
+	"Lotto10",
 )
 Lotto_Box02: (
 	"Lotto11",
@@ -4719,9 +4721,10 @@ Lotto_Box02: (
 	"Lotto16",
 	"Lotto17",
 	"Lotto18",
+	"Lotto19",
+	"Lotto20",
 )
 Lotto_Box03: (
-	"Lotto20",
 	"Lotto21",
 	"Lotto22",
 	"Lotto23",
@@ -4729,21 +4732,23 @@ Lotto_Box03: (
 	"Lotto25",
 	"Lotto26",
 	"Lotto27",
-)
-Lotto_Box04: (
+	"Lotto28",
 	"Lotto29",
 	"Lotto30",
+)
+Lotto_Box04: (
 	"Lotto31",
 	"Lotto32",
 	"Lotto33",
 	"Lotto34",
 	"Lotto35",
 	"Lotto36",
-)
-Lotto_Box05: (
+	"Lotto37",
 	"Lotto38",
 	"Lotto39",
 	"Lotto40",
+)
+Lotto_Box05: (
 	"Lotto41",
 	"Lotto42",
 	"Lotto43",
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a67494ee0..6c6e429b4 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -22191,6 +22191,7 @@ item_db: (
 	Script: <"
 		bonus bFlee,5;
 		bonus bAgi,1;
+		skill ALL_CATCRY, 1;
 	">
 },
 {
@@ -26896,6 +26897,7 @@ item_db: (
 	Upper: 63
 	Loc: 136
 	Refine: false
+	Script: <" skill ALL_DREAM_SUMMERNIGHT,1; ">
 },
 {
 	Id: 2751
@@ -65822,7 +65824,7 @@ item_db: (
 	Buy: 0
 	Weight: 20
 	Upper: 63
-	Script: <" getitem rand(7361,7370),1; ">
+	Script: <" getrandgroupitem 12035,1; ">
 },
 {
 	Id: 12036
@@ -65832,7 +65834,7 @@ item_db: (
 	Buy: 0
 	Weight: 20
 	Upper: 63
-	Script: <" getitem rand(7371,7380),1; ">
+	Script: <" getrandgroupitem 12036,1; ">
 },
 {
 	Id: 12037
@@ -65842,7 +65844,7 @@ item_db: (
 	Buy: 0
 	Weight: 20
 	Upper: 63
-	Script: <" getitem rand(7381,7390),1; ">
+	Script: <" getrandgroupitem 12037,1; ">
 },
 {
 	Id: 12038
@@ -65862,7 +65864,7 @@ item_db: (
 	Buy: 0
 	Weight: 20
 	Upper: 63
-	Script: <" getitem rand(7542,7546),1; ">
+	Script: <" getrandgroupitem 12039,1; ">
 },
 {
 	Id: 12040
@@ -68938,6 +68940,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Upper: 63
+	Script: <" itemskill ALL_ANGEL_PROTECT,1; ">
 },
 {
 	Id: 12314
@@ -69349,6 +69352,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	Upper: 63
+	Script: <" callfunc "F_CashDungeon",3; ">
 },
 {
 	Id: 12353
@@ -87095,7 +87099,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	Upper: 63
-	Script: <" callfunc "F_CashDungeon"; ">
+	Script: <" callfunc "F_CashDungeon",1; ">
 },
 {
 	Id: 14528
@@ -87739,7 +87743,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	Upper: 63
-	Script: <" callfunc "F_CashDungeon"; ">
+	Script: <" callfunc "F_CashDungeon",2; ">
 },
 {
 	Id: 14582
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 9bf1db66d..68ff1dcbf 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -4684,6 +4684,7 @@ Candy_Holder: (
 	("Pumpkin_Pie",5),
 )
 Lotto_Box01: (
+	"Lotto01",
 	"Lotto02",
 	"Lotto03",
 	"Lotto04",
@@ -4692,6 +4693,7 @@ Lotto_Box01: (
 	"Lotto07",
 	"Lotto08",
 	"Lotto09",
+	"Lotto10",
 )
 Lotto_Box02: (
 	"Lotto11",
@@ -4702,9 +4704,10 @@ Lotto_Box02: (
 	"Lotto16",
 	"Lotto17",
 	"Lotto18",
+	"Lotto19",
+	"Lotto20",
 )
 Lotto_Box03: (
-	"Lotto20",
 	"Lotto21",
 	"Lotto22",
 	"Lotto23",
@@ -4712,21 +4715,23 @@ Lotto_Box03: (
 	"Lotto25",
 	"Lotto26",
 	"Lotto27",
-)
-Lotto_Box04: (
+	"Lotto28",
 	"Lotto29",
 	"Lotto30",
+)
+Lotto_Box04: (
 	"Lotto31",
 	"Lotto32",
 	"Lotto33",
 	"Lotto34",
 	"Lotto35",
 	"Lotto36",
-)
-Lotto_Box05: (
+	"Lotto37",
 	"Lotto38",
 	"Lotto39",
 	"Lotto40",
+)
+Lotto_Box05: (
 	"Lotto41",
 	"Lotto42",
 	"Lotto43",
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 46f278998..e858fc709 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -1334,7 +1334,7 @@ REPLACE INTO `item_db` VALUES ('2434','Black_Leather_Boots_','Black Leather Boot
 REPLACE INTO `item_db` VALUES ('2435','Battle_Greave','Battle Greaves','5','10','5','0','0','0','4','0','1','40260834','63','2','64','0','80',NULL,'1','0','0','bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1;','','');
 REPLACE INTO `item_db` VALUES ('2436','Combat_Boots','Combat Boots','5','10','5','0','0','0','3','0','1','9014044','63','2','64','0','80',NULL,'1','0','0','bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1;','','');
 REPLACE INTO `item_db` VALUES ('2437','Battle_Boots','Battle Boots','5','10','5','0','0','0','3','0','1','16777216','63','2','64','0','80',NULL,'1','0','0','bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1;','','');
-REPLACE INTO `item_db` VALUES ('2438','Paw_Of_Cat','Paw Of Cat','5','10','5','300','0','0','0','0','0','4294967295','63','2','64','0','80',NULL,'1','0','0','bonus bFlee,5; bonus bAgi,1;','','');
+REPLACE INTO `item_db` VALUES ('2438','Paw_Of_Cat','Paw Of Cat','5','10','5','300','0','0','0','0','0','4294967295','63','2','64','0','80',NULL,'1','0','0','bonus bFlee,5; bonus bAgi,1; skill ALL_CATCRY, 1;','','');
 REPLACE INTO `item_db` VALUES ('2439','Refresh_Shoes','Refresh Shoes','5','20','10','0','0','0','9','0','0','4294967295','63','2','64','0','0',NULL,'0','0','0','bonus bMaxHPrate,17; bonus bMaxSPrate,8; bonus2 bHPRegenRate,20,10000; bonus2 bSPRegenRate,3,10000;','','');
 REPLACE INTO `item_db` VALUES ('2440','Sprint_Shoes','Sprint Shoes','5','20','10','300','0','0','2','0','1','13631360','2','2','64','0','70',NULL,'1','0','0','bonus bAgi,1; bonus bSPrecovRate,5;','','');
 REPLACE INTO `item_db` VALUES ('2441','Beach_Sandal','Beach Sandals','5','20','10','200','0','0','0','0','0','4294967295','63','2','64','0','0',NULL,'1','0','0','bonus bStr,1; bonus bInt,1; bonus bAgi,1; bonus2 bSubEle,Ele_Fire,10;','','');
@@ -4326,11 +4326,11 @@ REPLACE INTO `item_db` VALUES ('12031','Sleepy_Box','Box of Drowsiness','2','100
 REPLACE INTO `item_db` VALUES ('12032','Box_Of_Storm','Box of Storms','11','1000','500','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill ITEM_ENCHANTARMS,2;','','');
 REPLACE INTO `item_db` VALUES ('12033','Box_Of_Sunlight','Box of Sunlight','2','1000','500','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_CLAIRVOYANCE,30000,0;','','');
 REPLACE INTO `item_db` VALUES ('12034','Painting_Box','Box of Panting','2','1000','500','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','percentheal 0,9; if(rand(1000)<300) sc_start SC_SILENCE,30000,0;','','');
-REPLACE INTO `item_db` VALUES ('12035','Lotto_Box01','Lotto Box 01','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7361,7370),1;','','');
-REPLACE INTO `item_db` VALUES ('12036','Lotto_Box02','Lotto Box 02','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7371,7380),1;','','');
-REPLACE INTO `item_db` VALUES ('12037','Lotto_Box03','Lotto Box 03','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7381,7390),1;','','');
+REPLACE INTO `item_db` VALUES ('12035','Lotto_Box01','Lotto Box 01','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12035,1;','','');
+REPLACE INTO `item_db` VALUES ('12036','Lotto_Box02','Lotto Box 02','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12036,1;','','');
+REPLACE INTO `item_db` VALUES ('12037','Lotto_Box03','Lotto Box 03','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12037,1;','','');
 REPLACE INTO `item_db` VALUES ('12038','Lotto_Box04','Lotto Box 04','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12038,1;','','');
-REPLACE INTO `item_db` VALUES ('12039','Lotto_Box05','Lotto Box 05','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7542,7546),1;','','');
+REPLACE INTO `item_db` VALUES ('12039','Lotto_Box05','Lotto Box 05','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12039,1;','','');
 REPLACE INTO `item_db` VALUES ('12040','Stone_Of_Intelligence_','Stone of Sage','2','100000','50000','300','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','homevolution;','','');
 REPLACE INTO `item_db` VALUES ('12041','Str_Dish01','Fried Grasshopper Legs','0','2000','1000','60','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_STR,1200000,1; percentheal 5,0;','','');
 REPLACE INTO `item_db` VALUES ('12042','Str_Dish02','Seasoned Sticky Webfoot','0','4000','2000','500','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_STR,1200000,2; percentheal 5,0;','','');
@@ -4601,7 +4601,7 @@ REPLACE INTO `item_db` VALUES ('12309','Bulging_Head','JJangu Magic Powder','11'
 REPLACE INTO `item_db` VALUES ('12310','Spray_Of_Flowers','Spray Of Flowers','2','0','0','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_INCFLEE,600000,10;','','');
 REPLACE INTO `item_db` VALUES ('12311','Large_Spray_Of_Flowers','Huge Spray Of Flowers','11','0','0','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill ALL_PARTYFLEE,1;','','');
 REPLACE INTO `item_db` VALUES ('12312','Thick_Manual50','Thick Battle Manual','2','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_CASH_PLUSEXP,3600000,50;','','');
-REPLACE INTO `item_db` VALUES ('12313','Protection_Of_Angel','Guardian Angel','2','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
+REPLACE INTO `item_db` VALUES ('12313','Protection_Of_Angel','Guardian Angel','2','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill ALL_ANGEL_PROTECT,1;','','');
 REPLACE INTO `item_db` VALUES ('12314','Noive_Box','Noive Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db` VALUES ('12315','Goddess_Bless','Goddess Of Blessing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db` VALUES ('12316','Angel_Bless','Angel Of Blessing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
@@ -4640,7 +4640,7 @@ REPLACE INTO `item_db` VALUES ('12348','Manuk\'s_Faith','Manuk\'s Faith','2','0'
 REPLACE INTO `item_db` VALUES ('12349','Cornus\'_Tears','Cornus\' Tears','2','0','0','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','specialeffect2 EF_POTION_BERSERK; sc_start SC_SPL_MATK,600000,10;','','');
 REPLACE INTO `item_db` VALUES ('12350','Angeling_Potion','Angeling Potion','11','20','10','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','skilleffect AL_BLESSING,0; sc_start SC_BLESSING,120000,5; itemskill AL_ANGELUS,5;','','');
 REPLACE INTO `item_db` VALUES ('12351','Shout_Megaphone','Scream Megaphone','11','20','10','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill MC_LOUD,1;','','');
-REPLACE INTO `item_db` VALUES ('12352','Dun_Tele_Scroll3','Dungeon Teleport Scroll 3','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
+REPLACE INTO `item_db` VALUES ('12352','Dun_Tele_Scroll3','Dungeon Teleport Scroll 3','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\",3;','','');
 REPLACE INTO `item_db` VALUES ('12353','Tiny_Waterbottle','Small Bottle','2','800','400','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_PROPERTYWATER,90000,1;','','');
 REPLACE INTO `item_db` VALUES ('12354','Buche_De_Noel','Buche De Noel','2','2','1','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','specialeffect2 EF_ANGELUS; sc_start SC_INCMHPRATE,600000,3; sc_start SC_INCMSPRATE,600000,3; sc_start SC_INCHITRATE,600000,3; sc_start SC_CRITICALPERCENT,600000,7;','','');
 REPLACE INTO `item_db` VALUES ('12355','Xmas_Gift','Xmas Gift','2','2','1','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12355,1;','','');
@@ -6037,7 +6037,7 @@ REPLACE INTO `item_db` VALUES ('14523','Pill_','Pill','0','0','0','10','0','0','
 REPLACE INTO `item_db` VALUES ('14524','Superb_Fish_Slice','Superb Fish Slice','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','percentheal 100,100;','','');
 REPLACE INTO `item_db` VALUES ('14525','Chewy_Ricecake','Chewy Ricecake','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_PLUSATTACKPOWER,180000,10;','','');
 REPLACE INTO `item_db` VALUES ('14526','Oriental_Pastry','Oriental Pastry','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_PLUSMAGICPOWER,180000,10;','','');
-REPLACE INTO `item_db` VALUES ('14527','Dun_Tele_Scroll1','Dungeon Teleport Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\";','','');
+REPLACE INTO `item_db` VALUES ('14527','Dun_Tele_Scroll1','Dungeon Teleport Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\",1;','','');
 REPLACE INTO `item_db` VALUES ('14528','PVP_Tele_Scroll','PVP Teleport Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db` VALUES ('14529','Greed_Scroll','Greed Scroll','11','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill BS_GREED,1;','','');
 REPLACE INTO `item_db` VALUES ('14530','Flee_30_Scroll','Evasion Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_INCFLEE,1800000,30;','','');
@@ -6091,7 +6091,7 @@ REPLACE INTO `item_db` VALUES ('14577','Vit_Dish05_','Spicy Fried Bao','0','2','
 REPLACE INTO `item_db` VALUES ('14578','Agi_Dish05_','Steamed Bat Wing in Pumpkin','0','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_AGI,1200000,5; percentheal 6,2;','','');
 REPLACE INTO `item_db` VALUES ('14579','Dex_Dish05_','Green Salad','0','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_DEX,1200000,5; percentheal 5,5;','','');
 REPLACE INTO `item_db` VALUES ('14580','Luk_Dish05_','Fried Scorpion Tails','0','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_LUK,1200000,5; percentheal 5,2;','','');
-REPLACE INTO `item_db` VALUES ('14581','Dun_Tele_Scroll2','Dungeon Teleport Scroll II','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\";','','');
+REPLACE INTO `item_db` VALUES ('14581','Dun_Tele_Scroll2','Dungeon Teleport Scroll II','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\",2;','','');
 REPLACE INTO `item_db` VALUES ('14582','WOB_Rune','Yellow Butterfly Wing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashCity\",1;','','');
 REPLACE INTO `item_db` VALUES ('14583','WOB_Schwaltz','Green Butterfly Wing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashCity\",2;','','');
 REPLACE INTO `item_db` VALUES ('14584','WOB_Rachel','Red Butterfly Wing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashCity\",3;','','');
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 50160c5e1..e0fa911e8 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -1472,7 +1472,7 @@ REPLACE INTO `item_db_re` VALUES ('2434','Black_Leather_Boots_','Black Leather B
 REPLACE INTO `item_db_re` VALUES ('2435','Battle_Greave','Battle Greave','5','10','5','0','0','0','15','0','1','577131746','63','2','64','0','80',NULL,'1','0','0','bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1;','','');
 REPLACE INTO `item_db_re` VALUES ('2436','Combat_Boots','Combat Boots','5','10','5','0','0','0','9','0','1','9014044','63','2','64','0','80',NULL,'1','0','0','bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1;','','');
 REPLACE INTO `item_db_re` VALUES ('2437','Battle_Boots','Battle Boots','5','10','5','0','0','0','9','0','1','16777216','1','2','64','0','80',NULL,'1','0','0','bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1;','','');
-REPLACE INTO `item_db_re` VALUES ('2438','Paw_Of_Cat','Paw Of Cat','5','10','5','300','0','0','0','0','0','4294967295','63','2','64','0','0',NULL,'1','0','0','bonus bFlee,5; bonus bAgi,1;','','');
+REPLACE INTO `item_db_re` VALUES ('2438','Paw_Of_Cat','Paw Of Cat','5','10','5','300','0','0','0','0','0','4294967295','63','2','64','0','0',NULL,'1','0','0','bonus bFlee,5; bonus bAgi,1; skill ALL_CATCRY, 1;','','');
 REPLACE INTO `item_db_re` VALUES ('2439','Refresh_Shoes','Refresh Shoes','5','20','10','0','0','0','20','0','0','4294967295','63','2','64','0','0',NULL,'0','0','0','bonus bMaxHPrate,17; bonus bMaxSPrate,8; bonus2 bHPRegenRate,20,10000; bonus2 bSPRegenRate,3,10000;','','');
 REPLACE INTO `item_db_re` VALUES ('2440','Sprint_Shoes','Sprint Shoes','5','20','10','300','0','0','10','0','1','1040256','58','2','64','0','0',NULL,'1','0','0','bonus bAgi,1; bonus bSPrecovRate,5;','','');
 REPLACE INTO `item_db_re` VALUES ('2441','Beach_Sandal','Beach Sandals','5','20','10','200','0','0','0','0','0','4294967295','63','2','64','0','0',NULL,'1','0','0','bonus bStr,1; bonus bInt,1; bonus bAgi,1; bonus2 bSubEle,Ele_Fire,10;','','');
@@ -1769,7 +1769,7 @@ REPLACE INTO `item_db_re` VALUES ('2746','Cold_Heart','Cold Heart','5','20','10'
 REPLACE INTO `item_db_re` VALUES ('2747','Black_Cat','Black Cat','5','20','10','100','0','0','1','0','0','131072','58','2','136','0','80',NULL,'0','0','0','bonus bDex,3;','','');
 REPLACE INTO `item_db_re` VALUES ('2748','Cursed_Star','Cursed Star','5','20','10','200','0','0','0','0','0','526344','58','2','136','0','84',NULL,'0','0','0','bonus bMdef,3; bonus bDex,2; bonus bLuk,-1; bonus2 bHPLossRate,50,10000; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET;','','heal -300,0;');
 REPLACE INTO `item_db_re` VALUES ('2749','Linen_Glove','Linen Glove','5','20','10','120','0','0','1','0','1','1040256','58','2','136','0','90',NULL,'0','0','0','bonus bMdef,1; bonus bAgi,2; bonus bDex,1;','','');
-REPLACE INTO `item_db_re` VALUES ('2750','Summer_Night_Dream','Midsummer Night\'s Dream','5','20','10','0','0','0','0','0','0','4294967295','63','2','136','0','0',NULL,'0','0','0','','','');
+REPLACE INTO `item_db_re` VALUES ('2750','Summer_Night_Dream','Midsummer Night\'s Dream','5','20','10','0','0','0','0','0','0','4294967295','63','2','136','0','0',NULL,'0','0','0','skill ALL_DREAM_SUMMERNIGHT,1;','','');
 REPLACE INTO `item_db_re` VALUES ('2751','Academy_Badge','Academy Of Badge','5','0','0','100','0','0','0','0','0','4294967295','63','2','136','0','0',NULL,'0','0','0','bonus bInt,2; if(BaseLevel<80) { bonus bMaxHP,400; bonus bMaxSP,200; }','','');
 REPLACE INTO `item_db_re` VALUES ('2752','Praxinus_C','Praccsinos','5','2','1','0','0','0','0','0','0','4294967295','63','2','136','0','0',NULL,'0','0','0','bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5;','','');
 REPLACE INTO `item_db_re` VALUES ('2753','Beholder_Ring','Beholder Ring','5','0','0','0','0','0','0','0','0','4294967295','63','2','136','0','0',NULL,'0','0','0','bonus2 bExpAddRace,RC_Formless,15;','','');
@@ -5318,11 +5318,11 @@ REPLACE INTO `item_db_re` VALUES ('12031','Sleepy_Box','Box of Drowsiness','2','
 REPLACE INTO `item_db_re` VALUES ('12032','Box_Of_Storm','Box of Storms','11','1000','500','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill ITEM_ENCHANTARMS,2;','','');
 REPLACE INTO `item_db_re` VALUES ('12033','Box_Of_Sunlight','Box of Sunlight','2','1000','500','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_CLAIRVOYANCE,30000,0;','','');
 REPLACE INTO `item_db_re` VALUES ('12034','Painting_Box','Box of Panting','2','1000','500','200','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','percentheal 0,9; if(rand(1000)<300) sc_start SC_SILENCE,30000,0;','','');
-REPLACE INTO `item_db_re` VALUES ('12035','Lotto_Box01','Lotto Box 01','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7361,7370),1;','','');
-REPLACE INTO `item_db_re` VALUES ('12036','Lotto_Box02','Lotto Box 02','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7371,7380),1;','','');
-REPLACE INTO `item_db_re` VALUES ('12037','Lotto_Box03','Lotto Box 03','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7381,7390),1;','','');
+REPLACE INTO `item_db_re` VALUES ('12035','Lotto_Box01','Lotto Box 01','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12035,1;','','');
+REPLACE INTO `item_db_re` VALUES ('12036','Lotto_Box02','Lotto Box 02','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12036,1;','','');
+REPLACE INTO `item_db_re` VALUES ('12037','Lotto_Box03','Lotto Box 03','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12037,1;','','');
 REPLACE INTO `item_db_re` VALUES ('12038','Lotto_Box04','Lotto Box 04','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12038,1;','','');
-REPLACE INTO `item_db_re` VALUES ('12039','Lotto_Box05','Lotto Box 05','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getitem rand(7542,7546),1;','','');
+REPLACE INTO `item_db_re` VALUES ('12039','Lotto_Box05','Lotto Box 05','2','0','0','20','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12039,1;','','');
 REPLACE INTO `item_db_re` VALUES ('12040','Stone_Of_Intelligence_','Stone of Sage','2','100000','50000','300','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','homevolution;','','');
 REPLACE INTO `item_db_re` VALUES ('12041','Str_Dish01','Fried Grasshopper Legs','0','2000','1000','60','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_STR,1200000,1; percentheal 5,0;','','');
 REPLACE INTO `item_db_re` VALUES ('12042','Str_Dish02','Seasoned Sticky Webfoot','0','4000','2000','500','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_STR,1200000,2; percentheal 5,0;','','');
@@ -5593,7 +5593,7 @@ REPLACE INTO `item_db_re` VALUES ('12309','Bulging_Head','JJangu Magic Powder','
 REPLACE INTO `item_db_re` VALUES ('12310','Spray_Of_Flowers','Spray Of Flowers','2','0','0','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_INCFLEE,600000,10;','','');
 REPLACE INTO `item_db_re` VALUES ('12311','Large_Spray_Of_Flowers','Huge Spray Of Flowers','11','0','0','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill ALL_PARTYFLEE,1;','','');
 REPLACE INTO `item_db_re` VALUES ('12312','Thick_Manual50','Thick Battle Manual','2','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_CASH_PLUSEXP,3600000,50;','','');
-REPLACE INTO `item_db_re` VALUES ('12313','Protection_Of_Angel','Guardian Angel','2','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
+REPLACE INTO `item_db_re` VALUES ('12313','Protection_Of_Angel','Guardian Angel','2','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill ALL_ANGEL_PROTECT,1;','','');
 REPLACE INTO `item_db_re` VALUES ('12314','Noive_Box','Noive Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db_re` VALUES ('12315','Goddess_Bless','Goddess Of Blessing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db_re` VALUES ('12316','Angel_Bless','Angel Of Blessing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
@@ -5632,7 +5632,7 @@ REPLACE INTO `item_db_re` VALUES ('12348','Manuk\'s_Faith','Manuk\'s Faith','2',
 REPLACE INTO `item_db_re` VALUES ('12349','Cornus\'_Tears','Cornus\' Tears','2','0','0','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','specialeffect2 EF_POTION_BERSERK; sc_start SC_SPL_MATK,600000,10;','','');
 REPLACE INTO `item_db_re` VALUES ('12350','Angeling_Potion','Angeling Potion','11','20','10','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','skilleffect AL_BLESSING,0; sc_start SC_BLESSING,120000,5; itemskill AL_ANGELUS,5;','','');
 REPLACE INTO `item_db_re` VALUES ('12351','Shout_Megaphone','Scream Megaphone','11','20','10','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill MC_LOUD,1;','','');
-REPLACE INTO `item_db_re` VALUES ('12352','Dun_Tele_Scroll3','Dungeon Teleport Scroll 3','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
+REPLACE INTO `item_db_re` VALUES ('12352','Dun_Tele_Scroll3','Dungeon Teleport Scroll 3','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\",3;','','');
 REPLACE INTO `item_db_re` VALUES ('12353','Tiny_Waterbottle','Small Bottle','2','800','400','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_PROPERTYWATER,90000,1;','','');
 REPLACE INTO `item_db_re` VALUES ('12354','Buche_De_Noel','Buche De Noel','2','2','1','50','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','specialeffect2 EF_ANGELUS; sc_start SC_INCMHPRATE,600000,3; sc_start SC_INCMSPRATE,600000,3; sc_start SC_INCHITRATE,600000,3; sc_start SC_CRITICALPERCENT,600000,7;','','');
 REPLACE INTO `item_db_re` VALUES ('12355','Xmas_Gift','Xmas Gift','2','2','1','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','getrandgroupitem 12355,1;','','');
@@ -7267,7 +7267,7 @@ REPLACE INTO `item_db_re` VALUES ('14523','Pill_','Pill','0','0','0','10','0','0
 REPLACE INTO `item_db_re` VALUES ('14524','Superb_Fish_Slice','Superb Fish Slice','0','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','percentheal 100,100;','','');
 REPLACE INTO `item_db_re` VALUES ('14525','Chewy_Ricecake','Chewy Ricecake','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_PLUSATTACKPOWER,180000,10;','','');
 REPLACE INTO `item_db_re` VALUES ('14526','Oriental_Pastry','Oriental Pastry','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_PLUSMAGICPOWER,180000,10;','','');
-REPLACE INTO `item_db_re` VALUES ('14527','Dun_Tele_Scroll1','Dungeon Teleport Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\";','','');
+REPLACE INTO `item_db_re` VALUES ('14527','Dun_Tele_Scroll1','Dungeon Teleport Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\",1;','','');
 REPLACE INTO `item_db_re` VALUES ('14528','PVP_Tele_Scroll','PVP Teleport Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db_re` VALUES ('14529','Greed_Scroll','Greed Scroll','11','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill BS_GREED,1;','','');
 REPLACE INTO `item_db_re` VALUES ('14530','Flee_30_Scroll','Evasion Scroll','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_INCFLEE,1800000,30;','','');
@@ -7321,7 +7321,7 @@ REPLACE INTO `item_db_re` VALUES ('14577','Vit_Dish05_','Spicy Fried Bao','0','2
 REPLACE INTO `item_db_re` VALUES ('14578','Agi_Dish05_','Steamed Bat Wing in Pumpkin','0','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_AGI,1200000,5; percentheal 6,2;','','');
 REPLACE INTO `item_db_re` VALUES ('14579','Dex_Dish05_','Green Salad','0','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_DEX,1200000,5; percentheal 5,5;','','');
 REPLACE INTO `item_db_re` VALUES ('14580','Luk_Dish05_','Fried Scorpion Tails','0','2','1','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','sc_start SC_FOOD_LUK,1200000,5; percentheal 5,2;','','');
-REPLACE INTO `item_db_re` VALUES ('14581','Dun_Tele_Scroll2','Dungeon Teleport Scroll II','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\";','','');
+REPLACE INTO `item_db_re` VALUES ('14581','Dun_Tele_Scroll2','Dungeon Teleport Scroll II','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashDungeon\",2;','','');
 REPLACE INTO `item_db_re` VALUES ('14582','WOB_Rune','Yellow Butterfly Wing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashCity\",1;','','');
 REPLACE INTO `item_db_re` VALUES ('14583','WOB_Schwaltz','Green Butterfly Wing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashCity\",2;','','');
 REPLACE INTO `item_db_re` VALUES ('14584','WOB_Rachel','Red Butterfly Wing','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','callfunc \"F_CashCity\",3;','','');
diff --git a/src/map/pc.c b/src/map/pc.c
index 9a0760d61..fc1d56b6d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4183,6 +4183,11 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 		return 0; // You cannot use this item while sitting.
 	}
 
+	if (sd->state.storage_flag && item->type != IT_CASH) {
+		clif->colormes(sd->fd, COLOR_RED, msg_txt(1475));
+		return 0; // You cannot use this item while storage is open.
+	}
+
 	switch( nameid ) { // TODO: Is there no better way to handle this, other than hardcoding item IDs?
 		case ITEMID_ANODYNE:
 			if( map_flag_gvg2(sd->bl.m) )