-Remove mapflag name in msg_conf for @mapinfo since the name of the mapflag shouldn't change.

This commit is contained in:
lighta 2013-07-24 14:44:22 -04:00
parent 329bf2fc0a
commit 8c14fb9367
11 changed files with 141 additions and 529 deletions

View File

@ -882,66 +882,19 @@
1044: Autotrade Disabled
1045: Battlegrounds ON (type %d)
1046: PvP Flags:
1047: Pvp ON |
1048: NoGuild |
1049: NoParty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: GvG Flags:
1053: GvG ON |
1054: GvG Dungeon |
1055: GvG Castle |
1056: NoParty |
1057: Teleport Flags:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1047: GvG Flags:
1048: Teleport Flags:
1049: Weather Flags:
1050: Other Flags:
1051: Other Flags2:
//1052-1064 free
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1066: On
1067: Off
1068: No Save (Return to last Save Point)
1069: No Save, Save Point: %s,Random
1070: No Save, Save Point: %s,%d,%d
1071: Weather Flags:
1072: Snow |
1073: Fog |
1074: Sakura |
1075: Clouds |
1076: Clouds2 |
1077: Fireworks |
1078: Leaves |
//1079: Rain |
1080: Displays Night |
1081: Other Flags:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Other Flags:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: You have mounted your Dragon.

View File

@ -863,67 +863,18 @@
1044: Autotrade Disabled
1045: Battlegrounds ON (type %d)
1046: PvP Flags:
1047: Pvp ON |
1048: NoGuild |
1049: NoParty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: GvG Flags:
1053: GvG ON |
1054: GvG Dungeon |
1055: GvG Castle |
1056: NoParty |
1057: Teleport Flags:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1047: GvG Flags:
1048: Teleport Flags:
1049: Weather Flags:
1050: Other Flags:
1051: Other Flags2:
//1052-1064 free
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1066: On
1067: Off
1068: No Save (Return to last Save Point)
1069: No Save, Save Point: %s,Random
1070: No Save, Save Point: %s,%d,%d
1071: Weather Flags:
1072: Snow |
1073: Fog |
1074: Sakura |
1075: Clouds |
1076: Clouds2 |
1077: Fireworks |
1078: Leaves |
//1079: Rain |
1080: Displays Night |
1081: Other Flags:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Other Flags:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1099: Src4instance |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: You have mounted your Dragon.

View File

@ -869,67 +869,18 @@
1044: Autotrade Désactivé
1045: Battlegrounds ON (type %d)
1046: PvP Flags:
1047: Pvp ON |
1048: Noguild |
1049: Noparty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: GvG Flags:
1053: GvG ON |
1054: GvG Donjon |
1055: GvG Château |
1056: Noparty |
1057: Teleport Flags:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1047: GvG Flags:
1048: Teleport Flags:
1049: Weather Flags:
1050: Other Flags:
1051: Other Flags2:
//1052-1064 free
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1066: On
1067: Off
1068: No Save (Retour au dernier point de sauvegarde)
1069: No Save, Point de Sauvegarde: %s,Aléatoire
1070: No Save, Point de Sauvegarde: %s,%d,%d
1071: Weather Flags:
1072: Snow |
1073: Fog |
1074: Sakura |
1075: Clouds |
1076: Clouds2 |
1077: Fireworks |
1078: Leaves |
//1079: Rain |
1080: Displays Night |
1081: Other Flags:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Other Flags:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1099: Src4instance |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
1068: No Save (Return to last Save Point)
1069: No Save, Save Point: %s,Random
1070: No Save, Save Point: %s,%d,%d
// @mount
1119: Dragon monté.

View File

@ -881,66 +881,19 @@
1044: Autotrade dinonaktifkan
1045: Battleground ON (tipe %d)
1046: PvP Flags:
1047: Pvp ON |
1048: NoGuild |
1049: NoParty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: GvG Flags:
1053: GvG ON |
1054: GvG Dungeon |
1055: GvG Castle |
1056: NoParty |
1057: Teleport Flags:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1047: GvG Flags:
1048: Teleport Flags:
1049: Cuaca:
1050: Flag Lainnya:
1051: Flag Lainnya2:
//1052-1064 free
1065: Tidak ada pengurangan exp: %s | Tidak ada pengurangan zeny: %s
1066: Hidup
1067: Mati
1068: Tidak bisa menggunakan Save (Kembali ke Save Point terakhir)
1069: Tidak bisa menggunakan Save, Save Point: %s,Acak
1070: Tidak bisa menggunakan Save, Save Point: %s,%d,%d
1071: Cuaca:
1072: Salju |
1073: Kabut |
1074: Sakura |
1075: Awan |
1076: Awan2 |
1077: Kembang Api |
1078: Daun |
//1079: Hujan |
1080: Mode Malam |
1081: Flag Lainnya:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Flag Lainnya:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: Kamu sudah menaiki seekor naga.

