Merge pull request #2172 from dastgirp/enhance/getiteminfo

Updated getiteminfo and setiteminfo.

5 files changed, 66 insertions, 3 deletions

diff --git a/doc/sample/getiteminfo.txt b/doc/sample/getiteminfo.txt
index 57407c072..9d5121635 100644
--- a/doc/sample/getiteminfo.txt
+++ b/doc/sample/getiteminfo.txt
@@ -9,12 +9,12 @@
 //============================================================
 
 prontera,156,179,6	script	test_getiteminfo	4_F_KAFRA1,{
-	mes "Please enter an item ID.";
-	input .@value;
+	mes("Please enter an item ID.");
+	input(.@value);
 
 	// This line uses an INTERNAL function of your client to show item name by its ID!
 	// ^nItemID^XXXX -> Item Name
-	mes "Item ID: "+.@value+" ^nItemID^"+.@value;
+	mesf("Item ID: %d ^nItemID^%d", .@value, .@value);
 
 	mes("Current item info:");
 	mesf("Buy Price: %d", getiteminfo(.@value, ITEMINFO_BUYPRICE));
@@ -34,5 +34,8 @@ prontera,156,179,6	script	test_getiteminfo	4_F_KAFRA1,{
 	mesf("View ID: %d", getiteminfo(.@value, ITEMINFO_VIEWID));
 	mesf("MATK: %d", getiteminfo(.@value, ITEMINFO_MATK));
 	mesf("View Sprite: %d", getiteminfo(.@value, ITEMINFO_VIEWSPRITE));
+
+	.@trade$ = callfunc("F_GetTradeRestriction", .@value);
+	mesf("Trade Restriction: %s", .@trade$);
 	close;
 }
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 64468ed49..5cba5afc8 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3239,6 +3239,7 @@ Valid types are:
 	ITEMINFO_VIEWID     - View ID ("Sprite" field in the Item DB)
 	ITEMINFO_MATK       - MATK (only relevant if RENEWAL is set)
 	ITEMINFO_VIEWSPRITE - View Sprite ("ViewSprite" field in the Item DB)
+	ITEMINFO_TRADE      - Trade Restriction (see "doc/constant.md": item trade restriction)
 
 Check sample in doc/sample/getiteminfo.txt
 
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 9882e9d71..904ed7165 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -438,3 +438,40 @@ function	script	F_ShuffleNumbers	{
 function	script	F_MesColor	{
 	return sprintf("^%06X", min(getarg(0), 0xFFFFFF));
 }
+
+//== Function F_GetTradeRestriction ========================
+// Function to get item trade restriction
+// Examples:
+//    mes "Red Potion Restriction: "+ callfunc("F_GetTradeRestriction", Red_Potion);
+function	script	F_GetTradeRestriction	{
+	.@trade = getiteminfo(getarg(0), ITEMINFO_TRADE);
+
+	if (.@trade == 0) {
+		return "None";
+	}
+	.@trade$ = "";
+	if (.@trade & ITR_NODROP) {
+		.@trade$ += "NoDrop|";
+	}
+	if (.@trade & ITR_NOTRADE) {
+		.@trade$ += "NoTrade|";
+	}
+	if (.@trade & ITR_PARTNEROVERRIDE) {
+		.@trade$ += "PartnerOverride|";
+	}
+	if (.@trade & ITR_NOSELLTONPC) {
+		.@trade$ += "NoSellToNpc|";
+	}
+	if (.@trade & ITR_NOSTORAGE) {
+		.@trade$ += "NoStorage|";
+	}
+	if (.@trade & ITR_NOGSTORAGE) {
+		.@trade$ += "NoGuildStorage|";
+	}
+	if (.@trade & ITR_NOMAIL) {
+		.@trade$ += "NoMail|";
+	}
+	if (.@trade & ITR_NOAUCTION) {
+		.@trade$ += "NoAuction|";
+	}
+}
diff --git a/src/map/script.c b/src/map/script.c
index 5eed58977..fbf842f18 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -14415,6 +14415,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 +14684,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);
@@ -25859,6 +25865,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);
@@ -25949,6 +25956,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);
diff --git a/src/map/script.h b/src/map/script.h
index 9c72b793c..72210b05b 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -450,6 +450,7 @@ enum script_iteminfo_types {
 	ITEMINFO_VIEWID,
 	ITEMINFO_MATK,
 	ITEMINFO_VIEWSPRITE,
+	ITEMINFO_TRADE,
 
 	ITEMINFO_MAX
 };