1 files changed, 132 insertions, 121 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 5eed58977..fc1ece663 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6099,11 +6099,11 @@ static BUILDIN(menu)
 		sd->state.menu_or_input = 1;
 
 		/* menus beyond this length crash the client (see bugreport:6402) */
-		if( StrBuf->Length(&buf) >= 2047 ) {
+		if( StrBuf->Length(&buf) >= MAX_MENU_LENGTH - 1 ) {
 			struct npc_data * nd = map->id2nd(st->oid);
 			char* menu;
-			CREATE(menu, char, 2048);
-			safestrncpy(menu, StrBuf->Value(&buf), 2047);
+			CREATE(menu, char, MAX_MENU_LENGTH);
+			safestrncpy(menu, StrBuf->Value(&buf), MAX_MENU_LENGTH - 1);
 			ShowWarning("NPC Menu too long! (source:%s / length:%d)\n",nd?nd->name:"Unknown",StrBuf->Length(&buf));
 			clif->scriptmenu(sd, st->oid, menu);
 			aFree(menu);
@@ -6112,13 +6112,13 @@ static BUILDIN(menu)
 
 		StrBuf->Destroy(&buf);
 
-		if( sd->npc_menu >= 0xff )
+		if( sd->npc_menu >= MAX_MENU_OPTIONS )
 		{// client supports only up to 254 entries; 0 is not used and 255 is reserved for cancel; excess entries are displayed but cause 'uint8' overflow
-			ShowWarning("buildin_menu: Too many options specified (current=%d, max=254).\n", sd->npc_menu);
+			ShowWarning("buildin_menu: Too many options specified (current=%d, max=%d).\n", sd->npc_menu, MAX_MENU_OPTIONS - 1);
 			script->reportsrc(st);
 		}
 	}
-	else if( sd->npc_menu == 0xff )
+	else if( sd->npc_menu == MAX_MENU_OPTIONS )
 	{// Cancel was pressed
 		sd->state.menu_or_input = 0;
 		st->state = END;
@@ -6200,11 +6200,11 @@ static BUILDIN(select)
 		sd->state.menu_or_input = 1;
 
 		/* menus beyond this length crash the client (see bugreport:6402) */
-		if( StrBuf->Length(&buf) >= 2047 ) {
+		if( StrBuf->Length(&buf) >= MAX_MENU_LENGTH - 1 ) {
 			struct npc_data * nd = map->id2nd(st->oid);
 			char* menu;
-			CREATE(menu, char, 2048);
-			safestrncpy(menu, StrBuf->Value(&buf), 2047);
+			CREATE(menu, char, MAX_MENU_LENGTH);
+			safestrncpy(menu, StrBuf->Value(&buf), MAX_MENU_LENGTH - 1);
 			ShowWarning("NPC Menu too long! (source:%s / length:%d)\n",nd?nd->name:"Unknown",StrBuf->Length(&buf));
 			clif->scriptmenu(sd, st->oid, menu);
 			aFree(menu);
@@ -6212,107 +6212,31 @@ static BUILDIN(select)
 			clif->scriptmenu(sd, st->oid, StrBuf->Value(&buf));
 		StrBuf->Destroy(&buf);
 
-		if( sd->npc_menu >= 0xff ) {
-			ShowWarning("buildin_select: Too many options specified (current=%d, max=254).\n", sd->npc_menu);
+		if( sd->npc_menu >= MAX_MENU_OPTIONS ) {
+			ShowWarning("buildin_select: Too many options specified (current=%d, max=%d).\n", sd->npc_menu, MAX_MENU_OPTIONS - 1);
 			script->reportsrc(st);
 		}
-	} else if( sd->npc_menu == 0xff ) {// Cancel was pressed
+	} else if(sd->npc_menu == MAX_MENU_OPTIONS) { // Cancel was pressed
 		sd->state.menu_or_input = 0;
-		st->state = END;
-	} else {// return selected option
-		int menu = 0;
-
-		sd->state.menu_or_input = 0;
-		for( i = 2; i <= script_lastdata(st); ++i ) {
-			text = script_getstr(st, i);
-			sd->npc_menu -= script->menu_countoptions(text, sd->npc_menu, &menu);
-			if( sd->npc_menu <= 0 )
-				break;// entry found
-		}
-		pc->setreg(sd, script->add_variable("@menu"), menu);
-		script_pushint(st, menu);
-		st->state = RUN;
-	}
-	return true;
-}
-
-/// Displays a menu with options and returns the selected option.
-/// Behaves like 'menu' without the target labels, except when cancel is
-/// pressed.
-/// When cancel is pressed, the script continues and 255 is returned.
-///
-/// prompt(<option_text>{,<option_text>,...}) -> <selected_option>
-///
-/// @see menu
-static BUILDIN(prompt)
-{
-	int i;
-	const char *text;
-	struct map_session_data *sd = script->rid2sd(st);
-	if (sd == NULL)
-		return true;
-
-#ifdef SECURE_NPCTIMEOUT
-	sd->npc_idle_type = NPCT_MENU;
-#endif
 
-	if( sd->state.menu_or_input == 0 )
-	{
-		struct StringBuf buf;
-
-		StrBuf->Init(&buf);
-		sd->npc_menu = 0;
-		for( i = 2; i <= script_lastdata(st); ++i )
-		{
-			text = script_getstr(st, i);
-			if( sd->npc_menu > 0 )
-				StrBuf->AppendStr(&buf, ":");
-			StrBuf->AppendStr(&buf, text);
-			sd->npc_menu += script->menu_countoptions(text, 0, NULL);
-		}
-
-		st->state = RERUNLINE;
-		sd->state.menu_or_input = 1;
-
-		/* menus beyond this length crash the client (see bugreport:6402) */
-		if( StrBuf->Length(&buf) >= 2047 ) {
-			struct npc_data * nd = map->id2nd(st->oid);
-			char* menu;
-			CREATE(menu, char, 2048);
-			safestrncpy(menu, StrBuf->Value(&buf), 2047);
-			ShowWarning("NPC Menu too long! (source:%s / length:%d)\n",nd?nd->name:"Unknown",StrBuf->Length(&buf));
-			clif->scriptmenu(sd, st->oid, menu);
-			aFree(menu);
-		} else
-			clif->scriptmenu(sd, st->oid, StrBuf->Value(&buf));
-		StrBuf->Destroy(&buf);
-
-		if( sd->npc_menu >= 0xff )
-		{
-			ShowWarning("buildin_prompt: Too many options specified (current=%d, max=254).\n", sd->npc_menu);
-			script->reportsrc(st);
+		if (strncmp(get_buildin_name(st), "prompt", 6) == 0) {
+			pc->setreg(sd, script->add_variable("@menu"), MAX_MENU_OPTIONS);
+			script_pushint(st, MAX_MENU_OPTIONS); // XXX: we should really be pushing -1 instead
+			st->state = RUN;
+		} else {
+			st->state = END;
 		}
-	}
-	else if( sd->npc_menu == 0xff )
-	{// Cancel was pressed
-		sd->state.menu_or_input = 0;
-		pc->setreg(sd, script->add_variable("@menu"), 0xff);
-		script_pushint(st, 0xff);
-		st->state = RUN;
-	}
-	else
-	{// return selected option
+	} else {// return selected option
 		int menu = 0;
 
 		sd->state.menu_or_input = 0;
-		for( i = 2; i <= script_lastdata(st); ++i )
-		{
+		for( i = 2; i <= script_lastdata(st); ++i ) {
 			text = script_getstr(st, i);
 			sd->npc_menu -= script->menu_countoptions(text, sd->npc_menu, &menu);
 			if( sd->npc_menu <= 0 )
 				break;// entry found
 		}
-		pc->setreg(sd, script->add_variable("@menu"), menu);
+		pc->setreg(sd, script->add_variable("@menu"), menu); // TODO: throw a deprecation warning for scripts using @menu
 		script_pushint(st, menu);
 		st->state = RUN;
 	}
@@ -11376,7 +11300,7 @@ static int buildin_getunits_sub(struct block_list *bl, va_list ap)
 		(const void *)h64BPTRSIZE(bl->id), ref);
 
 	(*count)++;
-	return 0;
+	return 1;
 }
 
 static int buildin_getunits_sub_pc(struct map_session_data *sd, va_list ap)
@@ -11448,18 +11372,10 @@ static BUILDIN(getunits)
 			int16 x2 = script_getnum(st, 8);
 			int16 y2 = script_getnum(st, 9);
 
-			// FIXME: map_foreachinarea does NOT stop iterating when the callback
-			//        function returns -1. we still limit the array size, but
-			//        this doesn't break the loop. We need a foreach function
-			//        that behaves like map_foreachiddb, but for areas
-			map->foreachinarea(buildin_getunits_sub, m, x1, y1, x2, y2, type,
+			map->forcountinarea(buildin_getunits_sub, m, x1, y1, x2, y2, limit, type,
 				st, sd, id, start, &count, limit, name, ref, type);
 		} else {
-			// FIXME: map_foreachinmap does NOT stop iterating when the callback
-			//        function returns -1. we still limit the array size, but
-			//        this doesn't break the loop. We need a foreach function
-			//        that behaves like map_foreachiddb, but for maps
-			map->foreachinmap(buildin_getunits_sub, m, type,
+			map->forcountinmap(buildin_getunits_sub, m, limit, type,
 				st, sd, id, start, &count, limit, name, ref, type);
 		}
 	} else {
@@ -14415,6 +14331,9 @@ static BUILDIN(getiteminfo)
 	case ITEMINFO_VIEWSPRITE:
 		script_pushint(st, it->view_sprite);
 		break;
+	case ITEMINFO_TRADE:
+		script_pushint(st, it->flag.trade_restriction);
+		break;
 	default:
 		ShowError("buildin_getiteminfo: Invalid item type %d.\n", n);
 		script_pushint(st,-1);
@@ -14681,6 +14600,9 @@ static BUILDIN(setiteminfo)
 	case ITEMINFO_VIEWSPRITE:
 		it->view_sprite = value;
 		break;
+	case ITEMINFO_TRADE:
+		it->flag.trade_restriction = value;
+		break;
 	default:
 		ShowError("buildin_setiteminfo: invalid type %d.\n", n);
 		script_pushint(st,-1);
@@ -16795,6 +16717,63 @@ static BUILDIN(getdatatype)
 	return true;
 }
 
+static BUILDIN(data_to_string)
+{
+	if (script_hasdata(st, 2)) {
+		struct script_data *data = script_getdata(st, 2);
+
+		if (data_isstring(data)) {
+			script_pushcopy(st, 2);
+		} else if (data_isint(data)) {
+			char *str = NULL;
+
+			CREATE(str, char, 20);
+			safesnprintf(str, 20, "%"PRId64"", data->u.num);
+			script_pushstr(st, str);
+		} else if (data_islabel(data)) {
+			const char *str = "";
+
+			// XXX: because all we have is the label pos we can't be sure which
+			//      one is the correct label if more than one has the same pos.
+			//      We might want to store both the pos and str_data index in
+			//      data->u.num, similar to how C_NAME stores both the array
+			//      index and str_data index in u.num with bitmasking. This
+			//      would also avoid the awkward for() loops as we could
+			//      directly access the string with script->get_str().
+
+			if (st->oid) {
+				struct npc_data *nd = map->id2nd(st->oid);
+
+				for (int i = 0; i < nd->u.scr.label_list_num; ++i) {
+					if (nd->u.scr.label_list[i].pos == data->u.num) {
+						str = nd->u.scr.label_list[i].name;
+						break;
+					}
+				}
+			} else {
+				for (int i = LABEL_START; script->str_data[i].next != 0; i = script->str_data[i].next) {
+					if (script->str_data[i].label == data->u.num) {
+						str = script->get_str(i);
+						break;
+					}
+				}
+			}
+
+			script_pushconststr(st, str);
+		} else if (data_isreference(data)) {
+			script_pushstrcopy(st, reference_getname(data));
+		} else {
+			ShowWarning("script:data_to_string: unknown data type!\n");
+			script->reportdata(data);
+			script_pushconststr(st, "");
+		}
+	} else {
+		script_pushconststr(st, ""); // NIL
+	}
+
+	return true;
+}
+
 //=======================================================
 // chr <int>
 //-------------------------------------------------------
@@ -21171,6 +21150,17 @@ static BUILDIN(setquestinfo)
 		VECTOR_PUSH(qi->quest_requirement, quest_req);
 		break;
 	}
+	case QINFO_MERCENARY_CLASS:
+	{
+		int mer_class = script_getnum(st, 3);
+
+		if (!mercenary->class(mer_class)) {
+			ShowWarning("buildin_setquestinfo: invalid mercenary class given (%d).\n", mer_class);
+			return false;
+		}
+		qi->mercenary_class = mer_class;
+		break;
+	}
 	default:
 		ShowWarning("buildin_setquestinfo: invalid type given (%u).\n", type);
 		return false;
@@ -21324,18 +21314,7 @@ static BUILDIN(showevent)
 		}
 	}
 
-#if PACKETVER >= 20170315
-	if (icon < 0 || (icon > 10 && icon != 9999))
-		icon = 9999;
-#elif PACKETVER >= 20120410
-	if (icon < 0 || (icon > 8 && icon != 9999) || icon == 7)
-		icon = 9999; // Default to nothing if icon id is invalid.
-#else
-	if (icon < 0 || icon > 7)
-		icon = 0;
-	else
-		icon = icon + 1;
-#endif
+	icon = quest->questinfo_validate_icon(icon);
 
 	clif->quest_show_event(sd, &nd->bl, icon, color);
 	return true;
@@ -24810,6 +24789,16 @@ static BUILDIN(changecamera)
 	return true;
 }
 