View File

@ -862,67 +862,20 @@
1044: Autotrade Desabilitado
1045: Battlegrounds Habilitado (tipo %d)
1046: Flags de PvP:
1047: Pvp Habilitado |
1048: NoGuild |
1049: NoParty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: Flags de GvG:
1053: GvG Habilitado |
1054: GvG Dungeon |
1055: GvG Castle |
1056: NoParty |
1057: Flags de Teleporte:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1047: Flags de GvG:
1048: Flags de Teleporte:
1049: Flags de Clima:
1050: Outras Flags:
1051: Outras Flags2:
//1052-1064 free
1065: Sem Penalidade de Exp: %s | Sem Penalidade de Zeny: %s
1066: Habilitado
1067: Desabilitado
1068: Sem Salvo (Retorna ao último Ponto de Retorno)
1069: Sem Salvo, Ponto de Retorno: %s,Random
1070: Sem Salvo, Ponto de Retorno: %s,%d,%d
1071: Flags de Clima:
1072: Snow |
1073: Fog |
1074: Sakura |
1075: Clouds |
1076: Clouds2 |
1077: Fireworks |
1078: Leaves |
//1079: Rain |
1080: Displays Night |
1081: Outras Flags:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Outras Flags:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1099: Src4instance |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: Você montou um Dragão.

View File

@ -869,68 +869,19 @@
1043: Autotrade Разрешён
1044: Autotrade Запрещён
1045: Battlegrounds ВКЛЮЧЕНО (тип %d)
1046: PvP ôëàãè:
1047: Pvp ÂÊËÞ×ÅÍÎ |
1048: NoGuild |
1049: NoParty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: GvG ôëàãè:
1053: GvG ÂÊËÞ×ÅÍÎ |
1054: GvG Dungeon |
1055: GvG Castle |
1056: NoParty |
1057: Ôëàãè ïåðåìåùåíèÿ:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1046: PvP флаги:
1047: GvG флаги:
1048: Флаги перемещения:
1049: Флаги погоды:
1050: Другие флаги:
1051: Другие флаги2:
1065: Нет штрафов опыта: %s | Нет штрафов Зени: %s
1066: Включено
1067: Выключено
1068: No Save (Возвращение в точку сохранения)
1069: No Save, Точка сохранения: %s,Случайные координаты
1070: No Save, Точка сохранения: %s,%d,%d
1071: Ôëàãè ïîãîäû:
1072: Ñíåã |
1073: Òóìàí |
1074: Ñàêóðà |
1075: Îáëàêà |
1076: Îáëàêà 2 |
1077: Ôåéåðâåðêè |
1078: Ëèñòîïàä |
//1079: Äîæäü |
1080: Íî÷ü |
1081: Äðóãèå ôëàãè:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Äðóãèå ôëàãè:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1099: Src4instance |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: Вы оседлали Дракона.

View File

@ -869,67 +869,18 @@
1044: Autotrade desactivado
1045: Battleground activado (tipo %d)
1046: Configuración de PvP:
1047: PvP activado |
1048: Sin clan |
1049: Sin grupo |
1050: Modo pesadilla |
1051: Sin ranking |
1052: Configuración de GvG:
1053: GvG activado |
1054: Mazmorra GvG |
1055: Castillo GvG |
1056: Sin grupo |
1057: Configuración del teletransporte:
1058: Sin teletransporte |
1059: Sin teletransporte de monstruos |
1060: Sin @go |
1061: Sin @warp |
1062: Sin retorno |
1063: Sin go |
1064: Sin puntos de memorización |
1047: Configuración de GvG:
1048: Configuración del teletransporte:
1049: Opciones climáticas:
1050: Otras opciones:
1051: Otras opciones2:
1065: Sin penalización de experiencia: %s | Sin penalización de zeny: %s
1066: Activado
1067: Desactivado
1068: Sin opción de guardado (Vuelves al punto de guardado)
1069: Sin opción de guardado, punto de guardado: %s, aleatorio
1070: Sin opción de guardado, punto de guardado: %s,%d,%d
1071: Opciones climáticas:
1072: Nieve |
1073: Niebla |
1074: Hojas de cerezo |
1075: Nubes |
1076: Nubes2 |
1077: Fuegos artificiales |
1078: Hojas secas |
//1079: Lluvia |
1080: Modo nocturno |
1081: Otras opciones:
1082: Sin ramas |
1083: Sin intercambio de objetos |
1084: Sin tiendas |
1085: Sin soltar objetos |
1086: Sin habilidades |
1087: Sin muros de hielo |
1088: Permite KS |
1089: Reset |
1090: Otras opciones:
1091: Sin comandos |
1092: Sin experiencia de base |
1093: Sin experiencia de oficio |
1094: Sin objetos de monstruos |
1095: Sin objetos de MVP |
1096: Bloqueo de grupos |
1097: Bloqueo de clanes |
1098: Loadevent |
1099: Src4instance |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: Te has montado en tu dragón.

