diff --git a/src/Addons/34thPRC_ArmourStandard/data/config_vehicles.hpp b/src/Addons/34thPRC_ArmourStandard/data/config_vehicles.hpp index fc13299b..b1303262 100644 --- a/src/Addons/34thPRC_ArmourStandard/data/config_vehicles.hpp +++ b/src/Addons/34thPRC_ArmourStandard/data/config_vehicles.hpp @@ -1,5 +1,4 @@ #include "marines2\config_vehicles.hpp" #include "mkiv\config_vehicles.hpp" #include "odst\config_vehicles.hpp" -#include "odst2\config_vehicles.hpp" #include "mkvb\config_vehicles.hpp" diff --git a/src/Addons/34thPRC_ArmourStandard/data/odst2/backpacks/config_vehicles.hpp b/src/Addons/34thPRC_ArmourStandard/data/odst2/backpacks/config_vehicles.hpp deleted file mode 100644 index 70c5fc55..00000000 --- a/src/Addons/34thPRC_ArmourStandard/data/odst2/backpacks/config_vehicles.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "s9solajumpjet\config_vehicles.hpp" diff --git a/src/Addons/34thPRC_ArmourStandard/data/odst2/backpacks/s9solajumpjet/config_vehicles.hpp b/src/Addons/34thPRC_ArmourStandard/data/odst2/backpacks/s9solajumpjet/config_vehicles.hpp deleted file mode 100644 index 99fbc5fe..00000000 --- a/src/Addons/34thPRC_ArmourStandard/data/odst2/backpacks/s9solajumpjet/config_vehicles.hpp +++ /dev/null @@ -1,59 +0,0 @@ -class OPTRE_S12_SOLA_Jetpack; // OPTRE ---> OPTRE_Weapons -class SC_MercerJumppack; //Scion Conflict ---> sc_newequipment2 -class jen_jetpacks_example_mk5Jetpack_nato; //KJW's Jetpacks ---> jen_jetpacks_example -class 34thPRC_ArmourStandard_ODST2_Backpacks_S9BSOLAJumpJet : jen_jetpacks_example_mk5Jetpack_nato -{ - displayName="[34th] Series-9[B] SOLA Jump-Jet"; - author="34th PRC - Vasya, Jennderqueer, KJW, & Article 2 Studios"; - picture="\OPTRE_weapons\backpacks\icons\icon_jetpack_ca.paa"; - scope=2; - scopeArsenal=2; - ace_gunbag=1; - tf_hasLRradio=1; - tf_range=25000; - tf_encryptionCode="tf_west_radio_code"; - tf_dialog="rt1523g_radio_dialog"; - tf_subtype="digital_lr"; - tf_dialogUpdate="call TFAR_fnc_updateLRDialogToChannel;"; - sc_grapplinghook=1; - model="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; - uniformModel="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; - hiddenSelections[]= - { - "camo" - }; - hiddenSelectionsTextures[]= - { - "optre_weapons\backpacks\data\jetpack_co.paa" - }; - maximumLoad=600; - mass=20; -}; -class 34thPRC_ArmourStandard_ODST2_Backpacks_S9SSOLAJumpJet : SC_MercerJumppack -{ - displayName="[34th] Series-9[S] SOLA Jump-Jet"; - author="34th PRC - Vasya, Outworld Studios, & Article 2 Studios"; - picture="\OPTRE_weapons\backpacks\icons\icon_jetpack_ca.paa"; - scope=2; - scopeArsenal=2; - ace_gunbag=1; - tf_hasLRradio=1; - tf_range=25000; - tf_encryptionCode="tf_west_radio_code"; - tf_dialog="rt1523g_radio_dialog"; - tf_subtype="digital_lr"; - tf_dialogUpdate="call TFAR_fnc_updateLRDialogToChannel;"; - sc_grapplinghook=1; - model="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; - uniformModel="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; - hiddenSelections[]= - { - "camo" - }; - hiddenSelectionsTextures[]= - { - "optre_weapons\backpacks\data\jetpack_co.paa" - }; - maximumLoad=600; - mass=20; -}; diff --git a/src/Addons/34thPRC_ArmourStandard/data/odst2/config_vehicles.hpp b/src/Addons/34thPRC_ArmourStandard/data/odst2/config_vehicles.hpp deleted file mode 100644 index 0ea01538..00000000 --- a/src/Addons/34thPRC_ArmourStandard/data/odst2/config_vehicles.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "backpacks\config_vehicles.hpp" diff --git a/src/Addons/34thPRC_ArmourStandard/patches/jumppacks/kjwjetpacks/config.cpp b/src/Addons/34thPRC_ArmourStandard/patches/jumppacks/kjwjetpacks/config.cpp new file mode 100644 index 00000000..93e64933 --- /dev/null +++ b/src/Addons/34thPRC_ArmourStandard/patches/jumppacks/kjwjetpacks/config.cpp @@ -0,0 +1,47 @@ +class CfgPatches +{ + class 34thPRC_ArmourStandard_jumppacks_kjwjetpacks + { + author="34th PRC Modding Team"; + units[]={}; + requiredAddons[] = + { + "34thPRC_Overrides", // 34th PRC Aux Mod + "OPTRE_Weapons", // OPTRE + "jen_jetpacks_example", // KJW's Jetpacks + }; + skipWhenMissingDependencies = 1; + }; +}; +class CfgVehicles +{ + class jen_jetpacks_example_mk5Jetpack_nato; //KJW's Jetpacks ---> jen_jetpacks_example + class 34thPRC_ArmourStandard_jumppacks_kjwjetpacks_S9BSOLAJumpJet : jen_jetpacks_example_mk5Jetpack_nato + { + displayName="[34th] Series-9[B] SOLA Jump-Jet"; + author="34th PRC - Vasya, Jennderqueer, KJW, & Article 2 Studios"; + picture="\OPTRE_weapons\backpacks\icons\icon_jetpack_ca.paa"; + scope=2; + scopeArsenal=2; + ace_gunbag=1; + tf_hasLRradio=1; + tf_range=25000; + tf_encryptionCode="tf_west_radio_code"; + tf_dialog="rt1523g_radio_dialog"; + tf_subtype="digital_lr"; + tf_dialogUpdate="call TFAR_fnc_updateLRDialogToChannel;"; + sc_grapplinghook=1; + model="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; + uniformModel="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; + hiddenSelections[]= + { + "camo" + }; + hiddenSelectionsTextures[]= + { + "optre_weapons\backpacks\data\jetpack_co.paa" + }; + maximumLoad=600; + mass=20; + }; +}; diff --git a/src/Addons/34thPRC_ArmourStandard/patches/jumppacks/scionconflict/config.cpp b/src/Addons/34thPRC_ArmourStandard/patches/jumppacks/scionconflict/config.cpp new file mode 100644 index 00000000..a429e45d --- /dev/null +++ b/src/Addons/34thPRC_ArmourStandard/patches/jumppacks/scionconflict/config.cpp @@ -0,0 +1,47 @@ +class CfgPatches +{ + class 34thPRC_ArmourStandard_jumppacks_scionconflict + { + author="34th PRC Modding Team"; + units[]={}; + requiredAddons[] = + { + "34thPRC_Overrides", // 34th PRC Aux Mod + "sc_newequipment2", // Scion Conflict + "OPTRE_Weapons", // OPTRE + }; + skipWhenMissingDependencies = 1; + }; +}; +class CfgVehicles +{ + class SC_MercerJumppack; //Scion Conflict ---> sc_newequipment2 + class 34thPRC_ArmourStandard_jumppacks_scionconflict_S9SSOLAJumpJet : SC_MercerJumppack + { + displayName="[34th] Series-9[S] SOLA Jump-Jet"; + author="34th PRC - Vasya, Outworld Studios, & Article 2 Studios"; + picture="\OPTRE_weapons\backpacks\icons\icon_jetpack_ca.paa"; + scope=2; + scopeArsenal=2; + ace_gunbag=1; + tf_hasLRradio=1; + tf_range=25000; + tf_encryptionCode="tf_west_radio_code"; + tf_dialog="rt1523g_radio_dialog"; + tf_subtype="digital_lr"; + tf_dialogUpdate="call TFAR_fnc_updateLRDialogToChannel;"; + sc_grapplinghook=1; + model="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; + uniformModel="OPTRE_Weapons\Backpacks\jetpack_on.p3d"; + hiddenSelections[]= + { + "camo" + }; + hiddenSelectionsTextures[]= + { + "optre_weapons\backpacks\data\jetpack_co.paa" + }; + maximumLoad=600; + mass=20; + }; +};