[compat_rhs_usf3] ACE Explosives functionality for RHS USAF #7099
Conversation
This file contains 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
commy2
reviewed
Jul 11, 2019
| @@ -11,6 +11,8 @@ | |||
| }; \ | |||
| } | |||
|
|
|||
| class CBA_Extended_EventHandlers; | |||
commy2
reviewed
Jul 11, 2019
| class ACE_Explosives_Place: Items_base_F { | ||
| class EventHandlers { | ||
| class CBA_Extended_EventHandlers; | ||
| }; |
There was a problem hiding this comment.
Delete these three. They are already inherited.
commy2
reviewed
Jul 11, 2019
| }; | ||
|
|
||
| class ACE_Explosives_Place_rhsusf_m112_DemoCharge: ACE_Explosives_Place { | ||
| displayName = "USAF Demo Charge"; |
There was a problem hiding this comment.
Use their string key instead of the translated name, so this name shows up correctly in non English settings.
commy2
reviewed
Jul 11, 2019
| }; | ||
|
|
||
| class ACE_Explosives_Place_rhsusf_m112x4_DemoCharge: ACE_Explosives_Place { | ||
| displayName = "USAF Demo Charge (x4)"; |
commy2
reviewed
Jul 11, 2019
| }; | ||
|
|
||
| class ACE_Explosives_Place_rhs_mine_M19_Mine: ACE_Explosives_Place { | ||
| displayName = "USAF AT Mine"; |
commy2
reviewed
Jul 11, 2019
| }; | ||
|
|
||
| class ACE_Explosives_Place_rhsusf_mine_m14_mag_Mine: ACE_Explosives_Place { | ||
| displayName = "USAF AP Mine"; |
commy2
reviewed
Jul 11, 2019
| class ACE_Actions { | ||
| class ACE_MainActions { | ||
| class ACE_SetTrigger; | ||
| class ACE_PickUp; |
There was a problem hiding this comment.
Why are these two here? Superfluous.
|
Requested changes made and tested. |
commy2
approved these changes
Jul 11, 2019
Dystopian
reviewed
Jul 12, 2019
optionals/compat_rhs_usf3/config.cpp
Outdated
| @@ -6,7 +6,7 @@ class CfgPatches { | |||
| units[] = {}; | |||
| weapons[] = {}; | |||
| requiredVersion = REQUIRED_VERSION; | |||
| requiredAddons[] = {"ace_javelin", "ace_rearm", "ace_refuel", "ace_repair", "rhsusf_c_weapons", "rhsusf_c_troops", "rhsusf_c_m1a1", "rhsusf_c_m1a2", "RHS_US_A2_AirImport", "rhsusf_c_m109", "rhsusf_c_HEMTT_A4", "rhsusf_c_hmmwv", "rhsusf_c_rg33", "rhsusf_c_fmtv", "rhsusf_c_m113", "RHS_US_A2Port_Armor", "rhsusf_c_melb"}; | |||
| requiredAddons[] = {"ace_javelin", "ace_rearm", "ace_refuel", "ace_repair", "rhsusf_c_weapons", "rhsusf_c_troops", "rhsusf_c_m1a1", "rhsusf_c_m1a2", "RHS_US_A2_AirImport", "rhsusf_c_m109", "rhsusf_c_HEMTT_A4", "rhsusf_c_hmmwv", "rhsusf_c_rg33", "rhsusf_c_fmtv", "rhsusf_c_m113", "RHS_US_A2Port_Armor", "rhsusf_c_melb", "ace_explosives"}; | |||
There was a problem hiding this comment.
Suggested change
| requiredAddons[] = {"ace_javelin", "ace_rearm", "ace_refuel", "ace_repair", "rhsusf_c_weapons", "rhsusf_c_troops", "rhsusf_c_m1a1", "rhsusf_c_m1a2", "RHS_US_A2_AirImport", "rhsusf_c_m109", "rhsusf_c_HEMTT_A4", "rhsusf_c_hmmwv", "rhsusf_c_rg33", "rhsusf_c_fmtv", "rhsusf_c_m113", "RHS_US_A2Port_Armor", "rhsusf_c_melb", "ace_explosives"}; | |
| requiredAddons[] = {"ace_explosives", "ace_javelin", "ace_rearm", "ace_refuel", "ace_repair", "rhsusf_c_weapons", "rhsusf_c_troops", "rhsusf_c_m1a1", "rhsusf_c_m1a2", "RHS_US_A2_AirImport", "rhsusf_c_m109", "rhsusf_c_HEMTT_A4", "rhsusf_c_hmmwv", "rhsusf_c_rg33", "rhsusf_c_fmtv", "rhsusf_c_m113", "RHS_US_A2Port_Armor", "rhsusf_c_melb"}; |
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.
When merged this pull request will:
Add ACE Explosives functionality to RHS:USAF explosives (demoblocks and mines). Addresses issue #7054.
close #7054