Improve performance, add vote draw plugin, minor fixes

locale/shine/core/enGB.json

@@ -82,6 +82,7 @@
 
 	"ERROR_INVALID_JSON_IN_BASE_CONFIG": "The base configuration file has invalid JSON: {Context}",
 	"ERROR_INVALID_JSON_IN_PLUGIN_CONFIG": "Configuration file has invalid JSON: {Context}",
+	"ERROR_PLUGIN_INIT_ERROR": "An error occurred while attempting to enable the plugin:\n{Context}",
 	"WARNING_USER_CONFIG_VALIDATION_ERRORS": "Provided user configuration had validation errors which have been corrected.",
 	"WARNING_REMOTE_USER_CONFIG_VALIDATION_ERRORS": "Remote user configuration had validation errors which have been corrected. Check the local UserConfig.json file for the corrected data.",
 	"WARNING_INVALID_JSON_IN_REMOTE_USER_CONFIG": "Remote user configuration has invalid JSON: {Context}. User data has been loaded from locally cached data instead.",

locale/shine/extensions/votedraw/enGB.json

@@ -0,0 +1,10 @@
+{
+	"NOTIFY_PREFIX": "[Draw Vote]",
+	"VOTEMENU_BUTTON": "Vote to Draw",
+	"PLAYER_VOTED": "{PlayerName} voted to end the round as a draw ({VotesNeeded} more {VotesNeeded:Pluralise:vote|votes} needed)",
+	"PLAYER_VOTED_PRIVATE": "You voted to end the round as a draw ({VotesNeeded} more {VotesNeeded:Pluralise:vote|votes} needed)",
+	"ERROR_ALREADY_VOTED": "You have already voted to end the round as a draw.",
+	"ERROR_MUST_WAIT": "You must wait for {SecondsToWait:Duration} before voting to end the round as a draw.",
+	"ERROR_CANNOT_VOTE_ON_CURRENT_TEAM": "You cannot vote to end the round as a draw on your current team.",
+	"ERROR_ROUND_NOT_STARTED": "A round must be started to vote to end it as a draw."
+}

lua/shine/core/client/votemenu_gui.lua

@@ -505,7 +505,9 @@ local function AddButton( self, Pos, Anchor, Text, DoClick )
 		DoClick = DoClick,
 		IsSchemed = false
 	}
-	Button:SetHighlightOnMouseOver( true, 1, true )
+	-- Highlighting buttons is disabled until they are in the correct position. This avoids multiple buttons flashing
+	-- highlighted when the menu is opened or the page is changed.
+	Button.OnAnimationComplete = function() Button:SetHighlightOnMouseOver( true, true ) end
 	Button.ClickDelay = 0
 
 	return Button
@@ -520,9 +522,12 @@ local function HandleButton( Button, Text, DoClick, StartPos, EndPos )
 
 	if Shine.Config.AnimateUI then
 		Button:SetPos( StartPos )
-		Button:MoveTo( nil, nil, EndPos, 0, EasingTime )
+		Button:SetHighlightOnMouseOver( false )
+		Button:MoveTo( nil, nil, EndPos, 0, EasingTime, Button.OnAnimationComplete )
 	else
 		Button:SetPos( EndPos )
+		Button:StopMoving()
+		Button.OnAnimationComplete()
 	end
 end
 
@@ -549,7 +554,9 @@ function VoteMenu:AddTopButton( Text, DoClick )
 	Buttons.Top = TopButton
 
 	if Shine.Config.AnimateUI then
-		TopButton:MoveTo( nil, nil, EndPos, 0, EasingTime )
+		TopButton:MoveTo( nil, nil, EndPos, 0, EasingTime, TopButton.OnAnimationComplete )
+	else
+		TopButton.OnAnimationComplete()
 	end
 
 	return TopButton
@@ -578,7 +585,9 @@ function VoteMenu:AddBottomButton( Text, DoClick )
 	Buttons.Bottom = BottomButton
 
 	if Shine.Config.AnimateUI then
-		BottomButton:MoveTo( nil, nil, EndPos, 0, EasingTime )
+		BottomButton:MoveTo( nil, nil, EndPos, 0, EasingTime, BottomButton.OnAnimationComplete )
+	else
+		BottomButton.OnAnimationComplete()
 	end
 
 	return BottomButton
