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.

Sign up for GitHub

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

Jump to bottom

RF Compatibility - WS Templates #3204

Merged
merged 11 commits into from
May 17, 2024
Merged

RF Compatibility - WS Templates #3204

merged 11 commits into from
May 17, 2024

Conversation

Tiny-DM
Copy link

@Tiny-DM Tiny-DM commented Apr 7, 2024 •
edited
Loading

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

Information:
Added RF compatibility to the WS templates, as well as adding pickups to the militia vehicle pool for most factions.
Switched the SF marksmen to using the big suppressor for their 12.7mm rifle.
Several known bugs right now, but since the RPT has no errors I'm throwing this up now for a preliminary review.

Please verify the following and ensure all checks are completed.

  1. Have you loaded the mission in LAN host?
  2. Have you loaded the mission on a dedicated server?

Is further testing or are further changes required?

  1. No
  2. Yes (Please provide further detail below.)

How can the changes be tested?

Known bugs:
Military vehicles will take on civilian colors sometimes when bought.

Notes:

@Tiny-DM Tiny-DM added Enhancement New feature or request Don't merge This needs to be touched before being merged Templates Items related to templates labels Apr 7, 2024
@Tiny-DM Tiny-DM requested a review from ante185 April 7, 2024 03:25
ante185
ante185 requested changes Apr 7, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

first pass, just reading the diff so far

A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf Outdated Show resolved Hide resolved
ante185
ante185 reviewed Apr 7, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

Suggestions

A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf Outdated Show resolved Hide resolved
@ante185 ante185 added this to the 3.6 milestone Apr 8, 2024
@ante185 ante185 added the Change requested A change has been requested, and this can't be merged until it's done. label Apr 9, 2024
@Tiny-DM
Merge remote-tracking branch 'upstream/unstable' into ws-templates-rf
de73ecb
@Tiny-DM
Updates across all files
a9eb135 
Moved helicopters, updated to unstable,  changed a few colors, added custom classes
ante185
ante185 requested changes Apr 12, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

Several issues :(

A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf Outdated Show resolved Hide resolved
ante185
ante185 requested changes Apr 13, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

two missing semi colons, and an annoying casing validation failure

A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf Outdated Show resolved Hide resolved
ante185
ante185 requested changes Apr 14, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

Annnd i can't approve it yet :(

A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Show resolved Hide resolved
ante185
ante185 requested changes Apr 14, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

cannot approve yet.

A3A/addons/config_fixes/RF/CfgVehicles.hpp Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf Outdated Show resolved Hide resolved
ante185
ante185 approved these changes Apr 14, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

Approved

@ante185 ante185 added Ready for merge and removed Change requested A change has been requested, and this can't be merged until it's done. Don't merge This needs to be touched before being merged labels Apr 14, 2024
@ante185 ante185 added Technically ready for merge This can be merge, but there is some politics involved Ready for merge Review pending and removed Ready for merge Technically ready for merge This can be merge, but there is some politics involved labels Apr 16, 2024
@Tiny-DM Tiny-DM requested a review from ante185 April 21, 2024 21:17
ante185
ante185 approved these changes May 4, 2024
View reviewed changes
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

lgtm

@Bob-Murphy Bob-Murphy merged commit ff246b1 into unstable May 17, 2024
@Bob-Murphy Bob-Murphy added the Added to changelog Added to changelog label Jun 8, 2024
@Bob-Murphy Bob-Murphy deleted the ws-templates-rf branch July 6, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jaj22 jaj22 jaj22 left review comments

@ante185 ante185 ante185 approved these changes

Assignees
No one assigned
Labels
Added to changelog Added to changelog Enhancement New feature or request Ready for merge Templates Items related to templates
Projects
None yet
Milestone
3.6
Development

Successfully merging this pull request may close these issues.
4 participants
@Tiny-DM @jaj22 @ante185 @Bob-Murphy