Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add virtual faction aliases to other components #259

Merged
merged 5 commits into from
Aug 4, 2019

Conversation

NikkoJT
Copy link
Collaborator

@NikkoJT NikkoJT commented Jul 31, 2019

assignGear accepts some faction aliases for use with Virtual Faction such as "aaf" for "ind_f". This PR adds those aliases to other components to better accommodate new VF-only factions, specifically NPR.

Also updates groupMarkers to reflect than NPR will be OPFOR in the template.

Components affected: groupData, assignInsignia, briefing

NikkoJT added 2 commits July 31, 2019 16:21
assignGear accepts some faction aliases for use with Virtual Faction such as "aaf" for "ind_f". This PR adds those aliases to other components to better accommodate new VF-only factions.
Per host discussion, NPR will be an OPFOR faction. This updates their classification in groupMarkers to match.
@NikkoJT NikkoJT added this to the 3.5.4 milestone Jul 31, 2019
@NikkoJT NikkoJT requested review from SamLex and shadow-fa July 31, 2019 15:29
Also takes care of a couple of formatting typos.
@NikkoJT NikkoJT requested a review from shadow-fa July 31, 2019 19:23
shadow-fa
shadow-fa previously approved these changes Jul 31, 2019
Copy link
Member

@SamLex SamLex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, a few small changes I'd like to see.

I think it's also worth mention, just for background, that the faction aliases pre-date the Virtual Faction concept by quite a bit. Good to unify the concepts though

f/assignGear/f_assignInsignia.sqf Outdated Show resolved Hide resolved
f/groupMarkers/f_setLocalGroupMarkers.sqf Outdated Show resolved Hide resolved
Copy link
Member

@SamLex SamLex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks, looks great now. Just a few comment typos that I've suggested fixes for to cleanup.

f/groupMarkers/f_setLocalGroupMarkers.sqf Outdated Show resolved Hide resolved
f/groupMarkers/f_setLocalGroupMarkers.sqf Outdated Show resolved Hide resolved
f/groupMarkers/f_setLocalGroupMarkers.sqf Show resolved Hide resolved
@SamLex SamLex requested a review from shadow-fa August 4, 2019 17:06
@SamLex SamLex merged commit 034cd26 into dev Aug 4, 2019
@shadow-fa shadow-fa deleted the Add-Virtual-Faction-aliases-to-other-components branch August 11, 2019 16:01
@shadow-fa shadow-fa mentioned this pull request Aug 25, 2019
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants