[TF2] Improve ammo display on target ID #1212
Open
+111
−61
Conversation
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
Ammo no longer displays on weapons without ammo Reserve ammo shows up when applicable
| @@ -747,43 +747,45 @@ class CTFPlayer : public CBaseMultiplayerPlayer, public IHasAttributes, public I | |||
| void ScriptSetCondDuration( int nCond, float flNewDuration ); | |||
| HSCRIPT ScriptGetDisguiseTarget(); | |||
|
|
|||
| bool ScriptIsCarryingRune() { return m_Shared.IsCarryingRune(); } | |||
There was a problem hiding this comment.
I added an additional tab spacing past the function declaration to make it look uniform with the two new functions I added, in hindsight this with probably unnecessary and creates confusion when trying to diff this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR makes multiple changes to how ammo displays on the TargetID Display, which appears when healing a patient.
These changes also apply to spy's disguises and two new VScript functions
GetDisguiseAmmoReserveCount()andSetDisguiseAmmoReserveCount()have been added to access the disguise reserve ammo.Similarly to how ammo appears for disguise weapons, the reserve is also randomized when viewed this way.
If this gets merged, a new language token needs to be added to show weapons with reserve ammo:
"TF_playerid_ammo_reserve" " %s1 / %s2"