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

[compat_rhs_usf3] ACE Explosives functionality for RHS USAF #7099

Merged
merged 3 commits into from
Jul 12, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions optionals/compat_rhs_usf3/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,4 +297,23 @@ class CfgAmmo {
class rhs_ammo_smaw_SR: RocketBase {
ACE_caliber = 9;
};

class PipeBombBase;
class rhsusf_m112_ammo: PipeBombBase {
ace_explosives_magazine = "rhsusf_m112_mag";
ace_explosives_Explosive = "rhsusf_m112_ammo_scripted";
ace_explosives_size = 0;
ace_explosives_defuseObjectPosition[] = {-0.155,0,0.01};
soundActivation[] = {"", 0, 0, 0};
soundDeactivation[] = {"", 0, 0, 0};
};

class rhsusf_m112x4_ammo: PipeBombBase {
ace_explosives_magazine = "rhsusf_m112x4_mag";
ace_explosives_Explosive = "rhsusf_m112x4_ammo_scripted";
ace_explosives_size = 0;
ace_explosives_defuseObjectPosition[] = {-0.155,0.025,0.01};
soundActivation[] = {"", 0, 0, 0};
soundDeactivation[] = {"", 0, 0, 0};
};
};
56 changes: 56 additions & 0 deletions optionals/compat_rhs_usf3/CfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,60 @@ class cfgMagazines {
ammo = "ACE_Hellfire_AGM114N";
};

class rhsusf_m112_mag: CA_Magazine {
ace_explosives_DelayTime = 1;
ace_explosives_Placeable = 1;
ace_explosives_SetupObject = "ACE_Explosives_Place_rhsusf_m112_DemoCharge";
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
class Timer {
FuseTime = 0.5;
};
class Command {
FuseTime = 0.5;
};
class MK16_Transmitter: Command {};
class DeadmanSwitch: Command {};
};
};

class rhsusf_m112x4_mag: CA_Magazine {
ace_explosives_DelayTime = 1;
ace_explosives_Placeable = 1;
ace_explosives_SetupObject = "ACE_Explosives_Place_rhsusf_m112x4_DemoCharge";
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
class Timer {
FuseTime = 0.5;
};
class Command {
FuseTime = 0.5;
};
class MK16_Transmitter: Command {};
class DeadmanSwitch: Command {};
};
};

class ATMine_Range_Mag;
class rhs_mine_M19_mag: ATMine_Range_Mag {
ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_M19_Mine";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
digDistance = 0.075;
};
};
};

class rhsusf_mine_m14_mag: ATMine_Range_Mag {
ace_explosives_SetupObject = "ACE_Explosives_Place_rhsusf_mine_m14_mag_Mine";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
digDistance = 0.03;
};
};
};
};
47 changes: 47 additions & 0 deletions optionals/compat_rhs_usf3/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,51 @@ class CfgVehicles {
class rhsusf_airforce_jetpilot: rhsusf_usmc_marpat_wd_rifleman_m4 {
ace_gforcecoef = 0.55;
};

class Items_base_F;
class ACE_Explosives_Place: Items_base_F {
class ACE_Actions {
class ACE_MainActions;
};
};

class ACE_Explosives_Place_rhsusf_m112_DemoCharge: ACE_Explosives_Place {
displayName = "$STR_RHSUSF_M112_EXPLOSIVE_DISPLAY_NAME";
model = "\rhsusf\addons\rhsusf_weapons\explosives\rhsusf_m112x1_e";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
position = "[-0.155,0,0.01]";
};
};
};

class ACE_Explosives_Place_rhsusf_m112x4_DemoCharge: ACE_Explosives_Place {
displayName = "$STR_RHSUSF_M112X4_EXPLOSIVE_DISPLAY_NAME";
model = "\rhsusf\addons\rhsusf_weapons\explosives\rhsusf_m112x4_e";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
position = "[-0.155,0.025,0.01]";
};
};
};

class ACE_Explosives_Place_rhs_mine_M19_Mine: ACE_Explosives_Place {
displayName = "$STR_RHSUSF_M19_ATMINE_DISPLAY_NAME";
model = "\rhsusf\addons\rhsusf_weapons\mines\rhsusf_m19_e";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
position = "[0.011,0.011,0.045]";
};
};
};

class ACE_Explosives_Place_rhsusf_mine_m14_mag_Mine: ACE_Explosives_Place {
displayName = "$STR_RHSUSF_M14_APMINE_DISPLAY_NAME";
model = "\rhsusf\addons\rhsusf_weapons\mines\rhsusf_m14_e";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
position = "[0.02,0.015,0.02]";
};
};
};
};
2 changes: 1 addition & 1 deletion optionals/compat_rhs_usf3/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Copy link
Contributor

Choose a reason for hiding this comment

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

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"};

author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut"};
url = ECSTRING(main,URL);
Expand Down