View File

@ -876,67 +876,18 @@
1044: Autotrade Disabled
1045: Battlegrounds ON (type %d)
1046: PvP Flags:
1047: Pvp ON |
1048: NoGuild |
1049: NoParty |
1050: NightmareDrop |
1051: NoCalcRank |
1052: GvG Flags:
1053: GvG ON |
1054: GvG Dungeon |
1055: GvG Castle |
1056: NoParty |
1057: Teleport Flags:
1058: NoTeleport |
1059: Monster NoTeleport |
1060: NoWarp |
1061: NoWarpTo |
1062: NoReturn |
1063: NoGo |
1064: NoMemo |
1047: GvG Flags:
1048: Teleport Flags:
1049: Weather Flags:
1050: Other Flags:
1051: Other Flags:
1065: No Exp Penalty: %s | No Zeny Penalty: %s
1066: On
1067: Off
1068: No Save (Return to last Save Point)
1069: No Save, Save Point: %s,Random
1070: No Save, Save Point: %s,%d,%d
1071: Weather Flags:
1072: Snow |
1073: Fog |
1074: Sakura |
1075: Clouds |
1076: Clouds2 |
1077: Fireworks |
1078: Leaves |
//1079: Rain |
1080: Displays Night |
1081: Other Flags:
1082: NoBranch |
1083: NoTrade |
1084: NoVending |
1085: NoDrop |
1086: NoSkill |
1087: NoIcewall |
1088: AllowKS |
1089: Reset |
1090: Other Flags:
1091: NoCommand |
1092: NoBaseEXP |
1093: NoJobEXP |
1094: NoMobLoot |
1095: NoMVPLoot |
1096: PartyLock |
1097: GuildLock |
1098: Loadevent |
1099: Src4instance |
1100: Chmautojoin |
1101: NoUseCart |
1102: NoItemConsumption |
1103: NoSumStarMiracle |
1104: NoMineEffect |
1105: NoLockOn |
1106: Restricted (zone %d)
1107: NoTomb |
// @mount
1119: ¤Ø³ä´é¢Õè Dragon àÃÕºÃéÍÂ.

View File