@@ -669,12 +678,14 @@ function VoteMenu:PositionButton( Button, Index, MaxIndex, Align, IgnoreAnim )
 
 	if not IgnoreAnim and Shine.Config.AnimateUI then
 		local Size = self.Background:GetSize()
+		Button:SetHighlightOnMouseOver( false )
 		Button:SetPos( Vector( Align == GUIItem.Right and -Size.x * 0.5 or 0,
 			Size.y * 0.5, 0 ) )
-		Button:MoveTo( nil, nil, Pos, 0, EasingTime )
+		Button:MoveTo( nil, nil, Pos, 0, EasingTime, Button.OnAnimationComplete )
 	else
 		Button:SetPos( Pos )
 		Button:StopMoving()
+		Button.OnAnimationComplete()
 	end
 end
 

lua/shine/core/server/config.lua

@@ -62,6 +62,7 @@ local DefaultConfig = {
 		unstuck = true,
 		usermanagement = true,
 		votealltalk = false,
+		votedraw = false,
 		voterandom = false,
 		votesurrender = true,
 		welcomemessages = false,

lua/shine/core/shared/base_plugin/config.lua

@@ -259,18 +259,20 @@ function ConfigModule:MigrateConfig( Config )
 		self.__Name, CurrentConfigVersion, self.Version or "1.0"
 	)
 
-	Shine.SystemNotifications:AddNotification( {
-		Type = Shine.SystemNotifications.Type.INFO,
-		Message = {
-			Source = "Core",
-			TranslationKey = "INFO_PLUGIN_VERSION_UPDATE",
-			Context = tostring( OurVersion )
-		},
-		Source = {
-			Type = Shine.SystemNotifications.Source.PLUGIN,
-			ID = self.__Name
-		}
-	} )
+	if Server then
+		Shine.SystemNotifications:AddNotification( {
+			Type = Shine.SystemNotifications.Type.INFO,
+			Message = {
+				Source = "Core",
+				TranslationKey = "INFO_PLUGIN_VERSION_UPDATE",
+				Context = tostring( OurVersion )
+			},
+			Source = {
+				Type = Shine.SystemNotifications.Source.PLUGIN,
+				ID = self.__Name
+			}
+		} )
+	end
 
 	Config.__Version = self.Version or "1.0"
 

lua/shine/core/shared/base_plugin/timers.lua

@@ -15,15 +15,15 @@ local TimerModule = {}
 
 	Inputs: Same as Shine.Timer.Create.
 ]]
-function TimerModule:CreateTimer( Name, Delay, Reps, Func )
+function TimerModule:CreateTimer( Name, Delay, Reps, Func, Data )
 	Shine.TypeCheck( Delay, "number", 2, "CreateTimer" )
 	Shine.TypeCheck( Reps, "number", 3, "CreateTimer" )
 	Shine.TypeCheck( Func, "function", 4, "CreateTimer" )
 
 	self.Timers = rawget( self, "Timers" ) or setmetatable( {}, { __mode = "v" } )
 
 	local RealName = StringFormat( "%s_%s", self.__Name, Name )
-	local Timer = Shine.Timer.Create( RealName, Delay, Reps, Func )
+	local Timer = Shine.Timer.Create( RealName, Delay, Reps, Func, Data )
 
 	self.Timers[ Name ] = Timer
 
@@ -34,13 +34,13 @@ end
 	Creates a simple timer and adds it to the list of timers associated to the plugin.
 	Inputs: Same as Shine.Timer.Simple.
 ]]
-function TimerModule:SimpleTimer( Delay, Func )
+function TimerModule:SimpleTimer( Delay, Func, Data )
 	Shine.TypeCheck( Delay, "number", 1, "SimpleTimer" )
 	Shine.TypeCheck( Func, "function", 2, "SimpleTimer" )
 
 	self.Timers = rawget( self, "Timers" ) or setmetatable( {}, { __mode = "v" } )
 
-	local Timer = Shine.Timer.Simple( Delay, Func )
+	local Timer = Shine.Timer.Simple( Delay, Func, Data )
 
 	self.Timers[ Timer.Name ] = Timer