Browse Source

Add `TextNeutral` color to ColorAPI and aliases

pull/8/head
Anton Tarasenko 2 years ago
parent
commit
0137eda5ee
  1. 1
      config/AcediaAliases_Colors.ini
  2. 3
      config/AcediaSystem.ini
  3. 2
      sources/Color/ColorAPI.uc
  4. 12
      sources/Commands/Command.uc

1
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="TextHeader",value="rgb(128,0,128)")
record=(alias="TextSubHeader",value="rgb(147,112,219)") record=(alias="TextSubHeader",value="rgb(147,112,219)")
record=(alias="TextPositive",value="rgb(0,128,0)") 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="TextNegative",value="rgb(220,20,60)")
record=(alias="TextSubtle",value="rgb(128,128,128)") record=(alias="TextSubtle",value="rgb(128,128,128)")
record=(alias="TextEmphasis",value="rgb(0,128,255)") record=(alias="TextEmphasis",value="rgb(0,128,255)")

3
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) TextSubHeader=(R=147,G=112,B=219,A=255)
TextSubtle=(R=128,G=128,B=128,A=255) TextSubtle=(R=128,G=128,B=128,A=255)
TextEmphasis=(R=0,G=128,B=255,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) TextOk=(R=0,G=255,B=0,A=255)
TextWarning=(R=255,G=128,B=0,A=255) TextWarning=(R=255,G=128,B=0,A=255)
TextFailure=(R=255,G=0,B=0,A=255) TextFailure=(R=255,G=0,B=0,A=255)

2
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 TextSubtle;
var public config const Color TextEmphasis; var public config const Color TextEmphasis;
var public config const Color TextPositive; var public config const Color TextPositive;
var public config const Color TextNeutral;
var public config const Color TextNegative; var public config const Color TextNegative;
var public config const Color TextOk; var public config const Color TextOk;
var public config const Color TextWarning; var public config const Color TextWarning;
@ -1078,6 +1079,7 @@ defaultproperties
TextSubtle=(R=128,G=128,B=128,A=255) TextSubtle=(R=128,G=128,B=128,A=255)
TextEmphasis=(R=0,G=128,B=255,A=255) TextEmphasis=(R=0,G=128,B=255,A=255)
TextPositive=(R=0,G=128,B=0,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) TextNegative=(R=220,G=20,B=60,A=255)
TextOk=(R=0,G=255,B=0,A=255) TextOk=(R=0,G=255,B=0,A=255)
TextWarning=(R=255,G=128,B=0,A=255) TextWarning=(R=255,G=128,B=0,A=255)

12
sources/Commands/Command.uc

@ -264,9 +264,9 @@ protected function BuildData(CommandDataBuilder builder){}
* *
* @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. * 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 * 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. * 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 * @param callData `struct` filled with parameters that your command
* has been called with. Guaranteed to not be in error state and contain * has been called with. Guaranteed to not be in error state and contain
* all the required data. * all the required data.
* @param callerPlayer Player that instigated this call. * @param instigator Player that instigated this call.
*/ */
protected function ExecutedFor( protected function ExecutedFor(
EPlayer targetPlayer, EPlayer target,
CallData callData, CallData callData,
EPlayer callerPlayer){} EPlayer instigator){}
/** /**
* Returns an instance of command (of particular class) that is stored * Returns an instance of command (of particular class) that is stored

Loading…
Cancel
Save