1 files changed, 271 insertions, 92 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 5843ac292..c6f1c9a12 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5962,6 +5962,19 @@ static BUILDIN(next)
 	return true;
 }
 
+/// Clears the NPC dialog and continues the script without press next button.
+///
+/// mesclear();
+static BUILDIN(mesclear)
+{
+	struct map_session_data *sd = script->rid2sd(st);
+
+	if (sd != NULL)
+		clif->scriptclear(sd, st->oid);
+
+	return true;
+}
+
 /// Ends the script and displays the button 'close' on the npc dialog.
 /// The dialog is closed when the button is pressed.
 ///
@@ -6948,59 +6961,60 @@ static BUILDIN(jobname)
 	return true;
 }
 
-/// Get input from the player.
-/// For numeric inputs the value is capped to the range [min,max]. Returns 1 if
-/// the value was higher than 'max', -1 if lower than 'min' and 0 otherwise.
-/// For string inputs it returns 1 if the string was longer than 'max', -1 is
-/// shorter than 'min' and 0 otherwise.
-///
-/// input(<var>{,<min>{,<max>}}) -> <int>
+/*
+ * Get input from the player.
+ * For numeric inputs the value is capped to the range [min,max]. Returns 1 if
+ * the value was higher than 'max', -1 if lower than 'min' and 0 otherwise.
+ * For string inputs it returns 1 if the string was longer than 'max', -1 is
+ * shorter than 'min' and 0 otherwise.
+ *
+ * input(<var>{,<min>{,<max>}}) -> <int>
+ */
 static BUILDIN(input)
 {
-	struct script_data* data;
-	int64 uid;
-	const char* name;
-	int min;
-	int max;
 	struct map_session_data *sd = script->rid2sd(st);
 	if (sd == NULL)
 		return true;
 
-	data = script_getdata(st,2);
-	if( !data_isreference(data) ) {
+	struct script_data *data = script_getdata(st, 2);
+	if (!data_isreference(data)) {
 		ShowError("script:input: not a variable\n");
 		script->reportdata(data);
 		st->state = END;
 		return false;
 	}
-	uid = reference_getuid(data);
-	name = reference_getname(data);
-	min = (script_hasdata(st,3) ? script_getnum(st,3) : script->config.input_min_value);
-	max = (script_hasdata(st,4) ? script_getnum(st,4) : script->config.input_max_value);
+
+	int64 uid  = reference_getuid(data);
+	const char *name = reference_getname(data);
+	int min = (script_hasdata(st, 3) ? script_getnum(st, 3) : script->config.input_min_value);
+	int max = (script_hasdata(st, 4) ? script_getnum(st, 4) : script->config.input_max_value);
 
 #ifdef SECURE_NPCTIMEOUT
 	sd->npc_idle_type = NPCT_WAIT;
 #endif
 
-	if( !sd->state.menu_or_input ) {
+	if (!sd->state.menu_or_input) {
 		// first invocation, display npc input box
 		sd->state.menu_or_input = 1;
 		st->state = RERUNLINE;
-		if( is_string_variable(name) )
-			clif->scriptinputstr(sd,st->oid);
-		else
-			clif->scriptinput(sd,st->oid);
+		if (is_string_variable(name)) {
+			clif->scriptinputstr(sd, st->oid);
+		} else {
+			sd->npc_amount_min = min;
+			sd->npc_amount_max = max;
+			clif->scriptinput(sd, st->oid);
+		}
 	} else {
 		// take received text/value and store it in the designated variable
 		sd->state.menu_or_input = 0;
 		if (is_string_variable(name)) {
 			int len = (int)strlen(sd->npc_str);
-			script->set_reg(st, sd, uid, name, sd->npc_str, script_getref(st,2));
+			script->set_reg(st, sd, uid, name, sd->npc_str, script_getref(st, 2));
 			script_pushint(st, (len > max ? 1 : len < min ? -1 : 0));
 		} else {
 			int amount = sd->npc_amount;
 			script->set_reg(st, sd, uid, name, (const void *)h64BPTRSIZE(cap_value(amount,min,max)), script_getref(st,2));
-			script_pushint(st, (amount > max ? 1 : amount < min ? -1 : 0));
+			script_pushint(st, sd->npc_input_capped_range);
 		}
 		st->state = RUN;
 	}
@@ -8617,6 +8631,48 @@ static BUILDIN(delitem2)
 	return false;
 }
 
+/**
+ * Deletes item at given index.
+ * delitem(<index>{, <amount{, <account id>}});
+ */
+static BUILDIN(delitemidx)
+{
+	struct map_session_data *sd;
+
+	if (script_hasdata(st, 4)) {
+		if ((sd = script->id2sd(st, script_getnum(st, 4))) == NULL) {
+			st->state = END;
+			return true;
+		}
+	} else {
+		if ((sd = script->rid2sd(st)) == NULL)
+			return true;
+	}
+
+	int i = script_getnum(st, 2);
+	if (i < 0 || i >= sd->status.inventorySize) {
+		ShowError("buildin_delitemidx: Index (%d) should be from 0-%d.\n", i, sd->status.inventorySize - 1);
+		st->state = END;
+		return false;
+	}
+
+	if (itemdb->exists(sd->status.inventory[i].nameid) == NULL)
+		ShowWarning("buildin_delitemidx: Deleting invalid Item ID (%d).\n", sd->status.inventory[i].nameid);
+
+	int amount = 0;
+	if (script_hasdata(st, 3)) {
+		if ((amount = script_getnum(st, 3)) > sd->status.inventory[i].amount)
+			amount = sd->status.inventory[i].amount;
+	} else {
+		amount = sd->status.inventory[i].amount;
+	}
+
+	if (amount > 0)
+		script->buildin_delitem_delete(sd, i, &amount, true);
+
+	return true;
+}
+
 /*==========================================
  * Enables/Disables use of items while in an NPC [Skotlex]
  *------------------------------------------*/
@@ -8987,6 +9043,63 @@ static BUILDIN(getguildmember)
 	return true;
 }
 
+/**
+ * getguildonline(<Guild ID>{, type})
+ * Returns amount of guild members online.
+**/
+
+enum script_getguildonline_types {
+	GUILD_ONLINE_ALL = 0,
+	GUILD_ONLINE_VENDOR,
+	GUILD_ONLINE_NO_VENDOR
+};
+
+BUILDIN(getguildonline)
+{
+	struct guild *g;
+	int guild_id = script_getnum(st, 2);
+	int type = GUILD_ONLINE_ALL, j = 0;
+
+	if ((g = guild->search(guild_id)) == NULL) {
+		script_pushint(st, -1);
+		return true;
+	}
+
+	if (script_hasdata(st, 3)) {
+		type = script_getnum(st, 3);
+
+		if (type < GUILD_ONLINE_ALL || type > GUILD_ONLINE_NO_VENDOR) {
+			ShowWarning("buildin_getguildonline: Invalid type specified. Defaulting to GUILD_ONLINE_ALL.\n");
+			type = GUILD_ONLINE_ALL;
+		}
+	}
+
+	struct map_session_data *sd;
+	for (int i = 0; i < MAX_GUILD; i++) {
+		if (g->member[i].online && (sd = g->member[i].sd) != NULL) {
+			switch (type) {
+			case GUILD_ONLINE_VENDOR:
+				if (sd->state.vending > 0)
+					j++;
+				break;
+
+			case GUILD_ONLINE_NO_VENDOR:
+				if (sd->state.vending == 0)
+					j++;
+				break;
+
+			default:
+				j++;
+				break;
+			}
+		}
+	}
+
+	script_pushint(st, j);
+
+	return true;
+}
+
 /*==========================================
  * Get char string information by type :
  * Return by @type :
@@ -10653,6 +10766,12 @@ static BUILDIN(openstorage)
 		return false;
 	}
 
+	// Mapflag preventing from openstorage here
+	if (!pc_has_permission(sd, PC_PERM_BYPASS_NOSTORAGE) && (map->list[sd->bl.m].flag.nostorage & 2)) {
+		script_pushint(st, 0);
+		return true;
+	}
+
 	storage->open(sd);
 
 	script_pushint(st, 1); // success flag.
@@ -10666,6 +10785,12 @@ static BUILDIN(guildopenstorage)
 	if (sd == NULL)
 		return true;
 
+	// Mapflag preventing from openstorage here
+	if (!pc_has_permission(sd, PC_PERM_BYPASS_NOSTORAGE) && (map->list[sd->bl.m].flag.nogstorage & 2)) {
+		script_pushint(st, 1);
+		return true;
+	}
+
 	ret = gstorage->open(sd);
 	script_pushint(st,ret);
 	return true;
@@ -11044,10 +11169,16 @@ static BUILDIN(killmonster)
 	int16 m,allflag=0;
 	mapname=script_getstr(st,2);
 	event=script_getstr(st,3);
-	if(strcmp(event,"All")==0)
+
+	if (strcmpi(event, "all") == 0) {
+		if (strcmp(event, "all") != 0) {
+			ShowWarning("buildin_killmonster: \"%s\" deprecated! Please use \"all\" instead.\n", event);
+			script->reportsrc(st);
+		}
 		allflag = 1;
-	else
+	} else {
 		script->check_event(st, event);
+	}
 
 	if( (m=map->mapname2mapid(mapname))<0 )
 		return true;
@@ -13052,7 +13183,8 @@ enum mapinfo_info {
 	MAPINFO_ID,
 	MAPINFO_SIZE_X,
 	MAPINFO_SIZE_Y,
-	MAPINFO_ZONE
+	MAPINFO_ZONE,
+	MAPINFO_NPC_COUNT
 };
 
 static BUILDIN(getmapinfo)
@@ -13077,7 +13209,7 @@ static BUILDIN(getmapinfo)
 		}
 
 		if (bl == NULL) {
-			ShowError("script:getmapinfo: map not supplied and NPC/PC not attached!\n");
+			ShowError("buildin_getmapinfo: map not supplied and NPC/PC not attached!\n");
 			script_pushint(st, -3);
 			return false;
 		}
@@ -13108,8 +13240,11 @@ static BUILDIN(getmapinfo)
 	case MAPINFO_ZONE:
 		script_pushstrcopy(st, map->list[m].zone->name);
 		break;
+	case MAPINFO_NPC_COUNT:
+		script_pushint(st, map->list[m].npc_num);
+		break;
 	default:
-		ShowError("script:getmapinfo: unknown option in second argument (%u).\n", mode);
+		ShowError("buildin_getmapinfo: unknown option in second argument (%u).\n", mode);
 		script_pushint(st, -2);
 		return false;
 	}
@@ -13183,6 +13318,8 @@ static BUILDIN(getmapflag)
 			case MF_NOVIEWID:           script_pushint(st, map->list[m].flag.noviewid); break;
 			case MF_PAIRSHIP_STARTABLE: script_pushint(st, map->list[m].flag.pairship_startable); break;
 			case MF_PAIRSHIP_ENDABLE:   script_pushint(st, map->list[m].flag.pairship_endable); break;
+			case MF_NOSTORAGE:          script_pushint(st, map->list[m].flag.nostorage); break;
+			case MF_NOGSTORAGE:         script_pushint(st, map->list[m].flag.nogstorage); break;
 		}
 	}
 
@@ -13313,6 +13450,8 @@ static BUILDIN(setmapflag)
 			case MF_NOVIEWID:           map->list[m].flag.noviewid = (val <= 0) ? EQP_NONE : val; break;
 			case MF_PAIRSHIP_STARTABLE: map->list[m].flag.pairship_startable = 1; break;
 			case MF_PAIRSHIP_ENDABLE:   map->list[m].flag.pairship_endable = 1; break;
+			case MF_NOSTORAGE:          map->list[m].flag.nostorage = cap_value(val, 0, 3); break;
+			case MF_NOGSTORAGE:         map->list[m].flag.nogstorage = cap_value(val, 0, 3); break;
 		}
 	}
 
@@ -13404,6 +13543,8 @@ static BUILDIN(removemapflag)
 			case MF_NOCASHSHOP:         map->list[m].flag.nocashshop = 0; break;
 			case MF_NOAUTOLOOT:         map->list[m].flag.noautoloot = 0; break;
 			case MF_NOVIEWID:           map->list[m].flag.noviewid = EQP_NONE; break;
+			case MF_NOSTORAGE:          map->list[m].flag.nostorage = 0; break;
+			case MF_NOGSTORAGE:         map->list[m].flag.nogstorage = 0; break;
 		}
 	}
 
@@ -13915,7 +14056,8 @@ static BUILDIN(failedremovecards)
 		if (sd->status.inventory[i].card[c] > 0 && itemdb_type(sd->status.inventory[i].card[c]) == IT_CARD) {
 			cardflag = 1;
 
-			sd->status.inventory[i].card[c] = 0;
+			if (typefail == 1)
+				sd->status.inventory[i].card[c] = 0;
 
 			if (typefail == 2) { // add cards to inventory, clear
 				int flag;
@@ -15918,37 +16060,41 @@ static BUILDIN(npctalk)
 // change npc walkspeed [Valaris]
 static BUILDIN(npcspeed)
 {
-	struct npc_data* nd;
-	int speed;
-
-	speed = script_getnum(st,2);
-	nd = map->id2nd(st->oid);
+	struct npc_data *nd = map->id2nd(st->oid);
+	int speed = script_getnum(st, 2);
 
 	if (nd != NULL) {
 		unit->bl2ud2(&nd->bl); // ensure nd->ud is safe to edit
+		if (nd->ud == NULL) {
+			ShowWarning("buildin_npcspeed: floating NPC don't have unit data.\n");
+			return false;
+		}
 		nd->speed = speed;
 		nd->ud->state.speed_changed = 1;
 	}
 
 	return true;
 }
+
 // make an npc walk to a position [Valaris]
 static BUILDIN(npcwalkto)
 {
 	struct npc_data *nd = map->id2nd(st->oid);
-	int x=0,y=0;
-
-	x=script_getnum(st,2);
-	y=script_getnum(st,3);
+	int x = script_getnum(st, 2);
+	int y = script_getnum(st, 3);
 
 	if (nd != NULL) {
 		unit->bl2ud2(&nd->bl); // ensure nd->ud is safe to edit
+		if (nd->ud == NULL) {
+			ShowWarning("buildin_npcwalkto: floating NPC don't have unit data.\n");
+			return false;
+		}
 		if (!nd->status.hp) {
 			status_calc_npc(nd, SCO_FIRST);
 		} else {
 			status_calc_npc(nd, SCO_NONE);
 		}
-		unit->walktoxy(&nd->bl,x,y,0);
+		unit->walktoxy(&nd->bl, x, y, 0);
 	}
 
 	return true;
@@ -15960,6 +16106,10 @@ static BUILDIN(npcstop)
 
 	if (nd != NULL) {
 		unit->bl2ud2(&nd->bl); // ensure nd->ud is safe to edit
+		if (nd->ud == NULL) {
+			ShowWarning("buildin_npcstop: floating NPC don't have unit data.\n");
+			return false;
+		}
 		unit->stop_walking(&nd->bl, STOPWALKING_FLAG_FIXPOS|STOPWALKING_FLAG_NEXTCELL);
 	}
 
@@ -17778,6 +17928,17 @@ static BUILDIN(max)
 	return true;
 }
 
+static BUILDIN(cap_value)
+{
+	int value = script_getnum(st, 2);
+	int min = script_getnum(st, 3);
+	int max = script_getnum(st, 4);
+
+	script_pushint(st, (int)cap_value(value, min, max));
+
+	return true;
+}
+
 static BUILDIN(md5)
 {
 	const char *tmpstr;
@@ -20443,24 +20604,28 @@ static BUILDIN(getunittitle)
 /// unitwalk(<unit_id>,<target_id>) -> <bool>
 static BUILDIN(unitwalk)
 {
-	struct block_list* bl;
+	struct block_list *bl = map->id2bl(script_getnum(st, 2));
 
-	bl = map->id2bl(script_getnum(st,2));
-	if( bl == NULL ) {
+	if (bl == NULL) {
 		script_pushint(st, 0);
 		return true;
 	}
 
-	if( bl->type == BL_NPC ) {
-		unit->bl2ud2(bl); // ensure the ((struct npc_data*)bl)->ud is safe to edit
+	if (bl->type == BL_NPC) {
+		struct unit_data *ud = unit->bl2ud2(bl); // ensure the ((struct npc_data*)bl)->ud is safe to edit
+		if (ud == NULL) {
+			ShowWarning("buildin_unitwalk: floating NPC don't have unit data.\n");
+			return false;
+		}
 	}
-	if( script_hasdata(st,4) ) {
-		int x = script_getnum(st,3);
-		int y = script_getnum(st,4);
-		script_pushint(st, unit->walktoxy(bl,x,y,0));// We'll use harder calculations.
-	} else {
-		int target_id = script_getnum(st,3);
-		script_pushint(st, unit->walktobl(bl,map->id2bl(target_id),1,1));
+	if (script_hasdata(st, 4)) {
+		int x = script_getnum(st, 3);
+		int y = script_getnum(st, 4);
+		script_pushint(st, unit->walktoxy(bl, x, y, 0));// We'll use harder calculations.
+	}
+	else {
+		int target_id = script_getnum(st, 3);
+		script_pushint(st, unit->walktobl(bl, map->id2bl(target_id), 1, 1));
 	}
 
 	return true;
@@ -20484,32 +20649,34 @@ static BUILDIN(unitkill)
 /// unitwarp(<unit_id>,"<map name>",<x>,<y>) -> <bool>
 static BUILDIN(unitwarp)
 {
-	int unit_id;
+	int unit_id = script_getnum(st, 2);
+	const char *mapname = script_getstr(st, 3);
+	short x = (short)script_getnum(st, 4);
+	short y = (short)script_getnum(st, 5);
 	int mapid;
-	short x;
-	short y;
-	struct block_list* bl;
-	const char *mapname;
-
-	unit_id = script_getnum(st,2);
-	mapname = script_getstr(st, 3);
-	x = (short)script_getnum(st,4);
-	y = (short)script_getnum(st,5);
+	struct block_list *bl;
 
 	if (!unit_id) //Warp the script's runner
 		bl = map->id2bl(st->rid);
 	else
 		bl = map->id2bl(unit_id);
 
-	if( strcmp(mapname,"this") == 0 )
-		mapid = bl?bl->m:-1;
+	if (strcmp(mapname, "this") == 0)
+		mapid = bl ? bl->m : -1;
 	else
 		mapid = map->mapname2mapid(mapname);
 
-	if( mapid >= 0 && bl != NULL ) {
-		unit->bl2ud2(bl); // ensure ((struct npc_data *)bl)->ud is safe to edit
-		script_pushint(st, unit->warp(bl,mapid,x,y,CLR_OUTSIGHT));
-	} else {
+	if (mapid >= 0 && bl != NULL) {
+		struct unit_data *ud = unit->bl2ud2(bl); // ensure ((struct npc_data *)bl)->ud is safe to edit
+		if (bl->type == BL_NPC) {
+			if (ud == NULL) {
+				ShowWarning("buildin_unitwarp: floating NPC don't have unit data.\n");
+				return false;
+			}
+		}
+		script_pushint(st, unit->warp(bl, mapid, x, y, CLR_OUTSIGHT));
+	}
+	else {
 		script_pushint(st, 0);
 	}
 
@@ -20580,17 +20747,19 @@ static BUILDIN(unitattack)
 /// unitstop <unit_id>;
 static BUILDIN(unitstop)
 {
-	int unit_id;
-	struct block_list* bl;
-
-	unit_id = script_getnum(st,2);
+	struct block_list *bl = map->id2bl(script_getnum(st, 2));
 
-	bl = map->id2bl(unit_id);
-	if( bl != NULL ) {
-		unit->bl2ud2(bl); // ensure ((struct npc_data *)bl)->ud is safe to edit
+	if (bl != NULL) {
+		struct unit_data *ud = unit->bl2ud2(bl); // ensure ((struct npc_data *)bl)->ud is safe to edit
+		if (bl->type == BL_NPC) {
+			if (ud == NULL) {
+				ShowWarning("buildin_unitstop: floating NPC don't have unit data.\n");
+				return false;
+			}
+		}
 		unit->stop_attack(bl);
 		unit->stop_walking(bl, STOPWALKING_FLAG_NEXTCELL);
-		if( bl->type == BL_MOB )
+		if (bl->type == BL_MOB)
 			BL_UCAST(BL_MOB, bl)->target_id = 0;
 	}
 
@@ -21256,7 +21425,6 @@ static BUILDIN(questinfo)
 		return false;
 	}
 
-	qi.nd = nd;
 	qi.icon = quest->questinfo_validate_icon(icon);
 	if (script_hasdata(st, 3)) {
 		int color = script_getnum(st, 3);
@@ -21268,7 +21436,9 @@ static BUILDIN(questinfo)
 		qi.color = (unsigned char)color;
 	}
 
-	map->add_questinfo(nd->bl.m, &qi);
+	VECTOR_ENSURE(nd->qi_data, 1, 1);
+	VECTOR_PUSH(nd->qi_data, qi);
+	map->add_questinfo(nd->bl.m, nd);
 	return true;
 }
 
@@ -21286,15 +21456,12 @@ static BUILDIN(setquestinfo)
 		return false;
 	}
 
-	qi = &VECTOR_LAST(map->list[nd->bl.m].qi_data);
+	qi = &VECTOR_LAST(nd->qi_data);
 	if (qi == NULL) {
 		ShowWarning("buildin_setquestinfo: no valide questinfo data has been found for this npc.\n");
 		return false;
 	}
-	if (qi->nd != nd) {
-		ShowWarning("buildin_setquestinfo: invalid usage, setquestinfo must be used only after questinfo.\n");
-		return false;
-	}
+
 	switch (type) {
 	case QINFO_JOB:
 	{
@@ -25233,7 +25400,7 @@ static BUILDIN(enchantitem)
 }
 
 // send ack to inventory expand request
-static BUILDIN(expandInventoryAck)
+static BUILDIN(expandinventoryack)
 {
 	struct map_session_data *sd = script_rid2sd(st);
 	if (sd == NULL)
@@ -25247,7 +25414,7 @@ static BUILDIN(expandInventoryAck)
 }
 
 // send final ack to inventory expand request
-static BUILDIN(expandInventoryResult)
+static BUILDIN(expandinventoryresult)
 {
 	struct map_session_data *sd = script_rid2sd(st);
 	if (sd == NULL)
@@ -25257,7 +25424,7 @@ static BUILDIN(expandInventoryResult)
 }
 
 // adjust player inventory size to given value positive or negative
-static BUILDIN(expandInventory)
+static BUILDIN(expandinventory)
 {
 	struct map_session_data *sd = script_rid2sd(st);
 	if (sd == NULL)
@@ -25267,7 +25434,7 @@ static BUILDIN(expandInventory)
 }
 
 // return current player inventory size
-static BUILDIN(getInventorySize)
+static BUILDIN(getinventorysize)
 {
 	struct map_session_data *sd = script_rid2sd(st);
 	if (sd == NULL)
@@ -25469,6 +25636,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(mes, "?"),
 		BUILDIN_DEF(mesf, "s*"),
 		BUILDIN_DEF(next,""),
+		BUILDIN_DEF(mesclear,""),
 		BUILDIN_DEF(close,""),
 		BUILDIN_DEF(close2,""),
 		BUILDIN_DEF(menu,"sl*"),
@@ -25507,6 +25675,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(makeitem2,"viiiiiiii????"),
 		BUILDIN_DEF(delitem,"vi?"),
 		BUILDIN_DEF(delitem2,"viiiiiiii?"),
+		BUILDIN_DEF(delitemidx, "i??"),
 		BUILDIN_DEF2(enableitemuse,"enable_items",""),
 		BUILDIN_DEF2(disableitemuse,"disable_items",""),
 		BUILDIN_DEF(cutin,"si"),
@@ -25531,6 +25700,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(getguildmaster,"i"),
 		BUILDIN_DEF(getguildmasterid,"i"),
 		BUILDIN_DEF(getguildmember,"i?"),
+		BUILDIN_DEF(getguildonline, "i?"),
 		BUILDIN_DEF(strcharinfo,"i??"),
 		BUILDIN_DEF(strnpcinfo,"i??"),
 		BUILDIN_DEF(charid2rid,"i"),
@@ -25797,6 +25967,7 @@ static void script_parse_builtin(void)
 		// <--- List of mathematics commands
 		BUILDIN_DEF(min, "i*"),
 		BUILDIN_DEF(max, "i*"),
+		BUILDIN_DEF(cap_value, "iii"),
 		BUILDIN_DEF(md5,"s"),
 		BUILDIN_DEF(swap,"rr"),
 		// [zBuffer] List of dynamic var commands --->
@@ -26052,10 +26223,10 @@ static void script_parse_builtin(void)
 
 		BUILDIN_DEF(itempreview, "i"),
 		BUILDIN_DEF(enchantitem, "iii"),
-		BUILDIN_DEF(expandInventoryAck, "i?"),
-		BUILDIN_DEF(expandInventoryResult, "i"),
-		BUILDIN_DEF(expandInventory, "i"),
-		BUILDIN_DEF(getInventorySize, ""),
+		BUILDIN_DEF(expandinventoryack, "i?"),
+		BUILDIN_DEF(expandinventoryresult, "i"),
+		BUILDIN_DEF(expandinventory, "i"),
+		BUILDIN_DEF(getinventorysize, ""),
 
 		BUILDIN_DEF(closeroulette, ""),
 		BUILDIN_DEF(openrefineryui, ""),
@@ -26111,6 +26282,7 @@ static void script_hardcoded_constants(void)
 	script->set_constant("MAX_MENU_LENGTH", MAX_MENU_LENGTH, false, false);
 	script->set_constant("MOB_CLONE_START", MOB_CLONE_START, false, false);
 	script->set_constant("MOB_CLONE_END", MOB_CLONE_END, false, false);
+	script->set_constant("MAX_NPC_PER_MAP", MAX_NPC_PER_MAP, false, false);
 
 	script->constdb_comment("status options");
 	script->set_constant("Option_Nothing",OPTION_NOTHING,false, false);
@@ -26290,6 +26462,7 @@ static void script_hardcoded_constants(void)
 	script->set_constant("PERM_DISABLE_STORE", PC_PERM_DISABLE_STORE, false, false);
 	script->set_constant("PERM_DISABLE_EXP", PC_PERM_DISABLE_EXP, false, false);
 	script->set_constant("PERM_DISABLE_SKILL_USAGE", PC_PERM_DISABLE_SKILL_USAGE, false, false);
+	script->set_constant("PERM_BYPASS_NOSTORAGE", PC_PERM_BYPASS_NOSTORAGE, false, false);
 
 	script->constdb_comment("Data types");
 	script->set_constant("DATATYPE_NIL", DATATYPE_NIL, false, false);
@@ -26361,6 +26534,7 @@ static void script_hardcoded_constants(void)
 	script->set_constant("MAPINFO_SIZE_X", MAPINFO_SIZE_X, false, false);
 	script->set_constant("MAPINFO_SIZE_Y", MAPINFO_SIZE_Y, false, false);
 	script->set_constant("MAPINFO_ZONE", MAPINFO_ZONE, false, false);
+	script->set_constant("MAPINFO_NPC_COUNT", MAPINFO_NPC_COUNT, false, false);
 
 	script->constdb_comment("consolemes options");
 	script->set_constant("CONSOLEMES_DEBUG", CONSOLEMES_DEBUG, false, false);
@@ -26600,6 +26774,11 @@ static void script_hardcoded_constants(void)
 	script->set_constant("UDT_BODY2", UDT_BODY2, false, false);
 	script->set_constant("UDT_GROUP", UDT_GROUP, false, false);
 
+	script->constdb_comment("getguildonline types");
+	script->set_constant("GUILD_ONLINE_ALL", GUILD_ONLINE_ALL, false, false);
+	script->set_constant("GUILD_ONLINE_VENDOR", GUILD_ONLINE_VENDOR, false, false);
+	script->set_constant("GUILD_ONLINE_NO_VENDOR", GUILD_ONLINE_NO_VENDOR, false, false);
+
 	script->constdb_comment("Renewal");
 #ifdef RENEWAL
 	script->set_constant("RENEWAL", 1, false, false);