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

Fixes for 288 291 295 and 297 #298

Merged
merged 10 commits into from
Mar 11, 2021
Merged

Fixes for 288 291 295 and 297 #298

merged 10 commits into from
Mar 11, 2021

Conversation

NikkoJT
Copy link
Collaborator

@NikkoJT NikkoJT commented Jun 12, 2020

Contains assignGear-related changes for #288, #291, #295, and #297. I also did some more ghillie fixes.

NikkoJT added 6 commits June 12, 2020 12:56
Increases number of RPK drums for 3IFB ARs to match NATO MX SW mag counts.
Uncomments the NVG definition to avoid errors; comments the part where they're *used* to maintain the original intent of no NVGs by default.
Replaces all direct additions of rangefinders/binocs with a reference to a variable defined in the faction main file.
Replaces Mk30 HMG bags for 3IFB, AAF, FIA, LDF, NPR, and Syndikat with M2 .50 bags of appropriate factions.
NPR also uses 75rd drums for their ARs, and also had only 2 spares per AR, so I made the same change as for 3IFB.
Mediterranean ghillies are garbo in woodland. LDF and 3IFB get the NATO Pacific ghillie, which isn't perfect but it's better, and NPR get the camo Gorka suit since they have Spetsnaz advisors.
Copy link
Collaborator

@darkChozo darkChozo left a comment

Choose a reason for hiding this comment

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

Basically good, just had some minor comments.

f/assignGear/f_assignGear_3IFB.sqf Outdated Show resolved Hide resolved
@@ -188,8 +188,8 @@ _bag = "B_AssaultPack_cbr";
_bagLarge = "B_Kitbag_cbr";
_bagdiver = "B_AssaultPack_blk"; // used by divers
_baguav = "B_UAV_01_backpack_F"; // used by UAV operator
_baghmgg = "B_HMG_01_weapon_F"; // used by Heavy MG gunner
_baghmgag = "B_HMG_01_support_F"; // used by Heavy MG assistant gunner
_baghmgg = "I_G_HMG_02_weapon_F"; // used by Heavy MG gunner
Copy link
Collaborator

Choose a reason for hiding this comment

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

There's B_G and O_G variants of the M2 for FIA and NPR. Probably doesn't matter though, and I think they're slightly sketchy at the moment (they work but the tripods are mislabeled as Syndikat).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

All the bags look exactly the same, and B_G and O_G would both be also labelled as FIA. I just used the one visible in the editor arsenal - I can't think of any aspect in which it would make any difference.

f/assignGear/f_assignGear_3IFB.sqf Outdated Show resolved Hide resolved
it is what it is
@NikkoJT NikkoJT requested a review from darkChozo June 13, 2020 22:02
darkChozo
darkChozo previously approved these changes Jun 28, 2020
Copy link
Collaborator

@costno costno 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

@NikkoJT NikkoJT merged commit 478454d into dev Mar 11, 2021
@NikkoJT NikkoJT deleted the Fixes-for-288-291-295-and-297 branch April 27, 2021 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants