Minor additions and fixes.

* Added 'bMaxWeight' item bonus. (credits: AnnieRuru, tid:82366, bugreport:8541)
http://rathena.org/board/tracker/issue-8541-set-maxweight-item-script-error/
* Added an exception for delayed consumption items (type 11) to 'allow_consume_restricted_item'. Needs confirmation. (bugreport:8528)
http://rathena.org/board/tracker/issue-8528-item-noequiptxt-will-disappear-the-item-ex-reins-of-mount/
* Added missing Velum Claw (1832) to WoE Weapon Supply Box (12675). (credits: Inzanity)

Signed-off-by: Euphy <euphy.raliel@rathena.org>

db/const.txt

@@ -647,6 +647,8 @@ bExpAddClass	2069
 bAddClassDropItem	2070
 bAddClassDropItemGroup	2071
 
+bAddMaxWeight	2072
+
 EQI_HEAD_TOP	1
 EQI_ARMOR	2
 EQI_HAND_L	3
@@ -1145,6 +1147,7 @@ IG_Je_Un_Scroll	384
 IG_Yong_Kwang_Scroll	385
 IG_HALLOWEEN_G_BOX	386
 IG_Solo_Christmas_Gift	387
+IG_Sg_Weapon_Supply_Box	388
 
 SC_ALL	-1
 SC_STONE	0

db/re/item_db.txt

@@ -6182,7 +6182,7 @@
 12672,Start_New_Box,Start New Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 617,2; getitem 12263,2; getitem 12329,3; getitem 12330,2; },{},{}
 12673,Lucky_Egg_C10,Lucky Egg C10,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Lucky_Egg_C10); },{},{}
 12674,God_Material_Box,God Material Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12675,Sg_Weapon_Supply_Box,WoE Weapon Supply Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem callfunc("F_Rand",18113,2016,1586,1395,21001,18114,13072,16021,1492,1587,1396,1293,21002,1294,1436,16020,1775,1776),1; },{},{}
+12675,Sg_Weapon_Supply_Box,WoE Weapon Supply Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Sg_Weapon_Supply_Box); },{},{}
 12676,Sg_Violet_Potion_Box,Siege Violet Potion Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 11547,50; },{},{}
 12677,Siege_Arrow_Quiver_S,Siege Arrow Quiver S,2,2,,100,,,,,0xFFFFFFFF,63,2,,,130,,,{ getitem 1776,200; },{},{}
 12678,Siege_Arrow_Quiver_A,Siege Arrow Quiver A,2,2,,100,,,,,0xFFFFFFFF,63,2,,,95,,,{ getitem 1775,200; },{},{}

db/re/item_package.txt

@@ -3124,3 +3124,24 @@ IG_HALLOWEEN_G_BOX,Seed_Of_Yggdrasil,1,5,1
 IG_HALLOWEEN_G_BOX,Old_Blue_Box,1,1,1
 IG_HALLOWEEN_G_BOX,Old_Card_Album,1,1,1
 IG_HALLOWEEN_G_BOX,Old_Violet_Box,1,1,1
+
+// Based on available information - may be inaccurate
+IG_Sg_Weapon_Supply_Box,Velum_Arbalest,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Arc_Wand,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Bible,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Buster,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Claw,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Claymore,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_CrossBow,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Damascus,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Flail,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Glaive,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Encyclopedia,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Guillotine,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Jamadhar,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Katzbalger,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Scare,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Spear,1,1,1
+IG_Sg_Weapon_Supply_Box,Velum_Stunner,1,1,1
+IG_Sg_Weapon_Supply_Box,Siege_Arrow_A,1,1,1
+IG_Sg_Weapon_Supply_Box,Siege_Arrow_S,1,1,1

doc/item_bonus.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20140110
+//= 20140124
 //===== Description: =========================================
 //= List of script instructions used in item bonuses.
 //============================================================
@@ -121,6 +121,7 @@ bonus bSpeedAddRate,n;			Movement speed + n%
 bonus bAspd,n;        			Attack speed + n
 bonus bAspdRate,n;    			Attack speed + n%
 bonus bAtkRange,n;    			Attack range + n
+bonus bAddMaxWeight,n;			MaxWeight + n (in units of 0.1)
 
 =======================
 | 2. Extended Bonuses |

sql-files/item_db_re.sql

@@ -6213,7 +6213,7 @@ REPLACE INTO `item_db_re` VALUES (12671,'99lv_Battle_Manual','99lv Battle Manual
 REPLACE INTO `item_db_re` VALUES (12672,'Start_New_Box','Start New Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 617,2; getitem 12263,2; getitem 12329,3; getitem 12330,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12673,'Lucky_Egg_C10','Lucky Egg C10',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Lucky_Egg_C10);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12674,'God_Material_Box','God Material Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12675,'Sg_Weapon_Supply_Box','WoE Weapon Supply Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",18113,2016,1586,1395,21001,18114,13072,16021,1492,1587,1396,1293,21002,1294,1436,16020,1775,1776),1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12675,'Sg_Weapon_Supply_Box','WoE Weapon Supply Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Sg_Weapon_Supply_Box);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12676,'Sg_Violet_Potion_Box','Siege Violet Potion Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 11547,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12677,'Siege_Arrow_Quiver_S','Siege Arrow Quiver S',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'130',NULL,NULL,'getitem 1776,200;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12678,'Siege_Arrow_Quiver_A','Siege Arrow Quiver A',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'95',NULL,NULL,'getitem 1775,200;',NULL,NULL);

src/map/map.h

@@ -472,7 +472,7 @@ enum _sp {
 
 	SP_IGNORE_DEF_CLASS, SP_DEF_RATIO_ATK_CLASS, SP_ADDCLASS, SP_SUBCLASS, SP_MAGIC_ADDCLASS, //2062-2066
 	SP_WEAPON_COMA_CLASS, SP_IGNORE_MDEF_CLASS_RATE, SP_EXP_ADDCLASS, SP_ADD_CLASS_DROP_ITEM, //2067-2070
-	SP_ADD_CLASS_DROP_ITEMGROUP // 2071
+	SP_ADD_CLASS_DROP_ITEMGROUP, SP_ADDMAXWEIGHT  // 2071-2072
 };
 
 enum _look {

src/map/pc.c

@@ -2741,6 +2741,10 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
 				sd->bonus.add_varcast += val;
 			break;
 	#endif
+		case SP_ADDMAXWEIGHT:
+			if (sd->state.lr_flag != 2)
+				sd->max_weight += val;
+			break;
 		default:
 			ShowWarning("pc_bonus: unknown type %d %d !\n",type,val);
 			break;
@@ -4522,7 +4526,7 @@ int pc_useitem(struct map_session_data *sd,int n)
 
 	/* on restricted maps the item is consumed but the effect is not used */
 	if (!pc_has_permission(sd,PC_PERM_ITEM_UNCONDITIONAL) && itemdb_isNoEquip(id,sd->bl.m)) {
-		if( battle_config.allow_consume_restricted_item ) {
+		if( battle_config.allow_consume_restricted_item && !id->flag.delay_consume ) { //need confirmation for delayed consumption items
 			clif_useitemack(sd,n,item.amount-1,true);
 			pc_delitem(sd,n,1,1,0,LOG_TYPE_CONSUME);
 		}