Beacon changes (funcommands)#1187
Merged
asherkin merged 15 commits intoalliedmodders:masterfrom Feb 23, 2020
Mart-User:master
Merged
Beacon changes (funcommands)#1187asherkin merged 15 commits intoalliedmodders:masterfrom Mart-User:master
asherkin merged 15 commits intoalliedmodders:masterfrom
Mart-User:master
Conversation
Added game color config & specific settings for L4D/L4D2 Created the following keys: "Team1Color" "75,255,75,255" "Team2Color" "255,75,75,255" "Team3Color" "75,75,255,255" "Team4Color" "255,128,0,255" "TeamUnknownColor" "255,255,255,255" Added a specific setting for L4D/L4D2 game: "Team2Color" "75,75,255,255" "Team3Color" "255,75,75,255"
Added method "GetColor" to convert the string into a valid int[4] RGBA format. Created 5 new vars: int g_Team1Color[4] int g_Team2Color[4] int g_Team3Color[4] int g_Team4Color[4] int g_TeamUnknownColor[4] Loading 5 new configs from funcommands.games.txt (gamedata file): Team1Color -> g_Team1Color Team2Color -> g_Team2Color Team3Color -> g_Team3Color Team4Color -> g_Team4Color TeamUnknownColor -> g_TeamUnknownColor
-Added "teamColor" var to set the beacon color based on the client's team, instead of calling TE_SetupBeamRingPoint on each team check. -Moved TE_SetupBeamRingPoint calls more near each other. -Converted "if else" to "switch case" statement. -Removed "team" var. -Added different beacon color to Team 4 (hidden team on L4D2), may also apply to other games.
Added External Beacon key: - ExternalBeaconColor
Added External Beacon - ExternalBeaconColor key -> g_ExternalBeaconColor var
External beacon color reading from g_ExternalBeaconColor var
Colors based on default funcommands.sp color vars
Fixed beacon key names
Fixed beacon key names
Renamed teamColor var to teamBeaconColor
asherkin
reviewed
Feb 22, 2020
Member
asherkin
left a comment
asherkin
left a comment
There was a problem hiding this comment.
Thanks for bringing this back - the gamedata stuff is a solid improvement here and I think a lot of L4D(2) servers are going to like it.
I've left a couple of small inlines I'd like to see addressed before merging, but otherwise this looks mostly like what was ready-to-go before.
Renamed GetColor Method to ParseMethod Added a new line at the end of funcommands.sp file
Contributor
Author
|
Some var colors aren't being used now, like "greencolor" and "redcolor" so the build will fail. |
Member
I'd go with just removing the unused ones. |
Removed unused vars: - redColor - greenColor
Member
|
Looks like the changes from the previous commit got reverted. |
Changed method name "GetColor" to "ParseColor"
Added new line ending to the file
Contributor
Author
|
Yeah thanks! Repaired. |
asherkin
approved these changes
Feb 23, 2020
Removed TrimString function from the code. Used before when the separator was a space, but changed it to a comma to be safer.
Member
|
Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Some changes to the beacon fun function.
Changes to funcommands.sp / beacon.sp / funcommands.games.txt: