diff --git a/README.md b/README.md index d0056fa..c254db7 100644 --- a/README.md +++ b/README.md @@ -144,10 +144,10 @@ Plugin de Multimod para CS 1.6 / CS:CZ - Comandos de Administración (votaciones personalizadas, configuracion, forzar una votacion de modo) - `API` natives y forwards _(Toda la información detallada se encuentra [aquí](https://github.com/FEDERICOMB96/amxx-multimod-manager/wiki/API))_ -## Wiki +## Wiki: Necesitas **ayuda**? Consulte los _artículos_ de la [wiki](https://github.com/FEDERICOMB96/amxx-multimod-manager/wiki). -## Contribuyendo +## Contribuyendo: ¿Tienes **algo interesante** que te gustaría **compartir**? Abra un PR y estaré encantado de revisarlo. ## Créditos: diff --git a/addons/amxmodx/data/lang/multimod_manager.txt b/addons/amxmodx/data/lang/multimod_manager.txt index e32a4c5..021d795 100644 --- a/addons/amxmodx/data/lang/multimod_manager.txt +++ b/addons/amxmodx/data/lang/multimod_manager.txt @@ -96,7 +96,7 @@ MM_ADMIN_VOTEMOD_MODE_SELECTED_INFO = Ahora puedes cambiar a un mapa del modo se MM_ADMIN_VOTEMOD_M_TITLE_VOTE = \yVotación de modos %d/%d MM_ADMIN_VOTEMOD_START_VOTE = Iniciar una votación de modo MM_ADMIN_VOTEMOD_MIN_MODES = Debes seleccionar al menos 2 modos (%d máximo) -MM_ADMIN_VOTEMOD_SELECTED_MODES = \yModos seleccionados\w (%d%s) +MM_ADMIN_VOTEMOD_SELECTED_MODES = \yModos seleccionados\w MM_ADMIN_VOTEMOD_ADMIN_NAME = \yVotación hecha por\w %n MM_ADMIN_VOTEMOD_START_VOTE_SAY = ^3%n^1 ha iniciado una votación para el cambio de modo @@ -107,7 +107,7 @@ MM_ADMIN_VOTEMAP_MAP_SELECTED_INFO = Ahora puedes cambiar al mapa seleccionado MM_ADMIN_VOTEMAP_M_TITLE_VOTE = \yVotación de mapas para el modo\w %s\y %d/%d MM_ADMIN_VOTEMAP_START_VOTE = Iniciar una votación de mapa MM_ADMIN_VOTEMAP_MIN_MAPS = Debes seleccionar al menos 2 mapas (%d máximo) -MM_ADMIN_VOTEMAP_SELECTED_MAPS = \yMapas seleccionados\w (%d%s) +MM_ADMIN_VOTEMAP_SELECTED_MAPS = \yMapas seleccionados\w MM_ADMIN_VOTEMAP_ADMIN_NAME = \yVotación hecha por\w %n MM_ADMIN_VOTEMAP_START_VOTE_SAY = ^3%n^1 ha iniciado una votación para el cambio de mapa @@ -282,7 +282,7 @@ MM_ADMIN_VOTEMOD_MODE_SELECTED_INFO = Now you can change to a map of the selecte MM_ADMIN_VOTEMOD_M_TITLE_VOTE = \yVote mods %d/%d MM_ADMIN_VOTEMOD_START_VOTE = Start a vote mod MM_ADMIN_VOTEMOD_MIN_MODES = You must select at least 2 mods (%d maximum) -MM_ADMIN_VOTEMOD_SELECTED_MODES = \ySelected mods\w (%d%s) +MM_ADMIN_VOTEMOD_SELECTED_MODES = \ySelected mods\w MM_ADMIN_VOTEMOD_ADMIN_NAME = \yVote made by\w %n MM_ADMIN_VOTEMOD_START_VOTE_SAY = ^3%n^1 has started a vote for the mod change @@ -293,7 +293,7 @@ MM_ADMIN_VOTEMAP_MAP_SELECTED_INFO = Now you can change to the selected map MM_ADMIN_VOTEMAP_M_TITLE_VOTE = \yVote maps for the mod\w %s\y %d/%d MM_ADMIN_VOTEMAP_START_VOTE = Start a vote map MM_ADMIN_VOTEMAP_MIN_MAPS = You must select at least 2 maps (%d maximum) -MM_ADMIN_VOTEMAP_SELECTED_MAPS = \ySelected maps\w (%d%s) +MM_ADMIN_VOTEMAP_SELECTED_MAPS = \ySelected maps\w MM_ADMIN_VOTEMAP_ADMIN_NAME = \yVote made by\w %n MM_ADMIN_VOTEMAP_START_VOTE_SAY = ^3%n^1 has started a vote for the map change @@ -468,7 +468,7 @@ MM_ADMIN_VOTEMOD_MODE_SELECTED_INFO = Теперь вы можете перек MM_ADMIN_VOTEMOD_M_TITLE_VOTE = \yГолосование за режимы %d/%d MM_ADMIN_VOTEMOD_START_VOTE = Начать голосование за режим MM_ADMIN_VOTEMOD_MIN_MODES = Вы должны выбрать как минимум 2 режима (максимум %d) -MM_ADMIN_VOTEMOD_SELECTED_MODES = \yВыбранные режимы\w (%d%s) +MM_ADMIN_VOTEMOD_SELECTED_MODES = \yВыбранные режимы\w MM_ADMIN_VOTEMOD_ADMIN_NAME = \yГолос от\w %n MM_ADMIN_VOTEMOD_START_VOTE_SAY = ^3%n^1 начал голосование за смену режима @@ -479,7 +479,7 @@ MM_ADMIN_VOTEMAP_MAP_SELECTED_INFO = Теперь вы можете перекл MM_ADMIN_VOTEMAP_M_TITLE_VOTE = \yГолосование за карты режима\w %s\y %d/%d MM_ADMIN_VOTEMAP_START_VOTE = Начать голосование за карту MM_ADMIN_VOTEMAP_MIN_MAPS = Вы должны выбрать как минимум 2 карты (максимум %d) -MM_ADMIN_VOTEMAP_SELECTED_MAPS = \yВыбранные карты\w (%d%s) +MM_ADMIN_VOTEMAP_SELECTED_MAPS = \yВыбранные карты\w MM_ADMIN_VOTEMAP_ADMIN_NAME = \yГолос от\w %n MM_ADMIN_VOTEMAP_START_VOTE_SAY = ^3%n^1 начал голосование за смену карты @@ -654,7 +654,7 @@ MM_ADMIN_VOTEMOD_MODE_SELECTED_INFO = Movete da smenite na mapa na izbraniq mod MM_ADMIN_VOTEMOD_M_TITLE_VOTE = \yVot za modove %d/%d MM_ADMIN_VOTEMOD_START_VOTE = Startirai vot za mod MM_ADMIN_VOTEMOD_MIN_MODES = Trqbva da izberete pone 2 moda (%d maximum) -MM_ADMIN_VOTEMOD_SELECTED_MODES = \yIzbrani modove\w (%d%s) +MM_ADMIN_VOTEMOD_SELECTED_MODES = \yIzbrani modove\w MM_ADMIN_VOTEMOD_ADMIN_NAME = \yVota e napraven ot\w %n MM_ADMIN_VOTEMOD_START_VOTE_SAY = ^3%n^1 startira vot za smqna na moda @@ -665,7 +665,7 @@ MM_ADMIN_VOTEMAP_MAP_SELECTED_INFO = Mojete da smenite mapa MM_ADMIN_VOTEMAP_M_TITLE_VOTE = \yMapove za glasuvane za mod\w %s\y %d/%d MM_ADMIN_VOTEMAP_START_VOTE = Startirai vote za map MM_ADMIN_VOTEMAP_MIN_MAPS = Trqbva da izberete pone 2 mapa (%d maximum) -MM_ADMIN_VOTEMAP_SELECTED_MAPS = \yIzbrani mapove\w (%d%s) +MM_ADMIN_VOTEMAP_SELECTED_MAPS = \yIzbrani mapove\w MM_ADMIN_VOTEMAP_ADMIN_NAME = \yVota e napraven ot\w %n MM_ADMIN_VOTEMAP_START_VOTE_SAY = ^3%n^1 startira vot za smqna na mapa diff --git a/addons/amxmodx/scripting/include/mm_incs/admincmds.inc b/addons/amxmodx/scripting/include/mm_incs/admincmds.inc index f15d58d..6e4d758 100644 --- a/addons/amxmodx/scripting/include/mm_incs/admincmds.inc +++ b/addons/amxmodx/scripting/include/mm_incs/admincmds.inc @@ -194,8 +194,10 @@ ShowMenu_SelectMod(const id) if(UTIL_IsModOff(iModId)) menu_additem(iMenu, fmt("%s\r (%L)", aMods[ModName], LANG_PLAYER, "MM_LOCKED"), .callback=menu_makecallback("UTIL_DisableItem")); + else if((g_Admin_SelectedMod[id] == iModId) || (g_iCurrentMod == iModId)) + menu_additem(iMenu, fmt("%s\y (%L)", aMods[ModName], LANG_PLAYER, (g_Admin_SelectedMod[id] == iModId) ? "MM_SELECTED" : "MM_CURRENT")); else - menu_additem(iMenu, fmt("%s%s", aMods[ModName], (g_Admin_SelectedMod[id] == iModId) ? fmt("\y (%L)", LANG_PLAYER, "MM_SELECTED") : ((g_iCurrentMod == iModId) ? fmt("\y (%L)", LANG_PLAYER, "MM_CURRENT") : ""))); + menu_additem(iMenu, aMods[ModName]); } menu_setprop(iMenu, MPROP_NEXTNAME, fmt("%L", LANG_PLAYER, "MM_MORE")); @@ -251,7 +253,12 @@ ShowMenu_SelectMap(const id) new iMenu = menu_create(fmt("%L", LANG_PLAYER, "MM_ADMIN_VOTEMAP_M_TITLE_SELECT_MAP", aMods[ModName]), "menu_SelectMap"); for(new iMapId = 0; iMapId < iArraySize; ++iMapId) - menu_additem(iMenu, fmt("%a%s", ArrayGetStringHandle(aMods[Maps], iMapId), (g_Admin_SelectedMap[id] == iMapId+1) ? fmt("\y (%L)", LANG_PLAYER, "MM_SELECTED") : "")); + { + if(g_Admin_SelectedMap[id] == iMapId+1) + menu_additem(iMenu, fmt("%a\y (%L)", ArrayGetStringHandle(aMods[Maps], iMapId), LANG_PLAYER, "MM_SELECTED")); + else + menu_additem(iMenu, fmt("%a", ArrayGetStringHandle(aMods[Maps], iMapId))); + } menu_setprop(iMenu, MPROP_NEXTNAME, fmt("%L", LANG_PLAYER, "MM_MORE")); menu_setprop(iMenu, MPROP_BACKNAME, fmt("%L", LANG_PLAYER, "MM_BACK")); @@ -345,14 +352,34 @@ ShowMenu_Votemod(const id) if(IsOptionSelected(id, (g_Admin_VoteCurrentPage[id] * 7) + j)) { iKeys |= (1<