1 files changed, 352 insertions, 84 deletions

diff --git a/src/map/script.c b/src/map/script.c
index d5a05164f..d2101d21f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9967,14 +9967,22 @@ BUILDIN(setgroupid) {
 
 /// Returns the group ID of the player.
 ///
-/// getgroupid() -> <int>
-BUILDIN(getgroupid)
-{
-	struct map_session_data *sd = script->rid2sd(st);
-	if (sd == NULL)
+/// getgroupid({<account id>}) -> <int>
+BUILDIN(getgroupid) {
+	struct map_session_data *sd = NULL;
+
+	if (script_hasdata(st, 2)) {
+		sd = map->id2sd(script_getnum(st, 2));
+	} else {
+		sd = script->rid2sd(st);
+	}
+
+	if (sd == NULL) {
+		script_pushint(st, -1);
 		return true; // no player attached, report source
-	script_pushint(st, pc_get_group_id(sd));
+	}
 
+	script_pushint(st, pc_get_group_id(sd));
 	return true;
 }
 
@@ -12771,6 +12779,76 @@ BUILDIN(setmapflagnosave) {
 	return true;
 }
 
+enum mapinfo_info {
+	MAPINFO_NAME,
+	MAPINFO_ID,
+	MAPINFO_SIZE_X,
+	MAPINFO_SIZE_Y,
+	MAPINFO_ZONE
+};
+
+BUILDIN(getmapinfo)
+{
+	enum mapinfo_info mode = script_getnum(st, 2);
+	int16 m;
+
+	if (script_hasdata(st, 3)) {
+		if (script_isstringtype(st, 3)) {
+			const char *str = script_getstr(st, 3);
+			m = map->mapname2mapid(str);
+		} else {
+			m = script_getnum(st, 3);
+		}
+	} else {
+		struct block_list *bl = NULL;
+
+		if (st->oid) {
+			bl = map->id2bl(st->oid);
+		} else if (st->rid) {
+			bl = map->id2bl(st->rid);
+		}
+
+		if (bl == NULL) {
+			ShowError("script:getmapinfo: map not supplied and NPC/PC not attached!\n");
+			script_pushint(st, -3);
+			return false;
+		}
+
+		m = bl->m;
+	}
+
+	if (m < 0) {
+		// here we don't throw an error, so the command can be used
+		// to detect whether or not a map exists
+		script_pushint(st, -1);
+		return true;
+	}
+
+	switch (mode) {
+	case MAPINFO_NAME:
+		script_pushconststr(st, map->list[m].name);
+		break;
+	case MAPINFO_ID:
+		script_pushint(st, m);
+		break;
+	case MAPINFO_SIZE_X:
+		script_pushint(st, map->list[m].xs);
+		break;
+	case MAPINFO_SIZE_Y:
+		script_pushint(st, map->list[m].ys);
+		break;
+	case MAPINFO_ZONE:
+		script_pushstrcopy(st, map->list[m].zone->name);
+		break;
+	default:
+		ShowError("script:getmapinfo: unknown option in second argument (%u).\n", mode);
+		script_pushint(st, -2);
+		return false;
+	}
+
+	return true;
+}
+
 BUILDIN(getmapflag)
 {
 	int16 m,i;
@@ -13985,43 +14063,70 @@ BUILDIN(getitemslots)
 	return true;
 }
 
-// TODO: add matk here if needed/once we get rid of RENEWAL
+// TODO: add matk here if needed
 
 /*==========================================
  * Returns some values of an item [Lupus]
  * Price, Weight, etc...
- * getiteminfo(itemID,n), where n
- * 0 value_buy;
- * 1 value_sell;
- * 2 type;
- * 3 maxchance = Max drop chance of this item e.g. 1 = 0.01% , etc..
- * if = 0, then monsters don't drop it at all (rare or a quest item)
- * if = -1, then this item is sold in NPC shops only
- * 4 sex;
- * 5 equip;
- * 6 weight;
- * 7 atk;
- * 8 def;
- * 9 range;
- * 10 slot;
- * 11 look;
- * 12 elv;
- * 13 wlv;
- * 14 view id
  *------------------------------------------*/
 BUILDIN(getiteminfo)
 {
-	int item_id,n;
-	struct item_data *i_data;
+	int item_id = script_getnum(st, 2);
+	int n = script_getnum(st, 3);
+	struct item_data *it = itemdb->exists(item_id);
 
-	item_id = script_getnum(st,2);
-	n       = script_getnum(st,3);
-	i_data  = itemdb->exists(item_id);
+	if (it == NULL) {
+		script_pushint(st, -1);
+		return true;
+	}
 
-	if (i_data && n>=0 && n<=14) {
-		int *item_arr =  (int*)&i_data->value_buy;
-		script_pushint(st,item_arr[n]);
-	} else {
+	switch (n) {
+	case 0:
+		script_pushint(st, it->value_buy);
+		break;
+	case 1:
+		script_pushint(st, it->value_sell);
+		break;
+	case 2:
+		script_pushint(st, it->type);
+		break;
+	case 3:
+		script_pushint(st, it->maxchance);
+		break;
+	case 4:
+		script_pushint(st, it->sex);
+		break;
+	case 5:
+		script_pushint(st, it->equip);
+		break;
+	case 6:
+		script_pushint(st, it->weight);
+		break;
+	case 7:
+		script_pushint(st, it->atk);
+		break;
+	case 8:
+		script_pushint(st, it->def);
+		break;
+	case 9:
+		script_pushint(st, it->range);
+		break;
+	case 10:
+		script_pushint(st, it->slot);
+		break;
+	case 11:
+		script_pushint(st, it->subtype);
+		break;
+	case 12:
+		script_pushint(st, it->elv);
+		break;
+	case 13:
+		script_pushint(st, it->wlv);
+		break;
+	case 14:
+		script_pushint(st, it->view_id);
+		break;
+	default:
 		script_pushint(st,-1);
 	}
 	return true;
@@ -14214,43 +14319,71 @@ BUILDIN(setequipoption)
 /*==========================================
  * Set some values of an item [Lupus]
  * Price, Weight, etc...
- * setiteminfo(itemID,n,Value), where n
- * 0 value_buy;
- * 1 value_sell;
- * 2 type;
- * 3 maxchance = Max drop chance of this item e.g. 1 = 0.01% , etc..
- * if = 0, then monsters don't drop it at all (rare or a quest item)
- * if = -1, then this item is sold in NPC shops only
- * 4 sex;
- * 5 equip;
- * 6 weight;
- * 7 atk;
- * 8 def;
- * 9 range;
- * 10 slot;
- * 11 look;
- * 12 elv;
- * 13 wlv;
- * 14 view id
- * Returns Value or -1 if the wrong field's been set
  *------------------------------------------*/
 BUILDIN(setiteminfo)
 {
-	int item_id,n,value;
-	struct item_data *i_data;
+	// TODO: Validate data in a similar way as during database load
+	int item_id = script_getnum(st, 2);
+	int n = script_getnum(st, 3);
+	int value = script_getnum(st,4);
+	struct item_data *it = itemdb->exists(item_id);
 
-	item_id = script_getnum(st,2);
-	n       = script_getnum(st,3);
-	value   = script_getnum(st,4);
-	i_data  = itemdb->exists(item_id);
+	if (it == NULL) {
+		script_pushint(st, -1);
+		return true;
+	}
 
-	if (i_data && n>=0 && n<=14) {
-		int *item_arr = (int*)&i_data->value_buy;
-		item_arr[n] = value;
-		script_pushint(st,value);
-	} else {
+	switch (n) {
+	case 0:
+		it->value_buy = value;
+		break;
+	case 1:
+		it->value_sell = value;
+		break;
+	case 2:
+		it->type = value;
+		break;
+	case 3:
+		it->maxchance = value;
+		break;
+	case 4:
+		it->sex = value;
+		break;
+	case 5:
+		it->equip = value;
+		break;
+	case 6:
+		it->weight = value;
+		break;
+	case 7:
+		it->atk = value;
+		break;
+	case 8:
+		it->def = value;
+		break;
+	case 9:
+		it->range = value;
+		break;
+	case 10:
+		it->slot = value;
+		break;
+	case 11:
+		it->subtype = value;
+		break;
+	case 12:
+		it->elv = value;
+		break;
+	case 13:
+		it->wlv = value;
+		break;
+	case 14:
+		it->view_id = value;
+		break;
+	default:
 		script_pushint(st,-1);
+		return true;
 	}
+	script_pushint(st,value);
 	return true;
 }
 
@@ -15467,15 +15600,15 @@ BUILDIN(getlook)
 	type=script_getnum(st,2);
 	switch(type) {
 		case LOOK_HAIR:          val = sd->status.hair;          break; //1
-		case LOOK_WEAPON:        val = sd->status.weapon;        break; //2
-		case LOOK_HEAD_BOTTOM:   val = sd->status.head_bottom;   break; //3
-		case LOOK_HEAD_TOP:      val = sd->status.head_top;      break; //4
-		case LOOK_HEAD_MID:      val = sd->status.head_mid;      break; //5
+		case LOOK_WEAPON:        val = sd->status.look.weapon;   break; //2
+		case LOOK_HEAD_BOTTOM:   val = sd->status.look.head_bottom; break; //3
+		case LOOK_HEAD_TOP:      val = sd->status.look.head_top; break; //4
+		case LOOK_HEAD_MID:      val = sd->status.look.head_mid; break; //5
 		case LOOK_HAIR_COLOR:    val = sd->status.hair_color;    break; //6
 		case LOOK_CLOTHES_COLOR: val = sd->status.clothes_color; break; //7
-		case LOOK_SHIELD:        val = sd->status.shield;        break; //8
+		case LOOK_SHIELD:        val = sd->status.look.shield;   break; //8
 		case LOOK_SHOES:                                         break; //9
-		case LOOK_ROBE:          val = sd->status.robe;          break; //12
+		case LOOK_ROBE:          val = sd->status.look.robe;     break; //12
 		case LOOK_BODY2:         val=sd->status.body;            break; //13
 	}
 
@@ -15725,19 +15858,37 @@ BUILDIN(getmapxy)
 	return true;
 }
 
+enum logmes_type {
+	LOGMES_NPC,
+	LOGMES_ATCOMMAND
+};
+
 /*==========================================
- * Allows player to write NPC logs (i.e. Bank NPC, etc) [Lupus]
+ * Allows player to write logs (i.e. Bank NPC, etc) [Lupus]
  *------------------------------------------*/
-BUILDIN(logmes)
-{
-	const char *str;
+BUILDIN(logmes) {
+	const char *str = script_getstr(st, 2);
 	struct map_session_data *sd = script->rid2sd(st);
+	enum logmes_type type = LOGMES_NPC;
+	nullpo_retr(sd, false);
 
-	if (sd == NULL)
-		return true;
+	if (script_hasdata(st, 3)) {
+		type = script_getnum(st, 3);
+	}
+
+	switch (type) {
+	case LOGMES_ATCOMMAND:
+		logs->atcommand(sd, str);
+		break;
+	case LOGMES_NPC:
+		logs->npc(sd, str);
+		break;
+	default:
+		ShowError("script:logmes: Unknown log type!\n");
+		st->state = END;
+		return false;
+	}
 
-	str = script_getstr(st,2);
-	logs->npc(sd,str);
 	return true;
 }
 
@@ -23324,6 +23475,50 @@ BUILDIN(activatepset);
 BUILDIN(deactivatepset);
 BUILDIN(deletepset);
 
+enum dressroom_mode {
+	DRESSROOM_CLOSE = 0,
+	DRESSROOM_OPEN  = 1
+};
+
+/**
+ * dressroom({<enum dressroom_mode>});
+ */
+BUILDIN(dressroom)
+{
+#if PACKETVER >= 20150513
+	struct map_session_data *sd = script->rid2sd(st);
+	enum dressroom_mode mode = DRESSROOM_OPEN;
+
+	if (sd == NULL) {
+		return false;
+	}
+
+	if (script_hasdata(st, 2)) {
+		mode = script_getnum(st, 2);
+	}
+
+	switch (mode) {
+	case DRESSROOM_OPEN:
+		clif->dressroom_open(sd, 1);
+		break;
+	case DRESSROOM_CLOSE:
+		clif->dressroom_open(sd, 0);
+		break;
+	default:
+		ShowWarning("script:dressroom: unknown mode (%i).\n", mode);
+		script_pushint(st, 0);
+		return false;
+	}
+
+	script_pushint(st, 1);
+	return true;
+#else
+	ShowError("The dressing room works only with packet version >= 20150513");
+	script_pushint(st, 0);
+	return false;
+#endif
+}
+
 BUILDIN(pcre_match)
 {
 	const char *input = script_getstr(st, 2);
@@ -23424,7 +23619,7 @@ BUILDIN(rodex_sendmail)
 	// Common parameters - sender/message/zeny
 	if (rodex_sendmail_sub(st, &msg) == false)
 		return false;
-	
+
 	// Item list
 	while (i < RODEX_MAX_ITEM && script_hasdata(st, param)) {
 		struct item_data *idata;
@@ -23453,7 +23648,7 @@ BUILDIN(rodex_sendmail)
 		msg.items[i].item.nameid = idata->nameid;
 		msg.items[i].item.amount = script_getnum(st, (param + 1));
 		msg.items[i].item.identify = 1;
-		
+
 		++i;
 		param += 2;
 	}
@@ -23531,7 +23726,7 @@ BUILDIN(rodex_sendmail2)
 		for (j = 0; j < MAX_SLOTS; ++j) {
 			msg.items[i].item.card[j] = script_getnum(st, param + 4 + j);
 		}
-		
+
 		++i;
 		param += 4 + MAX_SLOTS;
 	}
@@ -23809,7 +24004,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(basicskillcheck,""),
 		BUILDIN_DEF(getgmlevel,""),
 		BUILDIN_DEF(setgroupid, "i?"),
-		BUILDIN_DEF(getgroupid,""),
+		BUILDIN_DEF(getgroupid,"?"),
 		BUILDIN_DEF(end,""),
 		BUILDIN_DEF(checkoption,"i?"),
 		BUILDIN_DEF(setoption,"i??"),
@@ -23890,6 +24085,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(isloggedin,"i?"),
 		BUILDIN_DEF(setmapflagnosave,"ssii"),
 		BUILDIN_DEF(getmapflag,"si"),
+		BUILDIN_DEF(getmapinfo,"i?"),
 		BUILDIN_DEF(setmapflag,"si?"),
 		BUILDIN_DEF(removemapflag,"si"),
 		BUILDIN_DEF(pvpon,"s"),
@@ -23966,7 +24162,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(checkoption2,"i?"),
 		BUILDIN_DEF(guildgetexp,"i"),
 		BUILDIN_DEF(guildchangegm,"is"),
-		BUILDIN_DEF(logmes,"s"), //this command actls as MES but rints info into LOG file either SQL/TXT [Lupus]
+		BUILDIN_DEF(logmes,"s?"), //this command actls as MES but rints info into LOG file either SQL/TXT [Lupus]
 		BUILDIN_DEF(summon,"si??"), // summons a slave monster [Celest]
 		BUILDIN_DEF(isnight,""), // check whether it is night time [Celest]
 		BUILDIN_DEF(isequipped,"i*"), // check whether another item/card has been equipped [Celest]
@@ -23979,6 +24175,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(activatepset,"i"), // Activate a pattern set [MouseJstr]
 		BUILDIN_DEF(deactivatepset,"i"), // Deactive a pattern set [MouseJstr]
 		BUILDIN_DEF(deletepset,"i"), // Delete a pattern set [MouseJstr]
+		BUILDIN_DEF(dressroom,"?"),
 		BUILDIN_DEF(pcre_match,"ss"),
 		BUILDIN_DEF(dispbottom,"s?"), //added from jA [Lupus]
 		BUILDIN_DEF(getusersname,""),
@@ -24181,7 +24378,7 @@ void script_parse_builtin(void) {
 		 **/
 		BUILDIN_DEF(bindatcmd, "ss???"),
 		BUILDIN_DEF(unbindatcmd, "s"),
-		BUILDIN_DEF(useatcmd, "s"),
+		BUILDIN_DEF_DEPRECATED(useatcmd, "s"),
 		BUILDIN_DEF(has_permission, "v?"),
 		BUILDIN_DEF(can_use_command, "s?"),
 		BUILDIN_DEF(add_group_command, "siii"),
@@ -24407,6 +24604,15 @@ void script_hardcoded_constants(void)
 	script->set_constant("EQP_SHADOW_SHOES", EQP_SHADOW_SHOES, false, false);
 	script->set_constant("EQP_SHADOW_ACC_R", EQP_SHADOW_ACC_R, false, false);
 	script->set_constant("EQP_SHADOW_ACC_L", EQP_SHADOW_ACC_L, false, false);
+	// Synonyms and combined values
+	script->set_constant("EQP_WEAPON", EQP_WEAPON, false, false);
+	script->set_constant("EQP_SHIELD", EQP_SHIELD, false, false);
+	script->set_constant("EQP_ARMS", EQP_ARMS, false, false);
+	script->set_constant("EQP_HELM", EQP_HELM, false, false);
+	script->set_constant("EQP_ACC", EQP_ACC, false, false);
+	script->set_constant("EQP_COSTUME", EQP_COSTUME, false, false);
+	script->set_constant("EQP_SHADOW_ACC", EQP_SHADOW_ACC, false, false);
+	script->set_constant("EQP_SHADOW_ARMS", EQP_SHADOW_ARMS, false, false);
 
 	script->constdb_comment("Item Option Types");
 	script->set_constant("IT_OPT_INDEX", IT_OPT_INDEX, false, false);
@@ -24483,6 +24689,68 @@ void script_hardcoded_constants(void)
 	script->set_constant("DATATYPE_VAR", DATATYPE_VAR, false, false);
 	script->set_constant("DATATYPE_LABEL", DATATYPE_LABEL, false, false);
 
+	script->constdb_comment("Logmes types");
+	script->set_constant("LOGMES_NPC", LOGMES_NPC, false, false);
+	script->set_constant("LOGMES_ATCOMMAND", LOGMES_ATCOMMAND, false, false);
+
+	script->constdb_comment("Item Subtypes (Weapon types)");
+	script->set_constant("W_FIST", W_FIST, false, false);
+	script->set_constant("W_DAGGER", W_DAGGER, false, false);
+	script->set_constant("W_1HSWORD", W_1HSWORD, false, false);
+	script->set_constant("W_2HSWORD", W_2HSWORD, false, false);
+	script->set_constant("W_1HSPEAR", W_1HSPEAR, false, false);
+	script->set_constant("W_2HSPEAR", W_2HSPEAR, false, false);
+	script->set_constant("W_1HAXE", W_1HAXE, false, false);
+	script->set_constant("W_2HAXE", W_2HAXE, false, false);
+	script->set_constant("W_MACE", W_MACE, false, false);
+	script->set_constant("W_2HMACE", W_2HMACE, false, false);
+	script->set_constant("W_STAFF", W_STAFF, false, false);
+	script->set_constant("W_BOW", W_BOW, false, false);
+	script->set_constant("W_KNUCKLE", W_KNUCKLE, false, false);
+	script->set_constant("W_MUSICAL", W_MUSICAL, false, false);
+	script->set_constant("W_WHIP", W_WHIP, false, false);
+	script->set_constant("W_BOOK", W_BOOK, false, false);
+	script->set_constant("W_KATAR", W_KATAR, false, false);
+	script->set_constant("W_REVOLVER", W_REVOLVER, false, false);
+	script->set_constant("W_RIFLE", W_RIFLE, false, false);
+	script->set_constant("W_GATLING", W_GATLING, false, false);
+	script->set_constant("W_SHOTGUN", W_SHOTGUN, false, false);
+	script->set_constant("W_GRENADE", W_GRENADE, false, false);
+	script->set_constant("W_HUUMA", W_HUUMA, false, false);
+	script->set_constant("W_2HSTAFF", W_2HSTAFF, false, false);
+
+	script->constdb_comment("Item Subtypes (Ammunition types)");
+	script->set_constant("A_ARROW", A_ARROW, false, false);
+	script->set_constant("A_DAGGER", A_DAGGER, false, false);
+	script->set_constant("A_BULLET", A_BULLET, false, false);
+	script->set_constant("A_SHELL", A_SHELL, false, false);
+	script->set_constant("A_GRENADE", A_GRENADE, false, false);
+	script->set_constant("A_SHURIKEN", A_SHURIKEN, false, false);
+	script->set_constant("A_KUNAI", A_KUNAI, false, false);
+	script->set_constant("A_CANNONBALL", A_CANNONBALL, false, false);
+	script->set_constant("A_THROWWEAPON", A_THROWWEAPON, false, false);
+
+	script->constdb_comment("Item Upper Masks");
+	script->set_constant("ITEMUPPER_NONE", ITEMUPPER_NONE, false, false);
+	script->set_constant("ITEMUPPER_NORMAL", ITEMUPPER_NORMAL, false, false);
+	script->set_constant("ITEMUPPER_UPPER", ITEMUPPER_UPPER, false, false);
+	script->set_constant("ITEMUPPER_BABY", ITEMUPPER_BABY, false, false);
+	script->set_constant("ITEMUPPER_THIRD", ITEMUPPER_THIRD, false, false);
+	script->set_constant("ITEMUPPER_THIRDUPPER", ITEMUPPER_THIRDUPPER, false, false);
+	script->set_constant("ITEMUPPER_THIRDBABY", ITEMUPPER_THIRDBABY, false, false);
+	script->set_constant("ITEMUPPER_ALL", ITEMUPPER_ALL, false, false);
+
+	script->constdb_comment("dressroom modes");
+	script->set_constant("DRESSROOM_OPEN", DRESSROOM_OPEN, false, false);
+	script->set_constant("DRESSROOM_CLOSE", DRESSROOM_CLOSE, false, false);
+
+	script->constdb_comment("getmapinfo options");
+	script->set_constant("MAPINFO_NAME", MAPINFO_NAME, false, false);
+	script->set_constant("MAPINFO_ID", MAPINFO_ID, false, false);
+	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->constdb_comment("Renewal");
 #ifdef RENEWAL
 	script->set_constant("RENEWAL", 1, false, false);