+// update preview window to given item
+static BUILDIN(itempreview)
+{
+	struct map_session_data *sd = script_rid2sd(st);
+	if (sd == NULL)
+		return false;
+	clif->item_preview(sd, script_getnum(st, 2));
+	return true;
+}
+
 /**
  * Adds a built-in script function.
  *
@@ -24978,7 +24967,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(close2,""),
 		BUILDIN_DEF(menu,"sl*"),
 		BUILDIN_DEF(select,"s*"), //for future jA script compatibility
-		BUILDIN_DEF(prompt,"s*"),
+		BUILDIN_DEF2(select, "prompt", "s*"),
 		//
 		BUILDIN_DEF(goto,"l"),
 		BUILDIN_DEF(callsub,"l*"),
@@ -25259,6 +25248,8 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(charat,"si"),
 		BUILDIN_DEF(isstr,"v"),
 		BUILDIN_DEF(getdatatype, "?"),
+		BUILDIN_DEF(data_to_string, "?"),
+		BUILDIN_DEF2(getd, "string_to_data", "?"),
 		BUILDIN_DEF(chr,"i"),
 		BUILDIN_DEF(ord,"s"),
 		BUILDIN_DEF(setchar,"ssi"),
@@ -25544,6 +25535,8 @@ static void script_parse_builtin(void)
 		// camera
 		BUILDIN_DEF(camerainfo, ""),
 		BUILDIN_DEF(changecamera, "iii?"),
+
+		BUILDIN_DEF(itempreview, "i"),
 	};
 	int i, len = ARRAYLENGTH(BUILDIN);
 	RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up
@@ -25590,6 +25583,8 @@ static void script_hardcoded_constants(void)
 	script->set_constant("MAX_BG_MEMBERS",MAX_BG_MEMBERS,false, false);
 	script->set_constant("MAX_CHAT_USERS",MAX_CHAT_USERS,false, false);
 	script->set_constant("MAX_REFINE",MAX_REFINE,false, false);
+	script->set_constant("MAX_MENU_OPTIONS", MAX_MENU_OPTIONS, false, false);
+	script->set_constant("MAX_MENU_LENGTH", MAX_MENU_LENGTH, false, false);
 
 	script->constdb_comment("status options");
 	script->set_constant("Option_Nothing",OPTION_NOTHING,false, false);
@@ -25859,6 +25854,7 @@ static void script_hardcoded_constants(void)
 	script->set_constant("ITEMINFO_VIEWID", ITEMINFO_VIEWID, false, false);
 	script->set_constant("ITEMINFO_MATK", ITEMINFO_MATK, false, false);
 	script->set_constant("ITEMINFO_VIEWSPRITE", ITEMINFO_VIEWSPRITE, false, false);
+	script->set_constant("ITEMINFO_TRADE", ITEMINFO_TRADE, false, false);
 
 	script->constdb_comment("monster skill states");
 	script->set_constant("MSS_ANY", MSS_ANY, false, false);
@@ -25942,6 +25938,7 @@ static void script_hardcoded_constants(void)
 	script->set_constant("QINFO_HOMUN_LEVEL", QINFO_HOMUN_LEVEL, false, false);
 	script->set_constant("QINFO_HOMUN_TYPE", QINFO_HOMUN_TYPE, false, false);
 	script->set_constant("QINFO_QUEST", QINFO_QUEST, false, false);
+	script->set_constant("QINFO_MERCENARY_CLASS", QINFO_MERCENARY_CLASS, false, false);
 
 	script->constdb_comment("function types");
 	script->set_constant("FUNCTION_IS_COMMAND", FUNCTION_IS_COMMAND, false, false);
@@ -25949,6 +25946,20 @@ static void script_hardcoded_constants(void)
 	script->set_constant("FUNCTION_IS_LOCAL", FUNCTION_IS_LOCAL, false, false);
 	script->set_constant("FUNCTION_IS_LABEL", FUNCTION_IS_LABEL, false, false);
 
+	script->constdb_comment("item trade restrictions");
+	script->set_constant("ITR_NONE", ITR_NONE, false, false);
+	script->set_constant("ITR_NODROP", ITR_NODROP, false, false);
+	script->set_constant("ITR_NOTRADE", ITR_NOTRADE, false, false);
+	script->set_constant("ITR_PARTNEROVERRIDE", ITR_PARTNEROVERRIDE, false, false);
+	script->set_constant("ITR_NOSELLTONPC", ITR_NOSELLTONPC, false, false);
+	script->set_constant("ITR_NOCART", ITR_NOCART, false, false);
+	script->set_constant("ITR_NOSTORAGE", ITR_NOSTORAGE, false, false);
+	script->set_constant("ITR_NOGSTORAGE", ITR_NOGSTORAGE, false, false);
+	script->set_constant("ITR_NOMAIL", ITR_NOMAIL, false, false);
+	script->set_constant("ITR_NOAUCTION", ITR_NOAUCTION, false, false);
+	script->set_constant("ITR_ALL", ITR_ALL, false, false);
+
+
 	script->constdb_comment("Renewal");
 #ifdef RENEWAL
 	script->set_constant("RENEWAL", 1, false, false);