update to v17

Help/VoteSys_Docs/ui.md

@@ -89,6 +89,8 @@ If you hold the "Ctrl" key while sending a message, it will be sent to your own
 
 You can recall past messages sent by you by pressing the Up arrow key repeatedly.
 
+Clicking and dragging the mouse while over the text area will select text inside the area. After releasing the mouse button the selected text will be copied to the clipboard.
+
 ### Logo Area
 
 ![Logo Area](LogoHighlight.png)

Help/Votesys_README.md

@@ -401,6 +401,7 @@ PresetName=2v2v2v2 TDM
 Abbreviation=xTDM
 Category=DM
 InheritFrom=DM/Team DeathMatch
+ServerName=My xTDM Server
 GameSettings=MaxTeams=4
 Mutators=Botpack.InstaGibDM
 bOpenVoteMenuAutomatically=False
@@ -423,9 +424,9 @@ Each preset has a `Name`, a `Category` and an `Abbreviation`.
 You can inherit from an arbitrary number of other presets.  
 Refer to other preset using their [full preset names](#full-preset-names).
 
-You can inherit `Game`, `Mutators`, `Parameters`, `GameSettings`, `MinimumMapRepeatDistance`, `MinPlayers`, and `MaxPlayers`. Other elements cannot be inherited.
+You can inherit `ServerName`, `Game`, `Mutators`, `Parameters`, `GameSettings`, `MinimumMapRepeatDistance`, `MinPlayers`, and `MaxPlayers`. Other elements cannot be inherited.
 
-If you dont specify a value for `Game` in the current preset, the first non-empty value in the list of presets you inherit from will be used.
+If you dont specify a value for `ServerName` or `Game` in the current preset, the first non-empty value in the list of presets you inherit from will be used.
 
 If you dont specify a value, or if you specify a negative value for `MinimumMapRepeatDistance`, `MinPlayers`, or `MaxPlayers` in the current preset, the first non-empty and non-negative value in the list of presets you inherit from will be used.
 
@@ -436,6 +437,11 @@ For `Mutators`, `Parameters`, and `GameSettings` the values will be combined in
 
 Default is 0.
 
+#### Server Name
+`ServerName` is used to change the name of the server for this preset. Changes to `ServerName` persist across map changes.
+
+It is recommended to define a `ServerName` either for all presets or for none of them. Remember that `ServerName` can be inherited from other presets.
+
 #### Game Type
 `Game` is used to identify the gametype for the preset. It must not be blank for enabled presets.
 

System/VoteSys_v17.int

@@ -1,178 +1,179 @@
-[Public]
+[Public]
-Object=(Name=VoteSys_v16b.MutVoteSys,Class=Class,MetaClass=Engine.Mutator,Description="MutVoteSys,Enables voting for next map")
+Object=(Name=VoteSys_v17.MutVoteSys,Class=Class,MetaClass=Engine.Mutator,Description="MutVoteSys,Enables voting for next map")
-
+
-[VS_UIS_PageAdmin]
+[VS_UIS_PageAdmin]
-Text_RestartServer="Restart Server"
+Text_RestartServer="Restart Server"
-Text_ReloadSettings="Reload Settings"
+Text_ReloadSettings="Reload Settings"
-Text_SettingsState_New="Loading"
+Text_SettingsState_New="Loading"
-Text_SettingsState_Complete="Loaded"
+Text_SettingsState_Complete="Loaded"
-Text_SettingsState_NotAdmin="Unauthorized"
+Text_SettingsState_NotAdmin="Unauthorized"
-
+
-[VS_UIS_Page]
+[VS_UIS_Page]
-SaveText="Save"
+SaveText="Save"
-
+
-[VS_UIS_PageAdminPresets]
+[VS_UIS_PageAdminPresets]
-Text_PresetName="Preset Name"
+Text_PresetName="Preset Name"
-Text_PresetNameEmpty="Preset will be deleted"
+Text_PresetNameEmpty="Preset will be deleted"
-Text_Category="Category"
+Text_Category="Category"
-Text_Abbreviation="Abbreviation"
+Text_Abbreviation="Abbreviation"
-Text_SortPriority="Sort Priority"
+Text_SortPriority="Sort Priority"
-Text_InheritFrom="Inherit From"
+Text_InheritFrom="Inherit From"
-Text_Game="Game"
+Text_ServerName="Server Name"
-Text_MapListName="Map List Name"
+Text_Game="Game"
-Text_Mutators="Mutators"
+Text_MapListName="Map List Name"
-Text_Parameters="Parameters"
+Text_Mutators="Mutators"
-Text_GameSettings="Game Settings"
+Text_Parameters="Parameters"
-Text_Packages="Packages"
+Text_GameSettings="Game Settings"
-Text_Disabled="Disabled"
+Text_Packages="Packages"
-Text_MinimumMapRepeatDistance="Min. Map Repeat Distance"
+Text_Disabled="Disabled"
-Text_MinPlayers="Min. Players"
+Text_MinimumMapRepeatDistance="Min. Map Repeat Distance"
-Text_MaxPlayers="Max. Players"
+Text_MinPlayers="Min. Players"
-Text_OpenVoteMenuAutomatically="Open Vote Menu Automatically"
+Text_MaxPlayers="Max. Players"
-
+Text_OpenVoteMenuAutomatically="Open Vote Menu Automatically"
-[VS_UIV_ClientWindow]
+
-MapFilterText="Filter Maps By Name"
+[VS_UIV_ClientWindow]
-VoteButtonText="Vote"
+MapFilterText="Filter Maps By Name"
-SuggestButtonText="Suggest"
+VoteButtonText="Vote"
-RandomButtonText="Random"
+SuggestButtonText="Suggest"
-ChatSayText="Say"
+RandomButtonText="Random"
-ChatTeamSayText="TeamSay"
+ChatSayText="Say"
-
+ChatTeamSayText="TeamSay"
-[VS_UI_CandidateListBox]
+
-PresetColumnHeader="Preset"
+[VS_UI_CandidateListBox]
-MapColumnHeader="Map"
+PresetColumnHeader="Preset"
-VotesColumnHeader="Votes"
+MapColumnHeader="Map"
-RandomMapDisplayName="<Random>"
+VotesColumnHeader="Votes"
-
+RandomMapDisplayName="<Random>"
-[VS_Msg_LocalMessage]
+
-MsgNobodyVoted="Nobody voted, randomly selecting {1}"
+[VS_Msg_LocalMessage]
-MsgVotesTied="Tied, randomly selecting {1}"
+MsgNobodyVoted="Nobody voted, randomly selecting {1}"
-MsgHaveWinner="{1} won"
+MsgVotesTied="Tied, randomly selecting {1}"
-MsgMidGame="Initiating mid-game voting, opening Vote Menu"
+MsgHaveWinner="{1} won"
-MsgGameEnded="Game ended, opening Vote Menu"
+MsgMidGame="Initiating mid-game voting, opening Vote Menu"
-MsgPlayerVoted="{1} voted for {2}"
+MsgGameEnded="Game ended, opening Vote Menu"
-MsgAdminForceTravel="Admin {1} forced switching to {2}"
+MsgPlayerVoted="{1} voted for {2}"
-MsgAdminKickPlayer="Admin {1} kicked player {2} ({3})"
+MsgAdminForceTravel="Admin {1} forced switching to {2}"
-MsgAdminBanPlayer="Admin {1} banned player {2} ({3})"
+MsgAdminKickPlayer="Admin {1} kicked player {2} ({3})"
-MsgKickVotePlaced="A player voted to kick {1}"
+MsgAdminBanPlayer="Admin {1} banned player {2} ({3})"
-MsgKickVoteSuccessful="{1} was kicked"
+MsgKickVotePlaced="A player voted to kick {1}"
-MsgPlayerVotedRandom="{1} voted for random map ({2})"
+MsgKickVoteSuccessful="{1} was kicked"
-ErrStillLoading="Vote Menu data is still being transferred, please try again"
+MsgPlayerVotedRandom="{1} voted for random map ({2})"
-ErrNoRootWindow="Failed to create {1} window (Root does not exist)"
+ErrStillLoading="Vote Menu data is still being transferred, please try again"
-ErrCreateDialog="Failed to create {1} window (Could not create Dialog)"
+ErrNoRootWindow="Failed to create {1} window (Root does not exist)"
-ErrWrongConsole="Failed to create {1} window (Console not a WindowConsole)"
+ErrCreateDialog="Failed to create {1} window (Could not create Dialog)"
-ErrMapLoadFailed="Loading map {1} failed, randomly selecting {2}"
+ErrWrongConsole="Failed to create {1} window (Console not a WindowConsole)"
-ErrNoConnection="VoteSys has no connection to server, check server firewall"
+ErrMapLoadFailed="Loading map {1} failed, randomly selecting {2}"
-ErrNotAllowed="Sorry, you are not allowed to vote"
+ErrNoConnection="VoteSys has no connection to server, check server firewall"
-
+ErrNotAllowed="Sorry, you are not allowed to vote"
-[VS_UIS_PageAdminMapLists]
+
-Text_MapListName="Map List Name"
+[VS_UIS_PageAdminMapLists]
-Text_Map="Include Maps"
+Text_MapListName="Map List Name"
-Text_IgnoreMap="Exclude Maps"
+Text_Map="Include Maps"
-Text_IncludeMapsWithPrefix="Include Prefixes"
+Text_IgnoreMap="Exclude Maps"
-Text_IgnoreMapsWithPrefix="Exclude Prefixes"
+Text_IncludeMapsWithPrefix="Include Prefixes"
-Text_IncludeList="Include Lists"
+Text_IgnoreMapsWithPrefix="Exclude Prefixes"
-Text_IgnoreList="Exclude Lists"
+Text_IncludeList="Include Lists"
-
+Text_IgnoreList="Exclude Lists"
-[VS_UIV_Window]
+
-WindowTitle="VoteSys Menu"
+[VS_UIV_Window]
-
+WindowTitle="VoteSys Menu"
-[VS_UIS_PageAdminUI]
+
-Text_RetainCandidates="Retain Candidates"
+[VS_UIS_PageAdminUI]
-Text_OpenVoteMenuAutomatically="Open Vote Menu Automatically"
+Text_RetainCandidates="Retain Candidates"
-Text_DefaultTimeMessageClass="Time Msg Class"
+Text_OpenVoteMenuAutomatically="Open Vote Menu Automatically"
-Text_LogoTexture="Logo Texture"
+Text_DefaultTimeMessageClass="Time Msg Class"
-Text_LogoRegion="Logo Region"
+Text_LogoTexture="Logo Texture"
-Text_LogoRegionX="X"
+Text_LogoRegion="Logo Region"
-Text_LogoRegionY="Y"
+Text_LogoRegionX="X"
-Text_LogoRegionW="W"
+Text_LogoRegionY="Y"
-Text_LogoRegionH="H"
+Text_LogoRegionW="W"
-Text_LogoDrawRegion="Logo Draw Region"
+Text_LogoRegionH="H"
-Text_LogoDrawRegionX="X"
+Text_LogoDrawRegion="Logo Draw Region"
-Text_LogoDrawRegionY="Y"
+Text_LogoDrawRegionX="X"
-Text_LogoDrawRegionW="W"
+Text_LogoDrawRegionY="Y"
-Text_LogoDrawRegionH="H"
+Text_LogoDrawRegionW="W"
-Text_LogoButton0Label="Button 1 Label"
+Text_LogoDrawRegionH="H"
-Text_LogoButton0LinkURL="Button 1 URL"
+Text_LogoButton0Label="Button 1 Label"
-Text_LogoButton1Label="Button 2 Label"
+Text_LogoButton0LinkURL="Button 1 URL"
-Text_LogoButton1LinkURL="Button 2 URL"
+Text_LogoButton1Label="Button 2 Label"
-Text_LogoButton2Label="Button 3 Label"
+Text_LogoButton1LinkURL="Button 2 URL"
-Text_LogoButton2LinkURL="Button 3 URL"
+Text_LogoButton2Label="Button 3 Label"
-
+Text_LogoButton2LinkURL="Button 3 URL"
-[VS_UIS_PageAdminSetup]
+
-Text_EnableACEIntegration="Enable ACE Integration"
+[VS_UIS_PageAdminSetup]
-Text_PresetProbeDepth="Preset Probe Depth"
+Text_EnableACEIntegration="Enable ACE Integration"
-Text_ManageServerPackages="Manage Server Packages"
+Text_PresetProbeDepth="Preset Probe Depth"
-Text_UseServerPackagesCompatibilityMode="Use Server Package Compat. Mode"
+Text_ManageServerPackages="Manage Server Packages"
-Text_DefaultPackages="Default Packages"
+Text_UseServerPackagesCompatibilityMode="Use Server Package Compat. Mode"
-Text_UseServerActorsCompatibilityMode="Use Server Actors Compat. Mode"
+Text_DefaultPackages="Default Packages"
-Text_DefaultActors="Default Actors"
+Text_UseServerActorsCompatibilityMode="Use Server Actors Compat. Mode"
-Text_GameNameMode="GameName Mode"
+Text_DefaultActors="Default Actors"
-Text_GameNameMode_DoNotModify="Do Not Modify"
+Text_GameNameMode="GameName Mode"
-Text_GameNameMode_PresetName="Preset Name"
+Text_GameNameMode_DoNotModify="Do Not Modify"
-Text_GameNameMode_CategoryAndPresetName="Full Preset Name"
+Text_GameNameMode_PresetName="Preset Name"
-Text_ServerAddress="Server Address"
+Text_GameNameMode_CategoryAndPresetName="Full Preset Name"
-Text_DataPort="Data Port"
+Text_ServerAddress="Server Address"
-Text_ClientDataPort="Client Data Port"
+Text_DataPort="Data Port"
-Text_DefaultPreset="Default Preset"
+Text_ClientDataPort="Client Data Port"
-Text_AlwaysUseDefaultPreset="Always Use Default Preset"
+Text_DefaultPreset="Default Preset"
-Text_DefaultMap="Default Map"
+Text_AlwaysUseDefaultPreset="Always Use Default Preset"
-Text_AlwaysUseDefaultMap="Always Use Default Map"
+Text_DefaultMap="Default Map"
-Text_IdleTimeout="Idle Timeout"
+Text_AlwaysUseDefaultMap="Always Use Default Map"
-
+Text_IdleTimeout="Idle Timeout"
-[VS_UI_PlayerMenu]
+
-PlayerIdText="ID:"
+[VS_UI_PlayerMenu]
-PlayerKickText="&Kick"
+PlayerIdText="ID:"
-PlayerBanText="&Ban"
+PlayerKickText="&Kick"
-PlayerBanTitle="Ban Player"
+PlayerBanText="&Ban"
-PlayerBanMessage="Do you want to permanently ban {1}?"
+PlayerBanTitle="Ban Player"
-
+PlayerBanMessage="Do you want to permanently ban {1}?"
-[VS_UIS_ClientWindow]
+
-PageClientSettingsName="Client"
+[VS_UIS_ClientWindow]
-PageAdminVotingName="[A] Voting"
+PageClientSettingsName="Client"
-PageAdminUIName="[A] UI"
+PageAdminVotingName="[A] Voting"
-PageAdminSetupName="[A] Setup"
+PageAdminUIName="[A] UI"
-PageAdminPresetsName="[A] Presets"
+PageAdminSetupName="[A] Setup"
-PageAdminMapListsName="[A] Map Lists"
+PageAdminPresetsName="[A] Presets"
-
+PageAdminMapListsName="[A] Map Lists"
-[VS_UIS_PageClient]
+
-ThemeText="Theme"
+[VS_UIS_PageClient]
-ThemeBright="Bright"
+ThemeText="Theme"
-ThemeDark="Dark"
+ThemeBright="Bright"
-ThemeBlack="Black"
+ThemeDark="Dark"
-MapListSortText="Sort Map List By"
+ThemeBlack="Black"
-MapListSortName="Name"
+MapListSortText="Sort Map List By"
-MapListSortRecency="Recency"
+MapListSortName="Name"
-MapListSortPlayCount="Play Count"
+MapListSortRecency="Recency"
-FavoritesFirstText="Sort Favorites First"
+MapListSortPlayCount="Play Count"
-ShowPlayerListText="Show Player List"
+FavoritesFirstText="Sort Favorites First"
-
+ShowPlayerListText="Show Player List"
-[VS_UI_ScreenshotWindow]
+
-TextPlayerCount="Players:"
+[VS_UI_ScreenshotWindow]
-
+TextPlayerCount="Players:"
-[VS_UIS_PageAdminVoting]
+
-Text_MidGameVoteThreshold="Mid-Game Vote Threshold"
+[VS_UIS_PageAdminVoting]
-Text_MidGameVoteTimeLimit="Mid-Game Vote Time Limit"
+Text_MidGameVoteThreshold="Mid-Game Vote Threshold"
-Text_GameEndedVoteDelay="Game Ended Vote Delay"
+Text_MidGameVoteTimeLimit="Mid-Game Vote Time Limit"
-Text_VoteTimeLimit="Vote Time Limit"
+Text_GameEndedVoteDelay="Game Ended Vote Delay"
-Text_VoteEndCondition="Vote End Rules"
+Text_VoteTimeLimit="Vote Time Limit"
-Text_VoteEndCondition_TimerOnly="Timer Only"
+Text_VoteEndCondition="Vote End Rules"
-Text_VoteEndCondition_TimerOrAllVotesIn="Everyone Voted"
+Text_VoteEndCondition_TimerOnly="Timer Only"
-Text_VoteEndCondition_TimerOrResultDetermined="Result Certain"
+Text_VoteEndCondition_TimerOrAllVotesIn="Everyone Voted"
-Text_EnableKickVoting="Enable Kick Voting"
+Text_VoteEndCondition_TimerOrResultDetermined="Result Certain"
-Text_KickVoteThreshold="Kick Vote Threshold"
+Text_EnableKickVoting="Enable Kick Voting"
-Text_MinimumMapRepeatDistance="Map Repeat Distance"
+Text_KickVoteThreshold="Kick Vote Threshold"
-
+Text_MinimumMapRepeatDistance="Map Repeat Distance"
-[VS_UI_MapMenu]
+
-FavoriteText="Favorite"
+[VS_UI_MapMenu]
-SortByText="Sort By"
+FavoriteText="Favorite"
-
+SortByText="Sort By"
-[VS_UIS_Window]
+
-WindowTitle="VoteSys Settings"
+[VS_UIS_Window]
-
+WindowTitle="VoteSys Settings"
-[VS_UI_MapSortByMenu]
+
-ItemNameText="Name"
+[VS_UI_MapSortByMenu]
-ItemRecencyText="Recency"
+ItemNameText="Name"
-ItemPlayCountText="Play Count"
+ItemRecencyText="Recency"
-FavoritesFirstText="Favorites First"
+ItemPlayCountText="Play Count"
-
+FavoritesFirstText="Favorites First"
+