Merge pull request #236 from missxantara/master

Item database bug fixes.

6 files changed, 46 insertions, 22 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/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) )