From 0137eda5ee89b264181e697901b730d096a33653 Mon Sep 17 00:00:00 2001 From: Anton Tarasenko Date: Tue, 28 Jun 2022 04:56:10 +0700 Subject: [PATCH] Add `TextNeutral` color to ColorAPI and aliases --- config/AcediaAliases_Colors.ini | 1 + config/AcediaSystem.ini | 3 +++ sources/Color/ColorAPI.uc | 2 ++ sources/Commands/Command.uc | 14 +++++++------- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/AcediaAliases_Colors.ini b/config/AcediaAliases_Colors.ini index ecb5a9f..686f2dc 100644 --- a/config/AcediaAliases_Colors.ini +++ b/config/AcediaAliases_Colors.ini @@ -4,6 +4,7 @@ record=(alias="TextDefault",value="rgb(255,255,255)") record=(alias="TextHeader",value="rgb(128,0,128)") record=(alias="TextSubHeader",value="rgb(147,112,219)") record=(alias="TextPositive",value="rgb(0,128,0)") +record=(alias="TextNeutral",value="rgb(255,255,0)") record=(alias="TextNegative",value="rgb(220,20,60)") record=(alias="TextSubtle",value="rgb(128,128,128)") record=(alias="TextEmphasis",value="rgb(0,128,255)") diff --git a/config/AcediaSystem.ini b/config/AcediaSystem.ini index 14773ce..ffc354d 100644 --- a/config/AcediaSystem.ini +++ b/config/AcediaSystem.ini @@ -91,6 +91,9 @@ TextHeader=(R=128,G=0,B=128,A=255) TextSubHeader=(R=147,G=112,B=219,A=255) TextSubtle=(R=128,G=128,B=128,A=255) TextEmphasis=(R=0,G=128,B=255,A=255) +TextPositive=(R=0,G=128,B=0,A=255) +TextNeutral=(R=255,G=255,B=0,A=255) +TextNegative=(R=220,G=20,B=60,A=255) TextOk=(R=0,G=255,B=0,A=255) TextWarning=(R=255,G=128,B=0,A=255) TextFailure=(R=255,G=0,B=0,A=255) diff --git a/sources/Color/ColorAPI.uc b/sources/Color/ColorAPI.uc index 8b710ac..a3d5329 100644 --- a/sources/Color/ColorAPI.uc +++ b/sources/Color/ColorAPI.uc @@ -56,6 +56,7 @@ var public config const Color TextSubHeader; var public config const Color TextSubtle; var public config const Color TextEmphasis; var public config const Color TextPositive; +var public config const Color TextNeutral; var public config const Color TextNegative; var public config const Color TextOk; var public config const Color TextWarning; @@ -1078,6 +1079,7 @@ defaultproperties TextSubtle=(R=128,G=128,B=128,A=255) TextEmphasis=(R=0,G=128,B=255,A=255) TextPositive=(R=0,G=128,B=0,A=255) + TextNeutral=(R=255,G=255,B=0,A=255) TextNegative=(R=220,G=20,B=60,A=255) TextOk=(R=0,G=255,B=0,A=255) TextWarning=(R=255,G=128,B=0,A=255) diff --git a/sources/Commands/Command.uc b/sources/Commands/Command.uc index 9bdc31b..e3b3dc8 100644 --- a/sources/Commands/Command.uc +++ b/sources/Commands/Command.uc @@ -262,11 +262,11 @@ protected function BuildData(CommandDataBuilder builder){} * Overload this method to perform required actions when * your command is called. * - * @param callData `struct` filled with parameters that your command + * @param callData `struct` filled with parameters that your command * has been called with. Guaranteed to not be in error state. - * @param callerPlayer Player that instigated this execution. + * @param instigator Player that instigated this execution. */ -protected function Executed(CallData callData, EPlayer callerPlayer){} +protected function Executed(CallData callData, EPlayer instigator){} /** * Overload this method to perform required actions when your command is called @@ -275,16 +275,16 @@ protected function Executed(CallData callData, EPlayer callerPlayer){} * * If your command does not require a target - this method will not be called. * - * @param targetPlayer Player that this command must perform an action on. + * @param target Player that this command must perform an action on. * @param callData `struct` filled with parameters that your command * has been called with. Guaranteed to not be in error state and contain * all the required data. - * @param callerPlayer Player that instigated this call. + * @param instigator Player that instigated this call. */ protected function ExecutedFor( - EPlayer targetPlayer, + EPlayer target, CallData callData, - EPlayer callerPlayer){} + EPlayer instigator){} /** * Returns an instance of command (of particular class) that is stored