@ -3826,7 +3826,7 @@ ACMD_FUNC(mapinfo) {
if (map[m_id].flag.town)
clif_displaymessage(fd, msg_txt(sd,1042)); // Town Map
if (map[m_id].flag.restricted){
sprintf(atcmd_output, msg_txt(sd,1106),map[m_id].zone); // Restricted (zone %d)
sprintf(atcmd_output, " Restricted (zone %d)",map[m_id].zone);
clif_displaymessage(fd, atcmd_output);
}
@ -3841,43 +3841,43 @@ ACMD_FUNC(mapinfo) {
}
strcpy(atcmd_output,msg_txt(sd,1046)); // PvP Flags:
if (map[m_id].flag.pvp)
strcat(atcmd_output, msg_txt(sd,1047)); // Pvp ON |
strcat(atcmd_output, " Pvp ON |");
if (map[m_id].flag.pvp_noguild)
strcat(atcmd_output, msg_txt(sd,1048)); // NoGuild |
strcat(atcmd_output, " NoGuild |");
if (map[m_id].flag.pvp_noparty)
strcat(atcmd_output, msg_txt(sd,1049)); // NoParty |
strcat(atcmd_output, " NoParty |");
if (map[m_id].flag.pvp_nightmaredrop)
strcat(atcmd_output, msg_txt(sd,1050)); // NightmareDrop |
strcat(atcmd_output, " NightmareDrop |");
if (map[m_id].flag.pvp_nocalcrank)
strcat(atcmd_output, msg_txt(sd,1051)); // NoCalcRank |
strcat(atcmd_output, " NoCalcRank |");
clif_displaymessage(fd, atcmd_output);
strcpy(atcmd_output,msg_txt(sd,1052)); // GvG Flags:
strcpy(atcmd_output,msg_txt(sd,1047)); // GvG Flags:
if (map[m_id].flag.gvg)
strcat(atcmd_output, msg_txt(sd,1053)); // GvG ON |
strcat(atcmd_output, " GvG ON |");
if (map[m_id].flag.gvg_dungeon)
strcat(atcmd_output, msg_txt(sd,1054)); // GvG Dungeon |
strcat(atcmd_output, " GvG Dungeon |");
if (map[m_id].flag.gvg_castle)
strcat(atcmd_output, msg_txt(sd,1055)); // GvG Castle |
strcat(atcmd_output, " GvG Castle |");
if (map[m_id].flag.gvg_noparty)
strcat(atcmd_output, msg_txt(sd,1056)); // NoParty |
strcat(atcmd_output, " NoParty |");
clif_displaymessage(fd, atcmd_output);
strcpy(atcmd_output,msg_txt(sd,1057)); // Teleport Flags:
strcpy(atcmd_output,msg_txt(sd,1048)); // Teleport Flags:
if (map[m_id].flag.noteleport)
strcat(atcmd_output, msg_txt(sd,1058)); // NoTeleport |
strcat(atcmd_output, " NoTeleport |");
if (map[m_id].flag.monster_noteleport)
strcat(atcmd_output, msg_txt(sd,1059)); // Monster NoTeleport |
strcat(atcmd_output, " Monster NoTeleport |");
if (map[m_id].flag.nowarp)
strcat(atcmd_output, msg_txt(sd,1060)); // NoWarp |
strcat(atcmd_output, " NoWarp |");
if (map[m_id].flag.nowarpto)
strcat(atcmd_output, msg_txt(sd,1061)); // NoWarpTo |
strcat(atcmd_output, " NoWarpTo |");
if (map[m_id].flag.noreturn)
strcat(atcmd_output, msg_txt(sd,1062)); // NoReturn |
strcat(atcmd_output, " NoReturn |");
if (map[m_id].flag.nogo)
strcat(atcmd_output, msg_txt(sd,1063)); // NoGo |
strcat(atcmd_output, " NoGo |"); //
if (map[m_id].flag.nomemo)
strcat(atcmd_output, msg_txt(sd,1064)); // NoMemo |
strcat(atcmd_output, " NoMemo |");
clif_displaymessage(fd, atcmd_output);
sprintf(atcmd_output, msg_txt(sd,1065), // No Exp Penalty: %s | No Zeny Penalty: %s
@ -3898,75 +3898,75 @@ ACMD_FUNC(mapinfo) {
}
}
strcpy(atcmd_output,msg_txt(sd,1071)); // Weather Flags:
strcpy(atcmd_output,msg_txt(sd,1049)); // Weather Flags:
if (map[m_id].flag.snow)
strcat(atcmd_output, msg_txt(sd,1072)); // Snow |
strcat(atcmd_output, " Snow |");
if (map[m_id].flag.fog)
strcat(atcmd_output, msg_txt(sd,1073)); // Fog |
strcat(atcmd_output, " Fog |");
if (map[m_id].flag.sakura)
strcat(atcmd_output, msg_txt(sd,1074)); // Sakura |
strcat(atcmd_output, " Sakura |");
if (map[m_id].flag.clouds)
strcat(atcmd_output, msg_txt(sd,1075)); // Clouds |
strcat(atcmd_output, " Clouds |");
if (map[m_id].flag.clouds2)
strcat(atcmd_output, msg_txt(sd,1076)); // Clouds2 |
strcat(atcmd_output, " Clouds2 |");
if (map[m_id].flag.fireworks)
strcat(atcmd_output, msg_txt(sd,1077)); // Fireworks |
strcat(atcmd_output, " Fireworks |");
if (map[m_id].flag.leaves)
strcat(atcmd_output, msg_txt(sd,1078)); // Leaves |
strcat(atcmd_output, " Leaves |");
if (map[m_id].flag.nightenabled)
strcat(atcmd_output, msg_txt(sd,1080)); // Displays Night |
strcat(atcmd_output, " Displays Night |");
clif_displaymessage(fd, atcmd_output);
strcpy(atcmd_output,msg_txt(sd,1081)); // Other Flags:
strcpy(atcmd_output,msg_txt(sd,1050)); // Other Flags:
if (map[m_id].flag.nobranch)
strcat(atcmd_output, msg_txt(sd,1082)); // NoBranch |
strcat(atcmd_output, " NoBranch |");
if (map[m_id].flag.notrade)
strcat(atcmd_output, msg_txt(sd,1083)); // NoTrade |
strcat(atcmd_output, " NoTrade |");
if (map[m_id].flag.novending)
strcat(atcmd_output, msg_txt(sd,1084)); // NoVending |
strcat(atcmd_output, " NoVending |");
if (map[m_id].flag.nodrop)
strcat(atcmd_output, msg_txt(sd,1085)); // NoDrop |
strcat(atcmd_output, " NoDrop |");
if (map[m_id].flag.noskill)
strcat(atcmd_output, msg_txt(sd,1086)); // NoSkill |
strcat(atcmd_output, " NoSkill |");
if (map[m_id].flag.noicewall)
strcat(atcmd_output, msg_txt(sd,1087)); // NoIcewall |
strcat(atcmd_output, " NoIcewall |");
if (map[m_id].flag.allowks)
strcat(atcmd_output, msg_txt(sd,1088)); // AllowKS |
strcat(atcmd_output, " AllowKS |");
if (map[m_id].flag.reset)
strcat(atcmd_output, msg_txt(sd,1089)); // Reset |
strcat(atcmd_output, " Reset |");
clif_displaymessage(fd, atcmd_output);
strcpy(atcmd_output,msg_txt(sd,1090)); // Other Flags:
strcpy(atcmd_output,msg_txt(sd,1051)); // Other Flags2:
if (map[m_id].nocommand)
strcat(atcmd_output, msg_txt(sd,1091)); // NoCommand |
strcat(atcmd_output, " NoCommand |");
if (map[m_id].flag.nobaseexp)
strcat(atcmd_output, msg_txt(sd,1092)); // NoBaseEXP |
strcat(atcmd_output, " NoBaseEXP |");
if (map[m_id].flag.nojobexp)
strcat(atcmd_output, msg_txt(sd,1093)); // NoJobEXP |
strcat(atcmd_output, " NoJobEXP |");
if (map[m_id].flag.nomobloot)
strcat(atcmd_output, msg_txt(sd,1094)); // NoMobLoot |
strcat(atcmd_output, " NoMobLoot |");
if (map[m_id].flag.nomvploot)
strcat(atcmd_output, msg_txt(sd,1095)); // NoMVPLoot |
strcat(atcmd_output, " NoMVPLoot |");
if (map[m_id].flag.partylock)
strcat(atcmd_output, msg_txt(sd,1096)); // PartyLock |
strcat(atcmd_output, " PartyLock |");
if (map[m_id].flag.guildlock)
strcat(atcmd_output, msg_txt(sd,1097)); // GuildLock |
strcat(atcmd_output, " GuildLock |");
if (map[m_id].flag.loadevent)
strcat(atcmd_output, msg_txt(sd,1098)); // Loadevent |
strcat(atcmd_output, " Loadevent |");
if (map[m_id].flag.chmautojoin)
strcat(atcmd_output, msg_txt(sd,1100)); // Chmautojoin |
strcat(atcmd_output, " Chmautojoin |");
if (map[m_id].flag.nousecart)
strcat(atcmd_output, msg_txt(sd,1101)); // NoUsecart |
strcat(atcmd_output, " NoUsecart |");
if (map[m_id].flag.noitemconsumption)
strcat(atcmd_output, msg_txt(sd,1102)); // NoItemConsumption |
strcat(atcmd_output, " NoItemConsumption |");
if (map[m_id].flag.nosumstarmiracle)
strcat(atcmd_output, msg_txt(sd,1103)); // NoSumStarMiracle |
strcat(atcmd_output, " NoSumStarMiracle |");
if (map[m_id].flag.nomineeffect)
strcat(atcmd_output, msg_txt(sd,1104)); // NoMineEffect |
strcat(atcmd_output, " NoMineEffect |");
if (map[m_id].flag.nolockon)
strcat(atcmd_output, msg_txt(sd,1105)); // NoLockOn |
strcat(atcmd_output, " NoLockOn |");
if (map[m_id].flag.notomb)
strcat(atcmd_output, msg_txt(sd,1107)); // NoTomb |
strcat(atcmd_output, " NoTomb |");
clif_displaymessage(fd, atcmd_output);
switch (list) {

View File

@ -12,8 +12,10 @@ struct map_session_data;
//Note: The range is unlimited unless this define is set.
//#define AUTOLOOT_DISTANCE AREA_SIZE
//global var
extern char atcommand_symbol;
extern char charcommand_symbol;
extern int atcmd_binding_count;
typedef enum {
COMMAND_ATCOMMAND = 1,
@ -30,8 +32,6 @@ void atcommand_db_load_groups(int* group_ids);
bool atcommand_exists(const char* name);
extern int atcmd_binding_count;
// @commands (script based)
struct atcmd_binding_data {
char command[50];
@ -39,9 +39,7 @@ struct atcmd_binding_data {
int level;
int level2;
};
struct atcmd_binding_data** atcmd_binding;
struct atcmd_binding_data* get_atcommandbind_byname(const char* name);
#endif /* _ATCOMMAND_H_ */

View File

@ -14,6 +14,33 @@ typedef enum damage_lv {
ATK_DEF // attack connected
} damage_lv;
enum { // Flag of the final calculation
BF_WEAPON = 0x0001,
BF_MAGIC = 0x0002,
BF_MISC = 0x0004,
BF_SHORT = 0x0010,
BF_LONG = 0x0040,
BF_SKILL = 0x0100,
BF_NORMAL = 0x0200,
BF_WEAPONMASK=0x000f,
BF_RANGEMASK= 0x00f0,
BF_SKILLMASK= 0x0f00,
};
enum e_battle_check_target
{//New definitions [Skotlex]
BCT_ENEMY = 0x020000,
BCT_NOENEMY = 0x1d0000, //This should be (~BCT_ENEMY&BCT_ALL)
BCT_PARTY = 0x040000,
BCT_NOPARTY = 0x1b0000, //This should be (~BCT_PARTY&BCT_ALL)
BCT_GUILD = 0x080000,
BCT_NOGUILD = 0x170000, //This should be (~BCT_GUILD&BCT_ALL)
BCT_ALL = 0x1f0000,
BCT_NOONE = 0x000000,
BCT_SELF = 0x010000,
BCT_NEUTRAL = 0x100000,
};
// dammage structure
struct Damage {
#ifdef RENEWAL
@ -52,19 +79,6 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
int battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int damage,int div_,uint16 skill_id,uint16 skill_lv,int flag);
int battle_calc_bg_damage(struct block_list *src,struct block_list *bl,int damage,int div_,uint16 skill_id,uint16 skill_lv,int flag);
enum { // Flag of the final calculation
BF_WEAPON = 0x0001,
BF_MAGIC = 0x0002,
BF_MISC = 0x0004,
BF_SHORT = 0x0010,
BF_LONG = 0x0040,
BF_SKILL = 0x0100,
BF_NORMAL = 0x0200,
BF_WEAPONMASK=0x000f,
BF_RANGEMASK= 0x00f0,
BF_SKILLMASK= 0x0f00,
};
int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects);
// Summary normal attack treatment (basic attack)
@ -77,20 +91,6 @@ struct block_list* battle_getenemy(struct block_list *target, int type, int rang
int battle_gettarget(struct block_list *bl);
int battle_getcurrentskill(struct block_list *bl);
enum e_battle_check_target
{//New definitions [Skotlex]
BCT_ENEMY = 0x020000,
BCT_NOENEMY = 0x1d0000, //This should be (~BCT_ENEMY&BCT_ALL)
BCT_PARTY = 0x040000,
BCT_NOPARTY = 0x1b0000, //This should be (~BCT_PARTY&BCT_ALL)
BCT_GUILD = 0x080000,
BCT_NOGUILD = 0x170000, //This should be (~BCT_GUILD&BCT_ALL)
BCT_ALL = 0x1f0000,
BCT_NOONE = 0x000000,
BCT_SELF = 0x010000,
BCT_NEUTRAL = 0x100000,
};
#define is_boss(bl) (status_get_mode(bl)&MD_BOSS) // Can refine later [Aru]
int battle_check_undead(int race,int element);