diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f51b767c3..3ae69fd08 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,24 +13,15 @@ jobs: id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + - name: Install dependencies + run: | + sudo add-apt-repository ppa:koffeinflummi/armake -y + sudo apt update -y + sudo apt install armake -y + - name: Build release run: ./tools/deploy.sh ${{ steps.get_version.outputs.VERSION }} - # - name: Create Release - # id: create_release - # uses: actions/create-release@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # tag_name: ${{ github.ref }} - # release_name: Release ${{ github.ref }} - # body: | - # Changes in this Release - # - First Change - # - Second Change - # draft: false - # prerelease: false - - name: Upload Release cScripts uses: JasonEtco/upload-to-release@master with: @@ -43,9 +34,23 @@ jobs: args: release/cScripts_PUBLIC-${{ steps.get_version.outputs.VERSION }}.zip application/zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Release cScripts (PATCH) + continue-on-error: true + uses: JasonEtco/upload-to-release@master + with: + args: release/cScripts_PATCH_v* application/zip + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Release cScripts (Compositions) uses: JasonEtco/upload-to-release@master with: args: release/Compositions-${{ steps.get_version.outputs.VERSION }}.zip application/zip + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Release CBA Settings Server Config + continue-on-error: true + uses: JasonEtco/upload-to-release@master + with: + args: release/Server_Config-${{ steps.get_version.outputs.VERSION }}.zip application/zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Compositions/Cav_Training_SOI_Classes_Armed/composition.sqe b/Compositions/Cav_Training_SOI_Classes_Armed/composition.sqe new file mode 100644 index 000000000..19828cc66 --- /dev/null +++ b/Compositions/Cav_Training_SOI_Classes_Armed/composition.sqe @@ -0,0 +1,2572 @@ +version=53; +center[]={15186.724,17.913332,17303.143}; +class items +{ + items=10; + class Item0 + { + dataType="Logic"; + class PositionInfo + { + position[]={2.2763672,0.0026683807,3.8574219}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module1"; + id=3; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_SL_1"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item1 + { + dataType="Logic"; + class PositionInfo + { + position[]={2.2763672,0.0053329468,1.8574219}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module2"; + id=343; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_1"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item2 + { + dataType="Logic"; + class PositionInfo + { + position[]={1.2763672,0.0026683807,2.8574219}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module3"; + id=344; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_2"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item3 + { + dataType="Logic"; + class PositionInfo + { + position[]={0.27636719,1.9073486e-006,3.8574219}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module4"; + id=345; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_3"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item4 + { + dataType="Logic"; + class PositionInfo + { + position[]={-0.22363281,0.0080032349,-2.6425781}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module5"; + id=726; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_4"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item5 + { + dataType="Logic"; + class PositionInfo + { + position[]={0.77636719,0.010669708,-3.6425781}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module6"; + id=727; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_5"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item6 + { + dataType="Group"; + side="West"; + class Entities + { + items=16; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={2.2763672,0.0041065216,3.9082031}; + angles[]={0.0013372133,3.9932261,0.0013372133}; + }; + side="West"; + flags=6; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_SL_1"; + description="Squad Leader - Instructor"; + isPlayable=1; + }; + id=1220; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male05ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=4; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.22363281,0.0014400482,3.4082031}; + angles[]={0.0013372133,3.9133425,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_FTL_3"; + description="Alpha FTL - Instructor"; + isPlayable=1; + }; + id=1221; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male12ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=4; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.7236328,0.0014381409,1.9082031}; + angles[]={0.0013372133,0.83187622,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_AR_3"; + description="Student"; + isPlayable=1; + }; + id=1222; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=4; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.7236328,0.0014381409,0.90820313}; + angles[]={0.0013372133,0.82828093,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_G_3"; + description="Student"; + isPlayable=1; + }; + id=1223; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=2; + }; + }; + class Item4 + { + dataType="Object"; + class PositionInfo + { + position[]={-3.7236328,0.0014381409,-0.091796875}; + angles[]={0.0013372133,0.82224208,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_3"; + description="Student"; + isPlayable=1; + }; + id=1224; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + }; + nAttributes=2; + }; + }; + class Item5 + { + dataType="Object"; + class PositionInfo + { + position[]={-4.7236328,0.0014381409,-1.0917969}; + angles[]={0.0013372133,0.81559235,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_6"; + description="Student"; + isPlayable=1; + }; + id=1225; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male11ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.01; + }; + }; + }; + nAttributes=4; + }; + }; + class Item6 + { + dataType="Object"; + class PositionInfo + { + position[]={0.77636719,0.0041065216,2.4082031}; + angles[]={0.0013372133,3.9133425,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_FTL_2"; + description="Bravo FTL - Instructor"; + isPlayable=1; + }; + id=1226; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male03ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.97000003; + }; + }; + }; + nAttributes=4; + }; + }; + class Item7 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.72363281,0.0041046143,0.90820313}; + angles[]={0.0013372133,0.83187622,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_AR_2"; + description="Student"; + isPlayable=1; + }; + id=1227; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.99000001; + }; + }; + }; + nAttributes=2; + }; + }; + class Item8 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.7236328,0.0041046143,-0.091796875}; + angles[]={0.0013372133,0.82828093,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_G_2"; + description="Student"; + isPlayable=1; + }; + id=1228; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=2; + }; + }; + class Item9 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.7236328,0.0041065216,-1.0917969}; + angles[]={0.0013372133,0.82224208,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_2"; + description="Student"; + isPlayable=1; + }; + id=1229; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=2; + }; + }; + class Item10 + { + dataType="Object"; + class PositionInfo + { + position[]={-3.7236328,0.0041065216,-2.0917969}; + angles[]={0.0013372133,0.81559235,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_5"; + description="Student"; + isPlayable=1; + }; + id=1230; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male11ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.04; + }; + }; + }; + nAttributes=4; + }; + }; + class Item11 + { + dataType="Object"; + class PositionInfo + { + position[]={1.7763672,0.006772995,1.4082031}; + angles[]={0.0013372133,3.9133425,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_FTL_1"; + description="Charlie FTL - Instructor"; + isPlayable=1; + }; + id=1231; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=4; + }; + }; + class Item12 + { + dataType="Object"; + class PositionInfo + { + position[]={0.27636719,0.0067710876,-0.091796875}; + angles[]={0.0013372133,0.83187622,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_AR_1"; + description="Student"; + isPlayable=1; + }; + id=1232; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.03; + }; + }; + }; + nAttributes=2; + }; + }; + class Item13 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.72363281,0.006772995,-1.0917969}; + angles[]={0.0013372133,0.82828093,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_G_1"; + description="Student"; + isPlayable=1; + }; + id=1233; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.99000001; + }; + }; + }; + nAttributes=2; + }; + }; + class Item14 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.7236328,0.006772995,-2.0917969}; + angles[]={0.0013372133,0.82224208,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_1"; + description="Student"; + isPlayable=1; + }; + id=1234; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=2; + }; + }; + class Item15 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.7236328,0.006772995,-3.0917969}; + angles[]={0.0013372133,0.81559235,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_4"; + description="Student"; + isPlayable=1; + }; + id=1235; + type="rhsusf_usmc_marpat_wd_rifleman_m4"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.05; + }; + }; + }; + nAttributes=4; + }; + }; + }; + class Attributes + { + }; + id=1219; + }; + class Item7 + { + dataType="Group"; + side="West"; + class Entities + { + items=2; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.72363281,0.0094394684,-3.0917969}; + angles[]={0.0013439035,0.83890998,0.0013439035}; + }; + side="West"; + flags=6; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Instructor/Observer""];}"; + name="C_FTL_4"; + description="Instructor/Observer"; + isPlayable=1; + }; + id=1237; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=4; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={0.20703125,0.01210022,-4.15625}; + angles[]={0.0013439035,0.83890998,0.0013439035}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Instructor/Observer""];}"; + name="C_FTL_5"; + description="Instructor/Observer"; + isPlayable=1; + }; + id=1239; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=4; + }; + }; + }; + class Attributes + { + }; + id=1236; + }; + class Item8 + { + dataType="Object"; + class PositionInfo + { + position[]={4.7724609,0.90175056,1.3574219}; + angles[]={0.0013372133,3.9567854,0.0013372133}; + }; + side="Empty"; + flags=4; + class Attributes + { + init="call{[this,""Bandit"",true,true,false,false,false] call cScripts_fnc_doStarterCrate;}"; + description="Starter Crate"; + }; + id=1478; + type="B_supplyCrate_F"; + class CustomAttributes + { + class Attribute0 + { + property="ammoBox"; + expression="[_this,_value] call bis_fnc_initAmmoBox;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="[[[[""launch_NLAW_F"",""arifle_MX_F"",""arifle_MX_SW_F"",""FirstAidKit""],[1,2,1,10]],[[""30Rnd_65x39_caseless_mag"",""16Rnd_9x21_Mag"",""30Rnd_45ACP_Mag_SMG_01"",""20Rnd_762x51_Mag"",""100Rnd_65x39_caseless_mag"",""1Rnd_HE_Grenade_shell"",""3Rnd_HE_Grenade_shell"",""1Rnd_Smoke_Grenade_shell"",""1Rnd_SmokeGreen_Grenade_shell"",""Chemlight_green"",""Laserbatteries"",""HandGrenade"",""MiniGrenade"",""SmokeShell"",""SmokeShellGreen"",""UGL_FlareWhite_F"",""UGL_FlareGreen_F"",""ACE_SpareBarrel"",""ACE_20Rnd_65x47_Scenar_mag"",""ACE_30Rnd_65x47_Scenar_mag"",""ACE_20Rnd_65_Creedmor_mag"",""ACE_30Rnd_65_Creedmor_mag"",""ACE_10Rnd_762x51_M118LR_Mag"",""ACE_20Rnd_762x51_M118LR_Mag"",""ACE_10Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_10Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mag_Tracer"",""ACE_20Rnd_762x51_Mag_Tracer_Dim""],[24,6,6,6,6,3,1,2,2,6,2,6,6,2,2,2,2,2,4,4,4,4,4,4,4,4,4,4,4,4]],[[""Laserdesignator"",""acc_flashlight"",""bipod_01_F_blk"",""ACE_Chemlight_Shield"",""ACE_EarPlugs""],[1,2,1,12,12]],[[""B_Kitbag_mcamo""],[2]]],false]"; + }; + }; + }; + nAttributes=1; + }; + }; + class Item9 + { + dataType="Group"; + side="West"; + class Entities + { + items=4; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={1.7763672,0.0094413757,-0.59179688}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=7; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1514; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={2.7763672,0.012105942,-1.5917969}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=5; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1587; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={0.77636719,0.0094413757,-1.5917969}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=5; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1589; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={1.7763672,0.012107849,-2.5917969}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=5; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1591; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + }; + class Attributes + { + }; + id=1509; + }; +}; +class connections +{ + class LinkIDProvider + { + nextID=6; + }; + class Links + { + items=6; + class Item0 + { + linkID=0; + item0=726; + item1=1237; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item1 + { + linkID=1; + item0=727; + item1=1239; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item2 + { + linkID=2; + item0=3; + item1=1220; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item3 + { + linkID=3; + item0=344; + item1=1226; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item4 + { + linkID=4; + item0=345; + item1=1221; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item5 + { + linkID=5; + item0=343; + item1=1231; + class CustomData + { + type="TriggerOwner"; + }; + }; + }; +}; diff --git a/Compositions/Cav_Training_SOI_Classes_Armed/header.sqe b/Compositions/Cav_Training_SOI_Classes_Armed/header.sqe new file mode 100644 index 000000000..45b24a8f6 --- /dev/null +++ b/Compositions/Cav_Training_SOI_Classes_Armed/header.sqe @@ -0,0 +1,4 @@ +version=53; +name="SOI Classes (Armed/BIT/AIT/BLC/Etc.)"; +author="=7Cav=SGT.Blake.H"; +category="Cav_EdSubcat_Deploy_Platoon"; diff --git a/Compositions/Cav_Training_SOI_Classes_Unarmed/composition.sqe b/Compositions/Cav_Training_SOI_Classes_Unarmed/composition.sqe new file mode 100644 index 000000000..c699e63fa --- /dev/null +++ b/Compositions/Cav_Training_SOI_Classes_Unarmed/composition.sqe @@ -0,0 +1,2572 @@ +version=53; +center[]={15190.182,17.921333,17299.682}; +class items +{ + items=10; + class Item0 + { + dataType="Logic"; + class PositionInfo + { + position[]={-3.6816406,1.9073486e-006,0.81835938}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module5"; + id=726; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_4"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item1 + { + dataType="Logic"; + class PositionInfo + { + position[]={-2.6816406,0.0026683807,-0.18164063}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module6"; + id=727; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_5"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item2 + { + dataType="Group"; + side="West"; + class Entities + { + items=2; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={-4.1816406,0.0014381409,0.36914063}; + angles[]={0.0013439035,0.83890998,0.0013439035}; + }; + side="West"; + flags=6; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Instructor/Observer""];}"; + name="C_FTL_4"; + description="Instructor/Observer"; + isPlayable=1; + }; + id=1237; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=4; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={-3.2509766,0.0040988922,-0.6953125}; + angles[]={0.0013439035,0.83890998,0.0013439035}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Instructor/Observer""];}"; + name="C_FTL_5"; + description="Instructor/Observer"; + isPlayable=1; + }; + id=1239; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=4; + }; + }; + }; + class Attributes + { + }; + id=1236; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={1.3144531,0.89374924,4.8183594}; + angles[]={0.0013372133,3.9567854,0.0013372133}; + }; + side="Empty"; + flags=4; + class Attributes + { + init="call{[this,""Bandit"",true,true,false,false,false] call cScripts_fnc_doStarterCrate;}"; + description="Starter Crate"; + }; + id=1478; + type="B_supplyCrate_F"; + class CustomAttributes + { + class Attribute0 + { + property="ammoBox"; + expression="[_this,_value] call bis_fnc_initAmmoBox;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="[[[[""launch_NLAW_F"",""arifle_MX_F"",""arifle_MX_SW_F"",""FirstAidKit""],[1,2,1,10]],[[""30Rnd_65x39_caseless_mag"",""16Rnd_9x21_Mag"",""30Rnd_45ACP_Mag_SMG_01"",""20Rnd_762x51_Mag"",""100Rnd_65x39_caseless_mag"",""1Rnd_HE_Grenade_shell"",""3Rnd_HE_Grenade_shell"",""1Rnd_Smoke_Grenade_shell"",""1Rnd_SmokeGreen_Grenade_shell"",""Chemlight_green"",""Laserbatteries"",""HandGrenade"",""MiniGrenade"",""SmokeShell"",""SmokeShellGreen"",""UGL_FlareWhite_F"",""UGL_FlareGreen_F"",""ACE_SpareBarrel"",""ACE_20Rnd_65x47_Scenar_mag"",""ACE_30Rnd_65x47_Scenar_mag"",""ACE_20Rnd_65_Creedmor_mag"",""ACE_30Rnd_65_Creedmor_mag"",""ACE_10Rnd_762x51_M118LR_Mag"",""ACE_20Rnd_762x51_M118LR_Mag"",""ACE_10Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_10Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mag_Tracer"",""ACE_20Rnd_762x51_Mag_Tracer_Dim""],[24,6,6,6,6,3,1,2,2,6,2,6,6,2,2,2,2,2,4,4,4,4,4,4,4,4,4,4,4,4]],[[""Laserdesignator"",""acc_flashlight"",""bipod_01_F_blk"",""ACE_Chemlight_Shield"",""ACE_EarPlugs""],[1,2,1,12,12]],[[""B_Kitbag_mcamo""],[2]]],false]"; + }; + }; + }; + nAttributes=1; + }; + }; + class Item4 + { + dataType="Group"; + side="West"; + class Entities + { + items=4; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.6816406,0.0014400482,2.8691406}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=7; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1514; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.68164063,0.0041046143,1.8691406}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=5; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1587; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.6816406,0.0014400482,1.8691406}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=5; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1589; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.6816406,0.0041065216,0.86914063}; + angles[]={0,0.82522762,0}; + }; + side="West"; + flags=5; + class Attributes + { + skill=0.40000001; + init="call{this setVariable [""cScripts_Player_Unit"", ""CADRE""];}"; + description="Cadre@Cadre"; + isPlayable=1; + }; + id=1591; + type="Cav_B_C_Alpha_RiflemanLAT_F"; + class CustomAttributes + { + class Attribute0 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=2; + }; + }; + }; + class Attributes + { + }; + id=1509; + }; + class Item5 + { + dataType="Group"; + side="West"; + class Entities + { + items=16; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={3.8183594,0.0094394684,2.3691406}; + angles[]={0.0013439035,3.9932261,0.0013439035}; + }; + side="West"; + flags=6; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_SL_2"; + description="Squad Leader - Instructor"; + isPlayable=1; + }; + id=1593; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male05ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=4; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={1.3183594,0.006772995,1.8691406}; + angles[]={0.0013372133,3.9133425,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_FTL_8"; + description="Alpha FTL - Instructor"; + isPlayable=1; + }; + id=1594; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male12ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.02; + }; + }; + }; + nAttributes=4; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={2.3183594,0.0094394684,0.86914063}; + angles[]={0.0013372133,3.9133425,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_FTL_9"; + description="Bravo FTL - Instructor"; + isPlayable=1; + }; + id=1599; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male03ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.97000003; + }; + }; + }; + nAttributes=4; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={3.3183594,0.012105942,-0.13085938}; + angles[]={0.0013372133,3.9133425,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CORPORAL"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_FTL_10"; + description="Charlie FTL - Instructor"; + isPlayable=1; + }; + id=1604; + type="rhsusf_usmc_marpat_wd_officer"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=4; + }; + }; + class Item4 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.18164063,0.006772995,0.36914063}; + angles[]={0.0013372133,0.83187622,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_AR_4"; + description="Student"; + isPlayable=1; + }; + id=1609; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male06ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=4; + }; + }; + class Item5 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.1816406,0.0067710876,-0.63085938}; + angles[]={0.0013372133,0.82828093,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_G_4"; + description="Student"; + isPlayable=1; + }; + id=1610; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=2; + }; + }; + class Item6 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.1816406,0.0067710876,-1.6308594}; + angles[]={0.0013372133,0.82224208,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_7"; + description="Student"; + isPlayable=1; + }; + id=1611; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + }; + nAttributes=2; + }; + }; + class Item7 + { + dataType="Object"; + class PositionInfo + { + position[]={-3.1816406,0.0067710876,-2.6308594}; + angles[]={0.0013372133,0.81559235,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_8"; + description="Student"; + isPlayable=1; + }; + id=1612; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male11ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.01; + }; + }; + }; + nAttributes=4; + }; + }; + class Item8 + { + dataType="Object"; + class PositionInfo + { + position[]={0.81835938,0.009437561,-0.63085938}; + angles[]={0.0013372133,0.83187622,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_AR_5"; + description="Student"; + isPlayable=1; + }; + id=1613; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.99000001; + }; + }; + }; + nAttributes=2; + }; + }; + class Item9 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.18164063,0.0094394684,-1.6308594}; + angles[]={0.0013372133,0.82828093,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_G_5"; + description="Student"; + isPlayable=1; + }; + id=1614; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=2; + }; + }; + class Item10 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.1816406,0.009437561,-2.6308594}; + angles[]={0.0013372133,0.82224208,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_9"; + description="Student"; + isPlayable=1; + }; + id=1615; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.95999998; + }; + }; + }; + nAttributes=2; + }; + }; + class Item11 + { + dataType="Object"; + class PositionInfo + { + position[]={-2.1816406,0.009437561,-3.6308594}; + angles[]={0.0013372133,0.81559235,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_10"; + description="Student"; + isPlayable=1; + }; + id=1616; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male11ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.04; + }; + }; + }; + nAttributes=4; + }; + }; + class Item12 + { + dataType="Object"; + class PositionInfo + { + position[]={1.8183594,0.012104034,-1.6308594}; + angles[]={0.0013372133,0.83187622,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_AR_6"; + description="Student"; + isPlayable=1; + }; + id=1617; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.03; + }; + }; + }; + nAttributes=2; + }; + }; + class Item13 + { + dataType="Object"; + class PositionInfo + { + position[]={0.81835938,0.012104034,-2.6308594}; + angles[]={0.0013372133,0.82828093,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_G_6"; + description="Student"; + isPlayable=1; + }; + id=1618; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.99000001; + }; + }; + }; + nAttributes=2; + }; + }; + class Item14 + { + dataType="Object"; + class PositionInfo + { + position[]={-0.18164063,0.012105942,-3.6308594}; + angles[]={0.0013372133,0.82224208,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_11"; + description="Student"; + isPlayable=1; + }; + id=1619; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.98000002; + }; + }; + }; + nAttributes=2; + }; + }; + class Item15 + { + dataType="Object"; + class PositionInfo + { + position[]={-1.1816406,0.012105942,-4.6308594}; + angles[]={0.0013372133,0.81559235,0.0013372133}; + }; + side="West"; + flags=4; + class Attributes + { + init="call{this setVariable [""cScripts_Player_Unit"", ""Training Group""];}"; + name="C_R_12"; + description="Student"; + isPlayable=1; + }; + id=1620; + type="rhsusf_usmc_marpat_wd_riflemanat"; + class CustomAttributes + { + class Attribute0 + { + property="acex_headless_blacklist"; + expression="_this setVariable [""acex_headless_blacklist"",_value,true]"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute1 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male10ENG"; + }; + }; + }; + class Attribute3 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.05; + }; + }; + }; + nAttributes=4; + }; + }; + }; + class Attributes + { + }; + id=1592; + }; + class Item6 + { + dataType="Logic"; + class PositionInfo + { + position[]={3.8183594,0.010667801,0.31835938}; + angles[]={0.0013439035,0,0.0013439035}; + }; + name="zeus_module2_1"; + id=1621; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_10"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item7 + { + dataType="Logic"; + class PositionInfo + { + position[]={2.8183594,0.0079994202,1.3183594}; + angles[]={0.0013439035,0,0.0013439035}; + }; + name="zeus_module3_1"; + id=1622; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_9"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item8 + { + dataType="Logic"; + class PositionInfo + { + position[]={1.8183594,0.0053329468,2.3183594}; + angles[]={0.0013439035,0,0.0013439035}; + }; + name="zeus_module4_1"; + id=1623; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_FTL_8"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; + class Item9 + { + dataType="Logic"; + class PositionInfo + { + position[]={4.3183594,0.0080013275,2.8183594}; + angles[]={0.0013372133,0,0.0013372133}; + }; + name="zeus_module1_1"; + id=1624; + type="ModuleCurator_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="C_SL_2"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; + }; + }; +}; +class connections +{ + class LinkIDProvider + { + nextID=6; + }; + class Links + { + items=6; + class Item0 + { + linkID=0; + item0=726; + item1=1237; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item1 + { + linkID=1; + item0=727; + item1=1239; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item2 + { + linkID=2; + item0=1623; + item1=1594; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item3 + { + linkID=3; + item0=1622; + item1=1599; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item4 + { + linkID=4; + item0=1621; + item1=1604; + class CustomData + { + type="TriggerOwner"; + }; + }; + class Item5 + { + linkID=5; + item0=1624; + item1=1593; + class CustomData + { + type="TriggerOwner"; + }; + }; + }; +}; diff --git a/Compositions/Cav_Training_SOI_Classes_Unarmed/header.sqe b/Compositions/Cav_Training_SOI_Classes_Unarmed/header.sqe new file mode 100644 index 000000000..b6ab7bc3a --- /dev/null +++ b/Compositions/Cav_Training_SOI_Classes_Unarmed/header.sqe @@ -0,0 +1,4 @@ +version=53; +name="SOI Classes (Unarmed/BLN/BRCC)"; +author="=7Cav=SGT.Blake.H"; +category="Cav_EdSubcat_Deploy_Platoon"; diff --git a/cScripts/CavFnc/functions/documents/fn_Doc_MissionControl.sqf b/cScripts/CavFnc/functions/documents/fn_Doc_MissionControl.sqf index 5953bb2c2..215f4aad7 100644 --- a/cScripts/CavFnc/functions/documents/fn_Doc_MissionControl.sqf +++ b/cScripts/CavFnc/functions/documents/fn_Doc_MissionControl.sqf @@ -18,6 +18,6 @@ if !(_variableName in _missionController) exitWith {}; player createDiaryRecord["7Cav", ["S3 Mission Control", - "Oh! This tab is under redevelopment!" + 'Open Zeus Interface' ] ]; diff --git a/cScripts/CavFnc/functions/logistics/fn_doStarterCrate.sqf b/cScripts/CavFnc/functions/logistics/fn_doStarterCrate.sqf index a25fb3224..a297060fc 100644 --- a/cScripts/CavFnc/functions/logistics/fn_doStarterCrate.sqf +++ b/cScripts/CavFnc/functions/logistics/fn_doStarterCrate.sqf @@ -37,13 +37,25 @@ params [ [formatText["Starter Crate system applied to %1.", _object]] call FUNC(logInfo); #endif +// Lowercase +_quickSelectScale = toLower(_quickSelectScale); + // If isServer call equipBase if (isServer) then { [_object, _quickSelectScale] call FUNC(doStarterCrateSupplies); }; // Make addAction Topic -_object addAction [" 7th Cavalry Equipment Crate", {}, [], 1.5, true, true, "", "true", 5]; +private _fullLableCheck = (_quickSelectScale == 'none' || _quickSelectScale == 'all' || _quickSelectScale == 'full'); +private _CoLableCheck = (_quickSelectScale == 'alpha' || _quickSelectScale == 'bravo' || _quickSelectScale == 'charlie'); +private _crateName = if ( !(_fullLableCheck) ) then { + if ( _CoLableCheck ) then { + format [" %1 Co ", [_quickSelectScale] call CBA_fnc_capitalize]; + } else { + format [" %1 ", [_quickSelectScale] call CBA_fnc_capitalize]; + }; +} else { ' ' }; +_object addAction [format [" 7th Cavalry%1Equipment Crate", _crateName], {}, [], 1.5, true, true, "", "true", 5]; if (_arsenal) then { [_object, _quickSelectScale] call FUNC(addArsenal); diff --git a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf index 02b1018ef..f23f5349a 100644 --- a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf +++ b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf @@ -237,7 +237,11 @@ if (_companySelector in _bravo or _alwaysAvalible) then { _crate addItemCargoGlobal ["ACRE_PRC117F",5]; _crate addItemCargoGlobal ["ACRE_PRC343",12]; - //================== WEAPONS ==================\\ + //================== OPTICS ==================\\ + + _crate addWeaponCargoGlobal ["rhs_weap_M136_hedp",10]; + + //================== OPTICS ==================\\ _crate addItemCargoGlobal ["rhsusf_acc_eotech_552",10]; _crate addItemCargoGlobal ["rhsusf_acc_anpeq15_bk_light",50]; @@ -286,8 +290,6 @@ if (_companySelector in _bravo or _alwaysAvalible) then { _crate addItemCargoGlobal ["ACE_EarPlugs",250]; - _crate addItemCargoGlobal ["ACE_FieldDressing",250]; - _crate addItemCargoGlobal ["ACE_packingBandage",250]; _crate addItemCargoGlobal ["ACE_elasticBandage",250]; _crate addItemCargoGlobal ["ACE_quikclot",250]; @@ -337,6 +339,7 @@ if (_companySelector in _bravo or _alwaysAvalible) then { _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50]; _crate addWeaponCargoGlobal ["rhs_weap_m240B",5]; _crate addItemCargoGlobal ["tf47_optic_m3maaws",10]; + _crate addWeaponCargoGlobal ["rhs_weap_M136_hedp",10]; _crate addWeaponCargoGlobal ["tf47_m3maaws",10]; _crate addWeaponCargoGlobal ["tf47_at4_HP",10]; @@ -420,12 +423,14 @@ if (_companySelector in _charlie or _alwaysAvalible) then { }; //================== WEAPONS ==================\\ - _crate addWeaponCargoGlobal ["tf47_at4_HP",20]; + _crate addWeaponCargoGlobal ["tf47_at4_HP",10]; + _crate addWeaponCargoGlobal ["rhs_weap_M136_hedp",10]; _crate addWeaponCargoGlobal ["rhs_weap_m72a7",50]; //================== HEAD GEAR ==================\\ _crate addItemCargoGlobal ["rhsusf_ach_helmet_ocp",10]; _crate addItemCargoGlobal ["rhsusf_ach_helmet_camo_ocp",10]; + _crate addItemCargoGlobal ["rhsusf_ach_helmet_headset_ocp",10]; _crate addItemCargoGlobal ["rhs_googles_clear",10]; _crate addItemCargoGlobal ["rhs_googles_black",10]; _crate addItemCargoGlobal ["rhsusf_oakley_goggles_clr",10]; @@ -433,6 +438,7 @@ if (_companySelector in _charlie or _alwaysAvalible) then { //================== OPTICS ==================\\ _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",10]; + _crate addItemCargoGlobal ["rhsusf_acc_compm4",10]; _crate addItemCargoGlobal ["rhsusf_acc_acog_rmr",10]; //================== MEDICAL ==================\\ @@ -442,7 +448,6 @@ if (_companySelector in _charlie or _alwaysAvalible) then { //================== AMMO ==================\\ _crate addMagazineCargoGlobal ["rhs_mag_30Rnd_556x45_M855A1_PMAG",250]; _crate addMagazineCargoGlobal ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",250]; - _crate addMagazineCargoGlobal ["rhsusf_20Rnd_762x51_m993_Mag",50]; _crate addMagazineCargoGlobal ["rhsusf_200Rnd_556x45_soft_pouch",100]; _crate addMagazineCargoGlobal ["rhsusf_100Rnd_762x51_m62_tracer",50]; _crate addMagazineCargoGlobal ["rhsusf_100Rnd_762x51_m61_ap",50]; @@ -486,13 +491,14 @@ if (_companySelector in _charlie or _alwaysAvalible) then { //================== RADIOS ==================\\ _crate addItemCargoGlobal ["ACRE_PRC343",10]; _crate addItemCargoGlobal ["ACRE_PRC152",10]; - + //================== ITEMS ==================\\ _crate addItemCargoGlobal ["ACE_Clacker",10]; _crate addItemCargoGlobal ["ACE_DefusalKit",10]; - _crate addItemCargoGlobal ["ClaymoreDirectionalMine_Remote_Mag",25]; - _crate addItemCargoGlobal ["rhsusf_m112_mag",10]; - _crate addItemCargoGlobal ["rhsusf_m112x4_mag",10]; + _crate addItemCargoGlobal ["ACE_M26_Clacker",20]; + _crate addMagazineCargoGlobal ["SatchelCharge_Remote_Mag",50]; + _crate addMagazineCargoGlobal ["DemoCharge_Remote_Mag",50]; + _crate addMagazineCargoGlobal ["ClaymoreDirectionalMine_Remote_Mag",25]; _crate addItemCargoGlobal ["ACE_CableTie",100]; _crate addItemCargoGlobal ["rhsusf_ANPVS_14",50]; _crate addItemCargoGlobal ["ACE_EntrenchingTool",10]; diff --git a/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf b/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf index 483470c00..3747b76f2 100644 --- a/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf +++ b/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf @@ -133,6 +133,9 @@ if (EGVAR(Settings,setMissionType) != 3) then { [_player] call FUNC(doPlayerAnnouncement); }; +// Reload a magazine if empty +if (needReload _player == 1) then {reload _player}; + if (isNil {_unit getVariable QEGVAR(Player,Unit)}) then { [formatText["%1 have no unit variable defined", _player], "LoadoutPostInit", true] call FUNC(logWarning); }; diff --git a/cScripts/CavFnc/functions/players/fn_setPreInitPlayerSettings.sqf b/cScripts/CavFnc/functions/players/fn_setPreInitPlayerSettings.sqf index 42b0c3232..e6c39b9e3 100644 --- a/cScripts/CavFnc/functions/players/fn_setPreInitPlayerSettings.sqf +++ b/cScripts/CavFnc/functions/players/fn_setPreInitPlayerSettings.sqf @@ -54,7 +54,7 @@ private _MedicClass = if (_isMedicLevel >= 1) then {true} else {false}; // Set Engineer private _EngineerClass = if (_isEngineerLevel >= 1) then {true} else {false}; (_player) setVariable ['ACE_isEngineer', _isEngineerLevel, _EngineerClass]; -if (_isEngineerClass >= 1) then {_player setUnitTrait "engineer"}; +if (_isEngineerLevel >= 1) then {_player setUnitTrait "engineer"}; #ifdef DEBUG_MODE if (_EngineerClass) then {[formatText["%1 engineerLevel is %2", _player, _EngineerClass], "LoadoutPreInit"] call FUNC(logInfo)}; #endif diff --git a/cScripts/CavFnc/functions/players/fn_setTeamColor.sqf b/cScripts/CavFnc/functions/players/fn_setTeamColor.sqf index 941ca9d55..6e85d201d 100644 --- a/cScripts/CavFnc/functions/players/fn_setTeamColor.sqf +++ b/cScripts/CavFnc/functions/players/fn_setTeamColor.sqf @@ -14,12 +14,15 @@ * */ -private _getTeamName = getText (configFile >> "CfgVehicles" >> typeOf player >> "displayName"); +private _getTeamName = ""; +if !(roleDescription player == "") then { + _getTeamName = roleDescription player; +} else { + _getTeamName = getText (configFile >> "CfgVehicles" >> typeOf player >> "displayName"); +}; _getTeamName = _getTeamName splitString " "; _getTeamName = _getTeamName select 0; -private _return = _getTeamName; - switch (_getTeamName) do { case "Alpha": { [player, "RED"] call ace_interaction_fnc_joinTeam; @@ -29,11 +32,20 @@ switch (_getTeamName) do { [player, "BLUE"] call ace_interaction_fnc_joinTeam; (player) setVariable [QEGVAR(Player,Team), 'BLUE']; }; + case "Charlie": { + [player, "GREEN"] call ace_interaction_fnc_joinTeam; + (player) setVariable [QEGVAR(Player,Team), 'GREEN']; + }; + case "Delta": { + [player, "YELLOW"] call ace_interaction_fnc_joinTeam; + (player) setVariable [QEGVAR(Player,Team), 'YELLOW']; + }; default { _getTeamName = 'WHITE'; (player) setVariable [QEGVAR(Player,Team), 'WHITE']; }; }; +private _return = _getTeamName; #ifdef DEBUG_MODE [formatText["%1 was assigned as team %2.", player, _getTeamName]] call FUNC(logInfo); diff --git a/cScripts/CavFnc/functions/systems/fn_addHeal.sqf b/cScripts/CavFnc/functions/systems/fn_addHeal.sqf index d06c5bec2..daef4b760 100644 --- a/cScripts/CavFnc/functions/systems/fn_addHeal.sqf +++ b/cScripts/CavFnc/functions/systems/fn_addHeal.sqf @@ -14,14 +14,15 @@ params [["_object", objNull, [objNull]]]; // Make addAction _object addAction [" Heal", { - [_this select 0, _this select 1] call ace_medical_treatment_fnc_fullHeal + params ["_target", "_caller", "_actionId", "_arguments"]; + [_target, _caller] call ace_medical_treatment_fnc_fullHeal; }, [], 1.5, true, true, "", "true", 5]; // Make ACE Interaction for ReGear private _Icon = "\z\ACE\addons\medical_gui\ui\cross.paa"; private _reHealCondition = {true}; private _reHealStatement = { - [_this select 0, player] call ace_medical_treatment_fnc_fullHeal + [_this select 0, player] call ace_medical_treatment_fnc_fullHeal; }; private _reHealAction = ["cScriptsHealAce", "Heal", _Icon, _reHealStatement, _reHealCondition] call ace_interact_menu_fnc_createAction; [_object, 0, ["ACE_MainActions"], _reHealAction] call ace_interact_menu_fnc_addActionToObject; diff --git a/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf b/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf index 1e1a46f02..fac12424e 100644 --- a/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf +++ b/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf @@ -187,7 +187,7 @@ if (_companySelector in _charlie or _alwaysAvalible) then { [_object,"Grenadier", "Cav_B_C_Grenadier_F", "", _charlieSquadCat, "Charlie", _allowOnlyForCompany] call FUNC(addQuickSelection); [_object,"Rifleman", "Cav_B_C_Rifleman_F", "", _charlieSquadCat, "Charlie", _allowOnlyForCompany] call FUNC(addQuickSelection); [_object,"Combat Life Saver", "Cav_B_C_CombatLifeSaver_F", "", _charlieSquadCat, "Charlie", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Marksman", "Cav_B_C_Marksman_F", "", _charlieSquadCat, "Charlie", _allowOnlyForCompany] call FUNC(addQuickSelection); + //[_object,"Marksman", "Cav_B_C_Marksman_F", "", _charlieSquadCat, "Charlie", _allowOnlyForCompany] call FUNC(addQuickSelection); [_object,"Crew", "Cav_B_C_Crew_F", "", _charlieSquadCat, "Charlie", _allowOnlyForCompany] call FUNC(addQuickSelection); diff --git a/cScripts/CavFnc/functions/systems/fn_addReGear.sqf b/cScripts/CavFnc/functions/systems/fn_addReGear.sqf index 5c0d59b05..cc005b5b5 100644 --- a/cScripts/CavFnc/functions/systems/fn_addReGear.sqf +++ b/cScripts/CavFnc/functions/systems/fn_addReGear.sqf @@ -18,13 +18,15 @@ params [ // Make addAction _object addAction [" ReGear", { - private _loadout = player getVariable ["poppy_loadout", ""]; - [player, _loadout] call Poppy_fnc_applyLoadout; + params ["_target", "_caller", "_actionId", "_arguments"]; + _arguments params ["_doHeal"]; + private _loadout = _caller getVariable ["poppy_loadout", ""]; + [_caller, _loadout] call Poppy_fnc_applyLoadout; - if (_this select 3) then { - [player, player] call ace_medical_fnc_treatmentAdvanced_fullHealLocal; + if (_doHeal) then { + [_target, _caller] call ace_medical_treatment_fnc_fullHeal; }; -}, _doHeal, 1.5, true, true, "", "true", 5]; +}, [_doHeal], 1.5, true, true, "", "true", 5]; // Make ACE Interaction for ReGear private _Icon = "cScripts\Data\Icon\icon_00.paa"; @@ -34,7 +36,7 @@ private _reGearStatement = { [player, _loadout] call Poppy_fnc_applyLoadout; if (_doHeal) then { - [player, player] call ace_medical_fnc_treatmentAdvanced_fullHealLocal; + [_this select 0, player] call ace_medical_treatment_fnc_fullHeal; }; }; private _reGearAction = ["cScriptsReGearAce", "ReGear", _Icon, _reGearStatement, _reGearCondition] call ace_interact_menu_fnc_createAction; diff --git a/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp b/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp index 79dcbb967..ae5aee0ac 100644 --- a/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp +++ b/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp @@ -3,6 +3,7 @@ class Cav_B_B_PlatoonSergeant_F : Cav_B_B_CavScout_PlatoonLead_F {}; //Proxy class Cav_B_B_PlatoonLeader_F : Cav_B_B_CavScout_PlatoonLead_F {}; //Proxy +class Cav_B_B_Officer_F : Cav_B_B_PlatoonLeader_F {}; class Cav_B_B_PlatoonSergeant_2_5_F : Cav_B_B_PlatoonSergeant_F {}; class Cav_B_B_PlatoonLeader_2_6_F : Cav_B_B_PlatoonLeader_F {}; diff --git a/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp b/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp index 53d7f78fb..8dfa8f641 100644 --- a/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp +++ b/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp @@ -3,6 +3,7 @@ class Cav_B_C_PlatoonSergeant_F : Cav_B_C_PlatoonStaff_F {}; class Cav_B_C_PlatoonLeader_F : Cav_B_C_PlatoonStaff_F {}; +class Cav_B_C_Officer_F : Cav_B_C_PlatoonStaff_F {}; class Cav_B_C_PlatoonLeader_Bandit_6_F : Cav_B_C_PlatoonStaff_F {}; class Cav_B_C_PlatoonSergeant_Bandit_5_F : Cav_B_C_PlatoonStaff_F {}; diff --git a/cScripts/Loadouts/script/CfgPoppy.hpp b/cScripts/Loadouts/script/CfgPoppy.hpp index 771d24fff..b8056ab6c 100644 --- a/cScripts/Loadouts/script/CfgPoppy.hpp +++ b/cScripts/Loadouts/script/CfgPoppy.hpp @@ -4,7 +4,7 @@ class CfgPoppy { forceShowErrors = 0; showLoadoutInBriefing = 0; enableAILoadoutsSP = 1; - handleRadioReplacements = 0 + handleRadioReplacements = 0; //Not implemented for 1.0.0. May be implemented with CBA 2.3.0. //enableAILoadoutsMP = 0; @@ -15,4 +15,4 @@ class CfgPoppy { }; }; -#include "Dialog.hpp" +#include "Dialog.hpp" \ No newline at end of file diff --git a/tools/build_settings_config.sh b/tools/build_settings_config.sh new file mode 100644 index 000000000..d01d80fa3 --- /dev/null +++ b/tools/build_settings_config.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION_TAG=$* + +mkdir -p tmp/cba_settings_userconfig + +cp cba_settings.sqf tmp/cba_settings_userconfig/ + +touch tmp/cba_settings_userconfig/\$PBOPREFIX\$ +echo "cba_settings_userconfig" > tmp/cba_settings_userconfig/\$PBOPREFIX\$ + +touch tmp/cba_settings_userconfig/config.cpp + +echo """ +class CfgPatches { + class cba_settings_userconfig { + author = \"\$STR_CBA_Author\"; + name = \"\$STR_CBA_Settings_Component\"; + url = \"\$STR_CBA_URL\"; + units[] = {}; + weapons[] = {}; + requiredVersion = 1.0; + requiredAddons[] = {\"cba_settings\"}; + version = ${VERSION_TAG}; + authors[] = {\"Brostrom.A\"}; + }; +}; +""" > tmp/cba_settings_userconfig/config.cpp + +armake build -f tmp/cba_settings_userconfig cba_settings_userconfig.pbo + +zip -0 release/Server_Config-${VERSION_TAG}.zip cba_settings_userconfig.pbo diff --git a/tools/check_loadout_classnames.py b/tools/check_loadout_classnames.py new file mode 100644 index 000000000..9d79c0b8f --- /dev/null +++ b/tools/check_loadout_classnames.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +import sys, os, re, json, glob + +__version__ = 1.0 + +# set projecty path +scriptPath = os.path.realpath(__file__) +scriptDir = os.path.dirname(scriptPath) +rootDir = os.path.dirname(os.path.dirname(scriptPath)) +os.chdir(rootDir) + +def strip_path_from_filename(pathfile=''): + filenamepath = pathfile.split('/') + filename = filenamepath[-1] + filename = str(filename) + return filename + +def main(): + data = {} + loadoutConfigs = glob.glob(rootDir + '/cScripts/Loadouts/*.hpp') + + for loadout in loadoutConfigs: + cfgFile = open(loadout) + configName = os.path.basename(loadout) + data[configName] = [] + CfgLoadout = cfgFile.read() + classnames = re.findall('%s(.*)%s' % ('class', ':'), CfgLoadout) + for classname in classnames: + classname = classname.strip() + data[configName].append(classname) + print(json.dumps(data)) + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/deploy.sh b/tools/deploy.sh index 8a7e760d1..436f50c63 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -4,6 +4,8 @@ set -e VERSION_TAG=$* +mkdir release/ + sed -i "s/#define VERSION.*/#define VERSION \"${VERSION_TAG}\"/" cScripts/script_component.hpp python3 tools/build.py -b release -d -y --deploy @@ -12,12 +14,19 @@ python3 tools/build.py -b release -p -d -y --deploy sed -i "s/DEVBUILD/${VERSION_TAG}/g" Compositions/*/header.sqe - # Make a patch release set +e # allow fail PREV_TAG=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) -zip release/cScripts_PATCH_v${PREV_TAG}_to_v${VERSION_TAG}.zip `git diff --name-only tags/${VERSION_TAG}^ tags/${PREV_TAG}` -x=*Compositions* -x=*tools* -x=*resourses* -x=*.github* -x=*.travis.yml* -x=*.gitignore* -x=*.gitattributes* -x=*.editorconfig* +echo "Creating patch build for ${PREV_TAG} to ${VERSION_TAG}" +git diff --name-only ${PREV_TAG} ${VERSION_TAG} > pre_changed_file_list.txt +sed '/tools/d;/Compositions/d;/resourses/d;/^\.\(.*\)/d' pre_changed_file_list.txt > changed_file_list.txt +zip release/cScripts_PATCH_v${PREV_TAG}_to_v${VERSION_TAG}.zip -@ < changed_file_list.txt set -e # Pack Compositions -zip release/Compositions-${VERSION_TAG}.zip -r Compositions \ No newline at end of file +zip release/Compositions-${VERSION_TAG}.zip -r Compositions + +chmod +x ./tools/build_settings_config.sh +./tools/build_settings_config.sh $VERSION_TAG + +zip release/Compositions-${VERSION_TAG}.zip -r Compositions diff --git a/tools/link_compositions.py b/tools/link_compositions.py new file mode 100644 index 000000000..aeffef855 --- /dev/null +++ b/tools/link_compositions.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 +import sys, os, shutil, urllib.parse, winreg + +__version__ = 1.0 + +def get_Arma3_Profile_Path_HKCU(lable='Program', regKey='', key='path'): + try: + registry = winreg.ConnectRegistry(None, winreg.HKEY_CURRENT_USER) + keypath = winreg.OpenKey(registry, regKey) + except: + sys.exit('Path for \'{}\' is invalid.'.format(lable)) + try: + path = winreg.QueryValueEx(keypath, key) + return path[0] + except: + sys.exit('Some thing whent wrong when looking for {}.'.format(key)) + +def get_compositions(path): + compDir = os.listdir(path) + compList = [] + for dir in compDir: + if os.path.isdir(os.path.join(path,dir)): + compList.append(dir) + return compList + +def main(): + global scriptPath + scriptPath = os.path.realpath(__file__) + global scriptDir + scriptDir = os.path.dirname(scriptPath) + global rootDir + rootDir = os.path.dirname(os.path.dirname(scriptPath)) + os.chdir(rootDir) + + profileName = get_Arma3_Profile_Path_HKCU('Player Name', 'SOFTWARE\\Bohemia Interactive\\Arma 3', 'Player Name') + profileName = urllib.parse.quote_plus(profileName) + profileName = profileName.replace(".", "%2e") + + scriptCompPath = os.path.join(rootDir, "Compositions") + profileCompPath = os.path.join(os.environ['USERPROFILE'], 'Documents', 'Arma 3 - Other Profiles', profileName, 'compositions') + + Compositions = get_compositions(scriptCompPath) + + for comp in Compositions: + destName = "Dev_{}".format(comp) + srcPath = os.path.join(scriptCompPath,comp) + dstPath = os.path.join(profileCompPath,destName) + + if os.path.isdir(os.path.join(dstPath)): + if "--force" in sys.argv: + os.rmdir(dstPath) + else: + print('> {} already linked skipping...'.format(destName)) + continue + os.symlink(srcPath,dstPath, target_is_directory=True) + print('> {} link created...'.format(destName)) + +if __name__ == "__main__": + sys.exit(main())