Explorar o código

Minor cleanup to mapflags (#7782)

* Adds missing documentation for mf_norodex.
* Updates atcommand mapflag to display information on some missing mapflags.
* Removes "Other Flags2" and combine list with "Other Flags" for atcommand mapflag.
Aleos hai 1 ano
pai
achega
5b832de199

+ 1 - 1
conf/msg_conf/map_msg.conf

@@ -1135,7 +1135,7 @@
 1048: Teleport Flags:
 1049: Weather Flags:
 1050: Other Flags:
-1051: Other Flags2:
+//1051: free
 1052: Skill Damage Adjustments:
 1053:  > [Map] %d%%, %d%%, %d%%, %d%% | Caster:%d
 1054:  > [Map Skill] Name : Player, Monster, Boss Monster, Other | Caster

+ 1 - 1
conf/msg_conf/map_msg_chn.conf

@@ -882,7 +882,7 @@
 1048: 傳送 旗標:
 1049: 天氣 旗標:
 1050: 其它 旗標:
-1051: 其它 旗標2:
+//1051: free
 //1052-1064 free
 1065:  死亡無經驗懲罰: %s | 死亡無金錢懲罰: %s
 1066: 開啟

+ 1 - 1
conf/msg_conf/map_msg_frn.conf

@@ -894,7 +894,7 @@
 1048: Teleportation Flags:
 1049: Météo Flags:
 1050: Autres Flags:
-1051: Autres Flags2:
+//1051: free
 1052: Réglage des dégâts des Skills:
 //1053-1064 free
 1065: Pas de pénalité d'Exp: %s | Pas de pénalité de Zeny: %s

+ 1 - 1
conf/msg_conf/map_msg_idn.conf

@@ -981,7 +981,7 @@
 1048: Teleport Flags: 
 1049: Cuaca: 
 1050: Flag Lainnya: 
-1051: Flag Lainnya2:
+//1051: free
 1052: Skill Damage Adjustments:
 //1053-1064 kosong
 1065: Tidak ada pengurangan exp: %s | Tidak ada pengurangan zeny: %s

+ 1 - 1
conf/msg_conf/map_msg_por.conf

@@ -1063,7 +1063,7 @@
 1048: Flags de Teleporte: 
 1049: Flags de Clima: 
 1050: Outras Flags: 
-1051: Outras Flags2:
+//1051: free
 1052: Skill Damage Adjustments:
 //1053-1064 free
 1065: Sem Penalidade de Exp: %s | Sem Penalidade de Zeny: %s

+ 1 - 1
conf/msg_conf/map_msg_rus.conf

@@ -895,7 +895,7 @@
 1048: Флаги перемещения:
 1049: Флаги погоды:
 1050: Другие флаги: 
-1051: Другие флаги2:
+//1051: free
 
 1065: Нет штрафов опыта: %s | Нет штрафов Зени: %s
 1066: Включено

+ 1 - 1
conf/msg_conf/map_msg_spn.conf

@@ -1135,7 +1135,7 @@
 1048: Configuración del teletransporte:
 1049: Opciones climáticas:
 1050: Otras opciones:
-1051: Otras opciones2:
+//1051: free
 1052: Ajustes de daño de habilidades:
 1053:  > [Mapa] %d%%, %d%%, %d%%, %d%% | Invocador:%d
 1054:  > [Habilidad] Nombre : Jugadores, Monstruos, Jefes, Otros | Invocador

+ 1 - 1
conf/msg_conf/map_msg_tha.conf

@@ -888,7 +888,7 @@
 1048: Teleport Flags:
 1049: Weather Flags:
 1050: Other Flags:
-1051: Other Flags:
+//1051: free
 
 1065: No Exp Penalty: %s | No Zeny Penalty: %s
 1066: On

+ 6 - 0
doc/mapflags.txt

@@ -294,6 +294,12 @@ Disable Bank on a map.
 
 ---------------------------------------
 
+*norodex
+
+Disable RODex on a map.
+
+---------------------------------------
+
 =====================
 | 2. Battle-related |
 =====================

+ 16 - 3
src/map/atcommand.cpp

@@ -4507,6 +4507,10 @@ ACMD_FUNC(mapinfo) {
 		strcat(atcmd_output, " NoGo |"); //
 	if (map_getmapflag(m_id, MF_NOMEMO))
 		strcat(atcmd_output, "  NoMemo |");
+	if (map_getmapflag(m_id, MF_PRIVATEAIRSHIP_SOURCE))
+		strcat(atcmd_output, " PrivateAirship_Source |");
+	if (map_getmapflag(m_id, MF_PRIVATEAIRSHIP_DESTINATION))
+		strcat(atcmd_output, " PrivateAirship_Destination |");
 	clif_displaymessage(fd, atcmd_output);
 
 	sprintf(atcmd_output, msg_txt(sd,1065),  // No Exp Penalty: %s | No Zeny Penalty: %s
@@ -4567,9 +4571,6 @@ ACMD_FUNC(mapinfo) {
 		strcat(atcmd_output, " Reset |");
 	if (map_getmapflag(m_id, MF_HIDEMOBHPBAR))
 		strcat(atcmd_output, " HideMobHPBar |");
-	clif_displaymessage(fd, atcmd_output);
-
-	strcpy(atcmd_output,msg_txt(sd,1051)); // Other Flags2:
 	if (map_getmapflag(m_id, MF_NOCOMMAND))
 		strcat(atcmd_output, " NoCommand |");
 	if (map_getmapflag(m_id, MF_NOBASEEXP))
@@ -4580,12 +4581,18 @@ ACMD_FUNC(mapinfo) {
 		strcat(atcmd_output, " NoMobLoot |");
 	if (map_getmapflag(m_id, MF_NOMVPLOOT))
 		strcat(atcmd_output, " NoMVPLoot |");
+	if (map_getmapflag(m_id, MF_NORENEWALEXPPENALTY))
+		strcat(atcmd_output, " NoRenewalExpPenalty |");
+	if (map_getmapflag(m_id, MF_NORENEWALDROPPENALTY))
+		strcat(atcmd_output, " NoRenewalDropPenalty |");
 	if (map_getmapflag(m_id, MF_PARTYLOCK))
 		strcat(atcmd_output, " PartyLock |");
 	if (map_getmapflag(m_id, MF_GUILDLOCK))
 		strcat(atcmd_output, " GuildLock |");
 	if (map_getmapflag(m_id, MF_LOADEVENT))
 		strcat(atcmd_output, " Loadevent |");
+	if (map_getmapflag(m_id, MF_NODYNAMICNPC))
+		strcat(atcmd_output, " NoDynamicNPC |");
 	if (map_getmapflag(m_id, MF_NOMAPCHANNELAUTOJOIN))
 		strcat(atcmd_output, " NoMapChannelAutoJoin |");
 	if (map_getmapflag(m_id, MF_NOUSECART))
@@ -4604,6 +4611,12 @@ ACMD_FUNC(mapinfo) {
 		strcat(atcmd_output, " NoCostume |");
 	if (map_getmapflag(m_id, MF_NOBANK))
 		strcat(atcmd_output, " NoBank |");
+	if (map_getmapflag(m_id, MF_NOCASHSHOP))
+		strcat(atcmd_output, " NoCashShop |");
+	if (map_getmapflag(m_id, MF_NORODEX))
+		strcat(atcmd_output, " NoRODex |");
+	if (map_getmapflag(m_id, MF_NOPETCAPTURE))
+		strcat(atcmd_output, " NoPetCapture |");
 	clif_displaymessage(fd, atcmd_output);
 
 	switch (list) {