diff --git a/.github/workflows/pboproject.yml b/.github/workflows/pboproject.yml new file mode 100644 index 0000000000..4aea0e7c18 --- /dev/null +++ b/.github/workflows/pboproject.yml @@ -0,0 +1,82 @@ +name: pboProject + +on: + push: + branches: + - master + pull_request_target: + +jobs: + pboproject: + runs-on: windows-2019 + steps: + - name: Install Arma 3 Tools + uses: arma-actions/arma3-tools@master + with: + toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }} + - name: Install Mikero Tools + uses: arma-actions/mikero-tools@2021-04-10 + - name: Download game data + run: | + Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip + Invoke-WebRequest "$env:RHSAFRF_URL" -OutFile rhsafrf.zip + Invoke-WebRequest "$env:RHSGREF_URL" -OutFile rhsgref.zip + Invoke-WebRequest "$env:RHSSAF_URL" -OutFile rhssaf.zip + Invoke-WebRequest "$env:RHSUSF_URL" -OutFile rhsusf.zip + $files = @("arma3.zip", "rhsafrf.zip", "rhsgref.zip", "rhssaf.zip", "rhsusf.zip") + ForEach ($file in $files) { + Extract-7Zip -Path $file -DestinationPath . + Remove-Item $file + } + env: + ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }} + RHSAFRF_URL: ${{ secrets.RHSAFRF_URL }} + RHSGREF_URL: ${{ secrets.RHSGREF_URL }} + RHSSAF_URL: ${{ secrets.RHSSAF_URL }} + RHSUSF_URL: ${{ secrets.RHSUSF_URL }} + - name: Checkout CBA A3 + uses: actions/checkout@v2 + with: + path: x\cba + ref: master + repository: CBATeam/CBA_A3.git + - name: Checkout ACE3 + uses: actions/checkout@v2 + with: + path: z\ace + persist-credentials: false + - name: Checkout pull request + uses: actions/checkout@v2 + if: ${{ github.event_name == 'pull_request_target' }} + with: + path: pullrequest + ref: 'refs/pull/${{ github.event.number }}/merge' + - name: Replace addons with pull request addons + if: ${{ github.event_name == 'pull_request_target' }} + run: | + rm -r z\ace\addons\ + rm -r z\ace\optionals\ + xcopy /e /h /q pullrequest\addons z\ace\addons\ + xcopy /e /h /q pullrequest\optionals z\ace\optionals\ + - name: Setup build environment + run: | + subst P: . + pboproject -P + xcopy /e /h /q z\ace\tools\pDummies\A3\ui_f_enoch a3\ui_f_enoch\ + xcopy /e /h /q z\ace\tools\pDummies\gm gm\ + xcopy /e /h /q z\ace\tools\pDummies\vn vn\ + - name: Build + run: py P:\z\ace\tools\make.py ci + env: + PYTHONUNBUFFERED: 1 + - name: Archive logs + uses: actions/upload-artifact@v2 + if: ${{ always() }} + with: + name: logs + path: temp/*.log + - name: Archive @ace + uses: actions/upload-artifact@v2 + with: + name: '@ace3-${{ github.sha }}' + path: z\ace\release\@ace diff --git a/addons/advanced_ballistics/RscTitles.hpp b/addons/advanced_ballistics/RscTitles.hpp index 6deaf0a058..1e29db268b 100644 --- a/addons/advanced_ballistics/RscTitles.hpp +++ b/addons/advanced_ballistics/RscTitles.hpp @@ -47,7 +47,7 @@ class RscTitles { sizeEx=0.027; text=""; }; - class RscProtractorMarker : RscProtractorBase { + class RscProtractorMarker: RscProtractorBase { idc=132951; }; }; diff --git a/addons/aircraft/RscInGameUI.hpp b/addons/aircraft/RscInGameUI.hpp index 67116a7b62..10d41d7009 100644 --- a/addons/aircraft/RscInGameUI.hpp +++ b/addons/aircraft/RscInGameUI.hpp @@ -1,6 +1,6 @@ class RscControlsGroup; class RscText; -class RangeText: RscText{}; +class RangeText: RscText {}; class RscPicture; class RscOpticsText; class RscIGProgress; diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index 48451f163e..1bd6c9909b 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -492,7 +492,7 @@ class GVAR(display) { x = QUOTE(safezoneX + safezoneW - 93 * GRID_W); h = QUOTE(safezoneH - 28 * GRID_H); }; - class rightTabContentListnBox : RscListNBox { + class rightTabContentListnBox: RscListNBox { idc = IDC_rightTabContentListnBox; colorBackground[]={0,0,0,0}; colorSelectBackground[]={1,1,1,0.5}; diff --git a/addons/arsenal/ui/RscCustomArsenalButton.hpp b/addons/arsenal/ui/RscCustomArsenalButton.hpp index 7f0a139374..abe3358399 100644 --- a/addons/arsenal/ui/RscCustomArsenalButton.hpp +++ b/addons/arsenal/ui/RscCustomArsenalButton.hpp @@ -1,4 +1,4 @@ -class GVAR(customArsenalButton_Button) : RscButtonArsenal { +class GVAR(customArsenalButton_Button): RscButtonArsenal { x = QUOTE(safezoneW + safezoneX - 10 * GRID_W); y = QUOTE(safezoneY + 88 * GRID_H); w = QUOTE(9 * GRID_W); @@ -10,7 +10,7 @@ class GVAR(customArsenalButton_Button) : RscButtonArsenal { colorBackground[] = {0,0,0,0.5}; }; -class GVAR(customArsenalButton_Background) : ctrlStaticBackground { +class GVAR(customArsenalButton_Background): ctrlStaticBackground { x = QUOTE(safezoneW + safezoneX - 13 * GRID_W); y = QUOTE(safezoneY + 88 * GRID_H); w = QUOTE(12 * GRID_W); diff --git a/addons/artillerytables/RscRangeTable.hpp b/addons/artillerytables/RscRangeTable.hpp index 8c673537d6..3245b77af6 100644 --- a/addons/artillerytables/RscRangeTable.hpp +++ b/addons/artillerytables/RscRangeTable.hpp @@ -42,7 +42,7 @@ class GVAR(rangeTableDialog) { colorSelectBackground[] = {0, 0, 0, 0.025}; colorSelectBackground2[] = {0, 0, 0, 0.025}; colorScrollbar[] = {0.95,0,0.95,1}; - class ListScrollBar: ScrollBar{ + class ListScrollBar: ScrollBar { color[] = {0,0,0,0.6}; }; }; diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp index 834c4eb8af..896bc78ae0 100644 --- a/addons/atragmx/RscTitles.hpp +++ b/addons/atragmx/RscTitles.hpp @@ -126,7 +126,7 @@ class ATragMX_RscListBox { thumb="\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa"; }; - class ListScrollBar : ScrollBar { + class ListScrollBar: ScrollBar { }; }; class ATragMX_RscListNBox: ATragMX_RscListBox { diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 7d5d1a617d..51e5c4ddd4 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -114,7 +114,7 @@ class CfgAmmo { caliber = 1.037; //~7mm RHA, ~22.4mm metal, probably still too high though as RHA is hardened. }; - class B_556x45_Ball : BulletBase { + class B_556x45_Ball: BulletBase { airFriction=-0.00130094; tracerScale = 1; tracerStartTime=0.073; // M856 tracer burns out to 800m @@ -138,7 +138,7 @@ class CfgAmmo { ACE_barrelLengths[] = {457.2}; // according with the SDAR barrel length: https://en.wikipedia.org/wiki/Kel-Tec_RFB }; - class ACE_556x45_Ball_Mk262 : B_556x45_Ball { + class ACE_556x45_Ball_Mk262: B_556x45_Ball { airFriction=-0.00111805; ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -152,7 +152,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; - class ACE_556x45_Ball_Mk318 : B_556x45_Ball { + class ACE_556x45_Ball_Mk318: B_556x45_Ball { airFriction=-0.0012588; ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -165,7 +165,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={780, 886, 950}; ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; - class ACE_556x45_Ball_M995_AP : B_556x45_Ball { + class ACE_556x45_Ball_M995_AP: B_556x45_Ball { airFriction=-0.00126182; caliber=1.6; ACE_caliber=5.69; @@ -221,7 +221,7 @@ class CfgAmmo { ACE_barrelLengths[] = {640}; }; - class B_65x39_Caseless : BulletBase { + class B_65x39_Caseless: BulletBase { airFriction=-0.00077363; tracerScale = 1.1; //1.0; ACE_caliber=6.706; @@ -236,11 +236,11 @@ class CfgAmmo { ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4, 762.0}; }; class B_65x39_Case_yellow; - class ACE_65x39_Caseless_Tracer_Dim : B_65x39_Case_yellow { + class ACE_65x39_Caseless_Tracer_Dim: B_65x39_Case_yellow { nvgOnly = 1; }; class B_65x39_Caseless_green; - class ACE_65x39_Caseless_green_Tracer_Dim : B_65x39_Caseless_green { + class ACE_65x39_Caseless_green_Tracer_Dim: B_65x39_Caseless_green { nvgOnly = 1; }; class ACE_65x47_Ball_Scenar: B_65x39_Caseless { @@ -277,7 +277,7 @@ class CfgAmmo { class B_65x39_Minigun_Caseless: SubmunitionBullet { tracerScale = 1.1; //1.0; }; - class B_762x51_Ball : BulletBase { + class B_762x51_Ball: BulletBase { airFriction=-0.00103711; tracerScale = 1.2; //0.6; tracerStartTime=0.073; // Based on the British L5A1 which burns out to 1000m @@ -297,7 +297,7 @@ class CfgAmmo { class ACE_B_762x51_Tracer_Dim: B_762x51_Tracer_Yellow { nvgOnly = 1; }; - class ACE_762x51_Ball_M118LR : B_762x51_Ball { + class ACE_762x51_Ball_M118LR: B_762x51_Ball { airFriction=-0.00085157; caliber=1.8; hit=16; @@ -314,7 +314,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x51_Ball_Mk316_Mod_0 : B_762x51_Ball { + class ACE_762x51_Ball_Mk316_Mod_0: B_762x51_Ball { airFriction=-0.00084311; caliber=1.8; hit=16; @@ -331,7 +331,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={775, 790, 805, 810}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball { + class ACE_762x51_Ball_Mk319_Mod_0: B_762x51_Ball { airFriction=-0.00104515; caliber=1.5; hit=14; @@ -348,7 +348,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={838, 892, 910}; ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; - class ACE_762x51_Ball_M993_AP : B_762x51_Ball { + class ACE_762x51_Ball_M993_AP: B_762x51_Ball { airFriction=-0.0010939; caliber=2.2; hit=11; @@ -364,7 +364,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={875, 910, 930}; ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; - class ACE_762x51_Ball_Subsonic : B_762x51_Ball { + class ACE_762x51_Ball_Subsonic: B_762x51_Ball { airFriction=-0.00060194; caliber=1; hit=6; @@ -380,7 +380,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={305, 325, 335, 340}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { + class ACE_762x67_Ball_Mk248_Mod_0: B_762x51_Ball { airFriction=-0.00072468; caliber=1.8; hit=17; @@ -397,7 +397,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={865, 900, 924}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { + class ACE_762x67_Ball_Mk248_Mod_1: B_762x51_Ball { airFriction=-0.00063027; caliber=1.9; hit=18; @@ -414,7 +414,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={847, 867, 877}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { + class ACE_762x67_Ball_Berger_Hybrid_OTM: B_762x51_Ball { airFriction=-0.000546; caliber=2.0; hit=19; @@ -446,7 +446,7 @@ class CfgAmmo { ACE_barrelLengths[]={406.4, 508.0, 604.5, 736.6}; }; class B_762x54_Tracer_Green; - class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { + class ACE_762x54_Ball_7T2: B_762x54_Tracer_Green { airFriction=-0.00103739; typicalSpeed=800; tracerStartTime=0.073; // Based on the 7T2 which burns three seconds @@ -475,7 +475,7 @@ class CfgAmmo { ACE_muzzleVelocities[] = {658, 678, 723, 743, 753}; // at 21°C, at 15°C {650, 670, 715, 735, 745} according with the AKM,AK12,AK12U,RPK initSpeed ACE_barrelLengths[] = {254, 314, 415, 520, 590}; // respectively {default / AK104,AK15K / AK47,AKM,AK103,AK15 / SKS / RPK} }; - class B_9x21_Ball : BulletBase { + class B_9x21_Ball: BulletBase { airFriction=-0.00211064; tracerScale = 0.5; ACE_caliber=9.042; @@ -492,7 +492,7 @@ class CfgAmmo { class B_9x21_Ball_Tracer_Green: B_9x21_Ball { tracerScale = 0.5; }; - class ACE_9x19_Ball : B_9x21_Ball { + class ACE_9x19_Ball: B_9x21_Ball { airFriction=-0.00201185; ACE_caliber=9.017; ACE_bulletLength=15.494; @@ -505,7 +505,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={340, 370, 400}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class B_93x64_Ball : BulletBase { + class B_93x64_Ball: BulletBase { airFriction = -0.000808; // According with the G1 BC 0.515 and the SVDK muzzle velocity 780 m/s https://www.kalashnikov.ru/medialibrary/bd9/72_77.pdf#page=3 ACE_caliber = 9.28; // https://www.kalashnikov.ru/medialibrary/bd9/72_77.pdf#page=3 ACE_bulletLength = 35.56; // Average length from bullets with similar mass and BC @@ -519,7 +519,7 @@ class CfgAmmo { ACE_muzzleVelocities[] = {768, 788, 798}; // Default values - 82 m/s at 21°C, at 15°C {760, 780, 790} according with the 10Rnd_93x64_DMR_05_Mag and the 150Rnd_93x64_Mag initSpeed ACE_barrelLengths[] = {508.0, 620.0, 660.4}; }; - class B_408_Ball : BulletBase { + class B_408_Ball: BulletBase { timeToLive=10; airFriction=-0.00046249; tracerScale = 1.3; @@ -536,7 +536,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={867}; ACE_barrelLengths[]={736.6}; }; - class ACE_408_Ball : BulletBase { + class ACE_408_Ball: BulletBase { timeToLive=10; airFriction=-0.00065414; typicalSpeed=1067; @@ -554,7 +554,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={1067}; ACE_barrelLengths[]={736.6}; }; - class B_338_Ball : BulletBase { + class B_338_Ball: BulletBase { timeToLive=10; airFriction=-0.00060841; ACE_caliber=8.585; @@ -569,7 +569,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={880, 915, 925}; ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; - class B_338_NM_Ball : BulletBase { + class B_338_NM_Ball: BulletBase { airFriction=-0.00053639; ACE_caliber=8.585; ACE_bulletLength=43.18; @@ -582,7 +582,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={790, 807, 820}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class ACE_338_Ball : B_338_Ball { + class ACE_338_Ball: B_338_Ball { timeToLive=10; airFriction=-0.00055706; typicalSpeed=826; @@ -598,7 +598,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={800, 820, 826, 830}; ACE_barrelLengths[]={508.0, 609.6, 673.1, 711.2}; }; - class ACE_338_Ball_API526 : B_338_Ball { + class ACE_338_Ball_API526: B_338_Ball { timeToLive=10; airFriction=-0.0006922; caliber=2.8; @@ -619,7 +619,7 @@ class CfgAmmo { class B_127x33_Ball: BulletBase { tracerScale = 1.3; //1.2; }; - class B_127x54_Ball : BulletBase { + class B_127x54_Ball: BulletBase { airFriction=-0.00019568; tracerScale = 1.3;// ACE_caliber=12.954; @@ -633,7 +633,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={300}; ACE_barrelLengths[]={436.88}; }; - class B_127x99_Ball : BulletBase { + class B_127x99_Ball: BulletBase { timeToLive=10; airFriction=-0.00058679; tracerScale = 1.3; //1.2; @@ -649,7 +649,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={900}; ACE_barrelLengths[]={736.6}; }; - class ACE_127x99_API : B_127x99_Ball { + class ACE_127x99_API: B_127x99_Ball { timeToLive=10; airFriction=-0.00058679; tracerScale = 1.3;// @@ -668,7 +668,7 @@ class CfgAmmo { ACE_barrelLengths[]={736.6}; EGVAR(vehicle_damage,incendiary) = 1.0; }; - class ACE_127x99_Ball_AMAX : B_127x99_Ball { + class ACE_127x99_Ball_AMAX: B_127x99_Ball { timeToLive=10; airFriction=-0.00037397; caliber=3.0; @@ -684,7 +684,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={860}; ACE_barrelLengths[]={736.6}; }; - class B_127x108_Ball : BulletBase { + class B_127x108_Ball: BulletBase { timeToLive=10; airFriction=-0.00065098; tracerScale = 1.3; //1.5; @@ -703,7 +703,7 @@ class CfgAmmo { typicalSpeed = 820; airFriction = -0.00065098; }; - class B_45ACP_Ball : BulletBase { + class B_45ACP_Ball: BulletBase { airFriction=-0.00082143; tracerScale = 0.6; ACE_caliber=11.481; diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp index f215650b95..999987a24b 100644 --- a/addons/ballistics/CfgMagazines.hpp +++ b/addons/ballistics/CfgMagazines.hpp @@ -671,7 +671,7 @@ class CfgMagazines { initSpeed = 254; }; - class 6Rnd_45ACP_Cylinder : 11Rnd_45ACP_Mag { + class 6Rnd_45ACP_Cylinder: 11Rnd_45ACP_Mag { initSpeed = 254; }; diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index ad0152f00f..967e00b9cd 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -2761,15 +2761,19 @@ 6.5x47 mm 30Rnd Sand Mag (HPBT Scenar) + 6.5x47 mm 30発入り サンド 弾倉 (HPBT Scenar) 6.5x47 mm 30Rnd Promet Mag (HPBT Scenar) + 6.5x47 mm 30発入り プロメット 弾倉 (HPBT Scenar) 6.5x47 mm 30Rnd Black Mag (HPBT Scenar) + 6.5x47 mm 30発入り ブラック 弾倉 (HPBT Scenar) 6.5x47 mm 30Rnd Khaki Mag (HPBT Scenar) + 6.5x47 mm 30発入り カーキ 弾倉 (HPBT Scenar) 6.5 mm Lapua @@ -2824,15 +2828,19 @@ 6.5 mm Creedmor 30Rnd Sand Mag + 6.5 mm クリードモア 30発入り サンド 弾倉 6.5 mm Creedmor 30Rnd Promet Mag + 6.5 mm クリードモア 30発入り プロメット 弾倉 6.5 mm Creedmor 30Rnd Black Mag + 6.5 mm クリードモア 30発入り ブラック 弾倉 6.5 mm Creedmor 30Rnd Khaki Mag + 6.5 mm クリードモア 30発入り カーキ 弾倉 6.5 mm CM diff --git a/addons/cargo/XEH_postInit.sqf b/addons/cargo/XEH_postInit.sqf index 8f4d1b4e82..1a7fbbc4fb 100644 --- a/addons/cargo/XEH_postInit.sqf +++ b/addons/cargo/XEH_postInit.sqf @@ -90,6 +90,7 @@ GVAR(vehicleAction) = [ GVAR(objectActions) = [ [QGVAR(renameObject), LELSTRING(common,rename), "", //TODO: add icon, maybe a pencil couldn't find it before. { + //IGNORE_PRIVATE_WARNING ["_target", "_player"]; GVAR(interactionVehicle) = _target; createDialog QGVAR(renameMenu); }, diff --git a/addons/cargo/functions/fnc_paradropItem.sqf b/addons/cargo/functions/fnc_paradropItem.sqf index 8394d2788c..707ae42b69 100644 --- a/addons/cargo/functions/fnc_paradropItem.sqf +++ b/addons/cargo/functions/fnc_paradropItem.sqf @@ -98,7 +98,7 @@ if (_showHint) then { [ [ LSTRING(UnloadedItem), - [_itemObject, true] call FUNC(getNameItem), + [_object, true] call FUNC(getNameItem), getText (configOf _vehicle >> "displayName") ], 3 diff --git a/addons/cargo/menu.hpp b/addons/cargo/menu.hpp index bdc9477ca1..a945f6e94c 100644 --- a/addons/cargo/menu.hpp +++ b/addons/cargo/menu.hpp @@ -6,7 +6,7 @@ class GVAR(menu) { onLoad = QUOTE([_this select 0] call FUNC(onMenuOpen)); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuDisplay)),nil)];); class controlsBackground { - class HeaderBackground: ACE_gui_backgroundBase{ + class HeaderBackground: ACE_gui_backgroundBase { idc = -1; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; x = "13 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)"; diff --git a/addons/cargo/renameMenu.hpp b/addons/cargo/renameMenu.hpp index de2f87d269..af54026e70 100644 --- a/addons/cargo/renameMenu.hpp +++ b/addons/cargo/renameMenu.hpp @@ -6,7 +6,7 @@ class GVAR(renameMenu) { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuDisplay)),_this select 0)];); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuDisplay)),nil)];); class controlsBackground { - class HeaderBackground: ACE_gui_backgroundBase{ + class HeaderBackground: ACE_gui_backgroundBase { idc = -1; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; x = "13 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)"; diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml index 01e19b5062..d1cb26a406 100644 --- a/addons/cargo/stringtable.xml +++ b/addons/cargo/stringtable.xml @@ -35,18 +35,23 @@ Renamed to:<br/>%1 + 名前を次に変更:<br/>%1 Custom name has been cleared. + カスタム名が削除されました。 Set New Name: + 新しい名前: Enable Rename Action + 名前変更を有効化 Enables the rename action for renamable objects. + 名前変更が可能なオブジェクトに対して、名前変更動作を有効化します。 Cargo @@ -256,9 +261,11 @@ Custom Name + カスタム名 Set a custom cargo name used in the cargo interface. + カーゴ欄で使われるカスタム名を設定します。 Cargo Space @@ -411,10 +418,12 @@ Reopen Cargo Menu Kargo Menüsünü Tekrar Aç + カーゴ メニューを再度開く Reopen the Cargo Menu after successful unload. Başarılı bir yük indirmeden sonra Kargo Menüsünü tekrar göster. + カーゴを降ろした後に再びカーゴ メニューを開きます。 diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp index 396d80b5c1..2e3a81d161 100644 --- a/addons/common/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -121,6 +121,7 @@ class CfgVehicles { class Land_HelipadEmpty_F; class ACE_LogicDummy: Land_HelipadEmpty_F { scope = 1; + scopeCurator = 0; SLX_XEH_DISABLED = 1; author = CSTRING(ACETeam); class EventHandlers { diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 4378428641..0df756d034 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -72,4 +72,5 @@ class ACE_Extensions {}; class ACE_Tests { vehicleTransportInventory = QPATHTOF(dev\test_vehicleInventory.sqf); mapConfigs = QPATHTOF(dev\test_mapConfigs.sqf); + cfgPatches = QPATHTOF(dev\test_cfgPatches.sqf); }; diff --git a/addons/common/define.hpp b/addons/common/define.hpp index 68f467d205..9e9e92ecb5 100644 --- a/addons/common/define.hpp +++ b/addons/common/define.hpp @@ -92,8 +92,7 @@ class ACE_gui_backgroundBase { text = ""; sizeEx = 0.032; }; -class ACE_gui_editBase -{ +class ACE_gui_editBase { type = 2; x = 0; y = 0; @@ -236,7 +235,7 @@ class ACE_gui_staticBase { }; class RscListBox; -class ACE_gui_listBoxBase : RscListBox{ +class ACE_gui_listBoxBase: RscListBox { type = CT_LISTBOX; style = ST_MULTI; font = FONT_ACE; @@ -379,8 +378,7 @@ class ACE_gui_comboBoxBase: RscCombo { soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1}; soundCollapse[] = {"\A3\ui_f\data\sound\RscCombo\soundCollapse",0.1,1}; maxHistoryDelay = 1.0; - class ScrollBar - { + class ScrollBar { color[] = {0.3,0.3,0.3,0.6}; colorActive[] = {0.3,0.3,0.3,1}; colorDisabled[] = {0.3,0.3,0.3,0.3}; @@ -485,8 +483,7 @@ onMouseButtonDblClick = ""; color[] = {0.30, 0.10, 0.90, 1.00}; size = 50; }; - class Legend - { + class Legend { x = "SafeZoneX + ( ((safezoneW / safezoneH) min 1.2) / 40)"; y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; @@ -496,8 +493,7 @@ onMouseButtonDblClick = ""; colorBackground[] = {1,1,1,0.5}; color[] = {0,0,0,1}; }; - class Task - { + class Task { icon = "\A3\ui_f\data\map\mapcontrol\taskIcon_CA.paa"; iconCreated = "\A3\ui_f\data\map\mapcontrol\taskIconCreated_CA.paa"; iconCanceled = "\A3\ui_f\data\map\mapcontrol\taskIconCanceled_CA.paa"; @@ -513,8 +509,7 @@ onMouseButtonDblClick = ""; coefMin = 1; coefMax = 1; }; - class Waypoint - { + class Waypoint { icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa"; color[] = {0,0,0,1}; size = 20; @@ -522,8 +517,7 @@ onMouseButtonDblClick = ""; coefMin = 0.900000; coefMax = 4; }; - class WaypointCompleted - { + class WaypointCompleted { icon = "\A3\ui_f\data\map\mapcontrol\waypointCompleted_ca.paa"; color[] = {0,0,0,1}; size = 20; @@ -531,8 +525,7 @@ onMouseButtonDblClick = ""; coefMin = 0.900000; coefMax = 4; }; - class CustomMark - { + class CustomMark { icon = "\A3\ui_f\data\map\mapcontrol\custommark_ca.paa"; size = 24; importance = 1; @@ -540,8 +533,7 @@ onMouseButtonDblClick = ""; coefMax = 1; color[] = {0,0,0,1}; }; - class Command - { + class Command { icon = "\A3\ui_f\data\map\mapcontrol\waypoint_ca.paa"; size = 18; importance = 1; @@ -549,8 +541,7 @@ onMouseButtonDblClick = ""; coefMax = 1; color[] = {1,1,1,1}; }; - class Bush - { + class Bush { icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa"; color[] = {0.45,0.64,0.33,0.4}; size = "14/2"; @@ -558,8 +549,7 @@ onMouseButtonDblClick = ""; coefMin = 0.25; coefMax = 4; }; - class Rock - { + class Rock { icon = "\A3\ui_f\data\map\mapcontrol\rock_ca.paa"; color[] = {0.1,0.1,0.1,0.8}; size = 12; @@ -567,8 +557,7 @@ onMouseButtonDblClick = ""; coefMin = 0.25; coefMax = 4; }; - class SmallTree - { + class SmallTree { icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa"; color[] = {0.45,0.64,0.33,0.4}; size = 12; @@ -576,8 +565,7 @@ onMouseButtonDblClick = ""; coefMin = 0.25; coefMax = 4; }; - class Tree - { + class Tree { icon = "\A3\ui_f\data\map\mapcontrol\bush_ca.paa"; color[] = {0.45,0.64,0.33,0.4}; size = 12; @@ -585,8 +573,7 @@ onMouseButtonDblClick = ""; coefMin = 0.25; coefMax = 4; }; - class busstop - { + class busstop { icon = "\A3\ui_f\data\map\mapcontrol\busstop_CA.paa"; size = 24; importance = 1; @@ -594,8 +581,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class fuelstation - { + class fuelstation { icon = "\A3\ui_f\data\map\mapcontrol\fuelstation_CA.paa"; size = 24; importance = 1; @@ -603,8 +589,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class hospital - { + class hospital { icon = "\A3\ui_f\data\map\mapcontrol\hospital_CA.paa"; size = 24; importance = 1; @@ -612,8 +597,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class church - { + class church { icon = "\A3\ui_f\data\map\mapcontrol\church_CA.paa"; size = 24; importance = 1; @@ -621,8 +605,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class lighthouse - { + class lighthouse { icon = "\A3\ui_f\data\map\mapcontrol\lighthouse_CA.paa"; size = 24; importance = 1; @@ -630,8 +613,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class power - { + class power { icon = "\A3\ui_f\data\map\mapcontrol\power_CA.paa"; size = 24; importance = 1; @@ -639,8 +621,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class powersolar - { + class powersolar { icon = "\A3\ui_f\data\map\mapcontrol\powersolar_CA.paa"; size = 24; importance = 1; @@ -648,8 +629,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class powerwave - { + class powerwave { icon = "\A3\ui_f\data\map\mapcontrol\powerwave_CA.paa"; size = 24; importance = 1; @@ -657,8 +637,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class powerwind - { + class powerwind { icon = "\A3\ui_f\data\map\mapcontrol\powerwind_CA.paa"; size = 24; importance = 1; @@ -666,8 +645,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class quay - { + class quay { icon = "\A3\ui_f\data\map\mapcontrol\quay_CA.paa"; size = 24; importance = 1; @@ -675,8 +653,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class shipwreck - { + class shipwreck { icon = "\A3\ui_f\data\map\mapcontrol\shipwreck_CA.paa"; size = 24; importance = 1; @@ -684,8 +661,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class transmitter - { + class transmitter { icon = "\A3\ui_f\data\map\mapcontrol\transmitter_CA.paa"; size = 24; importance = 1; @@ -693,8 +669,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class watertower - { + class watertower { icon = "\A3\ui_f\data\map\mapcontrol\watertower_CA.paa"; size = 24; importance = 1; @@ -702,8 +677,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {1,1,1,1}; }; - class Cross - { + class Cross { icon = "\A3\ui_f\data\map\mapcontrol\Cross_CA.paa"; size = 24; importance = 1; @@ -711,8 +685,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {0,0,0,1}; }; - class Chapel - { + class Chapel { icon = "\A3\ui_f\data\map\mapcontrol\Chapel_CA.paa"; size = 24; importance = 1; @@ -720,8 +693,7 @@ onMouseButtonDblClick = ""; coefMax = 1.0; color[] = {0,0,0,1}; }; - class Bunker - { + class Bunker { icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa"; size = 14; importance = "1.5 * 14 * 0.05"; @@ -729,8 +701,7 @@ onMouseButtonDblClick = ""; coefMax = 4; color[] = {0,0,0,1}; }; - class Fortress - { + class Fortress { icon = "\A3\ui_f\data\map\mapcontrol\bunker_ca.paa"; size = 16; importance = "2 * 16 * 0.05"; @@ -738,8 +709,7 @@ onMouseButtonDblClick = ""; coefMax = 4; color[] = {0,0,0,1}; }; - class Fountain - { + class Fountain { icon = "\A3\ui_f\data\map\mapcontrol\fountain_ca.paa"; size = 11; importance = "1 * 12 * 0.05"; @@ -747,8 +717,7 @@ onMouseButtonDblClick = ""; coefMax = 4; color[] = {0,0,0,1}; }; - class Ruin - { + class Ruin { icon = "\A3\ui_f\data\map\mapcontrol\ruin_ca.paa"; size = 16; importance = "1.2 * 16 * 0.05"; @@ -756,8 +725,7 @@ onMouseButtonDblClick = ""; coefMax = 4; color[] = {0,0,0,1}; }; - class Stack - { + class Stack { icon = "\A3\ui_f\data\map\mapcontrol\stack_ca.paa"; size = 20; importance = "2 * 16 * 0.05"; @@ -765,8 +733,7 @@ onMouseButtonDblClick = ""; coefMax = 4; color[] = {0,0,0,1}; }; - class Tourism - { + class Tourism { icon = "\A3\ui_f\data\map\mapcontrol\tourism_ca.paa"; size = 16; importance = "1 * 16 * 0.05"; @@ -774,8 +741,7 @@ onMouseButtonDblClick = ""; coefMax = 4; color[] = {0,0,0,1}; }; - class ViewTower - { + class ViewTower { icon = "\A3\ui_f\data\map\mapcontrol\viewtower_ca.paa"; size = 16; importance = "2.5 * 16 * 0.05"; diff --git a/addons/common/dev/test_cfgPatches.sqf b/addons/common/dev/test_cfgPatches.sqf new file mode 100644 index 0000000000..9412651940 --- /dev/null +++ b/addons/common/dev/test_cfgPatches.sqf @@ -0,0 +1,72 @@ +#include "\z\ace\addons\common\script_component.hpp" + +// PabstMirror +// ["cfgPatches"] call ace_common_fnc_runTests; + +diag_log text format ["--- Checking CfgPatches --- "]; + +private _testPass = true; + +// All ace cfgPatches +private _allPatches = "(configName _x) select [0,3] == 'ace'" configClasses (configFile >> "CfgPatches"); + +// Get all units[] +private _allUnits = []; +{ + _allUnits append ((getArray (_x >> "units")) apply { toLower _x }); +} forEach _allPatches; +{ + private _class = configFile >> "CfgVehicles" >> _x; + if (isNull _class) then { + WARNING_1("in units[] but null - %1", _x); + _testPass = false; + } else { + // if (((getNumber (_class >> "scope")) != 2) && {((getNumber (_class >> "scopeCurator")) != 2)}) then { + // WARNING_2("in units[] but not public - %1 from %2", configName _class, configSourceMod _class); + // _testPass = false; + // }; + }; +} forEach _allUnits; + +// Get all weapons[] +private _allWeapons = []; +{ + _allWeapons append ((getArray (_x >> "weapons")) apply { toLower _x }); +} forEach _allPatches; +{ + private _class = configFile >> "CfgWeapons" >> _x; + if (isNull _class) then { + WARNING_1("in weapons[] but null - %1", _x); + _testPass = false; + } else { + // if (((getNumber (_class >> "scope")) != 2) && {((getNumber (_class >> "scopeCurator")) != 2)}) then { + // WARNING_2("in weapons[] but not public - %1 from %2", configName _class, configSourceMod _class); + // _testPass = false; + // }; + }; +} forEach _allWeapons; + +// Check if all public vics are defined in a cfgPatch +private _vics = "(configName _x) select [0,3] == 'ace'" configClasses (configFile >> "CfgVehicles"); +{ + if (((getNumber (_x >> "scope")) == 2) || {((getNumber (_x >> "scopeCurator")) == 2)}) then { + if (!((toLower configName _x) in _allUnits)) then { + WARNING_2("Not in any units[] - %1 from %2", configName _x, configSourceMod _x); + _testPass = false; + }; + }; +} forEach _vics; + +// Check if all public weapons are defined in a cfgPatch +private _weapons = "(configName _x) select [0,3] == 'ace'" configClasses (configFile >> "CfgWeapons"); +{ + private _type = toLower configName _x; + if (((getNumber (_x >> "scope")) == 2) || {((getNumber (_x >> "scopeCurator")) == 2)}) then { + if (!((toLower configName _x) in _allWeapons)) then { + WARNING_2("Not in any weapons[] - %1 from %2", configName _x, configSourceMod _x); + _testPass = false; + }; + }; +} forEach _weapons; + +_testPass diff --git a/addons/common/dev/test_vehicleInventory.sqf b/addons/common/dev/test_vehicleInventory.sqf index fced35a987..7fdd0159c0 100644 --- a/addons/common/dev/test_vehicleInventory.sqf +++ b/addons/common/dev/test_vehicleInventory.sqf @@ -14,7 +14,7 @@ private _vehicles = configProperties [configFile >> "CfgVehicles", "(isClass _x) private _glassesConfig = configFile >> "CfgGlasses" >> _name; if (((!isClass _weaponConfig) || {(getNumber (_weaponConfig >> "type")) in [1,2,4]}) && {!isClass _glassesConfig}) then { diag_log text format ["%1 -> TransportItems -> %2 = Bad", _vehType, _name]; - _testPass = false; + if ("ace" in toLower (_vehType + _name)) then { _testPass = false; }; }; }; } forEach (configProperties [_x >> "TransportItems", "isClass _x", true]); @@ -23,7 +23,7 @@ private _vehicles = configProperties [configFile >> "CfgVehicles", "(isClass _x) private _weaponConfig = configFile >> "CfgWeapons" >> _name; if ((!isClass _weaponConfig) || {!((getNumber (_weaponConfig >> "type")) in [1,2,4])}) then { diag_log text format ["%1 -> TransportWeapons -> %2 = Bad", _vehType, _name]; - _testPass = false; + if ("ace" in toLower (_vehType + _name)) then { _testPass = false; }; }; } forEach (configProperties [_x >> "TransportWeapons", "isClass _x", true]); { @@ -31,7 +31,7 @@ private _vehicles = configProperties [configFile >> "CfgVehicles", "(isClass _x) private _magConfig = configFile >> "CfgMagazines" >> _name; if ((!isClass _magConfig)) then { diag_log text format ["%1 -> TransportMagazines -> %2 = Bad", _vehType, _name]; - _testPass = false; + if ("ace" in toLower (_vehType + _name)) then { _testPass = false; }; }; } forEach (configProperties [_x >> "TransportMagazines", "isClass _x", true]); { @@ -39,7 +39,7 @@ private _vehicles = configProperties [configFile >> "CfgVehicles", "(isClass _x) private _vehConfig = configFile >> "CfgVehicles" >> _name; if ((!isClass _vehConfig)) then { diag_log text format ["%1 -> TransportBackpacks -> %2 = Bad", _vehType, _name]; - _testPass = false; + if ("ace" in toLower (_vehType + _name)) then { _testPass = false; }; }; } forEach (configProperties [_x >> "TransportBackpacks", "isClass _x", true]); } forEach _vehicles; diff --git a/addons/common/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf index b67e57964f..62fbba322e 100644 --- a/addons/common/functions/fnc_canInteractWith.sqf +++ b/addons/common/functions/fnc_canInteractWith.sqf @@ -21,10 +21,11 @@ params ["_unit", "_target", ["_exceptions", []]]; _exceptions = _exceptions apply {toLower _x}; -private _owner = _target getVariable [QGVAR(owner), objNull]; - // exit if the target is not free to interact -if (!isNull _owner && {_unit != _owner}) exitWith {false}; +if ((!isNull _target) && { + private _owner = _target getVariable [QGVAR(owner), objNull]; + (!isNull _owner) && {_unit != _owner}} +) exitWith {false}; // check general conditions private _conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]]; diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 9c3ad10a1e..121d62805b 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1471,18 +1471,23 @@ Both İkisi de + 両方 Additional progress bar information + プログレス バー詳細情報 Controls extra information shown in progress bar. + プログレス バーへ表示される情報量を決定します。 Percentage + パーセンテージ Time remaining + 残り時間 None @@ -1518,6 +1523,7 @@ Time left: %1s + 残り時間: %1 秒 Locations Boost Training diff --git a/addons/concertina_wire/CfgVehicles.hpp b/addons/concertina_wire/CfgVehicles.hpp index 77b2c97d18..d8c80f68a9 100644 --- a/addons/concertina_wire/CfgVehicles.hpp +++ b/addons/concertina_wire/CfgVehicles.hpp @@ -34,22 +34,22 @@ class CfgVehicles { source = "user"; animPeriod = 1e-007; }; - class wire_3: wire_2{}; - class wire_4: wire_2{}; - class wire_5: wire_2{}; - class wire_6: wire_2{}; - class wire_7: wire_2{}; - class wire_8: wire_2{}; - class wire_9: wire_2{}; - class wire_10: wire_2{}; - class wire_11: wire_2{}; - class wire_12: wire_2{}; - class wire_13: wire_2{}; - class wire_14: wire_2{}; - class wire_15: wire_2{}; - class wire_16: wire_2{}; - class wire_17: wire_2{}; - class wire_18: wire_2{}; + class wire_3: wire_2 {}; + class wire_4: wire_2 {}; + class wire_5: wire_2 {}; + class wire_6: wire_2 {}; + class wire_7: wire_2 {}; + class wire_8: wire_2 {}; + class wire_9: wire_2 {}; + class wire_10: wire_2 {}; + class wire_11: wire_2 {}; + class wire_12: wire_2 {}; + class wire_13: wire_2 {}; + class wire_14: wire_2 {}; + class wire_15: wire_2 {}; + class wire_16: wire_2 {}; + class wire_17: wire_2 {}; + class wire_18: wire_2 {}; class wire_2_1: wire_2 { animPeriod = 8; diff --git a/addons/cookoff/XEH_PREP.hpp b/addons/cookoff/XEH_PREP.hpp index 728ebc8578..b9708b7c58 100644 --- a/addons/cookoff/XEH_PREP.hpp +++ b/addons/cookoff/XEH_PREP.hpp @@ -1,5 +1,5 @@ -PREP(handleDamage); +PREP(handleDamageBox); PREP(engineFire); PREP(cookOff); PREP(smoke); diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf index ab8619570d..889e252d90 100644 --- a/addons/cookoff/XEH_postInit.sqf +++ b/addons/cookoff/XEH_postInit.sqf @@ -25,7 +25,7 @@ GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace; ["ReammoBox_F", "init", { (_this select 0) addEventHandler ["HandleDamage", { if ((_this select 0) getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmobox)]) then { - _this call FUNC(handleDamage); + _this call FUNC(handleDamageBox); }; }]; }, nil, nil, true] call CBA_fnc_addClassEventHandler; diff --git a/addons/cookoff/config.cpp b/addons/cookoff/config.cpp index 0673efaffe..4fba15f5e1 100644 --- a/addons/cookoff/config.cpp +++ b/addons/cookoff/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {QGVAR(Sound),QGVAR(Turret_MBT_01),QGVAR(Turret_MBT_02)}; + units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; diff --git a/addons/cookoff/functions/fnc_handleDamage.sqf b/addons/cookoff/functions/fnc_handleDamageBox.sqf similarity index 82% rename from addons/cookoff/functions/fnc_handleDamage.sqf rename to addons/cookoff/functions/fnc_handleDamageBox.sqf index de29feb860..2bbb6f4b6b 100644 --- a/addons/cookoff/functions/fnc_handleDamage.sqf +++ b/addons/cookoff/functions/fnc_handleDamageBox.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" /* * Author: KoffeinFlummi, commy2 - * Handles all incoming damage for tanks (including wheeled APCs). + * Handles all incoming damage for boxi * * Arguments: * HandleDamage EH @@ -10,7 +10,7 @@ * Damage to be inflicted. * * Example: - * _this call ace_cookoff_fnc_handleDamage + * _this call ace_cookoff_fnc_handleDamageBox * * Public: No */ @@ -23,13 +23,6 @@ if (damage _vehicle >= 1) exitWith {}; // If cookoff is disabled exit if (_vehicle getVariable [QGVAR(enable), GVAR(enable)] in [0, false]) exitWith {}; -// Check for players and exit if none found and the enable for players only setting is true -if ( - _vehicle getVariable [QGVAR(enable), GVAR(enable)] isEqualTo 1 - && {fullCrew [_vehicle, "", false] findIf {isPlayer (_x select 0)} == -1} - && {_simulationType isNotEqualTo "box"} -) exitWith {}; - // get hitpoint name private _hitpoint = "#structural"; diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml index ec33b0f333..5979373f83 100644 --- a/addons/cookoff/stringtable.xml +++ b/addons/cookoff/stringtable.xml @@ -162,9 +162,11 @@ Enable Cook-Off Vehicle Fire + 誘爆火災を有効化 Whether or not vehicles will catch on fire during cook-off + 誘爆により車両が炎上するかどうかを設定します。 diff --git a/addons/csw/Cfg3den.hpp b/addons/csw/Cfg3den.hpp index a72c585fde..5d15e19d6b 100644 --- a/addons/csw/Cfg3den.hpp +++ b/addons/csw/Cfg3den.hpp @@ -9,7 +9,7 @@ class Cfg3DEN { }; class Combo: Title { class Controls: Controls { - class Title: Title{}; + class Title: Title {}; class Value; }; }; diff --git a/addons/csw/CfgWeapons.hpp b/addons/csw/CfgWeapons.hpp index 5c4e9c8f2f..80f8706376 100644 --- a/addons/csw/CfgWeapons.hpp +++ b/addons/csw/CfgWeapons.hpp @@ -246,7 +246,7 @@ class CfgWeapons { EGVAR(javelin,enabled) = 1; // needs to be explicitly enabled magazineReloadTime = 0.5; }; - class GVAR(Titan_AA_Static) : missiles_titan_static { + class GVAR(Titan_AA_Static): missiles_titan_static { magazineReloadTime = 0.5; }; diff --git a/addons/csw/config.cpp b/addons/csw/config.cpp index 47f8313668..98abcea5c0 100644 --- a/addons/csw/config.cpp +++ b/addons/csw/config.cpp @@ -4,8 +4,8 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {}; - weapons[] = {"ace_csw_carryTripod", "ace_csw_staticATWeapon"}; + units[] = {QGVAR(m3Tripod),QGVAR(m3TripodLow),QGVAR(kordTripod),QGVAR(kordTripodLow),QGVAR(sag30Tripod),QGVAR(m220Tripod),QGVAR(spg9Tripod),QGVAR(mortarBaseplate)}; + weapons[] = {QGVAR(m3CarryTripod),QGVAR(m3CarryTripodLow),QGVAR(kordCarryTripod),QGVAR(kordCarryTripodLow),QGVAR(m220CarryTripod),QGVAR(spg9CarryTripod),QGVAR(sag30CarryTripod),QGVAR(carryMortarBaseplate),QGVAR(staticATCarry),QGVAR(staticAACarry),QGVAR(staticHMGCarry),QGVAR(staticM2ShieldCarry),QGVAR(staticGMGCarry),QGVAR(staticMortarCarry)}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; author = ECSTRING(common,ACETeam); diff --git a/addons/csw/data/model.cfg b/addons/csw/data/model.cfg index 7adabdac10..2104dca5a5 100644 --- a/addons/csw/data/model.cfg +++ b/addons/csw/data/model.cfg @@ -20,37 +20,37 @@ class CfgModels { sections[] = {}; skeletonName = ""; }; - class ACE_CSW_Tripod : Default { + class ACE_CSW_Tripod: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ACE_CSW_Tripod_Skeleton"; }; - class ACE_CSW_M3_Tripod : Default { + class ACE_CSW_M3_Tripod: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ACE_CSW_M3_Tripod_Skeleton"; }; - class ace_csw_tripod_ags30 : Default { + class ace_csw_tripod_ags30: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ace_csw_tripod_ags30_Skeleton"; }; - class ace_csw_tripod_kord : Default { + class ace_csw_tripod_kord: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ace_csw_tripod_kord_Skeleton"; }; - class ace_csw_tripod_m122 : Default { + class ace_csw_tripod_m122: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ace_csw_tripod_m122_Skeleton"; }; - class ace_csw_tripod_m220 : Default { + class ace_csw_tripod_m220: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ace_csw_tripod_m220_Skeleton"; }; - class ace_csw_tripod_spg9 : Default { + class ace_csw_tripod_spg9: Default { sectionsInherit = ""; sections[] = {}; skeletonName = "ace_csw_tripod_spg9_Skeleton"; diff --git a/addons/dagr/Dialog.hpp b/addons/dagr/Dialog.hpp index e54df35f61..6ed57d4d12 100644 --- a/addons/dagr/Dialog.hpp +++ b/addons/dagr/Dialog.hpp @@ -152,7 +152,7 @@ class DAGR_Menu { "DAGR_MENU_SELECTION3", "DAGR_MENU_SELECTION4", "DAGR_MENU_Main_Text", "DAGR_MENU_PSELECTION1", "DAGR_MENU_PSELECTION2", "DAGR_MENU_PSELECTION3", "DAGR_MENU_PSELECTION4", "DAGR_MENU_PSELECTION5", "DAGR_MENU_PSELECTION6","DAGR_MENU_PSELECTION7", "DAGR_MENU_PSELECTION8"}; - class DAGR_MENU_UI : DAGR_Menu_Pic { + class DAGR_MENU_UI: DAGR_Menu_Pic { idc = 266861; x = 0.175; y = -0.173; @@ -160,28 +160,28 @@ class DAGR_Menu { sizeEx = 0.1; }; - class DAGR_PWR_Button : DAGR_Button { + class DAGR_PWR_Button: DAGR_Button { idc = 266863; action = QUOTE(GVAR(PWR) = true); x = 0.40; y = 0.65; }; - class DAGR_UP_Button : DAGR_Button { + class DAGR_UP_Button: DAGR_Button { idc = 266864; action = QUOTE(GVAR(UP) = true); x = 0.50; y = 0.675; }; - class DAGR_DOWN_Button : DAGR_Button { + class DAGR_DOWN_Button: DAGR_Button { idc = 266865; action = QUOTE(GVAR(DOWN) = true); x = 0.50; y = 0.81; }; - class DAGR_LEFT_Button : DAGR_Button { + class DAGR_LEFT_Button: DAGR_Button { idc = 266866; action = QUOTE(GVAR(LEFT) = true); x = 0.40; @@ -190,7 +190,7 @@ class DAGR_Menu { h = 0.07; }; - class DAGR_RIGHT_Button : DAGR_Button { + class DAGR_RIGHT_Button: DAGR_Button { idc = 266867; action = QUOTE(GVAR(RIGHT) = true); x = 0.62; @@ -199,13 +199,13 @@ class DAGR_Menu { h = 0.07; }; - class DAGR_NEXT_Button : DAGR_Button { + class DAGR_NEXT_Button: DAGR_Button { idc = 266868; x = 0.60; y = 0.65; }; - class DAGR_SEL_Button : DAGR_Button { + class DAGR_SEL_Button: DAGR_Button { idc = 266869; action = QUOTE(GVAR(SEL) = true); x = 0.54; @@ -214,7 +214,7 @@ class DAGR_Menu { h = 0.06; }; - class DAGR_MENU_Button : DAGR_Button { + class DAGR_MENU_Button: DAGR_Button { idc = 266870; action = QUOTE(GVAR(MENU_B) = true); x = 0.46; @@ -223,47 +223,47 @@ class DAGR_Menu { h = 0.06; }; - class DAGR_F1_Button : DAGR_Button { + class DAGR_F1_Button: DAGR_Button { idc = 266871; action = QUOTE(GVAR(F1) = true); x = 0.40; y = 0.575; }; - class DAGR_F2_Button : DAGR_Button { + class DAGR_F2_Button: DAGR_Button { idc = 266872; action = QUOTE(GVAR(F2) = true); x = 0.495; y = 0.575; }; - class DAGR_F3_Button : DAGR_Button { + class DAGR_F3_Button: DAGR_Button { idc = 266873; action = QUOTE(GVAR(F3) = true); x = 0.59; y = 0.575; }; - class DAGR_F1_Text : DAGR_Menu_Text { + class DAGR_F1_Text: DAGR_Menu_Text { idc = 266874; x = 0.388; y = 0.38; text = ""; }; - class DAGR_F2_Text : DAGR_Menu_Text { + class DAGR_F2_Text: DAGR_Menu_Text { idc = 266875; x = 0.506; y = 0.38; }; - class DAGR_F3_Text : DAGR_Menu_Text { + class DAGR_F3_Text: DAGR_Menu_Text { idc = 266876; x = 0.612; y = 0.38; }; - class DAGR_MENU_OPTION0 : DAGR_Menu_Text { + class DAGR_MENU_OPTION0: DAGR_Menu_Text { idc = 2668777; style = 0x02; sizeEx = 0.035; @@ -271,7 +271,7 @@ class DAGR_Menu { y = 0.19; }; - class DAGR_MENU_OPTION1 : DAGR_Menu_Text { + class DAGR_MENU_OPTION1: DAGR_Menu_Text { idc = 2668778; style = 0x02; sizeEx = 0.035; @@ -279,7 +279,7 @@ class DAGR_Menu { y = 0.225; }; - class DAGR_MENU_OPTION2 : DAGR_Menu_Text { + class DAGR_MENU_OPTION2: DAGR_Menu_Text { idc = 2668779; style = 0x02; sizeEx = 0.035; @@ -287,7 +287,7 @@ class DAGR_Menu { y = 0.26; }; - class DAGR_MENU_OPTION3 : DAGR_Menu_Text { + class DAGR_MENU_OPTION3: DAGR_Menu_Text { idc = 2668780; style = 0x02; sizeEx = 0.035; @@ -295,14 +295,14 @@ class DAGR_Menu { y = 0.295; }; - class DAGR_MENU_OPTION4 : DAGR_Menu_Text { + class DAGR_MENU_OPTION4: DAGR_Menu_Text { idc = 2668781; style = 0x02; sizeEx = 0.035; x = 0.43; y = 0.33; }; - class DAGR_MENU_SELECTION0 : DAGR_Menu_Pic { + class DAGR_MENU_SELECTION0: DAGR_Menu_Pic { idc = 2668783; x = 0.42; y = 0.246; @@ -311,7 +311,7 @@ class DAGR_Menu { sizeEx = 0.05; }; - class DAGR_MENU_SELECTION1 : DAGR_Menu_Pic { + class DAGR_MENU_SELECTION1: DAGR_Menu_Pic { idc = 2668784; x = 0.42; y = 0.281; @@ -320,7 +320,7 @@ class DAGR_Menu { sizeEx = 0.05; }; - class DAGR_MENU_SELECTION2 : DAGR_Menu_Pic { + class DAGR_MENU_SELECTION2: DAGR_Menu_Pic { idc = 2668785; x = 0.42; y = 0.316; @@ -329,7 +329,7 @@ class DAGR_Menu { sizeEx = 0.05; }; - class DAGR_MENU_SELECTION3 : DAGR_Menu_Pic { + class DAGR_MENU_SELECTION3: DAGR_Menu_Pic { idc = 2668786; x = 0.42; y = 0.351; @@ -338,7 +338,7 @@ class DAGR_Menu { sizeEx = 0.05; }; - class DAGR_MENU_SELECTION4 : DAGR_Menu_Pic { + class DAGR_MENU_SELECTION4: DAGR_Menu_Pic { idc = 2668787; x = 0.42; y = 0.386; @@ -347,7 +347,7 @@ class DAGR_Menu { sizeEx = 0.05; }; - class DAGR_MENU_Main_Text : DAGR_Menu_Text { + class DAGR_MENU_Main_Text: DAGR_Menu_Text { idc = 2668782; style = ST_CENTER; x = 0.38; @@ -358,7 +358,7 @@ class DAGR_Menu { }; //Waypoint adding and modification digits underline - class DAGR_MENU_PSELECTION1 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION1: DAGR_Menu_Pic { idc = 2668788; x = 0.465; y = 0.352; @@ -366,7 +366,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION2 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION2: DAGR_Menu_Pic { idc = 2668789; x = 0.475; y = 0.352; @@ -374,7 +374,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION3 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION3: DAGR_Menu_Pic { idc = 2668790; x = 0.485; y = 0.352; @@ -382,7 +382,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION4 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION4: DAGR_Menu_Pic { idc = 2668791; x = 0.495; y = 0.352; @@ -390,7 +390,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION5 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION5: DAGR_Menu_Pic { idc = 2668792; x = 0.505; y = 0.352; @@ -398,7 +398,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION6 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION6: DAGR_Menu_Pic { idc = 2668793; x = 0.515; y = 0.352; @@ -406,7 +406,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION7 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION7: DAGR_Menu_Pic { idc = 2668794; x = 0.525; y = 0.352; @@ -414,7 +414,7 @@ class DAGR_Menu { h = 0.003; }; - class DAGR_MENU_PSELECTION8 : DAGR_Menu_Pic { + class DAGR_MENU_PSELECTION8: DAGR_Menu_Pic { idc = 2668795; x = 0.535; y = 0.352; diff --git a/addons/dagr/RscTitles.hpp b/addons/dagr/RscTitles.hpp index 87230c7fc0..609b546af4 100644 --- a/addons/dagr/RscTitles.hpp +++ b/addons/dagr/RscTitles.hpp @@ -40,13 +40,13 @@ class RscTitles { onLoad="uiNamespace setVariable ['DAGR_Display', _this select 0]"; controls[] = {"DAGR_UI", "DAGR_Grid", "DAGR_Speed", "DAGR_Elevation", "DAGR_Heading", "DAGR_Time", "DAGR_WP", "DAGR_Bearing", "DAGR_DIST"}; - class DAGR_UI : DAGR_Pic { + class DAGR_UI: DAGR_Pic { idc = 266856; x = "(SafeZoneW + SafeZoneX) - 0.45"; y = "(SafeZoneH + SafeZoneY) - 0.47"; }; - class DAGR_Grid : DAGR_Text { + class DAGR_Grid: DAGR_Text { idc = 266851; x = "(SafeZoneW + SafeZoneX) - 0.370";// 0.830 y = "(SafeZoneH + SafeZoneY)- 0.250";// 0.845 @@ -54,39 +54,39 @@ class RscTitles { h = 0.06; sizeEx = 0.07; }; - class DAGR_Speed : DAGR_Text { + class DAGR_Speed: DAGR_Text { idc = 266852; x = "(SafeZoneW + SafeZoneX) - 0.388"; //0.812 y = "(SafeZoneH + SafeZoneY) - 0.181"; //0.914 }; - class DAGR_Elevation : DAGR_Text { + class DAGR_Elevation: DAGR_Text { idc = 266853; x = "(SafeZoneW + SafeZoneX) - 0.270"; //0.930 y = "(SafeZoneH + SafeZoneY) - 0.181"; //0.914 }; - class DAGR_Heading : DAGR_Text { + class DAGR_Heading: DAGR_Text { idc = 266854; x = "(SafeZoneW + SafeZoneX) - 0.413"; //0.787 y = "(SafeZoneH + SafeZoneY) - 0.1294"; //0.9656 }; - class DAGR_Time : DAGR_Text { + class DAGR_Time: DAGR_Text { idc = 266855; x = "(SafeZoneW + SafeZoneX) - 0.275"; //0.925 y = "(SafeZoneH + SafeZoneY) - 0.129"; //0.965 }; - class DAGR_WP : DAGR_Text { + class DAGR_WP: DAGR_Text { idc = 266857; x = "(SafeZoneW + SafeZoneX) - 0.235"; //0.965 y = "(SafeZoneH + SafeZoneY) - 0.181"; //0.914 }; - class DAGR_Bearing : DAGR_Text { + class DAGR_Bearing: DAGR_Text { idc = 266858; x = "(SafeZoneW + SafeZoneX) - 0.413"; //0.787 y = "(SafeZoneH + SafeZoneY) - 0.181"; //0.914 }; - class DAGR_DIST : DAGR_Text { + class DAGR_DIST: DAGR_Text { idc = 266859; x = "(SafeZoneW + SafeZoneX) - 0.265"; //0.935 y = "(SafeZoneH + SafeZoneY) - 0.129"; //0.965 diff --git a/addons/disposable/config.cpp b/addons/disposable/config.cpp index 2cc4f4202c..b4561fd8b3 100644 --- a/addons/disposable/config.cpp +++ b/addons/disposable/config.cpp @@ -4,7 +4,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {"ACE_launch_NLAW_loaded_F","ACE_launch_NLAW_used_F"}; + weapons[] = {"ACE_launch_NLAW_ready_F","ACE_launch_NLAW_used_F"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; author = ECSTRING(common,ACETeam); diff --git a/addons/dogtags/CfgWeapons.hpp b/addons/dogtags/CfgWeapons.hpp index ec8d9e6ee4..0f795d8d08 100644 --- a/addons/dogtags/CfgWeapons.hpp +++ b/addons/dogtags/CfgWeapons.hpp @@ -1,5 +1,5 @@ #define ACE_DOGTAG_ITEM(DOGTAGBASE,DOGTAGID) \ - class DOGTAGBASE##_##DOGTAGID : DOGTAGBASE { \ + class DOGTAGBASE##_##DOGTAGID: DOGTAGBASE { \ author = ECSTRING(common,ACETeam); \ scope = 1; \ scopeArsenal = 0; \ diff --git a/addons/dragon/CfgAmmo.hpp b/addons/dragon/CfgAmmo.hpp index c19c970460..09858b4fff 100644 --- a/addons/dragon/CfgAmmo.hpp +++ b/addons/dragon/CfgAmmo.hpp @@ -72,7 +72,7 @@ class CfgAmmo { }; }; - class GVAR(super) : GVAR(dragonBase) { + class GVAR(super): GVAR(dragonBase) { submunitionAmmo = QGVAR(penetrator_super); submunitionDirectionType = "SubmunitionModelDirection"; submunitionInitSpeed = 1000; @@ -110,7 +110,7 @@ class CfgAmmo { }; class ShellBase; - class GVAR(serviceCharge) : ShellBase { + class GVAR(serviceCharge): ShellBase { hit = 1; indirectHit = 2; indirectHitRange = 1; diff --git a/addons/dragon/CfgMagazines.hpp b/addons/dragon/CfgMagazines.hpp index e4b59a9304..605501376d 100644 --- a/addons/dragon/CfgMagazines.hpp +++ b/addons/dragon/CfgMagazines.hpp @@ -1,6 +1,6 @@ class CfgMagazines { class 1Rnd_GAA_missiles; - class GVAR(super) : 1Rnd_GAA_missiles { + class GVAR(super): 1Rnd_GAA_missiles { sound[] = {}; soundFly[] = {}; soundHit[] = {}; diff --git a/addons/explosives/CfgMagazines.hpp b/addons/explosives/CfgMagazines.hpp index 1784e80433..7bb2c6ff02 100644 --- a/addons/explosives/CfgMagazines.hpp +++ b/addons/explosives/CfgMagazines.hpp @@ -86,13 +86,13 @@ class CfgMagazines { GVAR(SetupObject) = "ACE_Explosives_Place_SLAM"; class ACE_Triggers { SupportedTriggers[] = {"IRSensor", "PressurePlate", "Timer", "Command", "MK16_Transmitter"}; - class PressurePlate{ + class PressurePlate { displayName = CSTRING(SLAME_Magnetic); digDistance = 0; ammo = "ACE_SLAMDirectionalMine_Magnetic_Ammo"; pitch = 90; }; - class IRSensor{ + class IRSensor { displayName = CSTRING(SLAME_IRSensor); }; class Timer { diff --git a/addons/explosives/CfgWeapons.hpp b/addons/explosives/CfgWeapons.hpp index 56ef154661..d45b484c59 100644 --- a/addons/explosives/CfgWeapons.hpp +++ b/addons/explosives/CfgWeapons.hpp @@ -2,7 +2,7 @@ class CfgWeapons { class Default; class Put: Default { muzzles[] += {QGVAR(muzzle)}; - class PutMuzzle: Default{}; + class PutMuzzle: Default {}; class GVAR(muzzle): PutMuzzle { magazines[] = {"ACE_FlareTripMine_Mag"}; }; diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index 08042297dc..b60186ab68 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -41,10 +41,10 @@ class CfgActions { class ActivateMine: None { show = 0; }; - class Deactivate:None { + class Deactivate: None { show = 0; }; - class DeactivateMine:None { + class DeactivateMine: None { show = 0; }; class UseContainerMagazine: None { diff --git a/addons/fastroping/config.cpp b/addons/fastroping/config.cpp index 749586708c..be8f70a482 100644 --- a/addons/fastroping/config.cpp +++ b/addons/fastroping/config.cpp @@ -4,7 +4,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {"ACE_fastropingSupplyCrate"}; - weapons[] = {"ACE_rope12","ACE_rope15","ACE_rope18","ACE_rope27","ACE_rope36"}; + weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction","ace_logistics_rope"}; author = ECSTRING(common,ACETeam); diff --git a/addons/fastroping/stringtable.xml b/addons/fastroping/stringtable.xml index 0afc9a7799..dc349d6778 100644 --- a/addons/fastroping/stringtable.xml +++ b/addons/fastroping/stringtable.xml @@ -167,6 +167,7 @@ Připravit 3m lana 3m halat sal Desplegar cuerdas de 3m + 3m ロープを展開 Deploy 6m ropes @@ -179,6 +180,7 @@ Připravit 6m lana 6m halat sal Desplegar cuerdas de 6m + 6m ロープを展開 Deploy 12m ropes diff --git a/addons/field_rations/CfgEventHandlers.hpp b/addons/field_rations/CfgEventHandlers.hpp index 0d3301d6e0..f6503c2479 100644 --- a/addons/field_rations/CfgEventHandlers.hpp +++ b/addons/field_rations/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; diff --git a/addons/field_rations/README.md b/addons/field_rations/README.md index 63eec9b597..b178343e99 100644 --- a/addons/field_rations/README.md +++ b/addons/field_rations/README.md @@ -3,3 +3,11 @@ ace_field_rations Provides a survival style, hunger and thirst system. Adds consumable items such as MREs. + +## ACEX Conversion - things still using acex prefix +- All settings +- CfgUIGrids Entry +- CfgWeapon Configs (e.g. `acex_field_rations_thirstQuenched`) +- CfgVehicles Configs (e.g. `acex_field_rations_waterSupply`) +- Events (`acex_rationConsumed`, `acex_rationRefilled`) +- Player setVars for thirst/hunger (e.g. `player getVariable "acex_field_rations_thirst"`) diff --git a/addons/field_rations/XEH_postInit.sqf b/addons/field_rations/XEH_postInit.sqf index 09a2145af2..be81985bc4 100644 --- a/addons/field_rations/XEH_postInit.sqf +++ b/addons/field_rations/XEH_postInit.sqf @@ -21,7 +21,7 @@ if !(hasInterface) exitWith {}; QPATHTOF(ui\icon_water_tap.paa), {true}, { - private _waterSource = _target getVariable [QXGVAR(waterSource), objNull]; + private _waterSource = _target getVariable [QGVAR(waterSource), objNull]; alive _waterSource && {XGVAR(waterSourceActions) != 0} @@ -29,7 +29,7 @@ if !(hasInterface) exitWith {}; && {[_player, _waterSource] call EFUNC(common,canInteractWith)} }, { - private _waterSource = _target getVariable [QXGVAR(waterSource), objNull]; + private _waterSource = _target getVariable [QGVAR(waterSource), objNull]; [_waterSource, _player] call FUNC(getRefillChildren); }, [], @@ -44,11 +44,11 @@ if !(hasInterface) exitWith {}; LLSTRING(CheckWater), QPATHTOF(ui\icon_water_tap.paa), { - private _waterSource = _target getVariable [QXGVAR(waterSource), objNull]; + private _waterSource = _target getVariable [QGVAR(waterSource), objNull]; [_player, _waterSource] call FUNC(checkWater); }, { - private _waterSource = _target getVariable [QXGVAR(waterSource), objNull]; + private _waterSource = _target getVariable [QGVAR(waterSource), objNull]; (_waterSource call FUNC(getRemainingWater)) != REFILL_WATER_INFINITE } ] call EFUNC(interact_menu,createAction), @@ -57,11 +57,11 @@ if !(hasInterface) exitWith {}; LLSTRING(DrinkFromSource), QPATHTOF(ui\icon_water_tap.paa), { - private _waterSource = _target getVariable [QXGVAR(waterSource), objNull]; + private _waterSource = _target getVariable [QGVAR(waterSource), objNull]; [_player, _waterSource] call FUNC(drinkFromSource); }, { - private _waterSource = _target getVariable [QXGVAR(waterSource), objNull]; + private _waterSource = _target getVariable [QGVAR(waterSource), objNull]; [_player, _waterSource] call FUNC(canDrinkFromSource); } ] call EFUNC(interact_menu,createAction) @@ -70,7 +70,7 @@ if !(hasInterface) exitWith {}; // Add water source actions to helper [QGVAR(helper), 0, [], _mainAction] call EFUNC(interact_menu,addActionToClass); { - [QGVAR(helper), 0, [QXGVAR(waterSource)], _x] call EFUNC(interact_menu,addActionToClass); + [QGVAR(helper), 0, [QGVAR(waterSource)], _x] call EFUNC(interact_menu,addActionToClass); } forEach _subActions; // Add inventory context menu option to consume items diff --git a/addons/field_rations/config.cpp b/addons/field_rations/config.cpp index 6c9647d8ed..d7acbb66b1 100644 --- a/addons/field_rations/config.cpp +++ b/addons/field_rations/config.cpp @@ -51,7 +51,7 @@ class CfgPatches { VERSION_CONFIG; }; - class XADDON: ADDON {}; + BWC_CONFIG(XADDON); }; #include "CfgEventHandlers.hpp" diff --git a/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf b/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf index 73b08bcf87..0d320b0610 100644 --- a/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf +++ b/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf @@ -50,7 +50,7 @@ TRACE_1("Starting interact PFH",_interactionType); if (_waterRemaining != REFILL_WATER_DISABLED) then { private _offset = [_x] call FUNC(getActionOffset); private _helper = QGVAR(helper) createVehicleLocal [0, 0, 0]; - _helper setVariable [QXGVAR(waterSource), _x]; + _helper setVariable [QGVAR(waterSource), _x]; _helper attachTo [_x, _offset]; _addedHelpers pushBack _helper; diff --git a/addons/fire/CfgEventHandlers.hpp b/addons/fire/CfgEventHandlers.hpp index 0d3301d6e0..f6503c2479 100644 --- a/addons/fire/CfgEventHandlers.hpp +++ b/addons/fire/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; diff --git a/addons/fire/stringtable.xml b/addons/fire/stringtable.xml index 90e1431bdb..7292b1fe40 100644 --- a/addons/fire/stringtable.xml +++ b/addons/fire/stringtable.xml @@ -3,21 +3,27 @@ ACE Fire + ACE 火災 Pat Down Fire + 火を叩き消す Patting Down Fire + 火を叩き消しています Allow units to catch fire + ユニットへ着火を許可 Enable fire-flare at night + 夜間にフレア効果を有効化 Uses a flare effect to increase fire intensity at night + 夜間に火災の強さを上昇させるフレア効果を有効化します。 diff --git a/addons/flashlights/CfgVehicles.hpp b/addons/flashlights/CfgVehicles.hpp index dbdf5421bc..6c3e32c1c7 100644 --- a/addons/flashlights/CfgVehicles.hpp +++ b/addons/flashlights/CfgVehicles.hpp @@ -59,8 +59,8 @@ class CfgVehicles { editorSubcategory = "EdSubcat_InventoryItems"; vehicleClass = "Items"; - class TransportItems { - MACRO_ADDITEM(ACE_Flashlight_Maglite_ML300L,1); + class TransportWeapons { + MACRO_ADDWEAPON(ACE_Flashlight_Maglite_ML300L,1); }; }; @@ -97,7 +97,9 @@ class CfgVehicles { MACRO_ADDITEM(ACE_Flashlight_MX991,12); MACRO_ADDITEM(ACE_Flashlight_KSF1,12); MACRO_ADDITEM(ACE_Flashlight_XL50,12); - MACRO_ADDITEM(ACE_Flashlight_Maglite_ML300L,2); + }; + class TransportWeapons { + MACRO_ADDWEAPON(ACE_Flashlight_Maglite_ML300L,2); }; }; }; diff --git a/addons/fortify/CfgEventHandlers.hpp b/addons/fortify/CfgEventHandlers.hpp index 6d454c89e1..b468b9e8b5 100644 --- a/addons/fortify/CfgEventHandlers.hpp +++ b/addons/fortify/CfgEventHandlers.hpp @@ -1,23 +1,23 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; class Extended_DisplayLoad_EventHandlers { class RscDisplayMission { - ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad)); + ADDON = QUOTE(_this call COMPILE_SCRIPT(XEH_missionDisplayLoad)); }; }; diff --git a/addons/fortify/README.md b/addons/fortify/README.md index 368dace328..988699a706 100644 --- a/addons/fortify/README.md +++ b/addons/fortify/README.md @@ -2,3 +2,9 @@ ace_fortify ============ Allows quick placement of fortifications. + +## ACEX Conversion - things still using acex prefix +- **Some** settings +- CfgVehicles Module Classnames +- `ACEX_Fortify_Presets` config +- Events (`acex_fortify_objectPlaced`, `acex_fortify_objectDeleted`, `acex_fortify_onDeployStart`) diff --git a/addons/fortify/XEH_postInit.sqf b/addons/fortify/XEH_postInit.sqf index 17e1e60c76..f14c4cb8f7 100644 --- a/addons/fortify/XEH_postInit.sqf +++ b/addons/fortify/XEH_postInit.sqf @@ -2,7 +2,7 @@ if (isServer) then { [QGVAR(registerObjects), LINKFUNC(registerObjects)] call CBA_fnc_addEventHandler; - [QGVAR(objectPlaced), { + [QXGVAR(objectPlaced), { params ["_unit", "_side", "_object"]; TRACE_3("objectPlaced",_unit,_side,_object); private _jipID = [QGVAR(addActionToObject), [_side, _object]] call CBA_fnc_globalEventJIP; @@ -49,7 +49,7 @@ GVAR(objectRotationZ) = 0; params ["_target", "_player", "_params"]; _params params ["_side"]; TRACE_2("deleting placed object",_target,_params); - [QGVAR(objectDeleted), [_player, _side, _target]] call CBA_fnc_globalEvent; + [QXGVAR(objectDeleted), [_player, _side, _target]] call CBA_fnc_globalEvent; deleteVehicle _target; _params call FUNC(updateBudget); }, diff --git a/addons/fortify/config.cpp b/addons/fortify/config.cpp index 5faf17341b..ab12338982 100644 --- a/addons/fortify/config.cpp +++ b/addons/fortify/config.cpp @@ -2,8 +2,8 @@ class CfgPatches { class ADDON { - units[] = {}; - weapons[] = {}; + units[] = {QXGVAR(setupModule), QXGVAR(buildLocationModule)}; + weapons[] = {"ACE_Fortify"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; author = ECSTRING(common,ACETeam); @@ -12,7 +12,7 @@ class CfgPatches { VERSION_CONFIG; }; - class XADDON: ADDON {}; + BWC_CONFIG(XADDON); }; #include "Cfg3DEN.hpp" diff --git a/addons/fortify/functions/fnc_deployConfirm.sqf b/addons/fortify/functions/fnc_deployConfirm.sqf index 775d0aad51..d04124fd93 100644 --- a/addons/fortify/functions/fnc_deployConfirm.sqf +++ b/addons/fortify/functions/fnc_deployConfirm.sqf @@ -35,7 +35,7 @@ _newObject setPosASL _posASL; _newObject setVectorDirAndUp [_vectorDir, _vectorUp]; // Server will use this event to run the jip compatible QGVAR(addActionToObject) event -[QGVAR(objectPlaced), [_unit, _side, _newObject]] call CBA_fnc_globalEvent; +[QXGVAR(objectPlaced), [_unit, _side, _newObject]] call CBA_fnc_globalEvent; if (cba_events_control) then { // Re-run if ctrl key held diff --git a/addons/fortify/functions/fnc_deployObject.sqf b/addons/fortify/functions/fnc_deployObject.sqf index 8ed404e7d6..cff46df6d9 100644 --- a/addons/fortify/functions/fnc_deployObject.sqf +++ b/addons/fortify/functions/fnc_deployObject.sqf @@ -43,7 +43,7 @@ private _icons = [["alt", localize "str_3den_display3den_entitymenu_movesurface_ [_lmb, _rmb, _wheel, _icons] call EFUNC(interaction,showMouseHint); private _mouseClickID = [_player, "DefaultAction", {GVAR(isPlacing) == PLACE_WAITING}, {GVAR(isPlacing) = PLACE_APPROVE}] call EFUNC(common,addActionEventHandler); -[QGVAR(onDeployStart), [_player, _object, _cost]] call CBA_fnc_localEvent; +[QXGVAR(onDeployStart), [_player, _object, _cost]] call CBA_fnc_localEvent; [{ params ["_args", "_pfID"]; diff --git a/addons/frag/CfgAmmoReflections.hpp b/addons/frag/CfgAmmoReflections.hpp index 513b58d544..41bd0d5c31 100644 --- a/addons/frag/CfgAmmoReflections.hpp +++ b/addons/frag/CfgAmmoReflections.hpp @@ -1,5 +1,5 @@ #define ACE_EXPLOSION_REFLECTION(range, hit)\ -class ace_explosion_reflection_##range##_##hit : ace_explosion_reflection_base {\ +class ace_explosion_reflection_##range##_##hit: ace_explosion_reflection_base {\ indirectHitRange = range;\ indirectHit = hit;\ dangerRadiusHit = range*3;\ @@ -58,7 +58,7 @@ class ace_explosion_reflection_##range##_##hit : ace_explosion_reflection_base { ACE_EXPLOSION_REFLECTION(range,490);\ ACE_EXPLOSION_REFLECTION(range,500) -class ace_explosion_reflection_base : Sh_120mm_HE { +class ace_explosion_reflection_base: Sh_120mm_HE { CraterWaterEffects = ""; CraterEffects = ""; effectsMissile = ""; diff --git a/addons/goggles/RscTitles.hpp b/addons/goggles/RscTitles.hpp index 7c62c6960c..0716892312 100644 --- a/addons/goggles/RscTitles.hpp +++ b/addons/goggles/RscTitles.hpp @@ -1,7 +1,7 @@ -class RscTitles{ +class RscTitles { #include "define.hpp" - class RscACE_Goggles_BaseTitle{ + class RscACE_Goggles_BaseTitle { idd = -1; onLoad = "uiNamespace setVariable ['ACE_Goggles_Display', _this select 0]"; onUnload = "uiNamespace setVariable ['ACE_Goggles_Display', displayNull]"; @@ -13,25 +13,25 @@ class RscTitles{ class controls; }; - class RscACE_Goggles:RscACE_Goggles_BaseTitle{ + class RscACE_Goggles: RscACE_Goggles_BaseTitle { idd = 1044; name = "RscACE_Goggles"; - class controls{ - class gogglesImage: RscPicture{ + class controls { + class gogglesImage: RscPicture { idc = 10650; }; }; }; - class RscACE_GogglesEffects:RscACE_Goggles_BaseTitle{ + class RscACE_GogglesEffects: RscACE_Goggles_BaseTitle { idd = 1045; onLoad = "uiNamespace setVariable ['ACE_Goggles_DisplayEffects', _this select 0]"; onUnload = "uiNamespace setVariable ['ACE_Goggles_DisplayEffects', displayNull]"; name = "RscACE_GogglesEffects"; fadeIn=0; fadeOut=0.5; - class controls{ - class dirtImage: RscPicture { + class controls { + class dirtImage: RscPicture { idc = 10660; }; class dustImage: RscPicture { diff --git a/addons/goggles/config.cpp b/addons/goggles/config.cpp index 88ebe3f8f8..4718662e62 100644 --- a/addons/goggles/config.cpp +++ b/addons/goggles/config.cpp @@ -42,7 +42,7 @@ class CfgGlasses { ACE_Protection = 1; }; - class G_Combat:None { + class G_Combat: None { COMBAT_GOGGLES }; @@ -57,135 +57,135 @@ class CfgGlasses { ACE_Protection = 1; }; - class G_Lowprofile:None { + class G_Lowprofile: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 2; ACE_Protection = 1; }; - class G_Shades_Black:None { + class G_Shades_Black: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; }; - class G_Shades_Blue:None{ + class G_Shades_Blue: None { ACE_Color[] = {0,0,1}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Shades_Green:None{ + class G_Shades_Green: None { ACE_Color[] = {0,1,0}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Shades_Red:None{ + class G_Shades_Red: None { ACE_Color[] = {1,0,0}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Spectacles:None{ + class G_Spectacles: None { ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Spectacles_Tinted:None{ + class G_Spectacles_Tinted: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; }; - class G_Sport_Blackred:None{ + class G_Sport_Blackred: None { ACE_Color[] = {1,0,0}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Sport_BlackWhite:None{ + class G_Sport_BlackWhite: None { ACE_Color[] = {0,0,1}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Sport_Blackyellow:None{ + class G_Sport_Blackyellow: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; }; - class G_Sport_Checkered:None{ + class G_Sport_Checkered: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; }; - class G_Sport_Greenblack:None{ + class G_Sport_Greenblack: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; }; - class G_Sport_Red:None{ + class G_Sport_Red: None { ACE_TintAmount=COLOUR*2; ACE_Color[] = {0,0,0}; ACE_Resistance = 1; }; - class G_Squares:None{ + class G_Squares: None { ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Squares_Tinted:None{ + class G_Squares_Tinted: None { ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Tactical_Black:None{ + class G_Tactical_Black: None { ACE_TintAmount=COLOUR; ACE_Color[] = {0,0,-1.5}; ACE_Resistance = 1; }; - class G_Tactical_Clear:None{ + class G_Tactical_Clear: None { ACE_TintAmount=COLOUR; ACE_Color[] = {0,0,-1}; ACE_Resistance = 1; }; - class G_Aviator:None{ + class G_Aviator: None { ACE_Color[] = {0,0,-1}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Lady_Blue:None{ + class G_Lady_Blue: None { ACE_Color[] = {0,0,1}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Lady_Red:None{ + class G_Lady_Red: None { ACE_Color[] = {1,0,0}; ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; - class G_Lady_Dark:None{ + class G_Lady_Dark: None { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; }; - class G_Lady_Mirror:None{ + class G_Lady_Mirror: None { ACE_TintAmount=COLOUR; ACE_Resistance = 1; }; class G_Balaclava_blk; - class G_Balaclava_combat:G_Balaclava_blk { + class G_Balaclava_combat: G_Balaclava_blk { COMBAT_GOGGLES }; - class G_Balaclava_lowprofile:G_Balaclava_blk { + class G_Balaclava_lowprofile: G_Balaclava_blk { ACE_TintAmount=COLOUR*2; ACE_Resistance = 2; ACE_Protection = 1; @@ -202,7 +202,7 @@ class CfgGlasses { }; class G_Bandanna_blk; - class G_Bandanna_shades:G_Bandanna_blk { + class G_Bandanna_shades: G_Bandanna_blk { ACE_TintAmount=COLOUR*2; ACE_Resistance = 1; ACE_Protection = 1; @@ -265,13 +265,13 @@ class CfgGesturesMale { class CfgWeapons { class H_HelmetB; - class H_CrewHelmetHeli_B:H_HelmetB { + class H_CrewHelmetHeli_B: H_HelmetB { ACE_Protection = 1; }; - class H_PilotHelmetHeli_B:H_HelmetB { + class H_PilotHelmetHeli_B: H_HelmetB { ACE_Protection = 1; }; - class H_PilotHelmetFighter_B:H_HelmetB { + class H_PilotHelmetFighter_B: H_HelmetB { ACE_Protection = 1; }; }; @@ -290,7 +290,7 @@ class SniperCloud { class CfgCloudlets { class Default; - class ACERainEffect:Default { + class ACERainEffect: Default { interval = 0.001; particleShape = "\A3\data_f\ParticleEffects\Universal\Refract"; particleFSNtieth = 1; diff --git a/addons/headless/CfgEventHandlers.hpp b/addons/headless/CfgEventHandlers.hpp index 0d3301d6e0..f6503c2479 100644 --- a/addons/headless/CfgEventHandlers.hpp +++ b/addons/headless/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; diff --git a/addons/headless/README.md b/addons/headless/README.md index 934c73e5cd..6d0cf28bd8 100644 --- a/addons/headless/README.md +++ b/addons/headless/README.md @@ -7,3 +7,8 @@ Adds automatic passing of AI groups to (up to 3) Headless Clients. - Round-robin transferring when more than 1 Headless Client is present - Mission makers can use the following to prevent a group from transferring to a Headless Client: `this setVariable ["acex_headless_blacklist", true, true];` + +## ACEX Conversion - things still using acex prefix +- All settings +- 3DEN attribute config name +- Object SetVar (`acex_headless_blacklist`) diff --git a/addons/headless/config.cpp b/addons/headless/config.cpp index e1a6f17276..1491c330b5 100644 --- a/addons/headless/config.cpp +++ b/addons/headless/config.cpp @@ -13,7 +13,7 @@ class CfgPatches { VERSION_CONFIG; }; - class XADDON: ADDON {}; + BWC_CONFIG(XADDON); }; #include "ACE_Settings.hpp" diff --git a/addons/huntir/config.cpp b/addons/huntir/config.cpp index 89992d5f52..4e9f5952cc 100644 --- a/addons/huntir/config.cpp +++ b/addons/huntir/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {"ACE_HuntIR", "ACE_HuntIRBox"}; + units[] = {"ACE_HuntIR", "ACE_HuntIR_Box", "ACE_Item_HuntIR_monitor"}; weapons[] = {"ACE_HuntIR_monitor"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; diff --git a/addons/intelitems/CfgEventHandlers.hpp b/addons/intelitems/CfgEventHandlers.hpp index 0d3301d6e0..f6503c2479 100644 --- a/addons/intelitems/CfgEventHandlers.hpp +++ b/addons/intelitems/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; diff --git a/addons/intelitems/README.md b/addons/intelitems/README.md index db446032ae..0149937739 100644 --- a/addons/intelitems/README.md +++ b/addons/intelitems/README.md @@ -2,3 +2,6 @@ ace_intelitems =============== Implements an intel system with unique items. + +## ACEX Conversion - things still using acex prefix +- All CfgWeapon Items (e.g. `acex_intelitems_notepad`) diff --git a/addons/intelitems/config.cpp b/addons/intelitems/config.cpp index 419db25c88..3b9b37b5b6 100644 --- a/addons/intelitems/config.cpp +++ b/addons/intelitems/config.cpp @@ -17,7 +17,7 @@ class CfgPatches { VERSION_CONFIG; }; - class XADDON: ADDON {}; + BWC_CONFIG(XADDON); }; #include "CfgEventHandlers.hpp" diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 95a00e2465..67599370a4 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -365,7 +365,7 @@ class CfgVehicles { }; }; - class Car_F: Car{}; + class Car_F: Car {}; class Quadbike_01_base_F: Car_F { class ACE_Actions: ACE_Actions { class ACE_MainActions: ACE_MainActions { diff --git a/addons/interaction/RscTitles.hpp b/addons/interaction/RscTitles.hpp index e157fd696c..0ac0e18241 100644 --- a/addons/interaction/RscTitles.hpp +++ b/addons/interaction/RscTitles.hpp @@ -57,7 +57,7 @@ class RscACE_SelectAnItem { h = 0.71; colorBackground[] = {0, 0, 0, 0.2}; }; - class header: RscText{ + class header: RscText { idc = 8870; x = X_OFFSET + 0.005; y = 0.005; diff --git a/addons/interaction/script_component.hpp b/addons/interaction/script_component.hpp index 2f20d864d5..9c0ab4c764 100644 --- a/addons/interaction/script_component.hpp +++ b/addons/interaction/script_component.hpp @@ -30,6 +30,6 @@ #define IDC_MOUSEHINT_EXTRA_NAME 2510 #define IDC_MOUSEHINT_EXTRA_TEXT 2520 -#define MACRO_DOOR_REACH_DISTANCE (AGLToASL positionCameraToWorld [0,0,0] vectorDistance ACE_player modelToWorldWorld (ACE_player selectionPosition "Head")) + 2 +#define MACRO_DOOR_REACH_DISTANCE ((AGLToASL positionCameraToWorld [0, 0, 0]) vectorDistance (ACE_player modelToWorldWorld (ACE_player selectionPosition "Head"))) + 2 #define DISABLED_LAMP_DAMAGE 0.95 diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 6fbfb1cbb2..1f2adaeaa4 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -325,12 +325,15 @@ Rename Group + グループ名変更 This group name is already in use. + このグループ名は既に使われています。 NEW GROUP NAME: + 新しいグループ名: DANCE! @@ -1238,13 +1241,16 @@ Allow group rename + グループ名変更を許可 Allows a group leader to rename their group if the name is not already taken. + グループ リーダーによるグループ名の変更を許可します。 Warning: can cause some objects to collide with others. Внимание: может вызвать отталкивание некоторых объектов друг от друга. + 警告: 一部のオブジェクトが干渉する可能性があります。 diff --git a/addons/kestrel4500/CfgSound.hpp b/addons/kestrel4500/CfgSound.hpp index 957863bc9d..5f7569647f 100644 --- a/addons/kestrel4500/CfgSound.hpp +++ b/addons/kestrel4500/CfgSound.hpp @@ -1,39 +1,32 @@ -class CfgSounds -{ - class kestrel4500_center_button_click - { +class CfgSounds { + class kestrel4500_center_button_click { name="kestrel4500_center_button_click"; sound[]={PATHTOF(sound\kestrel_center_button_click.wav),1,1}; titles[]={}; }; - class kestrel4500_top_button_click - { + class kestrel4500_top_button_click { name="kestrel4500_top_button_click"; sound[]={PATHTOF(sound\kestrel_top_button_click.wav),1,1}; titles[]={}; }; - class kestrel4500_right_button_click - { + class kestrel4500_right_button_click { name="kestrel4500_right_button_click"; sound[]={PATHTOF(sound\kestrel_right_button_click.wav),1,1}; titles[]={}; }; - class kestrel4500_bottom_button_click - { + class kestrel4500_bottom_button_click { name="kestrel4500_bottom_button_click"; sound[]={PATHTOF(sound\kestrel_bottom_button_click.wav),1,1}; titles[]={}; }; - class kestrel4500_left_button_click - { + class kestrel4500_left_button_click { name="kestrel4500_left_button_click"; sound[]={PATHTOF(sound\kestrel_left_button_click.wav),1,1}; titles[]={}; }; - class kestrel4500_exit_button_click - { + class kestrel4500_exit_button_click { name="kestrel4500_exit_button_click"; sound[]={PATHTOF(sound\kestrel_exit_button_click.wav),1,1}; titles[]={}; }; -}; \ No newline at end of file +}; diff --git a/addons/killtracker/CfgEventHandlers.hpp b/addons/killtracker/CfgEventHandlers.hpp index b0cc92b513..9cc1b0427b 100644 --- a/addons/killtracker/CfgEventHandlers.hpp +++ b/addons/killtracker/CfgEventHandlers.hpp @@ -1,5 +1,5 @@ class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; diff --git a/addons/killtracker/README.md b/addons/killtracker/README.md index 1bff57c5c0..f96e43e2a2 100644 --- a/addons/killtracker/README.md +++ b/addons/killtracker/README.md @@ -4,3 +4,7 @@ ace_killtracker Tracks deaths/kills and logs to the end mission disaplay. Attemps to log kills from Medical by using `ace_medical_lastDamageSource`. Note: Requires config setup in a mission, see `killtracker.inc` - has no effect if mission is not setup correctly. + +## ACEX Conversion - things still using acex prefix +- Global Var `acex_killTracker_outputText` +- `acex_killTracker` classname for `CfgDebriefingSections` diff --git a/addons/killtracker/stringtable.xml b/addons/killtracker/stringtable.xml index fdae7ed67d..c5776d67f4 100644 --- a/addons/killtracker/stringtable.xml +++ b/addons/killtracker/stringtable.xml @@ -3,6 +3,7 @@ ACE Killed Events + ACE キルトラッカー Total Kills: diff --git a/addons/laser/CfgWeapons.hpp b/addons/laser/CfgWeapons.hpp index 385f842a59..ced98b9592 100644 --- a/addons/laser/CfgWeapons.hpp +++ b/addons/laser/CfgWeapons.hpp @@ -1,7 +1,7 @@ class CfgWeapons { class Binocular; - class Laserdesignator : Binocular { + class Laserdesignator: Binocular { visionMode[] = {"Normal","NVG"}; }; }; diff --git a/addons/laser/RscInGameUI.hpp b/addons/laser/RscInGameUI.hpp index 16d3dfcd91..49ce3fdf5b 100644 --- a/addons/laser/RscInGameUI.hpp +++ b/addons/laser/RscInGameUI.hpp @@ -112,13 +112,13 @@ class RscInGameUI { h = "1.6 * (0.025 * SafezoneH)"; }; - class ACE_LaserCode_Helper : RscMapControl { + class ACE_LaserCode_Helper: RscMapControl { idc = -1; onDraw = QUOTE(_this call FUNC(onLaserDesignatorDraw)); w = 0; h = 0; }; - class ACE_LaserCode : RscText { + class ACE_LaserCode: RscText { idc = 123001; style = 0; sizeEx = "0.038*SafezoneH"; diff --git a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf index 04576820dd..089c25e0a0 100644 --- a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf +++ b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf @@ -95,7 +95,7 @@ private _finalOwner = objNull; }; }; }; -} forEach (GVAR(laserEmitters) select 2); // Go through all values in hash +} forEach (values GVAR(laserEmitters)); // Go through all values in hash TRACE_2("",count _spots, _spots); @@ -164,8 +164,8 @@ if ((count _spots) > 0) then { { _x params ["_xPos", "_owner"]; _finalPos = _finalPos vectorAdd _xPos; - private _count = _ownersHash getOrDefault [_owner, 0]; - _ownersHash set [_owner, _count + 1]; + private _count = _ownersHash getOrDefault [hashValue _owner, 0]; + _ownersHash set [hashValue _owner, _count + 1]; } forEach _finalBucket; _finalPos = _finalPos vectorMultiply (1 / (count _finalBucket)); diff --git a/addons/logistics_rope/README.md b/addons/logistics_rope/README.md index b2f7cb6bce..948e8bb2a2 100644 --- a/addons/logistics_rope/README.md +++ b/addons/logistics_rope/README.md @@ -2,10 +2,3 @@ ace_logistics_rope =================== Adds ropes. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Brandon (TCVM)](https://github.com/TheCandianVendingMachine) diff --git a/addons/logistics_rope/config.cpp b/addons/logistics_rope/config.cpp index 9e950de635..5765cee2cb 100644 --- a/addons/logistics_rope/config.cpp +++ b/addons/logistics_rope/config.cpp @@ -4,7 +4,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {}; + weapons[] = {"ACE_rope3","ACE_rope6","ACE_rope12","ACE_rope15","ACE_rope18","ACE_rope27","ACE_rope36"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; author = ECSTRING(common,ACETeam); diff --git a/addons/logistics_rope/stringtable.xml b/addons/logistics_rope/stringtable.xml index 3fa99dd722..ac05508402 100644 --- a/addons/logistics_rope/stringtable.xml +++ b/addons/logistics_rope/stringtable.xml @@ -3,6 +3,7 @@ A twisted braid of fibers. Usually used for rappelling or towing. + 組み紐されたロープ。ラペリングやけん引に使用されます。 Rope 3.2 meters @@ -15,6 +16,7 @@ Lano 3.2 metrů 3.2 metre halat Cuerda de 3.2 metros + ロープ (3.2 メートル) Rope 6.2 meters @@ -27,6 +29,7 @@ Lano 6.2 metrů 6.2 metre halat Cuerda de 6.2 metros + ロープ (6.2 メートル) Rope 12.2 meters diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml index 106c44c23d..35af14f472 100644 --- a/addons/magazinerepack/stringtable.xml +++ b/addons/magazinerepack/stringtable.xml @@ -168,9 +168,11 @@ Repack Loaded Magazines + 装填済み弾倉を詰め替え Repacking magazines, weapon unloaded + 弾倉を詰め替えし、<br />非装填状態です diff --git a/addons/main/config.cpp b/addons/main/config.cpp index 7dda3f1f4c..7aa06bc69d 100644 --- a/addons/main/config.cpp +++ b/addons/main/config.cpp @@ -11,6 +11,11 @@ class CfgPatches { url = CSTRING(URL); VERSION_CONFIG; }; + + class XADDON: ADDON { // just in-case anything requires "acex_main" + units[] = {}; + weapons[] = {}; + }; }; class CfgMods { diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index aa49333464..58ae338aae 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -43,9 +43,12 @@ #define ACEX_PREFIX acex #define XADDON DOUBLES(ACEX_PREFIX,COMPONENT) #define XGVAR(var) DOUBLES(XADDON,var) +#define EXGVAR(var1,var2) TRIPLES(ACEX_PREFIX,var1,var2) #define QXGVAR(var) QUOTE(XGVAR(var)) +#define QEXGVAR(var1,var2) QUOTE(EXGVAR(var1,var2)) #define QQXGVAR(var) QUOTE(QXGVAR(var)) -#define ACEX_PREP(func) PREP(func); OBSOLETE_SYS(TRIPLES(XADDON,fnc,func),DFUNC(func)) +#define QQEXGVAR(var1,var2) QUOTE(QEXGVAR(var1,var2)) +#define ACEX_PREP(func) PREP(func); TRIPLES(XADDON,fnc,func) = DFUNC(func) #define MACRO_ADDWEAPON(WEAPON,COUNT) class _xx_##WEAPON { \ diff --git a/addons/map_gestures/config.cpp b/addons/map_gestures/config.cpp index b7bbf791e7..50efc35265 100644 --- a/addons/map_gestures/config.cpp +++ b/addons/map_gestures/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {}; + units[] = {QGVAR(moduleGroupSettings)}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; diff --git a/addons/maptools/RscDisplayMainMap.hpp b/addons/maptools/RscDisplayMainMap.hpp index db54ab6bf8..94a5d2a8d4 100644 --- a/addons/maptools/RscDisplayMainMap.hpp +++ b/addons/maptools/RscDisplayMainMap.hpp @@ -51,7 +51,7 @@ class RscDisplayMainMap { shadow = 0; sizeEx = 0.18; }; - class altitude: RscText{ + class altitude: RscText { idc = 913591; x = 0.5; y = 0; @@ -66,7 +66,7 @@ class RscDisplayMainMap { shadow = 0; sizeEx = 0.18; }; - class coordinates: RscText{ + class coordinates: RscText { idc = 913592; x = 0; y = 0.225; diff --git a/addons/markers/ACE_Settings.hpp b/addons/markers/ACE_Settings.hpp index d8d72a5975..847d3eacde 100644 --- a/addons/markers/ACE_Settings.hpp +++ b/addons/markers/ACE_Settings.hpp @@ -1,7 +1,4 @@ class ACE_Settings { - class GVAR(movableMarkersEnabled) { - movedToSQF = 1; - }; class GVAR(moveRestriction) { movedToSQF = 1; }; diff --git a/addons/maverick/CfgAmmo.hpp b/addons/maverick/CfgAmmo.hpp index a741501540..654c1fbe80 100644 --- a/addons/maverick/CfgAmmo.hpp +++ b/addons/maverick/CfgAmmo.hpp @@ -1,11 +1,11 @@ class CfgAmmo { class MissileCore; - class MissileBase : MissileCore { + class MissileBase: MissileCore { class Components; }; - class Missile_AGM_02_F : MissileBase {}; + class Missile_AGM_02_F: MissileBase {}; - class GVAR(L) : Missile_AGM_02_F { + class GVAR(L): Missile_AGM_02_F { author = "xrufix"; autoSeekTarget = 0; irLock = 0; diff --git a/addons/maverick/CfgMagazines.hpp b/addons/maverick/CfgMagazines.hpp index 3254f605c0..524b3e0094 100644 --- a/addons/maverick/CfgMagazines.hpp +++ b/addons/maverick/CfgMagazines.hpp @@ -1,19 +1,19 @@ class CfgMagazines { class CA_Magazine; - class VehicleMagazine : CA_Magazine {}; + class VehicleMagazine: CA_Magazine {}; - class magazine_Missile_AGM_02_x1 : VehicleMagazine {}; - class PylonMissile_Missile_AGM_02_x1 : magazine_Missile_AGM_02_x1 {}; - class PylonMissile_Missile_AGM_02_x2 : magazine_Missile_AGM_02_x1 {}; + class magazine_Missile_AGM_02_x1: VehicleMagazine {}; + class PylonMissile_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {}; + class PylonMissile_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {}; - class 6Rnd_Missile_AGM_02_F : VehicleMagazine {}; - class PylonRack_1Rnd_Missile_AGM_02_F : 6Rnd_Missile_AGM_02_F {}; - class PylonRack_3Rnd_Missile_AGM_02_F : PylonRack_1Rnd_Missile_AGM_02_F{}; + class 6Rnd_Missile_AGM_02_F: VehicleMagazine {}; + class PylonRack_1Rnd_Missile_AGM_02_F: 6Rnd_Missile_AGM_02_F {}; + class PylonRack_3Rnd_Missile_AGM_02_F: PylonRack_1Rnd_Missile_AGM_02_F {}; - class PylonRack_Missile_AGM_02_x1 : magazine_Missile_AGM_02_x1 {}; - class PylonRack_Missile_AGM_02_x2 : magazine_Missile_AGM_02_x1 {}; + class PylonRack_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {}; + class PylonRack_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {}; - class GVAR(L_magazine_x1) : magazine_Missile_AGM_02_x1 { + class GVAR(L_magazine_x1): magazine_Missile_AGM_02_x1 { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -21,7 +21,7 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); }; - class GVAR(L_pylonmissile_x1) : PylonMissile_Missile_AGM_02_x1 { + class GVAR(L_pylonmissile_x1): PylonMissile_Missile_AGM_02_x1 { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -29,7 +29,7 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); pylonWeapon = QGVAR(L_Launcher); }; - class GVAR(L_pylonmissile_x2) : PylonMissile_Missile_AGM_02_x2 { + class GVAR(L_pylonmissile_x2): PylonMissile_Missile_AGM_02_x2 { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -38,7 +38,7 @@ class CfgMagazines { pylonWeapon = QGVAR(L_Launcher); }; - class GVAR(L_pylonRack_1Rnd) : PylonRack_1Rnd_Missile_AGM_02_F { + class GVAR(L_pylonRack_1Rnd): PylonRack_1Rnd_Missile_AGM_02_F { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -46,7 +46,7 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); pylonWeapon = QGVAR(L_Launcher_Plane); }; - class GVAR(L_PylonRack_3Rnd) : PylonRack_3Rnd_Missile_AGM_02_F { + class GVAR(L_PylonRack_3Rnd): PylonRack_3Rnd_Missile_AGM_02_F { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -55,7 +55,7 @@ class CfgMagazines { pylonWeapon = QGVAR(L_Launcher_Plane); }; - class GVAR(L_PylonRack_x1) : PylonRack_Missile_AGM_02_x1 { + class GVAR(L_PylonRack_x1): PylonRack_Missile_AGM_02_x1 { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -63,7 +63,7 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); pylonWeapon = QGVAR(L_Launcher); }; - class GVAR(L_PylonRack_x2) : PylonRack_Missile_AGM_02_x2 { + class GVAR(L_PylonRack_x2): PylonRack_Missile_AGM_02_x2 { ammo = QGVAR(L); author = "xrufix"; descriptionShort = CSTRING(L_MAG_DESCR); @@ -74,12 +74,12 @@ class CfgMagazines { // KH-25 class 4Rnd_Missile_AGM_01_F; - class PylonRack_1Rnd_Missile_AGM_01_F : 4Rnd_Missile_AGM_01_F {}; - class magazine_Missile_AGM_KH25_x1 : VehicleMagazine {}; - class PylonMissile_Missile_AGM_KH25_x1 : magazine_Missile_AGM_KH25_x1 {}; - class PylonMissile_Missile_AGM_KH25_INT_x1 : PylonMissile_Missile_AGM_KH25_x1 {}; + class PylonRack_1Rnd_Missile_AGM_01_F: 4Rnd_Missile_AGM_01_F {}; + class magazine_Missile_AGM_KH25_x1: VehicleMagazine {}; + class PylonMissile_Missile_AGM_KH25_x1: magazine_Missile_AGM_KH25_x1 {}; + class PylonMissile_Missile_AGM_KH25_INT_x1: PylonMissile_Missile_AGM_KH25_x1 {}; - class ace_kh25ml_pylonrack_x1 : PylonRack_1Rnd_Missile_AGM_01_F { + class ace_kh25ml_pylonrack_x1: PylonRack_1Rnd_Missile_AGM_01_F { ammo = "ace_kh25ml"; author = "xrufix"; descriptionShort = CSTRING(KH25ML_MAG_DESCR); @@ -87,14 +87,14 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); pylonWeapon = "ace_kh25ml_launcher"; }; - class ace_kh25ml_magazine_x1 : magazine_Missile_AGM_KH25_x1 { + class ace_kh25ml_magazine_x1: magazine_Missile_AGM_KH25_x1 { ammo = "ace_kh25ml"; author = "xrufix"; descriptionShort = CSTRING(KH25ML_MAG_DESCR); displayName = CSTRING(KH25ML_MAG_x1); displayNameShort = CSTRING(L_MAG_short); }; - class ace_kh25ml_pylonmissile_x1 : PylonMissile_Missile_AGM_KH25_x1 { + class ace_kh25ml_pylonmissile_x1: PylonMissile_Missile_AGM_KH25_x1 { ammo = "ace_kh25ml"; author = "xrufix"; descriptionShort = CSTRING(KH25ML_MAG_DESCR); @@ -102,7 +102,7 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); pylonWeapon = "ace_kh25ml_launcher"; }; - class ace_kh25ml_pylonmissile_int_x1 : PylonMissile_Missile_AGM_KH25_INT_x1 { + class ace_kh25ml_pylonmissile_int_x1: PylonMissile_Missile_AGM_KH25_INT_x1 { ammo = "ace_kh25ml"; author = "xrufix"; descriptionShort = CSTRING(KH25ML_MAG_DESCR); diff --git a/addons/maverick/CfgWeapons.hpp b/addons/maverick/CfgWeapons.hpp index c3157f34dd..e05c380381 100644 --- a/addons/maverick/CfgWeapons.hpp +++ b/addons/maverick/CfgWeapons.hpp @@ -1,12 +1,12 @@ class CfgWeapons { class LauncherCore; - class RocketPods : LauncherCore {}; - class weapon_AGM_65Launcher : RocketPods{}; + class RocketPods: LauncherCore {}; + class weapon_AGM_65Launcher: RocketPods {}; - class MissileLauncher : LauncherCore {}; - class Missile_AGM_02_Plane_CAS_01_F : MissileLauncher {}; + class MissileLauncher: LauncherCore {}; + class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher {}; - class GVAR(L_Launcher) : weapon_AGM_65Launcher { + class GVAR(L_Launcher): weapon_AGM_65Launcher { author = "xrufix"; displayname = CSTRING(L); magazines[] = { @@ -26,7 +26,7 @@ class CfgWeapons { GVAR(enabled) = 1; }; - class GVAR(L_Launcher_Plane) : Missile_AGM_02_Plane_CAS_01_F { + class GVAR(L_Launcher_Plane): Missile_AGM_02_Plane_CAS_01_F { author = "xrufix"; displayname = CSTRING(L); magazines[] = { @@ -46,8 +46,8 @@ class CfgWeapons { GVAR(enabled) = 1; }; - class weapon_AGM_KH25Launcher : MissileLauncher {}; - class ace_kh25ml_launcher : weapon_AGM_KH25Launcher { + class weapon_AGM_KH25Launcher: MissileLauncher {}; + class ace_kh25ml_launcher: weapon_AGM_KH25Launcher { author = "xrufix"; displayName = CSTRING(KH25ML); magazines[] = { diff --git a/addons/medical_damage/stringtable.xml b/addons/medical_damage/stringtable.xml index c419394b40..718b97c746 100644 --- a/addons/medical_damage/stringtable.xml +++ b/addons/medical_damage/stringtable.xml @@ -669,15 +669,19 @@ Thermal Burn + 熱傷 Minor Thermal Burn + 小さな熱傷 Medium Thermal Burn + 中くらいの熱傷 Major Thermal Burn + 大きな熱傷 Unit Damage Threshold diff --git a/addons/medical_feedback/functions/fnc_effectPain.sqf b/addons/medical_feedback/functions/fnc_effectPain.sqf index 96f233a4b9..9b8320244d 100644 --- a/addons/medical_feedback/functions/fnc_effectPain.sqf +++ b/addons/medical_feedback/functions/fnc_effectPain.sqf @@ -19,10 +19,10 @@ params ["_enable", "_intensity"]; if (!_enable || {_intensity == 0}) exitWith { - GVAR(ppPain) ppEffectEnable false; + if (GVAR(ppPain) != -1) then { GVAR(ppPain) ppEffectEnable false; }; GVAR(ppPainBlur) ppEffectEnable false; }; -GVAR(ppPain) ppEffectEnable true; +if (GVAR(ppPain) != -1) then { GVAR(ppPain) ppEffectEnable true; }; GVAR(ppPainBlur) ppEffectEnable true; // Trigger effect every 2s diff --git a/addons/medical_feedback/functions/fnc_initEffects.sqf b/addons/medical_feedback/functions/fnc_initEffects.sqf index 1d908c529d..eb2dc31f8b 100644 --- a/addons/medical_feedback/functions/fnc_initEffects.sqf +++ b/addons/medical_feedback/functions/fnc_initEffects.sqf @@ -33,7 +33,7 @@ private _fnc_createEffect = { // - Pain --------------------------------------------------------------------- if (!isNil QGVAR(ppPain)) then { TRACE_1("delete pain",GVAR(ppPain)); - ppEffectDestroy GVAR(ppPain) + if (GVAR(ppPain) != -1) then { ppEffectDestroy GVAR(ppPain); }; }; switch (GVAR(painEffectType)) do { case FX_PAIN_WHITE_FLASH: { @@ -57,6 +57,7 @@ switch (GVAR(painEffectType)) do { [0, 0, false] ] call _fnc_createEffect; }; + default { GVAR(ppPain) = -1; }; }; // Base blur on high pain if (isNil QGVAR(ppPainBlur)) then { diff --git a/addons/medical_feedback/stringtable.xml b/addons/medical_feedback/stringtable.xml index d695f8f5a4..bf24005976 100644 --- a/addons/medical_feedback/stringtable.xml +++ b/addons/medical_feedback/stringtable.xml @@ -192,10 +192,12 @@ Enable Fracture/Tourniquet/Splint Indicators Включить индикаторы переломов/жгутов/шин + 骨折/止血帯の表記を有効化 Enables indicators for fractures and applied tourniquets and splints over the Stance Indicator. Включает индикацию переломов, наложенных шин и жгутов поверх индикатора положения тела. + 体勢インジケータに骨折や添え木、止血帯の有無を表示するかどうかを設定できます。 diff --git a/addons/medical_gui/stringtable.xml b/addons/medical_gui/stringtable.xml index 55c827ec40..a4d3a67c45 100644 --- a/addons/medical_gui/stringtable.xml +++ b/addons/medical_gui/stringtable.xml @@ -1129,26 +1129,32 @@ Blood Loss Colors Цвета кровопотери + 失血量カラー Blood Loss Colors, That Used in Medical GUI. 10 Color Gradient. Цвета кровопотери, которые используются в Медицинском интерфейсе. Градиент из 10 цветов. + 医療 GUI 内で失血量を 10 段階のカラーで表します。 Blood Loss Color %1 Цвет кровопотери %1 + 失血量カラー %1 Damage Colors Цвета урона + 負傷カラー Damage Colors, That Used in Medical GUI. 10 Color Gradient. Цвета урона, которые используются в Медицинском интерфейсе. Градиент из 10 цветов. + 医療 GUI 内で負傷を 10 段階のカラーで表します。 Damage Color %1 Цвет урона %1 + 負傷カラー %1 diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index e85abf42d3..2e6d800858 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -152,15 +152,19 @@ Clear Trauma + 外傷の削除 Controls when hitpoint damage from wounds is healed. + 治療後に負傷箇所にある外傷の状態を決定できます。 After Bandage + 包帯を巻いた後 After Stitch + 縫合後 Boost medical training when in medical vehicles or facilities. Untrained becomes medic, medic becomes doctor. diff --git a/addons/metis/CfgMagazines.hpp b/addons/metis/CfgMagazines.hpp index e1c26d844f..2d20d942dc 100644 --- a/addons/metis/CfgMagazines.hpp +++ b/addons/metis/CfgMagazines.hpp @@ -1,9 +1,9 @@ class CfgMagazines { class CA_LauncherMagazine; - class Vorona_HEAT : CA_LauncherMagazine { + class Vorona_HEAT: CA_LauncherMagazine { ammo = QGVAR(HEAT); }; - class Vorona_HE : Vorona_HEAT { + class Vorona_HE: Vorona_HEAT { ammo = QGVAR(HE); }; }; diff --git a/addons/missileguidance/CfgMagazines.hpp b/addons/missileguidance/CfgMagazines.hpp index 7cc33b17a3..74d75e8d4a 100644 --- a/addons/missileguidance/CfgMagazines.hpp +++ b/addons/missileguidance/CfgMagazines.hpp @@ -1,7 +1,7 @@ class CfgMagazines { class 12Rnd_PG_missiles; - class 6Rnd_ACE_Hydra70_DAGR : 12Rnd_PG_missiles { + class 6Rnd_ACE_Hydra70_DAGR: 12Rnd_PG_missiles { ammo = "ACE_Hydra70_DAGR"; count = 12; displayName = "6 Round DAGR"; @@ -10,14 +10,14 @@ class CfgMagazines { weight = 36; }; - class 12Rnd_ACE_Hydra70_DAGR : 6Rnd_ACE_Hydra70_DAGR { + class 12Rnd_ACE_Hydra70_DAGR: 6Rnd_ACE_Hydra70_DAGR { count = 12; displayName = "16 Round DAGR"; displayNameShort = "16 Round DAGR"; descriptionShort = "16 Round DAGR"; weight = 72; }; - class 24Rnd_ACE_Hydra70_DAGR : 6Rnd_ACE_Hydra70_DAGR { + class 24Rnd_ACE_Hydra70_DAGR: 6Rnd_ACE_Hydra70_DAGR { count = 24; displayName = "24 Round DAGR"; displayNameShort = "24 Round DAGR"; diff --git a/addons/movement/functions/fnc_handleVirtualMass.sqf b/addons/movement/functions/fnc_handleVirtualMass.sqf index 8f035cc5ad..f2c0655b5c 100644 --- a/addons/movement/functions/fnc_handleVirtualMass.sqf +++ b/addons/movement/functions/fnc_handleVirtualMass.sqf @@ -23,7 +23,9 @@ if (isNull _unit) exitWith {}; private _virtualLoad = 0; { - _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]); + if (!isNull _x) then { + _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]); + }; } forEach [ _unit, uniformContainer _unit, diff --git a/addons/nametags/initSettings.sqf b/addons/nametags/initSettings.sqf index 8623433e50..3fd5e5b465 100644 --- a/addons/nametags/initSettings.sqf +++ b/addons/nametags/initSettings.sqf @@ -68,7 +68,7 @@ QGVAR(tagSize), "LIST", [LSTRING(TagSize_Name), LSTRING(TagSize_Description)], format ["ACE %1", localize LSTRING(Module_DisplayName)], - [[0, 1, 2, 3, 4], ["str_very_small", "str_small", "str_medium", "str_large", "str_very_large"], 1], + [[0, 1, 2, 3, 4], ["str_very_small", "str_small", "str_medium", "str_large", "str_very_large"], 2], 0 ] call CBA_fnc_addSetting; diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 831ef49a8e..f2113e1f6a 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -527,10 +527,12 @@ Nametag Ambient Brightness Coefficient Коэффициент окружающего освещения для меток игроков + 環境名札明るさ係数 Adjusts how strongly ambient brightness affects nametag view distance. Определяет как сильно окружающее освещение влияет на дальность отображения меток игроков. + 環境光の強さによって名札の描画距離を調整します。 diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp index beb6a910e4..5a854699e2 100644 --- a/addons/overheating/CfgVehicles.hpp +++ b/addons/overheating/CfgVehicles.hpp @@ -38,7 +38,7 @@ class CfgVehicles { }; class GVAR(CoolWeaponWithItem) { displayName = CSTRING(CoolWeaponWithItem); - condition = QUOTE(GVAR(enabled) && {isClass(configfile >> 'CfgPatches' >> 'acex_field_rations')}); + condition = QUOTE(GVAR(enabled) && {isClass (configfile >> 'CfgPatches' >> 'acex_field_rations')}); exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = "true"; showDisabled = 0; @@ -66,7 +66,7 @@ class CfgVehicles { }; class GVAR(CoolWeaponWithItem) { displayName = CSTRING(CoolWeaponWithItem); - condition = QUOTE(GVAR(enabled) && {isClass(configfile >> 'CfgPatches' >> 'acex_field_rations')}); + condition = QUOTE(GVAR(enabled) && {isClass (configfile >> 'CfgPatches' >> 'acex_field_rations')}); exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = "true"; showDisabled = 0; diff --git a/addons/overheating/CfgWeapons.hpp b/addons/overheating/CfgWeapons.hpp index 0ba620ae3a..67a2f0c765 100644 --- a/addons/overheating/CfgWeapons.hpp +++ b/addons/overheating/CfgWeapons.hpp @@ -1,17 +1,17 @@ class CfgWeapons { class PistolCore; - class Pistol : PistolCore { + class Pistol: PistolCore { //Closed Bolt (Closed Bolt will cook off if too hot) //Pistols are nearly universally closed bolt. GVAR(closedBolt) = 1; }; - class Pistol_Base_F : Pistol {}; - class hgun_Pistol_heavy_02_F : Pistol_Base_F { - GVAR(jamTypesAllowed) = ["Fire","Dud"]; + class Pistol_Base_F: Pistol {}; + class hgun_Pistol_heavy_02_F: Pistol_Base_F { + GVAR(jamTypesAllowed)[] = {"Fire", "Dud"}; }; - class hgun_Pistol_Signal_F : Pistol_Base_F { - GVAR(jamTypesAllowed) = ["Fire","Dud"]; + class hgun_Pistol_Signal_F: Pistol_Base_F { + GVAR(jamTypesAllowed)[] = {"Fire", "Dud"}; }; class RifleCore; @@ -48,34 +48,34 @@ class CfgWeapons { GVAR(allowSwapBarrel) = 1; GVAR(dispersion) = 0.75; }; - class DMR_01_base_F : Rifle_Long_Base_F { + class DMR_01_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class DMR_02_base_F : Rifle_Long_Base_F { + class DMR_02_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class DMR_03_base_F : Rifle_Long_Base_F { + class DMR_03_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class DMR_04_base_F : Rifle_Long_Base_F { + class DMR_04_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class DMR_05_base_F : Rifle_Long_Base_F { + class DMR_05_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class DMR_06_base_F : Rifle_Long_Base_F { + class DMR_06_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class DMR_07_base_F : Rifle_Long_Base_F { + class DMR_07_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class EBR_base_F : Rifle_Long_Base_F { + class EBR_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class GM6_base_F : Rifle_Long_Base_F { + class GM6_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; - class LRR_base_F : Rifle_Long_Base_F { + class LRR_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; }; class MMG_01_base_F: Rifle_Long_Base_F { @@ -93,9 +93,9 @@ class CfgWeapons { class LMG_03_Base_F: Rifle_Long_Base_F { GVAR(allowSwapBarrel) = 1; }; - class sgun_HunterShotgun_01_base_F : Rifle_Long_Base_F { + class sgun_HunterShotgun_01_base_F: Rifle_Long_Base_F { GVAR(closedBolt) = 1; - GVAR(jamTypesAllowed) = ["Fire","Dud"]; + GVAR(jamTypesAllowed)[] = {"Fire", "Dud"}; }; class ACE_ItemCore; class CBA_MiscItem_ItemInfo; diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf index 4a932058bb..fbd0f94f1c 100644 --- a/addons/overheating/XEH_postInit.sqf +++ b/addons/overheating/XEH_postInit.sqf @@ -82,27 +82,27 @@ if (hasInterface) then { [QGVAR(initiateSwapBarrelAssisted), DFUNC(swapBarrel)] call CBA_fnc_addEventHandler; // Add an action to allow hot weapons to be cooled off in AceX Field Rations water sources - if (isClass(configfile >> "CfgPatches" >> "acex_field_rations")) then { + if (isClass (configfile >> "CfgPatches" >> "acex_field_rations")) then { [ - {acex_field_rations_enabled || CBA_missionTime > 1}, + {EXGVAR(field_rations,enabled) || CBA_missionTime > 1}, { - if (!acex_field_rations_enabled) exitWith {}; + if (!EXGVAR(field_rations,enabled)) exitWith {}; - _CoolWeaponWithWaterSourceAction = [ + private _coolWeaponWithWaterSourceAction = [ QGVAR(CoolWeaponWithWaterSource), LLSTRING(CoolWeaponWithWaterSource), - "\z\acex\addons\field_rations\ui\icon_water_tap.paa", + QPATHTOEF(field_rations,ui\icon_water_tap.paa), { - private _waterSource = _target getVariable ["acex_field_rations_waterSource", objNull]; + private _waterSource = _target getVariable [QEGVAR(field_rations,waterSource), objNull]; [_player, _waterSource] call FUNC(coolWeaponWithWaterSource); }, { - private _waterSource = _target getVariable ["acex_field_rations_waterSource", objNull]; - [_player, _waterSource] call acex_field_rations_fnc_canDrinkFromSource; + private _waterSource = _target getVariable [QEGVAR(field_rations,waterSource), objNull]; + [_player, _waterSource] call EFUNC(field_rations,canDrinkFromSource); } ] call EFUNC(interact_menu,createAction); - ["acex_field_rations_helper", 0, ["acex_field_rations_waterSource"], _CoolWeaponWithWaterSourceAction] call EFUNC(interact_menu,addActionToClass); + [QEGVAR(field_rations,helper), 0, [QEGVAR(field_rations,waterSource)], _coolWeaponWithWaterSourceAction] call EFUNC(interact_menu,addActionToClass); }, [] ] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp index bedd96fa30..f04238fd10 100644 --- a/addons/overheating/config.cpp +++ b/addons/overheating/config.cpp @@ -4,7 +4,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {}; + weapons[] = {"ACE_SpareBarrel_Item"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; author = ECSTRING(common,ACETeam); diff --git a/addons/overheating/functions/fnc_coolWeaponWithItem.sqf b/addons/overheating/functions/fnc_coolWeaponWithItem.sqf index ee3e1437f9..8558303829 100644 --- a/addons/overheating/functions/fnc_coolWeaponWithItem.sqf +++ b/addons/overheating/functions/fnc_coolWeaponWithItem.sqf @@ -25,8 +25,8 @@ private _config = configFile >> "CfgWeapons" >> _item; private _weapon = currentWeapon _target; private _tempVarName = format [QGVAR(%1_temp), _weapon]; private _temperature = _target getVariable [_tempVarName, 0]; -private _replacementItem = getText (_config >> "acex_field_rations_replacementItem"); -private _liquidAmount = getNumber (_config >> "acex_field_rations_thirstQuenched"); +private _replacementItem = getText (_config >> QEXGVAR(field_rations,replacementItem)); +private _liquidAmount = getNumber (_config >> QEXGVAR(field_rations,thirstQuenched)); private _consumeText = format [LLSTRING(CoolingWeaponWithItem), getText (configFile >> "CfgWeapons" >> _weapon >> "displayName"), getText (_config >> "displayName")]; /* // to be added when licence compatible audio can be found or recorded diff --git a/addons/overheating/functions/fnc_coolWeaponWithWaterSource.sqf b/addons/overheating/functions/fnc_coolWeaponWithWaterSource.sqf index 5e7269d065..2e142602ec 100644 --- a/addons/overheating/functions/fnc_coolWeaponWithWaterSource.sqf +++ b/addons/overheating/functions/fnc_coolWeaponWithWaterSource.sqf @@ -28,7 +28,7 @@ private _fnc_onFinish = { params ["_args"]; _args params ["_player", "_target", "_weapon", "_tempVarName"]; - private _water = _target call acex_field_rations_fnc_getRemainingWater; + private _water = _target call EFUNC(field_rations,getRemainingWater); if (_water <= 0 && {_water != -10}) exitWith { [ @@ -46,7 +46,7 @@ private _fnc_condition = { _args params ["_player", "_target", "_weapon", "_tempVarName"]; private _temperature = _player getVariable [_tempVarName, 0]; - private _water = _target call acex_field_rations_fnc_getRemainingWater; + private _water = _target call EFUNC(field_rations,getRemainingWater); if (_water <= 0 && {_water != -10}) exitWith {false}; @@ -55,7 +55,7 @@ private _fnc_condition = { //Remove water from the source, unless it's unlimited if (_water != -10) then { - [_target, _water - 1] call acex_field_rations_fnc_setRemainingWater; + [_target, _water - 1] call EFUNC(field_rations,setRemainingWater); }; //Cool the weapon down diff --git a/addons/overheating/functions/fnc_getConsumableChildren.sqf b/addons/overheating/functions/fnc_getConsumableChildren.sqf index a46c32a88a..697b4bccd9 100644 --- a/addons/overheating/functions/fnc_getConsumableChildren.sqf +++ b/addons/overheating/functions/fnc_getConsumableChildren.sqf @@ -25,7 +25,7 @@ private _fnc_getActions = { { private _config = _cfgWeapons >> _x; - if (getNumber (_config >> "acex_field_rations_thirstQuenched") > 0) then { + if (getNumber (_config >> QEXGVAR(field_rations,thirstQuenched)) > 0) then { private _displayName = getText (_config >> "displayName"); private _picture = getText (_config >> "picture"); diff --git a/addons/overheating/functions/fnc_jamWeapon.sqf b/addons/overheating/functions/fnc_jamWeapon.sqf index c4e74f201f..ea77e11ba4 100644 --- a/addons/overheating/functions/fnc_jamWeapon.sqf +++ b/addons/overheating/functions/fnc_jamWeapon.sqf @@ -32,9 +32,9 @@ _unit setVariable [QGVAR(jammedWeapons), _jammedWeapons]; // Cookoffs only happen on Fire and Dud, dud rounds are lost on jam clear. // Reduce chance of duds as temp increases (functionally increasing the chance of the others but with fewer commands) private _temp = 1 max (_unit getVariable [format [QGVAR(%1_temp), _weapon], 0]); -private _jamTypesAllowed = getArray (configFile >> 'CfgWeapons' >> currentWeapon _player >> QGVAR(jamTypesAllowed)); +private _jamTypesAllowed = getArray (configFile >> 'CfgWeapons' >> currentWeapon _unit >> QGVAR(jamTypesAllowed)); -if (_jamTypesAllowed == []) then { +if (_jamTypesAllowed isEqualTo []) then { _jamTypesAllowed = ["Eject", 1, "Extract", 1, "Feed", 1, "Fire", 1, "Dud", (5 / (_temp / 5))]; } else { for "_i" from count _jamTypesAllowed to 1 step -1 do { diff --git a/addons/overheating/initSettings.sqf b/addons/overheating/initSettings.sqf index 3b7f1618d4..b351a8bed7 100644 --- a/addons/overheating/initSettings.sqf +++ b/addons/overheating/initSettings.sqf @@ -75,7 +75,7 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)]; [LSTRING(jamChanceCoef_displayName), LSTRING(jamChanceCoef_description)], _category, [0, 5, 1, 2], - 0 + 1 ] call CBA_fnc_addSetting; [ diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index dc1cfed94b..1025f14b12 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -48,9 +48,11 @@ Heating Coefficient + 過熱係数 Coefficient for the amount of heat a weapon generates per shot.\nHigher value increases heat. + 射撃毎に武器が生み出す熱量の係数を設定します。\n高い値であるほど熱量が増加します。 Display Text on Jam @@ -182,21 +184,27 @@ Distance for Effects and Dispersion + エフェクトと分散用距離 The distance, in meters, from the player within which overheating particle effects and dispersion are visible. + プレイヤーが過熱パーティクル エフェクトと分散を見えるようになる距離 (m) を設定します。 Heat Increases Fire Rate + 熱による連射速度上昇 As weapons heat up, their rate of fire increases by up to 10%. + 武器が熱を帯び始めると、連射速度が 10% 上昇します。 Jam Chance Coefficient + 弾詰まり係数 Coefficient for the chance that a weapon will jam from overheating.\nHigher value make jams more likely.\nSet to 0 to disable jamming. + 武器が過熱によって弾詰まりする確立係数を設定します。\n高い値では弾詰まりが起こりやすくなり、0 で弾詰まりが無効化されます。 Unjam Weapon on Reload @@ -232,9 +240,11 @@ Unjam on Barrel Swap + 銃身交換で弾詰まり解消 Controls whether swapping barrels clears a weapon jam. + 銃身を交換して弾詰まりの解消をできるようにします。 Chance of Unjam Failing @@ -270,9 +280,11 @@ Overheating Cookoff Coefficient + 過熱誘爆係数 Coefficient for the heat required for cookoffs to occur.\nHigher values require more heat to cookoff.\nSet to 0 to disable cookoff. + 過熱によって誘爆が起きる確立係数を設定します。\n高い値では誘爆までに必要な過熱量が増加し、0 で誘爆が無効化されます。 Spare barrel @@ -324,18 +336,23 @@ Weapon cooked off! + 武器が誘爆した! Failure to eject. + 排莢に失敗しました。 Failure to extract. + 排出に失敗しました。 Failure to feed. + 給弾に失敗しました。 Failure to fire. + 撃発に失敗しました。 Clear jam @@ -512,21 +529,27 @@ Cool weapon with... + 次で武器を冷ます・・・ Cooling %1 with %2. + %1 を %2 で冷ましています。 Cool weapon in water source. + 水源で武器を冷ます Cooling weapon in water source. + 水源で武器を冷ましています・・・ Container doesn't have enough water. + 水源には十分な水量がありません。 Weapon is cool enough the water has stopped boiling. + 武器が冷まりきり、水が沸騰していません。 Temperature diff --git a/addons/parachute/CfgVehicles.hpp b/addons/parachute/CfgVehicles.hpp index 245d1a73be..f764494224 100644 --- a/addons/parachute/CfgVehicles.hpp +++ b/addons/parachute/CfgVehicles.hpp @@ -57,7 +57,7 @@ class CfgVehicles { MACRO_HASRESERVE }; class Bag_Base; - class B_Parachute:Bag_Base { + class B_Parachute: Bag_Base { MACRO_HASRESERVE }; class B_B_Parachute_02_F: B_Parachute { diff --git a/addons/rangecard/RscTitles.hpp b/addons/rangecard/RscTitles.hpp index 8a2007b2b2..7c760bd993 100644 --- a/addons/rangecard/RscTitles.hpp +++ b/addons/rangecard/RscTitles.hpp @@ -54,7 +54,7 @@ class RangeCard_RscListNBox: RscListNBox { colorDisabled[]={1,1,1,0.3}; }; - class ListScrollBar : ScrollBar { + class ListScrollBar: ScrollBar { }; }; diff --git a/addons/realisticnames/CfgMagazines.hpp b/addons/realisticnames/CfgMagazines.hpp index dc34fe0b99..be7ce2b2a5 100644 --- a/addons/realisticnames/CfgMagazines.hpp +++ b/addons/realisticnames/CfgMagazines.hpp @@ -453,19 +453,19 @@ class CfgMagazines { class PylonRack_3Rnd_Missile_AGM_02_F: PylonRack_1Rnd_Missile_AGM_02_F { displayName = "AGM-65 Maverick G 3x"; // [vanilla: Macer 3x - Missile_AGM_02_Plane_CAS_01_F] }; - class magazine_Missile_AGM_02_x1 : VehicleMagazine { + class magazine_Missile_AGM_02_x1: VehicleMagazine { displayName = "AGM-65 Maverick G"; // [vanilla: Macer - Missile_AGM_02_Plane_CAS_01_F] }; - class PylonMissile_Missile_AGM_02_x1 : magazine_Missile_AGM_02_x1 { + class PylonMissile_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 { displayName = "AGM-65 Maverick G"; // [vanilla: Macer - Missile_AGM_02_Plane_CAS_01_F] }; - class PylonMissile_Missile_AGM_02_x2 : magazine_Missile_AGM_02_x1 { + class PylonMissile_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 { displayName = "AGM-65 Maverick G 2x"; // [vanilla: Macer 2x - Missile_AGM_02_Plane_CAS_01_F] }; - class PylonRack_Missile_AGM_02_x1 : magazine_Missile_AGM_02_x1 { + class PylonRack_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 { displayName = "AGM-65 Maverick G"; // [vanilla: Macer - Missile_AGM_02_Plane_CAS_01_F] }; - class PylonRack_Missile_AGM_02_x2 : magazine_Missile_AGM_02_x1 { + class PylonRack_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 { displayName = "AGM-65 Maverick G 2x"; // [vanilla: Macer 2x - Missile_AGM_02_Plane_CAS_01_F] }; class 2Rnd_LG_scalpel; diff --git a/addons/realisticnames/CfgVehicles.hpp b/addons/realisticnames/CfgVehicles.hpp index e0fa6af1de..8d4d0c2f4a 100644 --- a/addons/realisticnames/CfgVehicles.hpp +++ b/addons/realisticnames/CfgVehicles.hpp @@ -183,14 +183,14 @@ class CfgVehicles { }; class APC_Wheeled_02_base_F; - class O_APC_Wheeled_02_base_F : APC_Wheeled_02_base_F { + class O_APC_Wheeled_02_base_F: APC_Wheeled_02_base_F { displayName = CSTRING(APC_Wheeled_02_rcws_Name); }; class APC_Wheeled_02_base_v2_F; - class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { + class O_APC_Wheeled_02_rcws_v2_F: APC_Wheeled_02_base_v2_F { displayName = CSTRING(APC_Wheeled_02_rcws_Name); }; - class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { + class O_T_APC_Wheeled_02_rcws_v2_ghex_F: APC_Wheeled_02_base_v2_F { displayName = CSTRING(APC_Wheeled_02_rcws_Name); }; @@ -421,7 +421,7 @@ class CfgVehicles { }; class Plane_Fighter_04_Base_F; - class I_Plane_Fighter_04_F : Plane_Fighter_04_Base_F { + class I_Plane_Fighter_04_F: Plane_Fighter_04_Base_F { displayName = CSTRING(Plane_Fighter_04_Name); }; @@ -777,78 +777,78 @@ class CfgVehicles { // Polaris DAGOR (Prowler) class LSV_01_base_F; - class LSV_01_armed_base_F : LSV_01_base_F { + class LSV_01_armed_base_F: LSV_01_base_F { displayName = CSTRING(lsv_01_armed); }; - class LSV_01_unarmed_base_F : LSV_01_base_F { + class LSV_01_unarmed_base_F: LSV_01_base_F { displayName = CSTRING(lsv_01_unarmed); }; - class LSV_01_light_base_F : LSV_01_base_F { + class LSV_01_light_base_F: LSV_01_base_F { displayName = CSTRING(lsv_01_light); }; - class LSV_01_AT_base_F : LSV_01_base_F { + class LSV_01_AT_base_F: LSV_01_base_F { displayName = CSTRING(lsv_01_at); }; // Light Strike Vehicle Mk. II (Qilin) class LSV_02_base_F; - class LSV_02_armed_base_F : LSV_02_base_F { + class LSV_02_armed_base_F: LSV_02_base_F { displayName = CSTRING(lsv_02_armed); }; - class LSV_02_unarmed_base_F : LSV_02_base_F { + class LSV_02_unarmed_base_F: LSV_02_base_F { displayName = CSTRING(lsv_02_unarmed); }; - class LSV_02_AT_base_F : LSV_02_base_F { + class LSV_02_AT_base_F: LSV_02_base_F { displayName = CSTRING(lsv_02_at); }; // Rooikat 120 (Rhino MGS) class AFV_Wheeled_01_base_F; - class B_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { + class B_AFV_Wheeled_01_cannon_F: AFV_Wheeled_01_base_F { displayName = CSTRING(afv_wheeled_01); }; - class B_T_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { + class B_T_AFV_Wheeled_01_cannon_F: AFV_Wheeled_01_base_F { displayName = CSTRING(afv_wheeled_01); }; class AFV_Wheeled_01_up_base_F; - class B_AFV_Wheeled_01_up_cannon_F : AFV_Wheeled_01_up_base_F { + class B_AFV_Wheeled_01_up_cannon_F: AFV_Wheeled_01_up_base_F { displayName = CSTRING(afv_wheeled_01_up); }; - class B_T_AFV_Wheeled_01_up_cannon_F : AFV_Wheeled_01_up_base_F { + class B_T_AFV_Wheeled_01_up_cannon_F: AFV_Wheeled_01_up_base_F { displayName = CSTRING(afv_wheeled_01_up); }; // T-14 Armata (T-140 Angara) class MBT_04_cannon_base_F; - class O_MBT_04_cannon_F : MBT_04_cannon_base_F { + class O_MBT_04_cannon_F: MBT_04_cannon_base_F { displayName = CSTRING(MBT_04_cannon); }; - class O_T_MBT_04_cannon_F : MBT_04_cannon_base_F { + class O_T_MBT_04_cannon_F: MBT_04_cannon_base_F { displayName = CSTRING(MBT_04_cannon); }; class MBT_04_command_base_F; // Keep "K" designation for command variant. - class O_MBT_04_command_F : MBT_04_command_base_F { + class O_MBT_04_command_F: MBT_04_command_base_F { displayName = CSTRING(MBT_04_command); }; - class O_T_MBT_04_command_F : MBT_04_command_base_F { + class O_T_MBT_04_command_F: MBT_04_command_base_F { displayName = CSTRING(MBT_04_command); }; // Wiesel 2 (AWC 302 Nyx) class LT_01_AA_base_F; - class I_LT_01_AA_F : LT_01_AA_base_F { + class I_LT_01_AA_F: LT_01_AA_base_F { displayName = CSTRING(LT_01_AA); }; class LT_01_AT_base_F; - class I_LT_01_AT_F : LT_01_AT_base_F { + class I_LT_01_AT_F: LT_01_AT_base_F { displayName = CSTRING(LT_01_AT); }; class LT_01_cannon_base_F; - class I_LT_01_cannon_F : LT_01_cannon_base_F { + class I_LT_01_cannon_F: LT_01_cannon_base_F { displayName = CSTRING(LT_01_cannon); }; class LT_01_scout_base_F; - class I_LT_01_scout_F : LT_01_scout_base_F { + class I_LT_01_scout_F: LT_01_scout_base_F { displayName = CSTRING(LT_01_scout); }; diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 1d9eb9d4d2..d8efa1177e 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1656,7 +1656,7 @@ FNX-45 Tactical (Verde) FNX-45 Tactical (Verde) FNX-45 Tactical (Yeşil) - FNX-45 タクティカル (緑) + FNX-45 タクティカル (グリーン) FNX-45 Tactical (초록) FNX-45戰術型手槍 (綠色) FNX-45战术型手枪 (绿色) @@ -1741,7 +1741,7 @@ RPG-32 (Verde) RPG-32 (Verde) RPG-32 (Yeşil) - RPG-32 (緑) + RPG-32 (グリーン) RPG-32 (초록) RPG-32"哈希姆"火箭發射器 (綠色) RPG-32"哈希姆"火箭发射器 (绿色) @@ -1803,7 +1803,7 @@ "麥士蒂索人"-M型反坦克導彈(棕色) "麦士蒂索人"-M型反坦克导弹(棕色) Metis-M (Marrone) - メチス-M (茶) + メチス-M (ブラウン) Metis-M (Brązowy) Metis-M (Marrom) Metis-M (hnědý) @@ -1818,7 +1818,7 @@ "麥士蒂索人"-M型反坦克導彈(綠色) "麦士蒂索人"-M型反坦克导弹(绿色) Metis-M (Verde) - メチス-M (緑) + メチス-M (グリーン) Metis-M (Zielony) Metis-M (Verde) Metis-M (zelený) @@ -1853,7 +1853,7 @@ MX (Чёрный) MX (Preto) MX (Nero) - MX (黒) + MX (ブラック) MX (검정) MX突擊步槍 (黑色) MX突击步枪 (黑色) @@ -1903,7 +1903,7 @@ MXC (Чёрный) MXC (Preto) MXC (Nero) - MXC (黒) + MXC (ブラック) MXC (검정) MXC卡賓步槍 (黑色) MXC卡宾步枪 (黑色) @@ -1953,7 +1953,7 @@ MX 3GL (Чёрный) MX 3GL (Preto) MX 3GL (Nero) - MX 3GL (黒) + MX 3GL (ブラック) MX 3GL (검정) MX突擊步槍 (3連裝榴彈-黑色) MX突击步枪 (3连装榴弹-黑色) @@ -2003,7 +2003,7 @@ MX LSW (Чёрный) MX LSW (Preto) MX LSW (Nero) - MX LSW (黒) + MX LSW (ブラック) MX LSW (검정) MX輕型機槍 (黑色) MX轻型机枪 (黑色) @@ -2171,7 +2171,7 @@ F2000 Tactical (Камо) F2000 Tactical (Camo) F2000 Tactical (Camo) - F2000 タクティカル (迷彩) + F2000 タクティカル (カモフラージュ) F2000 Tactical (위장) F2000戰術型突擊步槍 (迷彩) F2000战术型突击步枪 (迷彩) @@ -3946,22 +3946,27 @@ ELCAN SpecterOS (Lush) ELCAN SpecterOS (Leśny) + ELCAN SpecterOS (緑地) ELCAN SpecterOS (Arid) ELCAN SpecterOS (Jałowy) + ELCAN SpecterOS (乾燥地帯) ELCAN SpecterOS 7.62 (Black) ELCAN SpecterOS 7.62 (Czarny) + ELCAN SpecterOS 7.62 (ブラック) ELCAN SpecterOS 7.62 (Lush) ELCAN SpecterOS 7.62 (Leśny) + ELCAN SpecterOS 7.62 (緑地) ELCAN SpecterOS 7.62 (Arid) ELCAN SpecterOS 7.62 (Jałowy) + ELCAN SpecterOS 7.62 (乾燥地帯) SIG BRAVO4 / ROMEO3 (Black) @@ -4208,10 +4213,12 @@ Burris XTR II (Old) Burris XTR II (Stary) + Burris XTR II (使い古し) Burris XTR II (ASP-1 Kir) Burris XTR II (ASP-1 Kir) + Burris XTR II (ASP-1 Kir) EOTech XPS3 (Tan) @@ -4261,10 +4268,12 @@ EOTech XPS3 (Lush) EOTech XPS3 (Leśny) + EOTech XPS3 (緑地) EOTech XPS3 (Arid) EOTech XPS3 (Jałowy) + EOTech XPS3 (乾燥地帯) EOTech XPS3 SMG (Tan) @@ -4372,7 +4381,7 @@ C-More Railway (Rot) C-More Railway (紅色) C-More Railway (红色) - C-More レイルウェイ (赤) + C-More レイルウェイ (レッド) C-More Railway (Rosso) C-More Railway (Czerwony) C-More Railway (Красный) @@ -4387,7 +4396,7 @@ C-More Railway (Grün) C-More Railway (綠色) C-More Railway (绿色) - C-More レイルウェイ (緑) + C-More レイルウェイ (グリーン) C-More Railway (Verde) C-More Railway (Zielony) C-More Railway (Зеленый) @@ -4402,7 +4411,7 @@ C-More Railway SMG (Rot) C-More Railway SMG (紅色) C-More Railway SMG (红色) - C-More レイルウェイ SMG (赤) + C-More レイルウェイ SMG (レッド) C-More Railway SMG (Rosso) C-More Railway SMG (Czerwony) C-More Railway SMG (Красный) @@ -4417,7 +4426,7 @@ C-More Railway SMG (Grün) C-More Railway SMG (綠色) C-More Railway SMG (绿色) - C-More レイルウェイ SMG (緑) + C-More レイルウェイ SMG (グリーン) C-More Railway SMG (Verde) C-More Railway SMG (Zielony) C-More Railway SMG (Зеленый) @@ -5018,7 +5027,7 @@ MSBS Grot MSBS Grot MSBS Grot - MSBS Grot + MSBS グロート MSBS Grot MSBS Grot @@ -5035,7 +5044,7 @@ MSBS Grot (Preto) MSBS Grot (검정) MSBS Grot(黑色) - MSBS Grot(ブラック) + MSBS グロート (ブラック) MSBS Grot (Siyah) MSBS Grot (Fekete) @@ -5052,7 +5061,7 @@ MSBS Grot (Camo) MSBS Grot (위장) MSBS Grot(迷彩) - MSBS Grot (カモフラージュ) + MSBS グロート (カモフラージュ) MSBS Grot (Kamuflaj) MSBS Grot (Terepmintás) @@ -5069,7 +5078,7 @@ MSBS Grot (Deserto) MSBS Grot (모래) MSBS Grot(沙色) - MSBS Grot (サンド) + MSBS グロート (サンド) MSBS Grot (Kum) MSBS Grot (Homok) @@ -5086,7 +5095,7 @@ MSBS Grot GL MSBS Grot GL MSBS Grot GL - MSBS Grot GL + MSBS グロート GL MSBS Grot GL MSBS Grot GL @@ -5103,7 +5112,7 @@ MSBS Grot GL (Preto) MSBS Grot GL (검정) MSBS Grot GL(黑色) - MSBS Grot GL(ブラック) + MSBS グロート GL(ブラック) MSBS Grot GL (Siyah) MSBS Grot GL (Fekete) @@ -5120,7 +5129,7 @@ MSBS Grot GL (Camo) MSBS Grot GL (위장) MSBS Grot GL(迷彩) - MSBS Grot GL (カモフラージュ) + MSBS グロート GL (カモフラージュ) MSBS Grot GL (Kamuflaj) MSBS Grot GL (Terepmintás) @@ -5137,7 +5146,7 @@ MSBS Grot GL (Deserto) MSBS Grot GL (모래) MSBS Grot GL(沙色) - MSBS Grot GL (サンド) + MSBS グロート GL (サンド) MSBS Grot GL (Kum) MSBS Grot GL (Homok) @@ -5154,7 +5163,7 @@ MSBS Grot MR MSBS Grot MR MSBS Grot MR - MSBS Grot MR + MSBS グロート MR MSBS Grot MR MSBS Grot MR @@ -5171,7 +5180,7 @@ MSBS Grot MR (Preto) MSBS Grot MR (검정) MSBS Grot MR(黑色) - MSBS Grot MR (ブラック) + MSBS グロート MR (ブラック) MSBS Grot MR (Siyah) MSBS Grot MR (Fekete) @@ -5188,7 +5197,7 @@ MSBS Grot MR (Camo) MSBS Grot MR (위장) MSBS Grot MR(迷彩) - MSBS Grot MR (カモフラージュ) + MSBS グロート MR (カモフラージュ) MSBS Grot MR (Kamuflaj) MSBS Grot MR (Terepmintás) @@ -5205,7 +5214,7 @@ MSBS Grot MR (Deserto) MSBS Grot MR (모래) MSBS Grot MR(沙色) - MSBS Grot MR (サンド) + MSBS グロート MR (サンド) MSBS Grot MR (Kum) MSBS Grot MR (Homok) @@ -5222,7 +5231,7 @@ MSBS Grot SG MSBS Grot SG MSBS Grot SG - MSBS Grot SG + MSBS グロート SG MSBS Grot SG MSBS Grot SG @@ -5239,7 +5248,7 @@ MSBS Grot SG (Preto) MSBS Grot SG (검정) MSBS Grot SG(黑色) - MSBS Grot SG(ブラック) + MSBS グロート SG (ブラック) MSBS Grot SG (Siyah) MSBS Grot SG (Fekete) @@ -5256,7 +5265,7 @@ MSBS Grot SG (Camo) MSBS Grot SG (위장) MSBS Grot SG(迷彩) - MSBS Grot SG (カモフラージュ) + MSBS グロート SG (カモフラージュ) MSBS Grot SG (Kamuflaj) MSBS Grot SG (Terepmintás) @@ -5273,7 +5282,7 @@ MSBS Grot SG (Deserto) MSBS Grot SG (모래) MSBS Grot SG(沙色) - MSBS Grot SG (サンド) + MSBS グロート SG (サンド) MSBS Grot SG (Kum) MSBS Grot SG (Homok) diff --git a/addons/rearm/CfgAmmo.hpp b/addons/rearm/CfgAmmo.hpp index 78151796c0..9ea0290d38 100644 --- a/addons/rearm/CfgAmmo.hpp +++ b/addons/rearm/CfgAmmo.hpp @@ -1,183 +1,183 @@ class CfgAmmo { class BombCore; - class LaserBombCore : BombCore { + class LaserBombCore: BombCore { GVAR(caliber) = 250; // Default caliber for bombs }; class MissileCore; - class MissileBase : MissileCore { + class MissileBase: MissileCore { GVAR(caliber) = 250; // Default caliber for missiles }; - class Missile_AA_04_F : MissileBase { + class Missile_AA_04_F: MissileBase { GVAR(dummy) = QGVAR(Missile_AA_04_F); }; - class Missile_AA_03_F : Missile_AA_04_F { + class Missile_AA_03_F: Missile_AA_04_F { GVAR(dummy) = QGVAR(Missile_AA_03_F); }; - class Rocket_04_HE_F : MissileBase { + class Rocket_04_HE_F: MissileBase { GVAR(caliber) = 70; GVAR(dummy) = QGVAR(Rocket_04_HE_F); }; - class Rocket_03_HE_F : Rocket_04_HE_F { + class Rocket_03_HE_F: Rocket_04_HE_F { GVAR(dummy) = QGVAR(Rocket_03_HE_F); }; - class Rocket_04_AP_F : Rocket_04_HE_F { + class Rocket_04_AP_F: Rocket_04_HE_F { GVAR(dummy) = QGVAR(Rocket_04_AP_F); }; - class Rocket_03_AP_F : Rocket_04_AP_F { + class Rocket_03_AP_F: Rocket_04_AP_F { GVAR(dummy) = QGVAR(Rocket_03_AP_F); }; - class M_PG_AT : MissileBase { + class M_PG_AT: MissileBase { GVAR(caliber) = 70; GVAR(dummy) = QGVAR(M_PG_AT); }; - class Missile_AGM_02_F : MissileBase { + class Missile_AGM_02_F: MissileBase { GVAR(dummy) = QGVAR(Missile_AGM_02_F); }; - class Missile_AGM_01_F : Missile_AGM_02_F { + class Missile_AGM_01_F: Missile_AGM_02_F { GVAR(dummy) = QGVAR(Missile_AGM_01_F); }; class RocketCore; - class RocketBase : RocketCore { + class RocketBase: RocketCore { GVAR(caliber) = 70; // Default caliber for rockets }; - class R_80mm_HE : RocketBase { + class R_80mm_HE: RocketBase { GVAR(caliber) = 80; GVAR(dummy) = QGVAR(R_80mm_HE); }; - class R_60mm_HE : R_80mm_HE { + class R_60mm_HE: R_80mm_HE { GVAR(caliber) = 60; GVAR(dummy) = QGVAR(R_60mm_HE); }; class BulletBase; - class B_19mm_HE : BulletBase { + class B_19mm_HE: BulletBase { GVAR(caliber) = 19; }; - class B_20mm : BulletBase { + class B_20mm: BulletBase { GVAR(caliber) = 20; }; class B_20mm_AP: BulletBase { GVAR(caliber) = 20; }; - class B_25mm : BulletBase { + class B_25mm: BulletBase { GVAR(caliber) = 25; }; - class B_30mm_AP : BulletBase { + class B_30mm_AP: BulletBase { GVAR(caliber) = 30; }; - class B_30mm_HE : B_19mm_HE { + class B_30mm_HE: B_19mm_HE { GVAR(caliber) = 30; }; - class Gatling_30mm_HE_Plane_CAS_01_F : BulletBase { + class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase { GVAR(caliber) = 30; }; - class B_35mm_AA : BulletBase { + class B_35mm_AA: BulletBase { GVAR(caliber) = 35; }; class B_30mm_APFSDS; - class B_40mm_APFSDS : B_30mm_APFSDS { + class B_40mm_APFSDS: B_30mm_APFSDS { GVAR(caliber) = 40; }; - class B_40mm_GPR : B_30mm_HE { + class B_40mm_GPR: B_30mm_HE { GVAR(caliber) = 40; }; class GrenadeBase; - class G_40mm_HE : GrenadeBase { + class G_40mm_HE: GrenadeBase { GVAR(caliber) = 39; }; class ShellBase; - class R_230mm_fly : ShellBase { + class R_230mm_fly: ShellBase { GVAR(dummy) = QGVAR(R_230mm_fly); }; - class Sh_120mm_APFSDS : Shellbase { + class Sh_120mm_APFSDS: Shellbase { GVAR(caliber) = 120; }; - class Sh_105mm_APFSDS : Sh_120mm_APFSDS { + class Sh_105mm_APFSDS: Sh_120mm_APFSDS { GVAR(caliber) = 105; }; - class Sh_125mm_APFSDS : Sh_120mm_APFSDS { + class Sh_125mm_APFSDS: Sh_120mm_APFSDS { GVAR(caliber) = 125; }; - class Sh_120mm_HE : ShellBase { + class Sh_120mm_HE: ShellBase { GVAR(caliber) = 120; }; - class Sh_125mm_HE : Sh_120mm_HE { + class Sh_125mm_HE: Sh_120mm_HE { GVAR(caliber) = 125; }; - class Sh_125mm_HEAT : Sh_125mm_HE { + class Sh_125mm_HEAT: Sh_125mm_HE { GVAR(caliber) = 125; }; - class Sh_105mm_HEAT_MP : Sh_125mm_HEAT { + class Sh_105mm_HEAT_MP: Sh_125mm_HEAT { GVAR(caliber) = 105; }; - class Sh_155mm_AMOS : ShellBase { + class Sh_155mm_AMOS: ShellBase { GVAR(caliber) = 155; }; - class Sh_82mm_AMOS : Sh_155mm_AMOS { + class Sh_82mm_AMOS: Sh_155mm_AMOS { GVAR(caliber) = 82; }; class Sh_82mm_AMOS_LG; - class Sh_155mm_AMOS_LG : Sh_82mm_AMOS_LG { + class Sh_155mm_AMOS_LG: Sh_82mm_AMOS_LG { GVAR(caliber) = 155; }; class ShotDeployBase; - class Smoke_82mm_AMOS_White : ShotDeployBase { + class Smoke_82mm_AMOS_White: ShotDeployBase { GVAR(caliber) = 82; }; class FlareCore; - class Flare_82mm_AMOS_White : FlareCore { + class Flare_82mm_AMOS_White: FlareCore { GVAR(caliber) = 82; }; - class SmokeLauncherAmmo : BulletBase { + class SmokeLauncherAmmo: BulletBase { GVAR(caliber) = 250; }; - class CMflareAmmo : BulletBase { + class CMflareAmmo: BulletBase { GVAR(caliber) = 39; }; class SubmunitionBase; - class Sh_82mm_AMOS_guided : SubmunitionBase { + class Sh_82mm_AMOS_guided: SubmunitionBase { GVAR(caliber) = 82; }; - class Sh_155mm_AMOS_guided : Sh_82mm_AMOS_guided { + class Sh_155mm_AMOS_guided: Sh_82mm_AMOS_guided { GVAR(caliber) = 155; }; - class R_230mm_HE : SubmunitionBase { + class R_230mm_HE: SubmunitionBase { GVAR(caliber) = 230; }; - class Mine_155mm_AMOS_range : SubmunitionBase { + class Mine_155mm_AMOS_range: SubmunitionBase { GVAR(caliber) = 155; }; - class Cluster_155mm_AMOS : SubmunitionBase { + class Cluster_155mm_AMOS: SubmunitionBase { GVAR(caliber) = 155; }; - class Smoke_120mm_AMOS_White : SubmunitionBase { + class Smoke_120mm_AMOS_White: SubmunitionBase { GVAR(caliber) = 155; }; - class AT_Mine_155mm_AMOS_range : SubmunitionBase { + class AT_Mine_155mm_AMOS_range: SubmunitionBase { GVAR(caliber) = 155; }; - class Bo_Mk82 : BombCore { + class Bo_Mk82: BombCore { GVAR(dummy) = QGVAR(Bo_Mk82); }; diff --git a/addons/rearm/CfgMagazines.hpp b/addons/rearm/CfgMagazines.hpp index a509377182..7f70238086 100644 --- a/addons/rearm/CfgMagazines.hpp +++ b/addons/rearm/CfgMagazines.hpp @@ -1,56 +1,56 @@ class CfgMagazines { class CA_Magazine; - class 60Rnd_CMFlareMagazine : CA_Magazine { + class 60Rnd_CMFlareMagazine: CA_Magazine { displayName = CSTRING(Mag_60Rnd_CMFlareMagazine); }; class VehicleMagazine; - class SmokeLauncherMag : VehicleMagazine { + class SmokeLauncherMag: VehicleMagazine { displayName = CSTRING(Mag_SmokeLauncherMag); }; - class SmokeLauncherMag_boat : VehicleMagazine { + class SmokeLauncherMag_boat: VehicleMagazine { displayName = CSTRING(Mag_SmokeLauncherMag); }; - class 1000Rnd_Gatling_30mm_Plane_CAS_01_F : VehicleMagazine { + class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { displayName = CSTRING(Mag_1000Rnd_Gatling_30mm_Plane_CAS_01_F); }; - class 500Rnd_Cannon_30mm_Plane_CAS_02_F : 1000Rnd_Gatling_30mm_Plane_CAS_01_F { + class 500Rnd_Cannon_30mm_Plane_CAS_02_F: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { displayName = CSTRING(Mag_500Rnd_Cannon_30mm_Plane_CAS_02_F); }; - class 2Rnd_Missile_AA_04_F : VehicleMagazine { + class 2Rnd_Missile_AA_04_F: VehicleMagazine { displayName = CSTRING(Mag_2Rnd_Missile_AA_04_F); }; - class 2Rnd_Missile_AA_03_F : 2Rnd_Missile_AA_04_F { + class 2Rnd_Missile_AA_03_F: 2Rnd_Missile_AA_04_F { displayName = CSTRING(Mag_2Rnd_Missile_AA_03_F); }; - class 6Rnd_Missile_AGM_02_F : VehicleMagazine { + class 6Rnd_Missile_AGM_02_F: VehicleMagazine { displayName = CSTRING(Mag_6Rnd_Missile_AGM_02_F); }; - class 4Rnd_Missile_AGM_01_F : 6Rnd_Missile_AGM_02_F { + class 4Rnd_Missile_AGM_01_F: 6Rnd_Missile_AGM_02_F { displayName = CSTRING(Mag_4Rnd_Missile_AGM_01_F); }; - class 7Rnd_Rocket_04_HE_F : VehicleMagazine { + class 7Rnd_Rocket_04_HE_F: VehicleMagazine { displayName = CSTRING(Mag_7Rnd_Rocket_04_HE_F); }; - class 20Rnd_Rocket_03_HE_F : 7Rnd_Rocket_04_HE_F { + class 20Rnd_Rocket_03_HE_F: 7Rnd_Rocket_04_HE_F { displayName = CSTRING(Mag_20Rnd_Rocket_03_HE_F); }; - class 7Rnd_Rocket_04_AP_F : 7Rnd_Rocket_04_HE_F { + class 7Rnd_Rocket_04_AP_F: 7Rnd_Rocket_04_HE_F { displayName = CSTRING(Mag_7Rnd_Rocket_04_AP_F); }; - class 20Rnd_Rocket_03_AP_F : 7Rnd_Rocket_04_AP_F { + class 20Rnd_Rocket_03_AP_F: 7Rnd_Rocket_04_AP_F { displayName = CSTRING(Mag_20Rnd_Rocket_03_AP_F); }; - class 4Rnd_Bomb_04_F : VehicleMagazine { + class 4Rnd_Bomb_04_F: VehicleMagazine { displayName = CSTRING(Mag_4Rnd_Bomb_04_F); }; - class 2Rnd_Bomb_03_F : 4Rnd_Bomb_04_F { + class 2Rnd_Bomb_03_F: 4Rnd_Bomb_04_F { displayName = CSTRING(Mag_2Rnd_Bomb_03_F); }; }; diff --git a/addons/rearm/CfgVehicles.hpp b/addons/rearm/CfgVehicles.hpp index c12ee16066..221b01b249 100644 --- a/addons/rearm/CfgVehicles.hpp +++ b/addons/rearm/CfgVehicles.hpp @@ -143,21 +143,25 @@ class CfgVehicles { }; class ReammoBox_F; - class NATO_Box_Base: ReammoBox_F{}; + class NATO_Box_Base: ReammoBox_F {}; class Box_NATO_AmmoVeh_F: NATO_Box_Base { transportAmmo = 0; GVAR(defaultSupply) = 1200; }; - class EAST_Box_Base: ReammoBox_F{}; + class EAST_Box_Base: ReammoBox_F {}; class Box_East_AmmoVeh_F: EAST_Box_Base { transportAmmo = 0; GVAR(defaultSupply) = 1200; }; - class IND_Box_Base: ReammoBox_F{}; + class IND_Box_Base: ReammoBox_F {}; class Box_IND_AmmoVeh_F: IND_Box_Base { transportAmmo = 0; GVAR(defaultSupply) = 1200; }; + class Box_IND_AmmoOrd_F; + class Box_IDAP_AmmoOrd_F: Box_IND_AmmoOrd_F { + transportAmmo = 0; // not sure why this one has 240 + }; // Dummy Vehicles class ThingX; diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp index ddee2f0351..41c4f12625 100644 --- a/addons/refuel/CfgVehicles.hpp +++ b/addons/refuel/CfgVehicles.hpp @@ -485,6 +485,11 @@ class CfgVehicles { GVAR(hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; GVAR(fuelCargo) = REFUEL_INFINITE_FUEL; }; + class Land_FuelStation_03_pump_F: House_F { // Enoch + transportFuel = 0; //50k + GVAR(hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + GVAR(fuelCargo) = REFUEL_INFINITE_FUEL; + }; // Helper object for non-AllVehicles objects class GVAR(helper): Helicopter_Base_F { diff --git a/addons/refuel/config.cpp b/addons/refuel/config.cpp index 39765e323c..2697b53a09 100644 --- a/addons/refuel/config.cpp +++ b/addons/refuel/config.cpp @@ -3,8 +3,8 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {}; - weapons[] = {QGVAR(fuelNozzle)}; + units[] = {QGVAR(fuelNozzle)}; + weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; author = ECSTRING(common,ACETeam); diff --git a/addons/reload/CfgActions.hpp b/addons/reload/CfgActions.hpp index a76be64ba3..acadf95385 100644 --- a/addons/reload/CfgActions.hpp +++ b/addons/reload/CfgActions.hpp @@ -1,6 +1,6 @@ class CfgActions { class LoadMagazine; - class LoadEmptyMagazine : LoadMagazine { + class LoadEmptyMagazine: LoadMagazine { showWindow = 0; textDefault = ""; }; diff --git a/addons/repair/CfgEden.hpp b/addons/repair/CfgEden.hpp index 3edc9420b0..d9df86a036 100644 --- a/addons/repair/CfgEden.hpp +++ b/addons/repair/CfgEden.hpp @@ -17,7 +17,7 @@ class Cfg3DEN { attributeLoad = "(_this controlsGroupCtrl 100) lbSetCurSel (((_value + 1) min 3) max 0);"; attributeSave = "(lbCurSel (_this controlsGroupCtrl 100)) - 1"; class Controls: Controls { - class Title: Title{}; + class Title: Title {}; class Value: ctrlToolbox { idc = 100; style = "0x02"; diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml index 3eb9fdc951..57e149999e 100644 --- a/addons/repair/stringtable.xml +++ b/addons/repair/stringtable.xml @@ -263,6 +263,7 @@ Boost engineer training when in repair vehicles or facilities. Untrained becomes engineer, engineer becomes advanced engineer. + 修理車両か施設内では工兵能力を上昇させます。兵士は工兵になり、工兵は上級工兵になります。 Full Repair Locations diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index c5e30a3028..63b87ee057 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -64,7 +64,7 @@ class CfgVehicles { // team leader class Man; - class CAManBase : Man { + class CAManBase: Man { class ACE_SelfActions { class ACE_MoveRallypoint { displayName = CSTRING(Rallypoint_MoveRallypoint); diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp index 79fbf69d74..b0a86336a4 100644 --- a/addons/respawn/config.cpp +++ b/addons/respawn/config.cpp @@ -3,8 +3,8 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {}; - weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_Rallypoint_West_Base", "ACE_Rallypoint_East_Base", "ACE_Rallypoint_Independent_Base"}; + units[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_Rallypoint_West_Base", "ACE_Rallypoint_East_Base", "ACE_Rallypoint_Independent_Base"}; + weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = { "ace_common" }; author = ECSTRING(common,ACETeam); diff --git a/addons/sandbag/config.cpp b/addons/sandbag/config.cpp index 80e3f71808..bbd2369659 100644 --- a/addons/sandbag/config.cpp +++ b/addons/sandbag/config.cpp @@ -3,8 +3,8 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {"ACE_Item_Sandbag", "ACE_Item_Sandbag_empty"}; - weapons[] = {"ACE_Sandbag", "ACE_Sandbag_empty"}; + units[] = {"ACE_Item_Sandbag_empty"}; + weapons[] = {"ACE_Sandbag_empty"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; author = ECSTRING(common,ACETeam); diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp index 653742180f..de712b378f 100644 --- a/addons/scopes/CfgWeapons.hpp +++ b/addons/scopes/CfgWeapons.hpp @@ -6,61 +6,61 @@ class CfgWeapons { class ItemCore; class InventoryOpticsItem_Base_F; - class optic_Yorris : ItemCore { + class optic_Yorris: ItemCore { ACE_ScopeHeightAboveRail = 2.77224; }; - class optic_MRD : ItemCore { + class optic_MRD: ItemCore { ACE_ScopeHeightAboveRail = 2.8; }; - class optic_Aco : ItemCore { + class optic_Aco: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - class optic_ACO_grn : ItemCore { + class optic_ACO_grn: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - class optic_ACO_grn_smg : ItemCore { + class optic_ACO_grn_smg: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - class optic_ACO_smg : ItemCore { + class optic_ACO_smg: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - class optic_Holosight : ItemCore { + class optic_Holosight: ItemCore { ACE_ScopeHeightAboveRail = 4.66933; }; - class optic_Holosight_smg : ItemCore { + class optic_Holosight_smg: ItemCore { ACE_ScopeHeightAboveRail = 4.66933; }; - class optic_Arco : ItemCore { + class optic_Arco: ItemCore { ACE_ScopeHeightAboveRail = 4.89287; }; - class optic_ERCO_blk_F : optic_Arco { + class optic_ERCO_blk_F: optic_Arco { ACE_ScopeHeightAboveRail = 3.48836; }; - class optic_Hamr : ItemCore { + class optic_Hamr: ItemCore { ACE_ScopeHeightAboveRail = 4.48584; }; - class optic_MRCO : ItemCore { + class optic_MRCO: ItemCore { ACE_ScopeHeightAboveRail = 3.88405; }; - class optic_Nightstalker : ItemCore { + class optic_Nightstalker: ItemCore { ACE_ScopeHeightAboveRail = 5.54325; ACE_ScopeAdjust_Vertical[] = {-4, 30}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class NCTALKEP { discreteDistance[] = {200}; @@ -70,13 +70,13 @@ class CfgWeapons { }; }; - class optic_NVS : ItemCore { + class optic_NVS: ItemCore { ACE_ScopeHeightAboveRail = 5.54325; ACE_ScopeAdjust_Vertical[] = {-4, 30}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class NVS { discreteDistance[] = {300}; @@ -86,13 +86,13 @@ class CfgWeapons { }; }; - class optic_TWS : ItemCore { + class optic_TWS: ItemCore { ACE_ScopeHeightAboveRail = 5.52874; ACE_ScopeAdjust_Vertical[] = {-4, 30}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class TWS { discreteDistance[] = {300}; @@ -102,13 +102,13 @@ class CfgWeapons { }; }; - class optic_LRPS : ItemCore { + class optic_LRPS: ItemCore { ACE_ScopeHeightAboveRail = 4.2098; ACE_ScopeAdjust_Vertical[] = {0, 27}; ACE_ScopeAdjust_Horizontal[] = {-8, 8}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class Snip { opticsZoomMin = 0.011; @@ -122,13 +122,13 @@ class CfgWeapons { }; }; - class optic_SOS : ItemCore { + class optic_SOS: ItemCore { ACE_ScopeHeightAboveRail = 4.41328; ACE_ScopeAdjust_Vertical[] = {-4, 30}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class Snip { discreteDistance[] = {100}; @@ -138,13 +138,13 @@ class CfgWeapons { }; }; - class optic_DMS : ItemCore { + class optic_DMS: ItemCore { ACE_ScopeHeightAboveRail = 3.86253; ACE_ScopeAdjust_Vertical[] = {-4, 20}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class Snip { discreteDistance[] = {100}; @@ -154,13 +154,13 @@ class CfgWeapons { }; }; - class optic_AMS_base : ItemCore { + class optic_AMS_base: ItemCore { ACE_ScopeHeightAboveRail = 3.8933; ACE_ScopeAdjust_Vertical[] = {0, 16}; ACE_ScopeAdjust_Horizontal[] = {-11, 11}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class AMS { opticsZoomMin = 0.0285; @@ -174,13 +174,13 @@ class CfgWeapons { }; }; - class optic_KHS_base : ItemCore { + class optic_KHS_base: ItemCore { ACE_ScopeHeightAboveRail = 4.30723; ACE_ScopeAdjust_Vertical[] = {0, 19}; ACE_ScopeAdjust_Horizontal[] = {-9, 9}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class KHS { opticsZoomMin = 0.026; @@ -194,13 +194,13 @@ class CfgWeapons { }; }; - class optic_KHS_old : ItemCore { + class optic_KHS_old: ItemCore { ACE_ScopeHeightAboveRail = 4.30723; ACE_ScopeAdjust_Vertical[] = {0, 19}; ACE_ScopeAdjust_Horizontal[] = {-9, 9}; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class KHS { opticsZoomMin = 0.026; diff --git a/addons/scopes/RscTitles.hpp b/addons/scopes/RscTitles.hpp index a15cbbed67..4dd1b7addf 100644 --- a/addons/scopes/RscTitles.hpp +++ b/addons/scopes/RscTitles.hpp @@ -14,7 +14,7 @@ class RscTitles { fadeout = 0; name = QGVAR(Zeroing); class controls { - class ACE_Scopes_Zeroing_BG : RscPicture { + class ACE_Scopes_Zeroing_BG: RscPicture { idc = 11; type = 0; text = QPATHTOF(UI\scopes_bg.paa); @@ -31,7 +31,7 @@ class RscTitles { w = 0.4 * safezoneW; h = 0.3 * safezoneH; }; - class ACE_Scopes_Zeroing_Vertical : RscText { + class ACE_Scopes_Zeroing_Vertical: RscText { idc = 12; type = 0; style = 2; @@ -48,7 +48,7 @@ class RscTitles { w = 0.04 * safezoneW; h = 0.025 * safezoneH; }; - class ACE_Scopes_Zeroing_Horizontal : RscText { + class ACE_Scopes_Zeroing_Horizontal: RscText { idc = 13; type = 0; style = 2; diff --git a/addons/scopes/initSettings.sqf b/addons/scopes/initSettings.sqf index 2405deb475..917587be8e 100644 --- a/addons/scopes/initSettings.sqf +++ b/addons/scopes/initSettings.sqf @@ -64,6 +64,14 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)]; 1 ] call CBA_fnc_addSetting; +[ + QGVAR(deduceBarometricPressureFromTerrainAltitude), "CHECKBOX", + [LSTRING(deduceBarometricPressureFromTerrainAltitude_displayName), LSTRING(deduceBarometricPressureFromTerrainAltitude_description)], + _category, + false, + 1 +] call CBA_fnc_addSetting; + [ QGVAR(useLegacyUI), "CHECKBOX", [LSTRING(useLegacyUI_displayName), LSTRING(useLegacyUI_description)], @@ -73,7 +81,7 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)]; ] call CBA_fnc_addSetting; [ - QGVAR(simplifedZeroing), "CHECKBOX", + QGVAR(simplifiedZeroing), "CHECKBOX", [LSTRING(simplifiedZeroing_displayName), LSTRING(simplifiedZeroing_description)], _category, false, diff --git a/addons/sitting/CfgEventHandlers.hpp b/addons/sitting/CfgEventHandlers.hpp index f93a54e2f1..7b93414593 100644 --- a/addons/sitting/CfgEventHandlers.hpp +++ b/addons/sitting/CfgEventHandlers.hpp @@ -1,18 +1,18 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - clientInit = QUOTE(call COMPILE_FILE(XEH_clientInit)); + clientInit = QUOTE(call COMPILE_SCRIPT(XEH_clientInit)); }; }; diff --git a/addons/sitting/README.md b/addons/sitting/README.md index 76cbcdd88a..e4d52bfa6d 100644 --- a/addons/sitting/README.md +++ b/addons/sitting/README.md @@ -2,3 +2,7 @@ ace_sitting =============== The Sitting module introduces ability to sit on chairs. + +## ACEX Conversion - things still using acex prefix +- All settings +- CfgVehicles Config Entries (e.g. `acex_sitting_canSit`) diff --git a/addons/sitting/config.cpp b/addons/sitting/config.cpp index 991c0a63ca..ab5c53047d 100644 --- a/addons/sitting/config.cpp +++ b/addons/sitting/config.cpp @@ -13,7 +13,7 @@ class CfgPatches { VERSION_CONFIG; }; - class XADDON: ADDON {}; + BWC_CONFIG(XADDON); }; #include "ACE_Settings.hpp" diff --git a/addons/sitting/functions/fnc_stand.sqf b/addons/sitting/functions/fnc_stand.sqf index bbc5769f75..80ef06a2c2 100644 --- a/addons/sitting/functions/fnc_stand.sqf +++ b/addons/sitting/functions/fnc_stand.sqf @@ -10,7 +10,7 @@ * None * * Example: - * player call acex_sitting_fnc_stand + * player call ace_sitting_fnc_stand * * Public: No */ diff --git a/addons/sitting/initSettings.sqf b/addons/sitting/initSettings.sqf index 0a0708f1db..744c188e9f 100644 --- a/addons/sitting/initSettings.sqf +++ b/addons/sitting/initSettings.sqf @@ -1,10 +1,10 @@ [ - QXGVAR(enabled), + QXGVAR(enable), "CHECKBOX", [LSTRING(Enable), LSTRING(ModuleDescription)], format ["ACE %1", LLSTRING(ModuleDisplayName)], true, true, - {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)}, + {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)}, true ] call CBA_fnc_addSetting; diff --git a/addons/slideshow/config.cpp b/addons/slideshow/config.cpp index 6149ad71d7..93378a3e82 100644 --- a/addons/slideshow/config.cpp +++ b/addons/slideshow/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {}; + units[] = {QGVAR(module)}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; diff --git a/addons/spectator/config.cpp b/addons/spectator/config.cpp index 359b96135b..44f98b6931 100644 --- a/addons/spectator/config.cpp +++ b/addons/spectator/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {}; + units[] = {QGVAR(virtual)}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; diff --git a/addons/spottingscope/CfgVehicles.hpp b/addons/spottingscope/CfgVehicles.hpp index 660a3d6749..6be6d70d63 100644 --- a/addons/spottingscope/CfgVehicles.hpp +++ b/addons/spottingscope/CfgVehicles.hpp @@ -41,7 +41,7 @@ class CfgVehicles { EGVAR(dragging,dragPosition)[] = {0,1,0}; EGVAR(dragging,dragDirection) = 0; - class ACE_Actions: ACE_Actions{ + class ACE_Actions: ACE_Actions { class ACE_MainActions: ACE_MainActions { selection = "main_turret_axis"; class ACE_Pickup { diff --git a/addons/tagging/CfgWeapons.hpp b/addons/tagging/CfgWeapons.hpp index 4405696a08..dbb8340e1d 100644 --- a/addons/tagging/CfgWeapons.hpp +++ b/addons/tagging/CfgWeapons.hpp @@ -2,7 +2,7 @@ class CfgWeapons { class ACE_ItemCore; class CBA_MiscItem_ItemInfo; - class ACE_SpraypaintBlack : ACE_ItemCore { + class ACE_SpraypaintBlack: ACE_ItemCore { author = "jokoho48"; displayname = CSTRING(spraypaintBlack); descriptionShort = CSTRING(descSpraypaint); @@ -15,17 +15,17 @@ class CfgWeapons { mass = 10; }; }; - class ACE_SpraypaintRed : ACE_SpraypaintBlack { + class ACE_SpraypaintRed: ACE_SpraypaintBlack { displayname = CSTRING(spraypaintRed); picture = QPATHTOF(UI\items\itemSpraypaintRed.paa); hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanRed_co.paa)}; }; - class ACE_SpraypaintGreen : ACE_SpraypaintBlack { + class ACE_SpraypaintGreen: ACE_SpraypaintBlack { displayname = CSTRING(spraypaintGreen); picture = QPATHTOF(UI\items\itemSpraypaintGreen.paa); hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanGreen_co.paa)}; }; - class ACE_SpraypaintBlue : ACE_SpraypaintBlack { + class ACE_SpraypaintBlue: ACE_SpraypaintBlack { displayname = CSTRING(spraypaintBlue); picture = QPATHTOF(UI\items\itemSpraypaintBlue.paa); hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanBlue_co.paa)}; diff --git a/addons/towing/CfgEventHandlers.hpp b/addons/towing/CfgEventHandlers.hpp index 0d3301d6e0..f6503c2479 100644 --- a/addons/towing/CfgEventHandlers.hpp +++ b/addons/towing/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; diff --git a/addons/towing/README.md b/addons/towing/README.md index cbd2f0103c..ad6bfd14cc 100644 --- a/addons/towing/README.md +++ b/addons/towing/README.md @@ -2,10 +2,3 @@ ace_towing =================== Adds the ability to tow vehicles. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Brandon (TCVM)](https://github.com/TheCandianVendingMachine) diff --git a/addons/towing/functions/fnc_towStateMachinePFH.sqf b/addons/towing/functions/fnc_towStateMachinePFH.sqf index ef642e5cc8..326a9aeee5 100644 --- a/addons/towing/functions/fnc_towStateMachinePFH.sqf +++ b/addons/towing/functions/fnc_towStateMachinePFH.sqf @@ -20,7 +20,7 @@ _args params ["_state", "_unit", "_parent", "_rope", "_length", "_ropeClass"]; private _exitCondition = !( (alive GVAR(attachHelper)) && - { alive _target } && + { alive _parent } && { alive _unit } && { "" isEqualTo currentWeapon _unit || { _unit call EFUNC(common,isSwimming) }} && { [_unit, objNull, [INTERACTION_EXCEPTIONS]] call EFUNC(common,canInteractWith) } && diff --git a/addons/towing/stringtable.xml b/addons/towing/stringtable.xml index aaf5e6a234..91f189d4e0 100644 --- a/addons/towing/stringtable.xml +++ b/addons/towing/stringtable.xml @@ -3,36 +3,47 @@ Towing + けん引 Attach Tow Rope + けん引ロープを取り付け Attaching Cancelled + 取り付けを中止しました Attach Tow Rope (3.2m) + けん引ロープ (3.2m) を取り付け Attach Tow Rope (6.2m) + けん引ロープ (6.2m) を取り付け Attach Tow Rope (12.2m) + けん引ロープ (12.2m) を取り付け Attach Tow Rope (15.2m) + けん引ロープ (15.2m) を取り付け Attach Tow Rope (18.2m) + けん引ロープ (18.2m) を取り付け Attach Tow Rope (27.2m) + けん引ロープ (28.2m) を取り付け Attach Tow Rope (36.2m) + けん引ロープ (36.2m) を取り付け Detach Tow Rope + けん引ロープを外す - \ No newline at end of file + diff --git a/addons/ui/XEH_clientInit.sqf b/addons/ui/XEH_clientInit.sqf index 5c311f5dd6..66aa0b3650 100644 --- a/addons/ui/XEH_clientInit.sqf +++ b/addons/ui/XEH_clientInit.sqf @@ -40,7 +40,7 @@ GVAR(elementsSet) = call CBA_fnc_createNamespace; if (_name in ELEMENTS_BASIC) then { [true] call FUNC(setElements); } else { - private _nameNoPrefix = toLower (_name select [_delimPos]); + private _nameNoPrefix = toLower (_name select [7]); private _cachedElement = GVAR(configCache) getVariable _nameNoPrefix; if (!isNil "_cachedElement") then { [_nameNoPrefix, _value, true] call FUNC(setAdvancedElement); diff --git a/addons/vehicle_damage/CfgAmmo.hpp b/addons/vehicle_damage/CfgAmmo.hpp index 0c29bd55f0..195d059c2a 100644 --- a/addons/vehicle_damage/CfgAmmo.hpp +++ b/addons/vehicle_damage/CfgAmmo.hpp @@ -23,7 +23,7 @@ class CfgAmmo { class ACE_G_40mm_HE; - CREATE_INCENDIARY_AMMO(BulletBase, BulletCore, 0.5); + CREATE_INCENDIARY_AMMO(BulletBase, BulletCore, 0.1); CREATE_INCENDIARY_AMMO(ShellBase, ShellCore, 1.0); CREATE_INCENDIARY_AMMO(ammo_Penetrator_Base, ShellBase, 1.0); CREATE_INCENDIARY_AMMO(MissileBase, MissileCore, 1.0); diff --git a/addons/vehicle_damage/CfgEventHandlers.hpp b/addons/vehicle_damage/CfgEventHandlers.hpp index da1c328162..74ffec132e 100644 --- a/addons/vehicle_damage/CfgEventHandlers.hpp +++ b/addons/vehicle_damage/CfgEventHandlers.hpp @@ -1,19 +1,19 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_postInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; diff --git a/addons/vehicle_damage/CfgVehicles.hpp b/addons/vehicle_damage/CfgVehicles.hpp index 8fdca38730..b34f793e0f 100644 --- a/addons/vehicle_damage/CfgVehicles.hpp +++ b/addons/vehicle_damage/CfgVehicles.hpp @@ -79,7 +79,7 @@ class CfgVehicles { }; }; class B_APC_Wheeled_01_base_F: APC_Wheeled_01_base_F {}; - class B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_base_F { + class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F { GVAR(hullDetonationProb) = 0.2; GVAR(turretDetonationProb) = 0.2; GVAR(engineDetonationProb) = 0; @@ -155,7 +155,7 @@ class CfgVehicles { GVAR(canHaveFireRing) = 1; }; - class APC_Tracked_02_base_F : Tank_F { + class APC_Tracked_02_base_F: Tank_F { GVAR(hullDetonationProb) = 0; GVAR(turretDetonationProb) = 0; GVAR(engineDetonationProb) = 0; @@ -171,7 +171,7 @@ class CfgVehicles { }; GVAR(canHaveFireRing) = 1; }; - class O_APC_Tracked_02_base_F : APC_Tracked_02_base_F {}; + class O_APC_Tracked_02_base_F: APC_Tracked_02_base_F {}; class O_APC_Tracked_02_AA_F: O_APC_Tracked_02_base_F { GVAR(hullDetonationProb) = 0.4; GVAR(turretDetonationProb) = 0.4; diff --git a/addons/vehicle_damage/README.md b/addons/vehicle_damage/README.md index d5c2f35c5e..8560222ff2 100644 --- a/addons/vehicle_damage/README.md +++ b/addons/vehicle_damage/README.md @@ -2,10 +2,3 @@ ace_vehicle_damage =================== Adds enhanced vehicle damage. Primary goal is to remove global vehicle health and instead opt for a "component based" health system. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Brandon TCVM)](https://github.com/TheCandianVendingMachine) diff --git a/addons/vehicle_damage/script_macros.hpp b/addons/vehicle_damage/script_macros.hpp index 678040a900..84f3120ac1 100644 --- a/addons/vehicle_damage/script_macros.hpp +++ b/addons/vehicle_damage/script_macros.hpp @@ -24,4 +24,4 @@ #define EJECT_IF_DESTROYED_VEHICLES ["Boat_Transport_02_base_F", "Rubber_duck_base_F"] -#define CREATE_INCENDIARY_AMMO(ammo,base,inc) class ammo : base { GVAR(incendiary) = inc; } +#define CREATE_INCENDIARY_AMMO(ammo,base,inc) class ammo: base { GVAR(incendiary) = inc; } diff --git a/addons/vehicle_damage/stringtable.xml b/addons/vehicle_damage/stringtable.xml index d1b626d574..e93a0497b1 100644 --- a/addons/vehicle_damage/stringtable.xml +++ b/addons/vehicle_damage/stringtable.xml @@ -3,21 +3,27 @@ ACE Advanced Vehicle Damage + ACE 拡張車両ダメージ Enable/Disable advanced vehicle damage + 拡張車両ダメージの使用を設定します。 Enable/Disable advanced car damage (Experimental) + 拡張車ダメージ (試験的) Enable/Disable advanced Car Damage + 拡張車ダメージの使用を設定します。 Removes all vehicle ammo after cook-off + 誘爆後は車両から全ての弾薬を削除します。 Enable/Disable Ammo Removal During Cook-Off + 誘爆後の弾薬処理 Wreck (Turret) diff --git a/addons/vehicles/CfgVehicles.hpp b/addons/vehicles/CfgVehicles.hpp index 995c9e577f..45d0e557e4 100644 --- a/addons/vehicles/CfgVehicles.hpp +++ b/addons/vehicles/CfgVehicles.hpp @@ -233,14 +233,14 @@ class CfgVehicles { }; // Tanks DLC Wiesel 2 - class LT_01_base_F : Tank_F { - class Turrets : Turrets { - class MainTurret : MainTurret {}; + class LT_01_base_F: Tank_F { + class Turrets: Turrets { + class MainTurret: MainTurret {}; }; }; - class LT_01_cannon_base_F : LT_01_base_F { - class Turrets : Turrets { - class MainTurret : MainTurret { + class LT_01_cannon_base_F: LT_01_base_F { + class Turrets: Turrets { + class MainTurret: MainTurret { weapons[] = { "SmokeLauncher", "ACE_LMG_coax_ext_MG3", @@ -251,8 +251,8 @@ class CfgVehicles { }; // Tanks DLC Rooikat 120 - class AFV_Wheeled_01_base_F : wheeled_APC_F { - class Turrets : Turrets { + class AFV_Wheeled_01_base_F: wheeled_APC_F { + class Turrets: Turrets { class MainTurret: MainTurret { weapons[] = {"ACE_cannon_120mm_GT12","ACE_LMG_coax_DenelMG4"}; magazines[] = {"12Rnd_120mm_APFSDS_shells_Tracer_Red","8Rnd_120mm_HE_shells_Tracer_Red","8Rnd_120mm_HEAT_MP_T_Red","4Rnd_120mm_LG_cannon_missiles","200Rnd_762x51_Belt_T_Red","200Rnd_762x51_Belt_T_Red","200Rnd_762x51_Belt_T_Red","200Rnd_762x51_Belt_T_Red"}; @@ -261,19 +261,19 @@ class CfgVehicles { }; // Tanks DLC Armata - class MBT_04_base_F : Tank_F { - class Turrets : Turrets { - class MainTurret : MainTurret { - class Turrets : Turrets { + class MBT_04_base_F: Tank_F { + class Turrets: Turrets { + class MainTurret: MainTurret { + class Turrets: Turrets { class CommanderOptics: CommanderOptics {}; }; }; }; }; - class MBT_04_cannon_base_F : MBT_04_base_F { - class Turrets : Turrets { - class MainTurret : MainTurret { - class Turrets : Turrets { + class MBT_04_cannon_base_F: MBT_04_base_F { + class Turrets: Turrets { + class MainTurret: MainTurret { + class Turrets: Turrets { class CommanderOptics: CommanderOptics { weapons[] = {"ACE_HMG_127_KORD","SmokeLauncher"}; }; diff --git a/addons/vehicles/CfgWeapons.hpp b/addons/vehicles/CfgWeapons.hpp index 4c1c4575b9..2fbe4e5246 100644 --- a/addons/vehicles/CfgWeapons.hpp +++ b/addons/vehicles/CfgWeapons.hpp @@ -10,7 +10,7 @@ class CfgWeapons { class ACE_LMG_coax_MAG58_mem3: LMG_coax {}; class ACE_LMG_coax_ext_MAG58: LMG_coax_ext {}; class ACE_LMG_coax_ext_MG3: LMG_coax_ext {}; - class ACE_LMG_coax_DenelMG4 : LMG_coax {}; + class ACE_LMG_coax_DenelMG4: LMG_coax {}; class LMG_Minigun: LMG_RCWS { // Add the following: "2000Rnd_762x51_Belt_T_Green","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Yellow","5000Rnd_762x51_Belt","5000Rnd_762x51_Yellow_Belt" @@ -28,16 +28,16 @@ class CfgWeapons { }; }; - class HMG_127_APC : HMG_127 {}; - class ACE_HMG_127_KORD : HMG_127_APC {}; + class HMG_127_APC: HMG_127 {}; + class ACE_HMG_127_KORD: HMG_127_APC {}; // Tanks DLC: weapons for Wiesel and Rooikat class CannonCore; - class autocannon_Base_F : CannonCore {}; - class cannon_20mm : autocannon_Base_F {}; - class ACE_cannon_20mm_Rh202 : cannon_20mm {}; + class autocannon_Base_F: CannonCore {}; + class cannon_20mm: autocannon_Base_F {}; + class ACE_cannon_20mm_Rh202: cannon_20mm {}; - class cannon_120mm : CannonCore {}; - class ACE_cannon_120mm_GT12 : cannon_120mm {}; + class cannon_120mm: CannonCore {}; + class ACE_cannon_120mm_GT12: cannon_120mm {}; }; diff --git a/addons/viewrestriction/CfgEventHandlers.hpp b/addons/viewrestriction/CfgEventHandlers.hpp index 36c0fca8a3..7636444f39 100644 --- a/addons/viewrestriction/CfgEventHandlers.hpp +++ b/addons/viewrestriction/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - clientInit = QUOTE(call COMPILE_FILE(XEH_clientInit)); + clientInit = QUOTE(call COMPILE_SCRIPT(XEH_clientInit)); }; }; diff --git a/addons/viewrestriction/README.md b/addons/viewrestriction/README.md index 5ef22641f0..883014f3cd 100644 --- a/addons/viewrestriction/README.md +++ b/addons/viewrestriction/README.md @@ -2,3 +2,7 @@ ace_viewrestriction =============== The View Restriction module introduces restricting of first and third person views overall or configured per type. + +## ACEX Conversion - things still using acex prefix +- All settings +- CfgVehicles Module Classname diff --git a/addons/viewrestriction/config.cpp b/addons/viewrestriction/config.cpp index 7b22d2ab3c..40158953cf 100644 --- a/addons/viewrestriction/config.cpp +++ b/addons/viewrestriction/config.cpp @@ -13,7 +13,7 @@ class CfgPatches { VERSION_CONFIG; }; - class XADDON: ADDON {}; + BWC_CONFIG(XADDON); }; #include "CfgEventHandlers.hpp" diff --git a/addons/volume/CfgEventHandlers.hpp b/addons/volume/CfgEventHandlers.hpp index 9426fa861e..bff1c64e94 100644 --- a/addons/volume/CfgEventHandlers.hpp +++ b/addons/volume/CfgEventHandlers.hpp @@ -1,17 +1,17 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { class ADDON { - clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient)); + clientInit = QUOTE(call COMPILE_SCRIPT(XEH_postInitClient)); }; }; diff --git a/addons/volume/README.md b/addons/volume/README.md index 664cd35b01..88dcd37c6e 100644 --- a/addons/volume/README.md +++ b/addons/volume/README.md @@ -2,3 +2,7 @@ ace_volume ========== Volume module reduces volume in vehicles or on keypress. + +## ACEX Conversion - things still using acex prefix +- All settings +- CBA Keybind ID diff --git a/addons/yardage450/RscTitles.hpp b/addons/yardage450/RscTitles.hpp index 28fd7735e9..75ca73d5f3 100644 --- a/addons/yardage450/RscTitles.hpp +++ b/addons/yardage450/RscTitles.hpp @@ -24,7 +24,7 @@ class RscTitles { onUnload = "with uiNameSpace do { ACE_RscYardage450 = displayNull; };"; class Controls { - class ACE_Yardage450_RscTarget : ACE_Yardage450_RscText { + class ACE_Yardage450_RscTarget: ACE_Yardage450_RscText { idc = 720041; style = ST_CENTER; x = "0.5 - (0.18 * SafeZoneH)"; @@ -34,7 +34,7 @@ class RscTitles { sizeEx = "0.05 * SafeZoneH"; text = "TARGET ACQUIRED"; }; - class ACE_Yardage450_RscLaser : ACE_Yardage450_RscTarget { + class ACE_Yardage450_RscLaser: ACE_Yardage450_RscTarget { idc = 720042; x = "0.5 - (0.14 * SafeZoneH)"; y = "0.5 - (0.18 * SafeZoneH)"; @@ -45,7 +45,7 @@ class RscTitles { colorBackground[] = {0, 0, 0, 1}; text = "LASER"; }; - class ACE_Yardage450_RscRange : ACE_Yardage450_RscTarget { + class ACE_Yardage450_RscRange: ACE_Yardage450_RscTarget { idc = 720043; style = ST_RIGHT; x = "0.5 - (0.02 * SafeZoneH)"; @@ -55,7 +55,7 @@ class RscTitles { sizeEx = "0.06 * SafeZoneH"; text = "---"; }; - class ACE_Yardage450_RscMeters : ACE_Yardage450_RscLaser { + class ACE_Yardage450_RscMeters: ACE_Yardage450_RscLaser { idc = 720044; x = "0.5 + (0.06 * SafeZoneH)"; y = "0.5 + (0.19 * SafeZoneH)"; @@ -64,7 +64,7 @@ class RscTitles { sizeEx = "0.018 * SafeZoneH"; text = "METERS"; }; - class ACE_Yardage450_RscYards : ACE_Yardage450_RscMeters { + class ACE_Yardage450_RscYards: ACE_Yardage450_RscMeters { idc = 720045; y = "0.5 + (0.21 * SafeZoneH)"; w = "0.0417 * SafeZoneH"; diff --git a/docs/wiki/feature/overheating.md b/docs/wiki/feature/overheating.md index 13ecc83964..871d006322 100644 --- a/docs/wiki/feature/overheating.md +++ b/docs/wiki/feature/overheating.md @@ -16,7 +16,7 @@ version: ### 1.1 Weapon Jamming -Adds a probability to jam a weapon when firing. Jams can be cleared by reloading, using the clear jam-key, or using the self interaction menu. +Adds a probability to jam a weapon when firing. The hotter a weapon gets, the more likely a jam is to occur. ### 1.2 Temperature simulation @@ -28,13 +28,17 @@ Hot weapons can also cause chambered ammunition to spontaneously ignite. The hig ### 1.4 Spare barrels -Adds the ability to changes barrels on machine guns to compensate for those effects. Changing the barrel can also unjam the gun. +Adds the ability to change barrels on machine guns to compensate for those effects. When a barrel is changed, the coolest barrel available is always selected. ## 2. Usage ### 2.1 Clearing a jammed weapon -- To clear a jammed weapon, press SHIFT + R (ACE3 default key bind `Clear jam`). +Jams can be cleared in the following ways: +- Press SHIFT + R (ACE3 default key bind `Clear jam`). +- Press self interaction Ctrl + ⊞ Win (ACE3 default key bind `Self Interaction Key`), select `Equipment`, select 'Clear Jam' +- Reload (setting dependant) +- Swap barrels (setting dependant) ### 2.2 Swapping barrels diff --git a/docs/wiki/framework/overheating-framework.md b/docs/wiki/framework/overheating-framework.md index b72294d20e..5af0079af5 100644 --- a/docs/wiki/framework/overheating-framework.md +++ b/docs/wiki/framework/overheating-framework.md @@ -18,11 +18,13 @@ version: ```cpp class CfgWeapons { - class MyMG { + class Rifle_Long_Base_F ; + + class MyMG : Rifle_Long_Base_F { ace_overheating_mrbs = 3000; //Mean Rounds Between Stoppages (this will be scaled based on the barrel temp) - ace_overheating_slowdownFactor = 1; //Slowdown Factor (this will be scaled based on the barrel temp) + ace_overheating_slowdownFactor = 1; //Slowdown Factor, reduces the velocity of the projectile (this will be scaled based on the barrel temp) ace_overheating_allowSwapBarrel = 1; // 1 to enable barrel swap. 0 to disable. Meant for machine guns where you can easily swap the barrel without dismantling the whole weapon. - ace_overheating_dispersion = 0.75; //Dispersion Factor (this will be scaled based on the barrel temp) + ace_overheating_dispersion = 0.75; //Dispersion Factor, increases the dispersion of the projectile (this will be scaled based on the barrel temp) }; }; ``` @@ -32,9 +34,10 @@ class CfgWeapons { ```cpp class CfgWeapons { class Pistol_Base_F; - class MyRevolver : Pistol_Base_F { - ace_overheating_jamTypesAllowed = ["Fire","Dud"]; //Allowed and default values are ["Eject", "Extract", "Feed", "Fire", "Dud"]. In the example here a revolver does not eject, extract, or feed on each shot to those values are removed. + class MyRevolver: Pistol_Base_F { + ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; // Allowed and default values are ["Eject", "Extract", "Feed", "Fire", "Dud"]. In the example here a revolver does not eject, extract, or feed on each shot so those values are removed. }; +}; ``` ### 1.3 Custom jam clearing animation @@ -52,11 +55,11 @@ class CfgWeapons { class CfgWeapons { class Rifle_Long_Base_F ; - class MySniper : Rifle_Long_Base_F { + class MySniper: Rifle_Long_Base_F { ace_overheating_closedBolt = 1; // Closed bolt, can cook off from barrel heat. }; - class MyMG : Rifle_Long_Base_F { + class MyMG: Rifle_Long_Base_F { ace_overheating_closedBolt = 0; // Open bolt, can only cook off on failure to fire type jams. }; }; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index b1d118a97d..fa48ec8079 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -1,7 +1,7 @@ class CfgAmmo { class BulletBase; - class B_556x45_Ball : BulletBase { + class B_556x45_Ball: BulletBase { airFriction=-0.001265; hit=8; typicalSpeed=750; @@ -16,7 +16,7 @@ class CfgAmmo ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6}; }; - class ACE_556x45_Ball_Mk262 : B_556x45_Ball { + class ACE_556x45_Ball_Mk262: B_556x45_Ball { airFriction=-0.001125; caliber=0.6; deflecting=18; @@ -33,7 +33,7 @@ class CfgAmmo ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; - class ACE_556x45_Ball_Mk318 : B_556x45_Ball { + class ACE_556x45_Ball_Mk318: B_556x45_Ball { airFriction=-0.001120; caliber=0.6; deflecting=18; @@ -54,7 +54,7 @@ class CfgAmmo class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red { nvgOnly = 1; }; - class ACE_545x39_Ball_7N6M : B_556x45_Ball { + class ACE_545x39_Ball_7N6M: B_556x45_Ball { airFriction=-0.001162; caliber=0.5; deflecting=18; @@ -72,7 +72,7 @@ class CfgAmmo ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_556x45_Ball_Tracer_Yellow; - class ACE_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Yellow { + class ACE_545x39_Ball_7T3M: B_556x45_Ball_Tracer_Yellow { airFriction=-0.001162; caliber=0.5; deflecting=18; @@ -113,7 +113,7 @@ class CfgAmmo ACE_muzzleVelocities[] = {903}; // at 21°C, at 15°C 895 m/s according with the 20Rnd_650x39_Cased_Mag_F initSpeep ACE_barrelLengths[] = {640}; }; - class B_65x39_Caseless : BulletBase { + class B_65x39_Caseless: BulletBase { airFriction=-0.000785; typicalSpeed=800; ACE_caliber=6.706; @@ -128,11 +128,11 @@ class CfgAmmo ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4, 762.0}; }; class B_65x39_Case_yellow; - class ACE_65x39_Caseless_Tracer_Dim : B_65x39_Case_yellow { + class ACE_65x39_Caseless_Tracer_Dim: B_65x39_Case_yellow { nvgOnly = 1; }; class B_65x39_Caseless_green; - class ACE_65x39_Caseless_green_Tracer_Dim : B_65x39_Caseless_green { + class ACE_65x39_Caseless_green_Tracer_Dim: B_65x39_Caseless_green { nvgOnly = 1; }; class ACE_65x47_Ball_Scenar: B_65x39_Caseless @@ -150,7 +150,7 @@ class CfgAmmo ACE_muzzleVelocities[]={730, 760, 790, 820, 830}; ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; - class B_762x51_Ball : BulletBase { + class B_762x51_Ball: BulletBase { airFriction=-0.001035; typicalSpeed=833; hit=9; @@ -169,7 +169,7 @@ class CfgAmmo class ACE_B_762x51_Tracer_Dim: B_762x51_Tracer_Yellow { nvgOnly = 1; }; - class ACE_762x51_Ball_M118LR : B_762x51_Ball { + class ACE_762x51_Ball_M118LR: B_762x51_Ball { airFriction=-0.0008525; caliber=1.05; hit=16; @@ -185,7 +185,7 @@ class CfgAmmo ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball { + class ACE_762x51_Ball_Mk319_Mod_0: B_762x51_Ball { airFriction=-0.00103; caliber=0.85; hit=14; @@ -201,7 +201,7 @@ class CfgAmmo ACE_muzzleVelocities[]={838, 892, 910}; ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; - class ACE_762x51_Ball_Subsonic : B_762x51_Ball { + class ACE_762x51_Ball_Subsonic: B_762x51_Ball { airFriction=-0.000535; caliber=0.5; hit=6; @@ -217,7 +217,7 @@ class CfgAmmo ACE_muzzleVelocities[]={305, 325, 335, 340}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { + class ACE_762x67_Ball_Mk248_Mod_0: B_762x51_Ball { airFriction=-0.000830; caliber=1.08; hit=17; @@ -233,7 +233,7 @@ class CfgAmmo ACE_muzzleVelocities[]={865, 900, 924}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { + class ACE_762x67_Ball_Mk248_Mod_1: B_762x51_Ball { airFriction=-0.000815; caliber=1.12; hit=18; @@ -249,7 +249,7 @@ class CfgAmmo ACE_muzzleVelocities[]={847, 867, 877}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { + class ACE_762x67_Ball_Berger_Hybrid_OTM: B_762x51_Ball { airFriction=-0.00076; caliber=1.15; hit=19; @@ -279,7 +279,7 @@ class CfgAmmo ACE_muzzleVelocities[]={700, 800, 820, 833}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x54_Ball_7N14 : B_762x51_Ball { + class ACE_762x54_Ball_7N14: B_762x51_Ball { airFriction=-0.001023; caliber=0.95; hit=15; @@ -296,7 +296,7 @@ class CfgAmmo ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class B_762x54_Tracer_Green; - class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { + class ACE_762x54_Ball_7T2: B_762x54_Tracer_Green { airFriction=-0.001023; caliber=0.9; hit=15; @@ -312,7 +312,7 @@ class CfgAmmo ACE_muzzleVelocities[]={680, 750, 798, 800}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class ACE_762x35_Ball : B_762x51_Ball { + class ACE_762x35_Ball: B_762x51_Ball { airFriction=-0.000821; caliber=0.9; hit=11; @@ -328,7 +328,7 @@ class CfgAmmo ACE_muzzleVelocities[]={620, 655, 675}; ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; - class ACE_762x39_Ball : B_762x51_Ball { + class ACE_762x39_Ball: B_762x51_Ball { airFriction=-0.0015168; hit=12; typicalSpeed=716; @@ -343,7 +343,7 @@ class CfgAmmo ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class ACE_762x39_Ball_57N231P : B_762x51_Tracer_Yellow { + class ACE_762x39_Ball_57N231P: B_762x51_Tracer_Yellow { airFriction=-0.0015168; hit=12; typicalSpeed=716; @@ -358,7 +358,7 @@ class CfgAmmo ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class B_9x21_Ball : BulletBase { + class B_9x21_Ball: BulletBase { airFriction=-0.00125; typicalSpeed=390; hit=6; @@ -373,7 +373,7 @@ class CfgAmmo ACE_muzzleVelocities[]={440, 460, 480}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class ACE_9x18_Ball_57N181S : B_9x21_Ball { + class ACE_9x18_Ball_57N181S: B_9x21_Ball { hit=5; airFriction=-0.001234; typicalSpeed=298; @@ -388,7 +388,7 @@ class CfgAmmo ACE_muzzleVelocities[]={298, 330, 350}; ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; - class ACE_9x19_Ball : B_9x21_Ball { + class ACE_9x19_Ball: B_9x21_Ball { airFriction=-0.001234; typicalSpeed=370; hit=6; @@ -403,7 +403,7 @@ class CfgAmmo ACE_muzzleVelocities[]={340, 370, 400}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class ACE_10x25_Ball : B_9x21_Ball { + class ACE_10x25_Ball: B_9x21_Ball { airFriction=-0.00168; typicalSpeed=425; hit=7; @@ -433,7 +433,7 @@ class CfgAmmo ACE_muzzleVelocities[]={282, 300, 320}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class ACE_303_Ball : ACE_762x51_Ball_M118LR { + class ACE_303_Ball: ACE_762x51_Ball_M118LR { airFriction=-0.00083; typicalSpeed=761; ACE_caliber=7.899; @@ -447,7 +447,7 @@ class CfgAmmo ACE_muzzleVelocities[]={748, 761, 765}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class B_93x64_Ball : BulletBase { + class B_93x64_Ball: BulletBase { airFriction=-0.00106; typicalSpeed=880; ACE_caliber=9.296; @@ -462,7 +462,7 @@ class CfgAmmo ACE_muzzleVelocities[]={850, 870, 880}; ACE_barrelLengths[]={508.0, 620.014, 660.4}; }; - class B_93x64_Ball_ace_3_13 : BulletBase { + class B_93x64_Ball_ace_3_13: BulletBase { airFriction = -0.000808; // According with the G1 BC 0.515 and the SVDK muzzle velocity 780 m/s https://www.kalashnikov.ru/medialibrary/bd9/72_77.pdf#page=3 ACE_caliber = 9.28; // https://www.kalashnikov.ru/medialibrary/bd9/72_77.pdf#page=3 ACE_bulletLength = 35.56; // Average length from bullets with similar mass and BC @@ -476,7 +476,7 @@ class CfgAmmo ACE_muzzleVelocities[] = {768, 788, 798}; // Default values - 82 m/s at 21°C, at 15°C {760, 780, 790} according with the 10Rnd_93x64_DMR_05_Mag and the 150Rnd_93x64_Mag initSpeed ACE_barrelLengths[] = {508.0, 620.0, 660.4}; }; - class B_408_Ball : BulletBase { + class B_408_Ball: BulletBase { timeToLive=10; airFriction=-0.000395; typicalSpeed=910; @@ -492,7 +492,7 @@ class CfgAmmo ACE_muzzleVelocities[]={910}; ACE_barrelLengths[]={736.6}; }; - class ACE_106x83mm_Ball : B_408_Ball { + class ACE_106x83mm_Ball: B_408_Ball { timeToLive=10; ACE_caliber=10.566; ACE_bulletLength=53.061; @@ -505,7 +505,7 @@ class CfgAmmo ACE_muzzleVelocities[]={960}; ACE_barrelLengths[]={736.6}; }; - class B_338_Ball : BulletBase { + class B_338_Ball: BulletBase { timeToLive=10; airFriction=-0.000606; typicalSpeed=915; @@ -520,7 +520,7 @@ class CfgAmmo ACE_muzzleVelocities[]={880, 915, 925}; ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; - class B_338_NM_Ball : BulletBase { + class B_338_NM_Ball: BulletBase { airFriction=-0.000537; typicalSpeed=820; ACE_caliber=8.585; @@ -534,7 +534,7 @@ class CfgAmmo ACE_muzzleVelocities[]={790, 807, 820}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class ACE_338_Ball : B_338_Ball { + class ACE_338_Ball: B_338_Ball { timeToLive=10; airFriction=-0.000535; caliber=1.55; @@ -550,7 +550,7 @@ class CfgAmmo ACE_muzzleVelocities[]={800, 820, 826, 830}; ACE_barrelLengths[]={508.0, 609.6, 673.1, 711.2}; }; - class ACE_338_Ball_API526 : B_338_Ball { + class ACE_338_Ball_API526: B_338_Ball { timeToLive=10; airFriction=-0.000673; caliber=2.4; @@ -566,7 +566,7 @@ class CfgAmmo ACE_muzzleVelocities[]={880, 915, 925}; ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; - class B_127x54_Ball : BulletBase { + class B_127x54_Ball: BulletBase { airFriction=-0.00014; typicalSpeed=300; ACE_caliber=12.954; @@ -580,7 +580,7 @@ class CfgAmmo ACE_muzzleVelocities[]={300}; ACE_barrelLengths[]={436.88}; }; - class B_127x99_Ball : BulletBase { + class B_127x99_Ball: BulletBase { timeToLive=10; airFriction=-0.0006; typicalSpeed=853; @@ -595,7 +595,7 @@ class CfgAmmo ACE_muzzleVelocities[]={853}; ACE_barrelLengths[]={736.6}; }; - class ACE_127x99_Ball_AMAX : B_127x99_Ball { + class ACE_127x99_Ball_AMAX: B_127x99_Ball { timeToLive=10; airFriction=-0.000374; typicalSpeed=860; @@ -610,7 +610,7 @@ class CfgAmmo ACE_muzzleVelocities[]={860}; ACE_barrelLengths[]={736.6}; }; - class B_127x108_Ball : BulletBase { + class B_127x108_Ball: BulletBase { timeToLive=10; airFriction=-0.00064; typicalSpeed=820; @@ -651,7 +651,7 @@ class CfgAmmo ACE_barrelLengths[] = {264, 407}; airFriction = -0.002619; // default BI value -0.001412 }; - class B_45ACP_Ball : BulletBase { + class B_45ACP_Ball: BulletBase { airFriction=-0.0007182; typicalSpeed=250; ACE_caliber=11.481; @@ -666,7 +666,7 @@ class CfgAmmo ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class TMR_B_762x51_M118LR : B_762x51_Ball + class TMR_B_762x51_M118LR: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=31.496; @@ -889,7 +889,7 @@ class CfgAmmo ACE_muzzleVelocities[]={730, 750, 760}; ACE_barrelLengths[]={203.2, 254.0, 304.8}; }; - class RH_556x45_B_M855A1 : B_556x45_Ball + class RH_556x45_B_M855A1: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -902,7 +902,7 @@ class CfgAmmo ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6}; }; - class RH_556x45_B_Mk262 : B_556x45_Ball + class RH_556x45_B_Mk262: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -915,7 +915,7 @@ class CfgAmmo ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; - class RH_556x45_B_Mk318 : B_556x45_Ball + class RH_556x45_B_Mk318: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -993,7 +993,7 @@ class CfgAmmo ACE_muzzleVelocities[]={300, 320, 340}; ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; - class RH_762x51_B_M80A1 : B_762x51_Ball + class RH_762x51_B_M80A1: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=28.956; @@ -1006,7 +1006,7 @@ class CfgAmmo ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; - class RH_762x51_B_Mk316LR : B_762x51_Ball + class RH_762x51_B_Mk316LR: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=31.496; @@ -1019,7 +1019,7 @@ class CfgAmmo ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class RH_762x51_B_Mk319 : B_762x51_Ball + class RH_762x51_B_Mk319: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=27.28; @@ -1244,7 +1244,7 @@ class CfgAmmo ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class M_mas_545x39_Ball_7N6M : BulletBase + class M_mas_545x39_Ball_7N6M: BulletBase { ACE_caliber=5.588; ACE_bulletLength=21.59; @@ -1257,7 +1257,7 @@ class CfgAmmo ACE_muzzleVelocities[]={780, 880, 920}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class M_mas_545x39_Ball_7T3M : BulletBase + class M_mas_545x39_Ball_7T3M: BulletBase { ACE_caliber=5.588; ACE_bulletLength=21.59; @@ -1270,7 +1270,7 @@ class CfgAmmo ACE_muzzleVelocities[]={785, 883, 925}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class B_mas_556x45_Ball_Mk262 : B_556x45_Ball + class B_mas_556x45_Ball_Mk262: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -1283,7 +1283,7 @@ class CfgAmmo ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; - class B_mas_9x18_Ball_57N181S : BulletBase + class B_mas_9x18_Ball_57N181S: BulletBase { ACE_caliber=9.271; ACE_bulletLength=15.494; @@ -1374,7 +1374,7 @@ class CfgAmmo ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class B_mas_762x51_Ball_M118LR : B_762x51_Ball + class B_mas_762x51_Ball_M118LR: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=31.496; @@ -1387,7 +1387,7 @@ class CfgAmmo ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball + class B_mas_762x67_Ball_Mk248_Mod_0: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=34.366; @@ -1400,7 +1400,7 @@ class CfgAmmo ACE_muzzleVelocities[]={865, 900, 924}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball + class B_mas_762x67_Ball_Mk248_Mod_1: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=37.821; @@ -1413,7 +1413,7 @@ class CfgAmmo ACE_muzzleVelocities[]={820, 867, 900}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball + class B_mas_762x67_Ball_Berger_Hybrid_OTM: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=40.691; @@ -1426,7 +1426,7 @@ class CfgAmmo ACE_muzzleVelocities[]={800, 853, 884}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class B_mas_762x54_Ball : BulletBase + class B_mas_762x54_Ball: BulletBase { ACE_caliber=7.925; ACE_bulletLength=28.956; @@ -1439,7 +1439,7 @@ class CfgAmmo ACE_muzzleVelocities[]={700, 800, 820, 833}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class B_mas_762x54_Ball_T : BulletBase + class B_mas_762x54_Ball_T: BulletBase { ACE_caliber=7.925; ACE_bulletLength=28.956; @@ -1452,7 +1452,7 @@ class CfgAmmo ACE_muzzleVelocities[]={680, 750, 798, 800}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class BWA3_B_762x51_Ball_LR : BulletBase + class BWA3_B_762x51_Ball_LR: BulletBase { ACE_caliber=7.823; ACE_bulletLength=31.496; @@ -1465,7 +1465,7 @@ class CfgAmmo ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class BWA3_B_762x51_Ball_SD : BulletBase + class BWA3_B_762x51_Ball_SD: BulletBase { ACE_caliber=7.823; ACE_bulletLength=31.496; @@ -1479,7 +1479,7 @@ class CfgAmmo ACE_barrelLengths[]={406.4, 609.6}; }; - class BWA3_B_46x30_Ball : BulletBase + class BWA3_B_46x30_Ball: BulletBase { ACE_caliber=4.902; ACE_bulletLength=13.005; @@ -1493,7 +1493,7 @@ class CfgAmmo ACE_barrelLengths[]={101.6, 177.8, 228.6, 304.8}; }; - class Trixie_338_Ball : BulletBase + class Trixie_338_Ball: BulletBase { ACE_caliber=8.585; ACE_bulletLength=43.18; @@ -1506,7 +1506,7 @@ class CfgAmmo ACE_muzzleVelocities[]={820, 826, 830}; ACE_barrelLengths[]={609.6, 673.1, 711.2}; }; - class Trixie_303_Ball : BulletBase + class Trixie_303_Ball: BulletBase { ACE_caliber=7.899; ACE_bulletLength=31.166; @@ -1520,7 +1520,7 @@ class CfgAmmo ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - class rhs_ammo_556x45_Mk318_Ball : BulletBase + class rhs_ammo_556x45_Mk318_Ball: BulletBase { ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -1533,7 +1533,7 @@ class CfgAmmo ACE_muzzleVelocities[]={780, 886, 950}; ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; - class rhs_ammo_556x45_Mk262_Ball : BulletBase + class rhs_ammo_556x45_Mk262_Ball: BulletBase { ACE_caliber=5.69; ACE_bulletLength=23.012; @@ -1546,7 +1546,7 @@ class CfgAmmo ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; - class rhsammo_762x51_Ball : BulletBase + class rhsammo_762x51_Ball: BulletBase { ACE_caliber=7.823; ACE_bulletLength=28.956; @@ -1559,7 +1559,7 @@ class CfgAmmo ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; - class rhs_B_545x39_Ball : BulletBase + class rhs_B_545x39_Ball: BulletBase { ACE_caliber=5.588; ACE_bulletLength=21.59; @@ -1572,7 +1572,7 @@ class CfgAmmo ACE_muzzleVelocities[]={780, 880, 920}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class rhs_B_545x39_Ball_Tracer_Green : BulletBase + class rhs_B_545x39_Ball_Tracer_Green: BulletBase { ACE_caliber=5.588; ACE_bulletLength=21.59; @@ -1585,7 +1585,7 @@ class CfgAmmo ACE_muzzleVelocities[]={785, 883, 925}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class rhs_ammo_762x51_M118_Special_Ball : BulletBase + class rhs_ammo_762x51_M118_Special_Ball: BulletBase { ACE_caliber=7.823; ACE_bulletLength=31.496; @@ -1598,7 +1598,7 @@ class CfgAmmo ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class rhs_B_762x54_Ball : BulletBase + class rhs_B_762x54_Ball: BulletBase { ACE_caliber=7.925; ACE_bulletLength=28.956; @@ -1611,7 +1611,7 @@ class CfgAmmo ACE_muzzleVelocities[]={700, 800, 820, 833}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class rhs_B_762x54_Ball_Tracer_Green : BulletBase + class rhs_B_762x54_Ball_Tracer_Green: BulletBase { ACE_caliber=7.925; ACE_bulletLength=28.956; @@ -1624,7 +1624,7 @@ class CfgAmmo ACE_muzzleVelocities[]={680, 750, 798, 800}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class rhs_B_762x39_Ball : BulletBase + class rhs_B_762x39_Ball: BulletBase { ACE_caliber=7.823; ACE_bulletLength=28.956; @@ -1637,7 +1637,7 @@ class CfgAmmo ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class rhs_B_762x39_Tracer : BulletBase + class rhs_B_762x39_Tracer: BulletBase { ACE_caliber=7.823; ACE_bulletLength=28.956; @@ -1650,7 +1650,7 @@ class CfgAmmo ACE_muzzleVelocities[]={650, 716, 750}; ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; - class rhs_ammo_762x51_M80_Ball : BulletBase + class rhs_ammo_762x51_M80_Ball: BulletBase { ACE_caliber=7.823; ACE_bulletLength=28.956; @@ -1663,7 +1663,7 @@ class CfgAmmo ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; - class rhsusf_B_300winmag : BulletBase + class rhsusf_B_300winmag: BulletBase { ACE_caliber=7.823; ACE_bulletLength=37.821; diff --git a/extras/CfgWeaponsReference.hpp b/extras/CfgWeaponsReference.hpp index 5775b01090..3f8ef7d740 100644 --- a/extras/CfgWeaponsReference.hpp +++ b/extras/CfgWeaponsReference.hpp @@ -25,47 +25,47 @@ class CfgWeapons class DMR_06_base_F; class MMG_01_base_F; class MMG_02_base_F; - class hgun_P07_F : Pistol_Base_F + class hgun_P07_F: Pistol_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=101.6; }; - class hgun_Rook40_F : Pistol_Base_F + class hgun_Rook40_F: Pistol_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=111.76; }; - class hgun_Pistol_heavy_01_F : Pistol_Base_F + class hgun_Pistol_heavy_01_F: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=114.3; }; - class hgun_Pistol_heavy_02_F : Pistol_Base_F + class hgun_Pistol_heavy_02_F: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=76.2; }; - class hgun_ACPC2_F : Pistol_Base_F + class hgun_ACPC2_F: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=127.0; }; - class hgun_PDW2000_F : PDW2000_Base_F + class hgun_PDW2000_F: PDW2000_Base_F { ACE_barrelTwist=228.6; ACE_barrelLength=177.8; }; - class arifle_Katiba_F : arifle_Katiba_Base_F + class arifle_Katiba_F: arifle_Katiba_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=728.98; }; - class arifle_Katiba_C_F : arifle_Katiba_Base_F + class arifle_Katiba_C_F: arifle_Katiba_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=680.72; }; - class arifle_Katiba_GL_F : arifle_Katiba_Base_F + class arifle_Katiba_GL_F: arifle_Katiba_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=728.98; @@ -95,72 +95,72 @@ class CfgWeapons ACE_barrelTwist=228.6; ACE_barrelLength=457.2; }; - class arifle_SDAR_F : SDAR_base_F + class arifle_SDAR_F: SDAR_base_F { ACE_barrelTwist=285.75; ACE_barrelLength=457.2; }; - class SMG_02_F : SMG_02_Base_F + class SMG_02_F: SMG_02_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=195.58; }; - class arifle_TRG20_F : Tavor_base_F + class arifle_TRG20_F: Tavor_base_F { ACE_barrelTwist=177.8; ACE_barrelLength=381.0; }; - class arifle_TRG21_F : Tavor_base_F + class arifle_TRG21_F: Tavor_base_F { ACE_barrelTwist=177.8; ACE_barrelLength=459.74; }; - class LMG_Zafir_F : Rifle_Long_Base_F + class LMG_Zafir_F: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=459.74; }; - class arifle_Mk20_F : Mk20_Base_F + class arifle_Mk20_F: Mk20_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=441.96; }; - class arifle_Mk20C_F : Mk20_Base_F + class arifle_Mk20C_F: Mk20_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=406.4; }; - class arifle_Mk20_GL_F : Mk20_Base_F + class arifle_Mk20_GL_F: Mk20_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=406.4; }; - class SMG_01_F : SMG_01_Base + class SMG_01_F: SMG_01_Base { ACE_barrelTwist=406.4; ACE_barrelLength=139.7; }; - class srifle_DMR_01_F : DMR_01_base_F + class srifle_DMR_01_F: DMR_01_base_F { ACE_barrelTwist=241.3; ACE_barrelLength=609.6; }; - class srifle_EBR_F : EBR_base_F + class srifle_EBR_F: EBR_base_F { ACE_barrelTwist=304.8; ACE_barrelLength=609.6; }; - class LMG_Mk200_F : Rifle_Long_Base_F + class LMG_Mk200_F: Rifle_Long_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class srifle_LRR_F : LRR_base_F + class srifle_LRR_F: LRR_base_F { ACE_barrelTwist=330.2; ACE_barrelLength=736.6; }; - class srifle_GM6_F : GM6_base_F + class srifle_GM6_F: GM6_base_F { ACE_barrelTwist=381.0; ACE_barrelLength=1099.82; @@ -205,7 +205,7 @@ class CfgWeapons ACE_barrelTwist=234.95; ACE_barrelLength=609.6; }; - class HMG_M2 : HMG_127 + class HMG_M2: HMG_127 { ACE_barrelTwist=304.8; ACE_barrelLength=1143.0; @@ -222,432 +222,432 @@ class CfgWeapons ACE_barrelLength = 264; modes[] = {"Single", "FullAuto"}; }; - class RH_deagle : Pistol_Base_F + class RH_deagle: Pistol_Base_F { ACE_barrelTwist=482.6; ACE_barrelLength=152.4; }; - class RH_sw659 : Pistol_Base_F + class RH_sw659: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=188.976; }; - class RH_usp : Pistol_Base_F + class RH_usp: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=112.014; }; - class RH_uspm : Pistol_Base_F + class RH_uspm: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=152.4; }; - class RH_mak : Pistol_Base_F + class RH_mak: Pistol_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=93.472; }; - class RH_m1911 : Pistol_Base_F + class RH_m1911: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=127.0; }; - class RH_kimber : Pistol_Base_F + class RH_kimber: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=127.0; }; - class RH_m9 : Pistol_Base_F + class RH_m9: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=124.46; }; - class RH_vz61 : Pistol_Base_F + class RH_vz61: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=114.3; }; - class RH_tec9 : Pistol_Base_F + class RH_tec9: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=127.0; }; - class RH_muzi : Pistol_Base_F + class RH_muzi: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=127.0; }; - class RH_g18 : Pistol_Base_F + class RH_g18: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=114.046; }; - class RH_g17 : Pistol_Base_F + class RH_g17: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=114.046; }; - class RH_tt33 : Pistol_Base_F + class RH_tt33: Pistol_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=116.84; }; - class RH_mk2 : Pistol_Base_F + class RH_mk2: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=101.6; }; - class RH_p226 : Pistol_Base_F + class RH_p226: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=111.76; }; - class RH_g19 : Pistol_Base_F + class RH_g19: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=101.6; }; - class RH_gsh18 : Pistol_Base_F + class RH_gsh18: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=104.14; }; - class RH_mateba : Pistol_Base_F + class RH_mateba: Pistol_Base_F { ACE_barrelTwist=355.6; ACE_barrelLength=152.4; }; - class RH_python : Pistol_Base_F + class RH_python: Pistol_Base_F { ACE_barrelTwist=355.6; ACE_barrelLength=152.4; }; - class RH_bull : Pistol_Base_F + class RH_bull: Pistol_Base_F { ACE_barrelTwist=609.6; ACE_barrelLength=165.1; }; - class RH_ttracker : Pistol_Base_F + class RH_ttracker: Pistol_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=101.6; }; - class RH_mp412 : Pistol_Base_F + class RH_mp412: Pistol_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=152.4; }; - class RH_fnp45 : Pistol_Base_F + class RH_fnp45: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=114.3; }; - class RH_fn57 : Pistol_Base_F + class RH_fn57: Pistol_Base_F { ACE_barrelTwist=231.14; ACE_barrelLength=121.92; }; - class RH_vp70 : Pistol_Base_F + class RH_vp70: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=116.84; }; - class RH_cz75 : Pistol_Base_F + class RH_cz75: Pistol_Base_F { ACE_barrelTwist=246.38; ACE_barrelLength=119.38; }; - class RH_PDW : Rifle_Base_F + class RH_PDW: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=254.0; }; - class RH_hb : Rifle_Base_F + class RH_hb: Rifle_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=152.4; }; - class RH_sbr9 : Rifle_Base_F + class RH_sbr9: Rifle_Base_F { ACE_barrelTwist=246.38; ACE_barrelLength=228.6; }; - class RH_ar10 : Rifle_Base_F + class RH_ar10: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=528.32; }; - class RH_m4 : Rifle_Base_F + class RH_m4: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class RH_M4m : Rifle_Base_F + class RH_M4m: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=266.7; }; - class RH_M4sbr : Rifle_Base_F + class RH_M4sbr: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=266.7; }; - class RH_M16a1 : Rifle_Base_F + class RH_M16a1: Rifle_Base_F { ACE_barrelTwist=355.6; ACE_barrelLength=508.0; }; - class RH_M16A2 : Rifle_Base_F + class RH_M16A2: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A3 : Rifle_Base_F + class RH_M16A3: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A4 : Rifle_Base_F + class RH_M16A4: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A6 : Rifle_Base_F + class RH_M16A6: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_hk416 : Rifle_Base_F + class RH_hk416: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class RH_hk416c : Rifle_Base_F + class RH_hk416c: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class RH_hk416s : Rifle_Base_F + class RH_hk416s: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=264.16; }; - class RH_m27iar : Rifle_Base_F + class RH_m27iar: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=419.1; }; - class RH_Mk12mod1 : Rifle_Base_F + class RH_Mk12mod1: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class RH_SAMR : Rifle_Base_F + class RH_SAMR: Rifle_Base_F { ACE_barrelTwist=195.58; ACE_barrelLength=508.0; }; - class RH_m110 : Rifle_Base_F + class RH_m110: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=508.0; }; - class RH_mk11 : Rifle_Base_F + class RH_mk11: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class RH_sr25ec : Rifle_Base_F + class RH_sr25ec: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=508.0; }; - class hlc_rifle_ak74 : Rifle_Base_F + class hlc_rifle_ak74: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=414.02; }; - class hlc_rifle_aks74u : Rifle_Base_F + class hlc_rifle_aks74u: Rifle_Base_F { ACE_barrelTwist=160.02; ACE_barrelLength=210.82; }; - class hlc_rifle_ak47 : Rifle_Base_F + class hlc_rifle_ak47: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=414.02; }; - class hlc_rifle_akm : Rifle_Base_F + class hlc_rifle_akm: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=414.02; }; - class hlc_rifle_rpk : Rifle_Base_F + class hlc_rifle_rpk: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=589.28; }; - class hlc_rifle_aek971 : Rifle_Base_F + class hlc_rifle_aek971: Rifle_Base_F { ACE_barrelTwist=241.3; ACE_barrelLength=431.8; }; - class hlc_rifle_saiga12k : Rifle_Base_F + class hlc_rifle_saiga12k: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=429.26; }; - class hlc_ar15_base : Rifle_Base_F + class hlc_ar15_base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=292.1; }; - class hlc_rifle_bcmjack : Rifle_Base_F + class hlc_rifle_bcmjack: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class hlc_rifle_Bushmaster300 : Rifle_Base_F + class hlc_rifle_Bushmaster300: Rifle_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=406.4; }; - class hlc_rifle_SAMR : Rifle_Base_F + class hlc_rifle_SAMR: Rifle_Base_F { ACE_barrelTwist=228.6; ACE_barrelLength=406.4; }; - class hlc_rifle_honeybase : Rifle_Base_F + class hlc_rifle_honeybase: Rifle_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=152.4; }; - class hlc_rifle_SLRchopmod : Rifle_Base_F + class hlc_rifle_SLRchopmod: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class hlc_rifle_LAR : Rifle_Base_F + class hlc_rifle_LAR: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class hlc_rifle_c1A1 : Rifle_Base_F + class hlc_rifle_c1A1: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=551.18; }; - class hlc_rifle_FAL5061 : Rifle_Base_F + class hlc_rifle_FAL5061: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=457.2; }; - class hlc_rifle_STG58F : Rifle_Base_F + class hlc_rifle_STG58F: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class hlc_rifle_SLR : Rifle_Base_F + class hlc_rifle_SLR: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=551.18; }; - class hlc_rifle_falosw : Rifle_Base_F + class hlc_rifle_falosw: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=330.2; }; - class hlc_rifle_psg1 : Rifle_Base_F + class hlc_rifle_psg1: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=650.24; }; - class hlc_rifle_g3sg1 : Rifle_Base_F + class hlc_rifle_g3sg1: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=449.58; }; - class hlc_rifle_hk51 : Rifle_Base_F + class hlc_rifle_hk51: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=211.074; }; - class hlc_rifle_hk53 : Rifle_Base_F + class hlc_rifle_hk53: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=211.074; }; - class hlc_rifle_g3a3 : Rifle_Base_F + class hlc_rifle_g3a3: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=449.58; }; - class hlc_M14_base : Rifle_Base_F + class hlc_M14_base: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class hlc_rifle_m14sopmod : Rifle_Base_F + class hlc_rifle_m14sopmod: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=457.2; }; - class hlc_lmg_M60E4 : Rifle_Base_F + class hlc_lmg_M60E4: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=431.8; }; - class hlc_lmg_m60 : Rifle_Base_F + class hlc_lmg_m60: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class hlc_smg_mp5k_PDW : Rifle_Base_F + class hlc_smg_mp5k_PDW: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=114.3; }; - class hlc_smg_mp5a2 : Rifle_Base_F + class hlc_smg_mp5a2: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - class hlc_smg_mp5a4 : Rifle_Base_F + class hlc_smg_mp5a4: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - class hlc_smg_mp5n : Rifle_Base_F + class hlc_smg_mp5n: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - class hlc_smg_mp5sd5 : Rifle_Base_F + class hlc_smg_mp5sd5: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=144.78; }; - class hlc_smg_mp5sd6 : Rifle_Base_F + class hlc_smg_mp5sd6: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=144.78; }; - class hlc_smg_9mmar : Rifle_Base_F + class hlc_smg_9mmar: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - class hlc_smg_mp510 : Rifle_Base_F + class hlc_smg_mp510: Rifle_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=226.06; }; - class hlc_smg_mp5a3 : Rifle_Base_F + class hlc_smg_mp5a3: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; @@ -708,515 +708,515 @@ class CfgWeapons ACE_barrelTwist=254.0; ACE_barrelLength=134.112; }; - class arifle_mas_mk16 : Rifle_Base_F + class arifle_mas_mk16: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=350.52; }; - class arifle_mas_mk16_l : Rifle_Base_F + class arifle_mas_mk16_l: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class arifle_mas_mk17 : Rifle_Base_F + class arifle_mas_mk17: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=406.4; }; - class srifle_mas_m110 : Rifle_Base_F + class srifle_mas_m110: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=508.0; }; - class arifle_mas_ak_74m : Rifle_Base_F + class arifle_mas_ak_74m: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=415.036; }; - class arifle_mas_ak_74m_gl : Rifle_Base_F + class arifle_mas_ak_74m_gl: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=415.036; }; - class srifle_mas_svd : Rifle_Base_F + class srifle_mas_svd: Rifle_Base_F { ACE_barrelTwist=238.76; ACE_barrelLength=619.76; }; - class srifle_mas_m91 : Rifle_Base_F + class srifle_mas_m91: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=736.6; }; - class srifle_mas_ksvk : Rifle_Base_F + class srifle_mas_ksvk: Rifle_Base_F { ACE_barrelTwist=457.2; ACE_barrelLength=999.998; }; - class LMG_mas_rpk_F : Rifle_Base_F + class LMG_mas_rpk_F: Rifle_Base_F { ACE_barrelTwist=195.072; ACE_barrelLength=589.28; }; - class LMG_mas_pkm_F : Rifle_Base_F + class LMG_mas_pkm_F: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=645.16; }; - class arifle_mas_aks74u : Rifle_Base_F + class arifle_mas_aks74u: Rifle_Base_F { ACE_barrelTwist=160.02; ACE_barrelLength=210.82; }; - class arifle_mas_bizon : Rifle_Base_F + class arifle_mas_bizon: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=231.14; }; - class arifle_mas_saiga : Rifle_Base_F + class arifle_mas_saiga: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=430.022; }; - class arifle_mas_hk416 : Rifle_Base_F + class arifle_mas_hk416: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class arifle_mas_hk416_gl : Rifle_Base_F + class arifle_mas_hk416_gl: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class arifle_mas_hk416c : Rifle_Base_F + class arifle_mas_hk416c: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class arifle_mas_hk416_m203c : Rifle_Base_F + class arifle_mas_hk416_m203c: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class arifle_mas_hk417c : Rifle_Base_F + class arifle_mas_hk417c: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=330.2; }; - class arifle_mas_m4 : Rifle_Base_F + class arifle_mas_m4: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class arifle_mas_m4c : Rifle_Base_F + class arifle_mas_m4c: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=261.62; }; - class arifle_mas_l119 : Rifle_Base_F + class arifle_mas_l119: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=406.4; }; - class arifle_mas_l119_gl : Rifle_Base_F + class arifle_mas_l119_gl: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=406.4; }; - class arifle_mas_l119_m203 : Rifle_Base_F + class arifle_mas_l119_m203: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=406.4; }; - class arifle_mas_m16 : Rifle_Base_F + class arifle_mas_m16: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class arifle_mas_m16_gl : Rifle_Base_F + class arifle_mas_m16_gl: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class srifle_mas_hk417 : Rifle_Base_F + class srifle_mas_hk417: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=419.1; }; - class srifle_mas_sr25 : Rifle_Base_F + class srifle_mas_sr25: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class srifle_mas_ebr : Rifle_Base_F + class srifle_mas_ebr: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=457.2; }; - class srifle_mas_m24 : Rifle_Base_F + class srifle_mas_m24: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class arifle_mas_mp5 : Rifle_Base_F + class arifle_mas_mp5: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - class arifle_mas_mp5sd : Rifle_Base_F + class arifle_mas_mp5sd: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=144.78; }; - class srifle_mas_m107 : Rifle_Base_F + class srifle_mas_m107: Rifle_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class LMG_mas_M249_F : Rifle_Base_F + class LMG_mas_M249_F: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=414.02; }; - class LMG_mas_M249a_F : Rifle_Base_F + class LMG_mas_M249a_F: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class LMG_mas_mk48_F : Rifle_Base_F + class LMG_mas_mk48_F: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=501.65; }; - class LMG_mas_m240_F : Rifle_Base_F + class LMG_mas_m240_F: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - class LMG_mas_mg3_F : Rifle_Base_F + class LMG_mas_mg3_F: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=563.88; }; - class arifle_mas_g3 : Rifle_Base_F + class arifle_mas_g3: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=449.58; }; - class arifle_mas_g3_m203 : Rifle_Base_F + class arifle_mas_g3_m203: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=449.58; }; - class arifle_mas_fal : Rifle_Base_F + class arifle_mas_fal: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class arifle_mas_fal_m203 : Rifle_Base_F + class arifle_mas_fal_m203: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class arifle_mas_m1014 : Rifle_Base_F + class arifle_mas_m1014: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=469.9; }; - class BWA3_P8 : Pistol_Base_F + class BWA3_P8: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=107.95; }; - class BWA3_MP7 : Pistol_Base_F + class BWA3_MP7: Pistol_Base_F { ACE_barrelTwist=160.02; ACE_barrelLength=180.34; }; - class BWA3_G36 : Rifle_Base_F + class BWA3_G36: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=480.06; }; - class BWA3_G36K : Rifle_Base_F + class BWA3_G36K: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class BWA3_G28_Standard : Rifle_Long_Base_F + class BWA3_G28_Standard: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=419.1; }; - class BWA3_G27 : Rifle_Base_F + class BWA3_G27: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=406.4; }; - class BWA3_MG4 : Rifle_Long_Base_F + class BWA3_MG4: Rifle_Long_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=480.06; }; - class BWA3_MG5 : Rifle_Long_Base_F + class BWA3_MG5: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=548.64; }; - class BWA3_G82 : Rifle_Long_Base_F + class BWA3_G82: Rifle_Long_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class Trixie_L131A1 : Pistol_Base_F + class Trixie_L131A1: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=114.3; }; - class Trixie_XM8_Carbine : Rifle_Base_F + class Trixie_XM8_Carbine: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class Trixie_XM8_Compact : Rifle_Base_F + class Trixie_XM8_Compact: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class Trixie_XM8_SAW : Rifle_Base_F + class Trixie_XM8_SAW: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class Trixie_XM8_SAW_NB : Rifle_Base_F + class Trixie_XM8_SAW_NB: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class Trixie_XM8_DMR : Rifle_Base_F + class Trixie_XM8_DMR: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class Trixie_XM8_DMR_NB : Rifle_Base_F + class Trixie_XM8_DMR_NB: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class L129A1_base : Rifle_Base_F + class L129A1_base: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=406.4; }; - class Trixie_Enfield : Rifle_Base_F + class Trixie_Enfield: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=640.08; }; - class Trixie_CZ550_Rail : Rifle_Base_F + class Trixie_CZ550_Rail: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=599.999; }; - class Trixie_FNFAL_Rail : Rifle_Base_F + class Trixie_FNFAL_Rail: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class Trixie_M110 : Rifle_Base_F + class Trixie_M110: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=508.0; }; - class Trixie_MK12 : Rifle_Base_F + class Trixie_MK12: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class Trixie_LM308MWS : Rifle_Base_F + class Trixie_LM308MWS: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=406.4; }; - class Trixie_M14DMR : Rifle_Base_F + class Trixie_M14DMR: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class Trixie_M14DMR_NG_Black_Short : Rifle_Base_F + class Trixie_M14DMR_NG_Black_Short: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=457.2; }; - class Trixie_M14DMR_NG_Short : Rifle_Base_F + class Trixie_M14DMR_NG_Short: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=457.2; }; - class Trixie_M14 : Rifle_Base_F + class Trixie_M14: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class Trixie_M40A3 : Rifle_Base_F + class Trixie_M40A3: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=609.6; }; - class Trixie_CZ750 : Rifle_Base_F + class Trixie_CZ750: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=660.4; }; - class Trixie_M24 : Rifle_Base_F + class Trixie_M24: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class Trixie_AWM338 : Rifle_Base_F + class Trixie_AWM338: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=685.8; }; - class Trixie_M107 : Rifle_Base_F + class Trixie_M107: Rifle_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class Trixie_AS50 : Rifle_Base_F + class Trixie_AS50: Rifle_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class L110A1_base : Rifle_Base_F + class L110A1_base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=347.98; }; - class Trixie_L86A2_base : Rifle_Base_F + class Trixie_L86A2_base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=645.16; }; - class Trixie_l85a2_base : Rifle_Base_F + class Trixie_l85a2_base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=518.16; }; - class L7A2_base : Rifle_Base_F + class L7A2_base: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - class rhs_weap_pya : Pistol_Base_F + class rhs_weap_pya: Pistol_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=111.76; }; - class rhs_weap_pkp : Rifle_Long_Base_F + class rhs_weap_pkp: Rifle_Long_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=657.86; }; - class rhs_weap_pkm : Rifle_Long_Base_F + class rhs_weap_pkm: Rifle_Long_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=645.16; }; - class rhs_weap_rpk74m : Rifle_Long_Base_F + class rhs_weap_rpk74m: Rifle_Long_Base_F { ACE_barrelTwist=195.072; ACE_barrelLength=589.28; }; - class rhs_weap_rpk74 : Rifle_Long_Base_F + class rhs_weap_rpk74: Rifle_Long_Base_F { ACE_barrelTwist=195.072; ACE_barrelLength=589.28; }; - class rhs_weap_ak74m : Rifle_Base_F + class rhs_weap_ak74m: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=414.02; }; - class rhs_weap_aks74u : Rifle_Base_F + class rhs_weap_aks74u: Rifle_Base_F { ACE_barrelTwist=160.02; ACE_barrelLength=210.82; }; - class rhs_weap_akm : Rifle_Base_F + class rhs_weap_akm: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=414.02; }; - class rhs_weap_svd : Rifle_Base_F + class rhs_weap_svd: Rifle_Base_F { ACE_barrelTwist=238.76; ACE_barrelLength=619.76; }; - class rhs_weap_svds : Rifle_Base_F + class rhs_weap_svds: Rifle_Base_F { ACE_barrelTwist=238.76; ACE_barrelLength=563.88; }; - class rhs_weap_m4_Base : Rifle_Base_F + class rhs_weap_m4_Base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class rhs_weap_m16a4 : Rifle_Base_F + class rhs_weap_m16a4: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class rhs_weap_m16a4_carryhandle : Rifle_Base_F + class rhs_weap_m16a4_carryhandle: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class rhs_weap_m16a4_grip : Rifle_Base_F + class rhs_weap_m16a4_grip: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class rhs_weap_m240B : Rifle_Base_F + class rhs_weap_m240B: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - class rhs_weap_m249_pip : Rifle_Base_F + class rhs_weap_m249_pip: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=414.02; }; - class rhs_weap_mk18 : Rifle_Base_F + class rhs_weap_mk18: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=261.62; }; - class rhs_weap_M590_5RD : Rifle_Base_F + class rhs_weap_M590_5RD: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=469.9; }; - class rhs_weap_M590_8RD : Rifle_Base_F + class rhs_weap_M590_8RD: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=508.0; }; - class rhs_weap_sr25 : Rifle_Base_F + class rhs_weap_sr25: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class rhs_weap_sr25_ec : Rifle_Base_F + class rhs_weap_sr25_ec: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=508.0; @@ -1230,7 +1230,7 @@ class CfgWeapons ACE_barrelTwist = 160.0; ACE_barrelLength = 180.0; }; - class R3F_PAMAS : Pistol_Base_F + class R3F_PAMAS: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=124.46; @@ -1265,310 +1265,310 @@ class CfgWeapons ACE_barrelTwist=381.0; ACE_barrelLength=701.04; }; - class R3F_HK417S_HG : Rifle_Base_F + class R3F_HK417S_HG: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=304.8; }; - class R3F_HK417M : Rifle_Base_F + class R3F_HK417M: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=406.4; }; - class R3F_HK417L : Rifle_Base_F + class R3F_HK417L: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=508.0; }; - class R3F_M107 : Rifle_Base_F + class R3F_M107: Rifle_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class R3F_HK416M : Rifle_Base_F + class R3F_HK416M: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=355.6; }; - class R3F_MP5SD : Rifle_Base_F + class R3F_MP5SD: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=144.78; }; - class CUP_hgun_Colt1911 : Pistol_Base_F + class CUP_hgun_Colt1911: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=127.0; }; - class CUP_sgun_AA12 : Rifle_Base_F + class CUP_sgun_AA12: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=457.2; }; - class CUP_arifle_AK_Base : Rifle_Base_F + class CUP_arifle_AK_Base: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=414.02; }; - class CUP_arifle_AK107_Base : Rifle_Base_F + class CUP_arifle_AK107_Base: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=414.02; }; - class CUP_arifle_AKS_Base : Rifle_Base_F + class CUP_arifle_AKS_Base: Rifle_Base_F { ACE_barrelTwist=199.898; ACE_barrelLength=414.02; }; - class CUP_arifle_AKS74U : Rifle_Base_F + class CUP_arifle_AKS74U: Rifle_Base_F { ACE_barrelTwist=160.02; ACE_barrelLength=210.82; }; - class CUP_arifle_RPK74 : Rifle_Long_Base_F + class CUP_arifle_RPK74: Rifle_Long_Base_F { ACE_barrelTwist=195.072; ACE_barrelLength=589.28; }; - class CUP_srifle_AS50 : Rifle_Long_Base_F + class CUP_srifle_AS50: Rifle_Long_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class CUP_srifle_AWM_Base : Rifle_Long_Base_F + class CUP_srifle_AWM_Base: Rifle_Long_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=685.8; }; - class CUP_smg_bizon : Rifle_Base_F + class CUP_smg_bizon: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=231.14; }; - class CUP_hgun_Compact : Pistol_Base_F + class CUP_hgun_Compact: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=94.996; }; - class CUP_srifle_CZ750 : Rifle_Long_Base_F + class CUP_srifle_CZ750: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=660.4; }; - class CUP_arifle_CZ805_Base : Rifle_Base_F + class CUP_arifle_CZ805_Base: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=355.6; }; - class CUP_arifle_CZ805_A1 : Rifle_Base_F + class CUP_arifle_CZ805_A1: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=355.6; }; - class CUP_arifle_CZ805_A2 : Rifle_Base_F + class CUP_arifle_CZ805_A2: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=276.86; }; - class CUP_srifle_DMR : Rifle_Base_F + class CUP_srifle_DMR: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class CUP_hgun_Duty : Pistol_Base_F + class CUP_hgun_Duty: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=94.996; }; - class CUP_arifle_FNFAL : Rifle_Base_F + class CUP_arifle_FNFAL: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - class CUP_arifle_G36A : Rifle_Base_F + class CUP_arifle_G36A: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=480.06; }; - class CUP_arifle_G36K : Rifle_Base_F + class CUP_arifle_G36K: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class CUP_arifle_G36C : Rifle_Base_F + class CUP_arifle_G36C: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class CUP_arifle_MG36 : Rifle_Base_F + class CUP_arifle_MG36: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=480.06; }; - class CUP_hgun_Glock17 : Pistol_Base_F + class CUP_hgun_Glock17: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=114.046; }; - class CUP_srifle_CZ550 : Rifle_Base_F + class CUP_srifle_CZ550: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=599.999; }; - class CUP_srifle_ksvk : Rifle_Long_Base_F + class CUP_srifle_ksvk: Rifle_Long_Base_F { ACE_barrelTwist=457.2; ACE_barrelLength=999.998; }; - class CUP_lmg_L7A2 : Rifle_Long_Base_F + class CUP_lmg_L7A2: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - class CUP_arifle_L85A2_Base : Rifle_Base_F + class CUP_arifle_L85A2_Base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=518.16; }; - class CUP_lmg_L110A1 : Rifle_Long_Base_F + class CUP_lmg_L110A1: Rifle_Long_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=347.98; }; - class CUP_srifle_LeeEnfield : Rifle_Base_F + class CUP_srifle_LeeEnfield: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=640.08; }; - class CUP_hgun_M9 : Pistol_Base_F + class CUP_hgun_M9: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=124.46; }; - class CUP_srifle_M14 : Rifle_Base_F + class CUP_srifle_M14: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class CUP_arifle_M16_Base : Rifle_Base_F + class CUP_arifle_M16_Base: Rifle_Base_F { ACE_barrelTwist=355.6; ACE_barrelLength=508.0; }; - class CUP_arifle_M4_Base : Rifle_Base_F + class CUP_arifle_M4_Base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class CUP_srifle_Mk12SPR : Rifle_Base_F + class CUP_srifle_Mk12SPR: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class CUP_srifle_M24_des : Rifle_Base_F + class CUP_srifle_M24_des: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class CUP_lmg_M60A4 : Rifle_Long_Base_F + class CUP_lmg_M60A4: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=431.8; }; - class CUP_srifle_M107_Base : Rifle_Long_Base_F + class CUP_srifle_M107_Base: Rifle_Long_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - class CUP_srifle_M110 : Rifle_Base_F + class CUP_srifle_M110: Rifle_Base_F { ACE_barrelTwist=279.4; ACE_barrelLength=508.0; }; - class CUP_lmg_M240 : Rifle_Long_Base_F + class CUP_lmg_M240: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - class CUP_lmg_M249_para : Rifle_Long_Base_F + class CUP_lmg_M249_para: Rifle_Long_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=414.02; }; - class CUP_lmg_M249 : Rifle_Long_Base_F + class CUP_lmg_M249: Rifle_Long_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class CUP_sgun_M1014 : Rifle_Base_F + class CUP_sgun_M1014: Rifle_Base_F { ACE_twistDirection=0; ACE_barrelTwist=0.0; ACE_barrelLength=469.9; }; - class CUP_hgun_Makarov : Pistol_Base_F + class CUP_hgun_Makarov: Pistol_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=93.472; }; - class CUP_hgun_MicroUzi : Pistol_Base_F + class CUP_hgun_MicroUzi: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=127.0; }; - class CUP_lmg_Mk48_Base : Rifle_Long_Base_F + class CUP_lmg_Mk48_Base: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=501.65; }; - class CUP_smg_MP5SD6 : Rifle_Base_F + class CUP_smg_MP5SD6: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=144.78; }; - class CUP_smg_MP5A5 : Rifle_Base_F + class CUP_smg_MP5A5: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - class CUP_hgun_PB6P9 : Rifle_Base_F + class CUP_hgun_PB6P9: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=104.14; }; - class CUP_hgun_Phantom : Rifle_Base_F + class CUP_hgun_Phantom: Rifle_Base_F { ACE_barrelTwist=246.38; ACE_barrelLength=119.38; }; - class CUP_lmg_PKM : Rifle_Long_Base_F + class CUP_lmg_PKM: Rifle_Long_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=645.16; }; - class CUP_lmg_Pecheneg : Rifle_Long_Base_F + class CUP_lmg_Pecheneg: Rifle_Long_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=657.86; }; - class CUP_hgun_TaurusTracker455 : Pistol_Base_F + class CUP_hgun_TaurusTracker455: Pistol_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=101.6; }; - class CUP_arifle_Sa58P : Rifle_Base_F + class CUP_arifle_Sa58P: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=391.16; }; - class CUP_arifle_Sa58V : Rifle_Base_F + class CUP_arifle_Sa58V: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=391.16; }; - class CUP_hgun_SA61 : Pistol_Base_F + class CUP_hgun_SA61: Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=114.3; @@ -1579,112 +1579,112 @@ class CfgWeapons ACE_twistDirection=0; ACE_barrelLength=429.26; }; - class CUP_arifle_Mk16_CQC : Rifle_Base_F + class CUP_arifle_Mk16_CQC: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=254.0; }; - class CUP_arifle_Mk16_STD : Rifle_Base_F + class CUP_arifle_Mk16_STD: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=355.6; }; - class CUP_arifle_Mk16_SV : Rifle_Base_F + class CUP_arifle_Mk16_SV: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class CUP_arifle_Mk17_CQC : Rifle_Base_F + class CUP_arifle_Mk17_CQC: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=330.2; }; - class CUP_arifle_Mk17_STD : Rifle_Base_F + class CUP_arifle_Mk17_STD: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=406.4; }; - class CUP_arifle_Mk20 : Rifle_Base_F + class CUP_arifle_Mk20: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=508.0; }; - class CUP_srifle_SVD : Rifle_Base_F + class CUP_srifle_SVD: Rifle_Base_F { ACE_barrelTwist=238.76; ACE_barrelLength=619.76; }; - class CUP_lmg_UK59 : Rifle_Long_Base_F + class CUP_lmg_UK59: Rifle_Long_Base_F { ACE_barrelTwist=381.0; ACE_barrelLength=551.18; }; - class CUP_DSHKM_W : MGun + class CUP_DSHKM_W: MGun { ACE_barrelTwist=381.0; ACE_barrelLength=1069.34; }; - class CUP_KPVT_W : MGun + class CUP_KPVT_W: MGun { ACE_barrelTwist=454.914; ACE_barrelLength=1346.2; }; - class CUP_KPVB_W : MGun + class CUP_KPVB_W: MGun { ACE_barrelTwist=454.914; ACE_barrelLength=1346.2; }; - class CUP_M134 : MGunCore + class CUP_M134: MGunCore { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - class CUP_M240_veh_W : Rifle_Long_Base_F + class CUP_M240_veh_W: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - class CUP_PKT_W : MGun + class CUP_PKT_W: MGun { ACE_barrelTwist=240.03; ACE_barrelLength=722.122; }; - class CUP_srifle_VSSVintorez : Rifle_Base_F + class CUP_srifle_VSSVintorez: Rifle_Base_F { ACE_barrelTwist=210.82; ACE_barrelLength=200.66; }; - class CUP_arifle_XM8_Base : Rifle_Base_F + class CUP_arifle_XM8_Base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class CUP_arifle_XM8_Carbine : Rifle_Base_F + class CUP_arifle_XM8_Carbine: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class CUP_arifle_xm8_sharpshooter : Rifle_Base_F + class CUP_arifle_xm8_sharpshooter: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class CUP_arifle_xm8_SAW : Rifle_Base_F + class CUP_arifle_xm8_SAW: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class CUP_arifle_XM8_Compact : Rifle_Base_F + class CUP_arifle_XM8_Compact: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class CUP_arifle_XM8_Railed_Base : Rifle_Base_F + class CUP_arifle_XM8_Railed_Base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - class CUP_arifle_XM8_Carbine_FG : Rifle_Base_F + class CUP_arifle_XM8_Carbine_FG: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=317.5; @@ -1845,7 +1845,7 @@ class CfgWeapons ACE_barrelTwist=454.914; ACE_barrelLength=1346.2; }; - class VTN_C_M4A1 : Rifle_Base_F + class VTN_C_M4A1: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; diff --git a/extras/blank/README.md b/extras/blank/README.md index abea8b9f37..57a4d7d9b6 100644 --- a/extras/blank/README.md +++ b/extras/blank/README.md @@ -2,10 +2,3 @@ ace_blank =================== Adds blank feature. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Name](https://github.com/name) diff --git a/optionals/compat_gm/CfgAmmo.hpp b/optionals/compat_gm/CfgAmmo.hpp index 4b5d53b8e3..30a86758e5 100644 --- a/optionals/compat_gm/CfgAmmo.hpp +++ b/optionals/compat_gm/CfgAmmo.hpp @@ -7,19 +7,19 @@ class CfgAmmo { EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; }; - class MineBase; - class gm_mine_at_mn111: MineBase { + class gm_mine_at_base; + class gm_mine_at_mn111: gm_mine_at_base { EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; }; - class gm_mine_at_dm21: MineBase { + class gm_mine_at_dm21: gm_mine_at_base { EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; }; - class gm_mine_at_tm46: MineBase { + class gm_mine_at_tm46: gm_mine_at_base { EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; }; - class APERSMine_Range_Ammo; - class gm_mine_ap_dm31: APERSMine_Range_Ammo { + class gm_mine_bounce_base; + class gm_mine_ap_dm31: gm_mine_bounce_base { EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; }; }; diff --git a/optionals/compat_gm/CfgEventHandlers.hpp b/optionals/compat_gm/CfgEventHandlers.hpp index e52b5b0b87..2e06ca222b 100644 --- a/optionals/compat_gm/CfgEventHandlers.hpp +++ b/optionals/compat_gm/CfgEventHandlers.hpp @@ -1,12 +1,12 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; diff --git a/optionals/compat_gm/CfgMagazines.hpp b/optionals/compat_gm/CfgMagazines.hpp index 0b87abaf42..07aaffc425 100644 --- a/optionals/compat_gm/CfgMagazines.hpp +++ b/optionals/compat_gm/CfgMagazines.hpp @@ -1,6 +1,4 @@ class cfgMagazines { - class CA_Magazine; - // MG3 class gm_120rnd_762x51mm_mg3_grn; class gm_120Rnd_762x51mm_B_T_DM21_mg3_grn: gm_120rnd_762x51mm_mg3_grn { @@ -14,14 +12,13 @@ class cfgMagazines { }; // PK - class gm_100rnd_762x54mm_pk_grn; - class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mm_pk_grn { - ACE_isBelt = 1; - }; - class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mm_pk_grn { - ACE_isBelt = 1; - }; class gm_100rnd_762x54mmR_pk_grn; + class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mmR_pk_grn { + ACE_isBelt = 1; + }; + class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mmR_pk_grn { + ACE_isBelt = 1; + }; class gm_100Rnd_762x54mmR_API_7bz3_pk_grn: gm_100rnd_762x54mmR_pk_grn { ACE_isBelt = 1; }; @@ -30,7 +27,8 @@ class cfgMagazines { }; // Explosives - class gm_explosive_petn_charge: CA_Magazine { + class gm_explosive_petn_charge_base; + class gm_explosive_petn_charge: gm_explosive_petn_charge_base { EGVAR(explosive,DelayTime) = 1; EGVAR(explosive,Placeable) = 1; EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_petn"; @@ -48,12 +46,13 @@ class cfgMagazines { }; }; - class gm_explosive_plnp_charge: gm_explosive_petn_charge { + class gm_explosive_plnp_charge_base; + class gm_explosive_plnp_charge: gm_explosive_plnp_charge_base { EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_plnp"; }; - class ATMine_Range_Mag; - class gm_mine_at_tm46: ATMine_Range_Mag { + class gm_mine_at_base; + class gm_mine_at_tm46: gm_mine_at_base { EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_mine_tm46"; useAction = 0; class ACE_Triggers { @@ -63,7 +62,7 @@ class cfgMagazines { }; }; }; - class gm_mine_at_dm21: ATMine_Range_Mag { + class gm_mine_at_dm21: gm_mine_at_base { EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm21"; useAction = 0; class ACE_Triggers { @@ -73,7 +72,7 @@ class cfgMagazines { }; }; }; - class gm_mine_at_mn111: ATMine_Range_Mag { + class gm_mine_at_mn111: gm_mine_at_base { EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_m111"; useAction = 0; class ACE_Triggers { @@ -84,8 +83,7 @@ class cfgMagazines { }; }; - // class ATMine_Range_Mag; - class gm_mine_ap_dm31: ATMine_Range_Mag { + class gm_mine_ap_dm31: gm_mine_at_base { EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm31"; useAction = 0; class ACE_Triggers { diff --git a/optionals/compat_gm/CfgVehicles.hpp b/optionals/compat_gm/CfgVehicles.hpp index 2ea7f9823d..6254f3e38a 100644 --- a/optionals/compat_gm/CfgVehicles.hpp +++ b/optionals/compat_gm/CfgVehicles.hpp @@ -214,17 +214,19 @@ class CfgVehicles { EGVAR(medical,medicClass) = 1; }; - class gm_kat1_base; - class gm_kat1_451_base: gm_kat1_base { + class gm_kat1_base: gm_wheeled_truck_base { EGVAR(refuel,fuelCapacity) = 270; }; + + class gm_kat1_451_base; class gm_kat1_451_refuel_base: gm_kat1_451_base { gm_InsigniasDefaultHazardSign = "gm_insignia_hazard_fuelF54_wht"; EGVAR(refuel,fuelCargo) = 4600; EGVAR(refuel,hooks)[] = {{-0.60,-3.44,-0.919689},{0.60,-3.44,-0.919689}}; }; - class gm_kat1_454_cargo_base: gm_kat1_451_base { + class gm_kat1_454_base; + class gm_kat1_454_cargo_base: gm_kat1_454_base { EGVAR(cargo,space) = 10; }; @@ -280,7 +282,7 @@ class CfgVehicles { EGVAR(cookoff,cookoffSelections)[] = {"mainturret_hatch","commanderturret_hatch"}; }; - class gm_pt76_base: gm_tracked_APC_base { + class gm_pt76_base: gm_tracked_Tank_base { EGVAR(refuel,fuelCapacity) = 250; }; @@ -350,8 +352,7 @@ class CfgVehicles { EGVAR(fastroping,enabled) = 0; class UserActions { - class openDoor_L - { + class openDoor_L { displayNameDefault = "Open left Door"; displayName = "Open left Door"; position = ""; @@ -361,16 +362,14 @@ class CfgVehicles { statement = "this animateDoor ['door_2_1_source',1]"; }; - class openDoor_R: openDoor_L - { + class openDoor_R: openDoor_L { displayNameDefault = "Open right Door"; displayName = "Open right Door"; condition = QUOTE((this animationSourcePhase 'door_2_2_unhide' > 0.5) && (this doorPhase 'door_2_2_source' < 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])}); statement = "this animateDoor ['door_2_2_source',1]"; }; - class closeDoor_L - { + class closeDoor_L { displayNameDefault = "Close left Door"; displayName = "Close left Door"; position = ""; @@ -380,8 +379,7 @@ class CfgVehicles { statement = "this animateDoor ['door_2_1_source',0]"; }; - class closeDoor_R: closeDoor_L - { + class closeDoor_R: closeDoor_L { displayNameDefault = "Close right Door"; displayName = "Close right Door"; condition = QUOTE((this animationSourcePhase 'door_2_2_unhide' > 0.5) && (this doorPhase 'door_2_2_source' > 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])}); @@ -399,7 +397,7 @@ class CfgVehicles { EGVAR(fastroping,onPrepare) = QFUNC(onPrepare); }; - class gm_ch53_base:gm_helicopter_base { + class gm_ch53_base: gm_helicopter_base { EGVAR(map,vehicleLightColor)[] = {1,0,0,0.1}; EGVAR(fastroping,enabled) = 1; EGVAR(fastroping,ropeOrigins)[] = {{0.6, -5.2, -0.8},{-0.6, -5.2, -0.8}}; @@ -413,7 +411,7 @@ class CfgVehicles { }; // EAST - class gm_mi2_base:gm_helicopter_base { + class gm_mi2_base: gm_helicopter_base { EGVAR(map,vehicleLightColor)[] = {1,0,0,0.1}; EGVAR(fastroping,enabled) = 1; EGVAR(fastroping,ropeOrigins)[] = {{-1.17969,0.0205078,-0.178533}}; @@ -435,7 +433,7 @@ class CfgVehicles { EGVAR(refuel,fuelCapacity) = 1076; }; - class gm_mi2platan_base: gm_mi2_base{ + class gm_mi2platan_base: gm_mi2_base { EGVAR(refuel,fuelCapacity) = 1076; }; diff --git a/optionals/compat_gm/CfgWeapons.hpp b/optionals/compat_gm/CfgWeapons.hpp index 6bc6578e90..6565a833dd 100644 --- a/optionals/compat_gm/CfgWeapons.hpp +++ b/optionals/compat_gm/CfgWeapons.hpp @@ -41,7 +41,7 @@ class CfgWeapons { }; class gm_ge_headgear_sph4_base; - class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base{ + class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base { HEARING_PROTECTION_PELTOR }; @@ -73,52 +73,54 @@ class CfgWeapons { class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base { HEARING_PROTECTION_PELTOR }; - - class gm_ge_headgear_beret_base; - class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_bdx; + class gm_ge_headgear_beret_crew_blk; + class gm_ge_headgear_beret_crew_grn; + class gm_ge_headgear_beret_crew_red; + class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_blk_antitank: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_blk_antitank: gm_ge_headgear_beret_crew_blk { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_blk_armor: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_blk_armor: gm_ge_headgear_beret_crew_blk { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_blk_armorrecon: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_blk_armorrecon: gm_ge_headgear_beret_crew_blk { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_blk_recon: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_blk_recon: gm_ge_headgear_beret_crew_blk { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; - class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_base { + class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red { HEARING_PROTECTION_PELTOR }; }; diff --git a/optionals/compat_r3f/CfgAmmo.hpp b/optionals/compat_r3f/CfgAmmo.hpp index 085d15edd2..93a93e41fe 100644 --- a/optionals/compat_r3f/CfgAmmo.hpp +++ b/optionals/compat_r3f/CfgAmmo.hpp @@ -74,6 +74,10 @@ class CfgAmmo { ACE_dragModel = 1; ACE_muzzleVelocities[] = {780}; ACE_barrelLengths[] = {700}; + EGVAR(vehicle_damage,incendiary) = 0.2; + }; + class R3F_127x99_PEI: R3F_127x99_Ball { + EGVAR(vehicle_damage,incendiary) = 1.0; }; class R3F_127x99_Ball2: BulletBase { // BARRETT M107 M33 https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L635 airFriction = -0.000618; // ACE3 value, default -0.00086 @@ -88,6 +92,10 @@ class CfgAmmo { ACE_dragModel = 1; ACE_muzzleVelocities[] = {850}; ACE_barrelLengths[] = {736.6}; + EGVAR(vehicle_damage,incendiary) = 0.2; + }; + class R3F_127x99_PEI2: R3F_127x99_Ball2 { + EGVAR(vehicle_damage,incendiary) = 1.0; }; class R3F_127x99_Ball3: BulletBase { // McMillan TAC-50 AMAX https://web.archive.org/web/20080527201619/http://mcmfamily.com/pdfs/Tac-50%20Technical%20Data.pdf typicalSpeed = 823; // R3F default value 820 @@ -103,5 +111,6 @@ class CfgAmmo { ACE_dragModel = 1; ACE_muzzleVelocities[] = {831}; // at 21°C, at 15°C 823 m/s (2700 fps) according with the R3F_TAC50 initSpeed ACE_barrelLengths[] = {736.6}; + EGVAR(vehicle_damage,incendiary) = 0.2; }; }; diff --git a/optionals/compat_r3f/CfgWeapons.hpp b/optionals/compat_r3f/CfgWeapons.hpp index 1f8523f802..44a660f704 100644 --- a/optionals/compat_r3f/CfgWeapons.hpp +++ b/optionals/compat_r3f/CfgWeapons.hpp @@ -13,7 +13,7 @@ class CfgWeapons { class R3F_Famas_F1_M203: R3F_Famas_F1 { muzzles[] = {"this","Lance_Grenades"}; }; - class R3F_Famas_surb: R3F_Famas_F1 { // R3F FAMAS Surbaissé, should be FAMAS Valorisé : http://narval34.free.fr/fiche_tech_famas.pdf + class R3F_Famas_surb: R3F_Famas_F1 { // R3F FAMAS Surbaissé, should be FAMAS Valorisé: http://narval34.free.fr/fiche_tech_famas.pdf ACE_RailHeightAboveBore = 5.08219; ACE_barrelTwist = 177.8; // 1:7" FAMAS Valorisé ACE_barrelLength = 450.0; // 3D model with Beretta barrel : FAMAS Valorisé diff --git a/optionals/compat_rh_acc/CfgWeapons.hpp b/optionals/compat_rh_acc/CfgWeapons.hpp index 001506ce8d..85c5725523 100644 --- a/optionals/compat_rh_acc/CfgWeapons.hpp +++ b/optionals/compat_rh_acc/CfgWeapons.hpp @@ -5,7 +5,7 @@ class CfgWeapons { /* Scopes */ class InventoryOpticsItem_Base_F; - class RH_shortdot : ItemCore { + class RH_shortdot: ItemCore { ACE_ScopeHeightAboveRail = 4.40511; /* // This would require MOA turrets ACE_ScopeAdjust_Vertical[] = { -1, 25 }; @@ -15,13 +15,13 @@ class CfgWeapons { */ }; - class RH_accupoint : ItemCore { + class RH_accupoint: ItemCore { ACE_ScopeHeightAboveRail = 3.726; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class Accupoint { discreteDistance[] = { 100 }; @@ -31,13 +31,13 @@ class CfgWeapons { }; }; - class RH_m3lr : ItemCore { + class RH_m3lr: ItemCore { ACE_ScopeHeightAboveRail = 3.5751; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class m3lr { discreteDistance[] = { 100 }; @@ -47,13 +47,13 @@ class CfgWeapons { }; }; - class RH_leu_mk4 : ItemCore { + class RH_leu_mk4: ItemCore { ACE_ScopeHeightAboveRail = 4.64216; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class mk4 { discreteDistance[] = { 100 }; @@ -63,13 +63,13 @@ class CfgWeapons { }; }; - class RH_c79 : ItemCore { + class RH_c79: ItemCore { ACE_ScopeHeightAboveRail = 4.16731; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class c79scope { discreteDistance[] = { 100 }; @@ -79,13 +79,13 @@ class CfgWeapons { }; }; - class RH_c79_2d : ItemCore { + class RH_c79_2d: ItemCore { ACE_ScopeHeightAboveRail = 4.16731; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class c79scope { discreteDistance[] = { 100 }; @@ -95,13 +95,13 @@ class CfgWeapons { }; }; - class RH_anpvs10 : ItemCore { + class RH_anpvs10: ItemCore { ACE_ScopeHeightAboveRail = 2.64379; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class pvs10 { discreteDistance[] = { 100 }; @@ -111,13 +111,13 @@ class CfgWeapons { }; }; - class RH_pas13cm : ItemCore { + class RH_pas13cm: ItemCore { ACE_ScopeHeightAboveRail = 10.601; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class MTWS { discreteDistance[] = { 100 }; @@ -127,13 +127,13 @@ class CfgWeapons { }; }; - class RH_pas13cmg : ItemCore { + class RH_pas13cmg: ItemCore { ACE_ScopeHeightAboveRail = 10.601; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class MTWSmg { discreteDistance[] = { 100 }; @@ -143,13 +143,13 @@ class CfgWeapons { }; }; - class RH_pas13ch : ItemCore { + class RH_pas13ch: ItemCore { ACE_ScopeHeightAboveRail = 10.6017; ACE_ScopeAdjust_Vertical[] = { -4, 30 }; ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_VerticalIncrement = 0.1; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class HTWS { discreteDistance[] = { 100 }; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index 73596fa631..cb6254ad5c 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -1,9 +1,6 @@ - -class CfgAmmo -{ +class CfgAmmo { class BulletBase; - class RH_50_AE_Ball: BulletBase - { + class RH_50_AE_Ball: BulletBase { ACE_caliber=12.7; ACE_bulletLength=28.194; ACE_bulletMass=21.06; @@ -15,8 +12,7 @@ class CfgAmmo ACE_muzzleVelocities[]={360, 398, 420}; ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; - class RH_454_Casull: BulletBase - { + class RH_454_Casull: BulletBase { ACE_caliber=11.481; ACE_bulletLength=22.733; ACE_bulletMass=21.06; @@ -28,8 +24,7 @@ class CfgAmmo ACE_muzzleVelocities[]={450, 490, 500}; ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; - class RH_32ACP: BulletBase - { + class RH_32ACP: BulletBase { ACE_caliber=7.938; ACE_bulletLength=15.494; ACE_bulletMass=4.212; @@ -41,8 +36,7 @@ class CfgAmmo ACE_muzzleVelocities[]={282, 300, 320}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class RH_45ACP: BulletBase - { + class RH_45ACP: BulletBase { ACE_caliber=11.481; ACE_bulletLength=17.272; ACE_bulletMass=14.904; @@ -54,8 +48,7 @@ class CfgAmmo ACE_muzzleVelocities[]={230, 250, 285}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class RH_B_40SW: BulletBase - { + class RH_B_40SW: BulletBase { ACE_caliber=10.16; ACE_bulletLength=11.354; ACE_bulletMass=8.748; @@ -67,8 +60,7 @@ class CfgAmmo ACE_muzzleVelocities[]={360, 380, 400}; ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; - class RH_44mag_ball: BulletBase - { + class RH_44mag_ball: BulletBase { ACE_caliber=10.897; ACE_bulletLength=20.422; ACE_bulletMass=12.96; @@ -80,8 +72,7 @@ class CfgAmmo ACE_muzzleVelocities[]={360, 390, 420}; ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; - class RH_357mag_ball: BulletBase - { + class RH_357mag_ball: BulletBase { ACE_caliber=9.068; ACE_bulletLength=13.741; ACE_bulletMass=8.1; @@ -93,8 +84,7 @@ class CfgAmmo ACE_muzzleVelocities[]={490, 510, 535}; ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; - class RH_762x25: BulletBase - { + class RH_762x25: BulletBase { ACE_caliber=7.874; ACE_bulletLength=13.856; ACE_bulletMass=5.5728; @@ -106,8 +96,7 @@ class CfgAmmo ACE_muzzleVelocities[]={360, 380, 400}; ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; - class RH_9x18_Ball: BulletBase - { + class RH_9x18_Ball: BulletBase { ACE_caliber=9.271; ACE_bulletLength=15.494; ACE_bulletMass=6.00048; @@ -119,8 +108,7 @@ class CfgAmmo ACE_muzzleVelocities[]={298, 330, 350}; ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; - class RH_B_9x19_Ball: BulletBase - { + class RH_B_9x19_Ball: BulletBase { ACE_caliber=9.017; ACE_bulletLength=15.494; ACE_bulletMass=8.0352; @@ -132,8 +120,7 @@ class CfgAmmo ACE_muzzleVelocities[]={340, 370, 400}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class RH_B_22LR_SD: BulletBase - { + class RH_B_22LR_SD: BulletBase { ACE_caliber=5.664; ACE_bulletLength=11.43; ACE_bulletMass=2.4624; @@ -145,8 +132,7 @@ class CfgAmmo ACE_muzzleVelocities[]={330, 340, 360}; ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; - class RH_57x28mm: BulletBase - { + class RH_57x28mm: BulletBase { ACE_caliber=5.69; ACE_bulletLength=12.573; ACE_bulletMass=1.8144; @@ -158,4 +144,4 @@ class CfgAmmo ACE_muzzleVelocities[]={550, 625, 720}; ACE_barrelLengths[]={101.6, 152.4, 262.89}; }; -}; \ No newline at end of file +}; diff --git a/optionals/compat_rh_de/CfgWeapons.hpp b/optionals/compat_rh_de/CfgWeapons.hpp index eb7d902a8b..ed8322e356 100644 --- a/optionals/compat_rh_de/CfgWeapons.hpp +++ b/optionals/compat_rh_de/CfgWeapons.hpp @@ -1,140 +1,112 @@ -class CfgWeapons -{ +class CfgWeapons { class Pistol_Base_F; class RH_Pistol_Base_F; - class RH_deagle: RH_Pistol_Base_F - { + class RH_deagle: RH_Pistol_Base_F { ACE_barrelTwist=482.6; ACE_barrelLength=152.4; }; - class RH_mateba: Pistol_Base_F - { + class RH_mateba: Pistol_Base_F { ACE_barrelTwist=355.6; ACE_barrelLength=152.4; }; - class RH_mp412: Pistol_Base_F - { + class RH_mp412: Pistol_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=152.4; }; - class RH_python: Pistol_Base_F - { + class RH_python: Pistol_Base_F { ACE_barrelTwist=355.6; ACE_barrelLength=152.4; }; - class RH_bull: RH_python - { + class RH_bull: RH_python { ACE_barrelTwist=609.6; ACE_barrelLength=165.1; }; - class RH_ttracker: Pistol_Base_F - { + class RH_ttracker: Pistol_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=101.6; }; - class RH_cz75: RH_Pistol_Base_F - { + class RH_cz75: RH_Pistol_Base_F { ACE_barrelTwist=246.38; ACE_barrelLength=119.38; }; - class RH_p226: RH_Pistol_Base_F - { + class RH_p226: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=111.76; }; - class RH_sw659: RH_Pistol_Base_F - { + class RH_sw659: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=188.976; }; - class RH_usp: RH_Pistol_Base_F - { + class RH_usp: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=112.014; }; - class RH_uspm: RH_Pistol_Base_F - { + class RH_uspm: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=152.4; }; - class RH_kimber: RH_Pistol_Base_F - { + class RH_kimber: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=127.0; }; - class RH_m1911: RH_Pistol_Base_F - { + class RH_m1911: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=127.0; }; - class RH_tt33: RH_Pistol_Base_F - { + class RH_tt33: RH_Pistol_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=116.84; }; - class RH_mak: RH_Pistol_Base_F - { + class RH_mak: RH_Pistol_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=93.472; }; - class RH_mk2: RH_Pistol_Base_F - { + class RH_mk2: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=101.6; }; - class RH_m9: RH_Pistol_Base_F - { + class RH_m9: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=124.46; }; - class RH_g18: RH_Pistol_Base_F - { + class RH_g18: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=114.046; }; - class RH_g17: RH_Pistol_Base_F - { + class RH_g17: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=114.046; }; - class RH_g19: RH_Pistol_Base_F - { + class RH_g19: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=101.6; }; - class RH_gsh18: RH_Pistol_Base_F - { + class RH_gsh18: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=104.14; }; - class RH_fnp45: RH_Pistol_Base_F - { + class RH_fnp45: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=114.3; }; - class RH_fn57: RH_fnp45 - { + class RH_fn57: RH_fnp45 { ACE_barrelTwist=231.14; ACE_barrelLength=121.92; }; - class RH_vp70: RH_Pistol_Base_F - { + class RH_vp70: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=116.84; }; - class RH_vz61: RH_Pistol_Base_F - { + class RH_vz61: RH_Pistol_Base_F { ACE_barrelTwist=406.4; ACE_barrelLength=114.3; }; - class RH_tec9: RH_Pistol_Base_F - { + class RH_tec9: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=127.0; }; - class RH_muzi: RH_Pistol_Base_F - { + class RH_muzi: RH_Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=127.0; }; -}; \ No newline at end of file +}; diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 56d392dd00..5029cff22b 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -8,8 +8,7 @@ class CfgAmmo { class B_65x39_Caseless; class B_762x51_Ball; - class RH_9x19_B_M822: BulletBase - { + class RH_9x19_B_M822: BulletBase { ACE_caliber=9.017; ACE_bulletLength=15.494; ACE_bulletMass=8.0352; @@ -21,8 +20,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={340, 370, 400}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class RH_9x19_B_HP: BulletBase - { + class RH_9x19_B_HP: BulletBase { ACE_caliber=9.017; ACE_bulletLength=15.494; ACE_bulletMass=8.0352; @@ -34,8 +32,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={340, 370, 400}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class RH_9x19_B_HPSB: BulletBase - { + class RH_9x19_B_HPSB: BulletBase { ACE_caliber=9.017; ACE_bulletLength=15.316; ACE_bulletMass=9.5256; @@ -47,8 +44,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={295, 310, 330}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - class RH_556x45_B_M855A1: B_556x45_Ball - { + class RH_556x45_B_M855A1: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; ACE_bulletMass=4.0176; @@ -60,8 +56,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6}; }; - class RH_556x45_B_Mk318: B_556x45_Ball - { + class RH_556x45_B_Mk318: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; ACE_bulletMass=4.0176; @@ -73,8 +68,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={780, 886, 950}; ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; - class RH_556x45_B_Mk262: B_556x45_Ball - { + class RH_556x45_B_Mk262: B_556x45_Ball { ACE_caliber=5.69; ACE_bulletLength=23.012; ACE_bulletMass=4.9896; @@ -86,8 +80,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={624, 816, 832, 838}; ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; - class RH_68x43_B_FMJ: B_65x39_Caseless - { + class RH_68x43_B_FMJ: B_65x39_Caseless { ACE_caliber=7.036; ACE_bulletLength=24.359; ACE_bulletMass=7.452; @@ -99,8 +92,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={713, 785, 810, 850}; ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; }; - class RH_68x43_B_Match: B_65x39_Caseless - { + class RH_68x43_B_Match: B_65x39_Caseless { ACE_caliber=7.036; ACE_bulletLength=31.75; ACE_bulletMass=8.748; @@ -112,8 +104,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={700, 732, 750, 780}; ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; }; - class RH_762x35_B_FMJ: B_65x39_Caseless - { + class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=7.823; ACE_bulletLength=28.397; ACE_bulletMass=9.5256; @@ -125,8 +116,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={559, 609, 625}; ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; - class RH_762x35_B_Match: B_65x39_Caseless - { + class RH_762x35_B_Match: B_65x39_Caseless { ACE_caliber=7.823; ACE_bulletLength=29.286; ACE_bulletMass=8.1; @@ -138,8 +128,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={572, 676, 700}; ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; - class RH_762x35_B_MSB: B_65x39_Caseless - { + class RH_762x35_B_MSB: B_65x39_Caseless { ACE_caliber=7.823; ACE_bulletLength=37.821; ACE_bulletMass=14.256; @@ -151,8 +140,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={300, 320, 340}; ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; - class RH_762x51_B_M80A1: B_762x51_Ball - { + class RH_762x51_B_M80A1: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=28.956; ACE_bulletMass=9.4608; @@ -164,8 +152,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; - class RH_762x51_B_Mk316LR: B_762x51_Ball - { + class RH_762x51_B_Mk316LR: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=31.496; ACE_bulletMass=11.34; @@ -177,8 +164,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={775, 790, 805, 810}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - class RH_762x51_B_Mk319: B_762x51_Ball - { + class RH_762x51_B_Mk319: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=31.496; ACE_bulletMass=8.424; @@ -190,8 +176,7 @@ class CfgAmmo { ACE_muzzleVelocities[]={838, 892, 910}; ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; - class RH_762x51_B_LFMJSB: B_762x51_Ball - { + class RH_762x51_B_LFMJSB: B_762x51_Ball { ACE_caliber=7.823; ACE_bulletLength=34.036; ACE_bulletMass=12.96; diff --git a/optionals/compat_rh_m4/CfgWeapons.hpp b/optionals/compat_rh_m4/CfgWeapons.hpp index d3ac2fe4a0..2156dd9399 100644 --- a/optionals/compat_rh_m4/CfgWeapons.hpp +++ b/optionals/compat_rh_m4/CfgWeapons.hpp @@ -1,130 +1,103 @@ - -class CfgWeapons -{ +class CfgWeapons { class Rifle_Base_F; - class RH_ar10: Rifle_Base_F - { + class RH_ar10: Rifle_Base_F { ACE_barrelTwist=285.75; ACE_barrelLength=528.32; }; - class RH_m110: Rifle_Base_F - { + class RH_m110: Rifle_Base_F { ACE_barrelTwist=254.0; ACE_barrelLength=508.0; }; - class RH_Mk11: RH_m110 - { + class RH_Mk11: RH_m110 { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; }; - class RH_SR25EC: RH_m110 - { + class RH_SR25EC: RH_m110 { ACE_barrelTwist=285.75; ACE_barrelLength=508.0; }; - class RH_m4: Rifle_Base_F - { + class RH_m4: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class RH_M4_ris: RH_m4 - { + class RH_M4_ris: RH_m4 { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class RH_M4A1_ris: RH_M4_ris - { + class RH_M4A1_ris: RH_M4_ris { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class RH_M4m: RH_M4A1_ris - { + class RH_M4m: RH_M4A1_ris { ACE_barrelTwist=177.8; ACE_barrelLength=266.7; }; - class RH_M4sbr: RH_M4A1_ris - { + class RH_M4sbr: RH_M4A1_ris { ACE_barrelTwist=177.8; ACE_barrelLength=266.7; }; - class RH_hb: Rifle_Base_F - { + class RH_hb: Rifle_Base_F { ACE_barrelTwist=203.2; ACE_barrelLength=152.4; }; - class RH_hb_b: RH_hb - { + class RH_hb_b: RH_hb { ACE_barrelTwist=203.2; ACE_barrelLength=152.4; }; - class RH_sbr9: Rifle_Base_F - { + class RH_sbr9: Rifle_Base_F { ACE_barrelTwist=246.38; ACE_barrelLength=228.6; }; - class RH_M4A6: RH_M4A1_ris - { + class RH_M4A6: RH_M4A1_ris { ACE_barrelTwist=254.0; ACE_barrelLength=368.3; }; - class RH_M16a1: RH_m4 - { + class RH_M16a1: RH_m4 { ACE_barrelTwist=355.6; ACE_barrelLength=508.0; }; - class RH_M16A2: RH_m4 - { + class RH_M16A2: RH_m4 { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A4 : RH_M4_ris - { + class RH_M16A4: RH_M4_ris { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A3: RH_M16A4 - { + class RH_M16A3: RH_M16A4 { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A4_m: RH_M16A4 - { + class RH_M16A4_m: RH_M16A4 { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_M16A6: RH_M16A4 - { + class RH_M16A6: RH_M16A4 { ACE_barrelTwist=177.8; ACE_barrelLength=508.0; }; - class RH_Mk12mod1: RH_M16A4 - { + class RH_Mk12mod1: RH_M16A4 { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; }; - class RH_SAMR: RH_Mk12mod1 - { + class RH_SAMR: RH_Mk12mod1 { ACE_barrelTwist=195.58; ACE_barrelLength=508.0; }; - class RH_Hk416: RH_M4A1_ris - { + class RH_Hk416: RH_M4A1_ris { ACE_barrelTwist=177.8; ACE_barrelLength=368.3; }; - class RH_Hk416s: RH_M4sbr - { + class RH_Hk416s: RH_M4sbr { ACE_barrelTwist=177.8; ACE_barrelLength=264.16; }; - class RH_Hk416c: RH_M4sbr - { + class RH_Hk416c: RH_M4sbr { ACE_barrelTwist=177.8; ACE_barrelLength=228.6; }; - class RH_M27IAR: RH_Mk12mod1 - { + class RH_M27IAR: RH_Mk12mod1 { ACE_barrelTwist=177.8; ACE_barrelLength=419.1; }; -}; \ No newline at end of file +}; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index 9474ec47eb..7c5e8a45a8 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -1,15 +1,13 @@ - class BulletBase; -class RH_B_6x35: BulletBase -{ - ACE_caliber=5.69; - ACE_bulletLength=11.303; - ACE_bulletMass=4.212; - ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; - ACE_ballisticCoefficients[]={0.26}; - ACE_velocityBoundaries[]={}; - ACE_standardAtmosphere="ASM"; - ACE_dragModel=1; - ACE_muzzleVelocities[]={730, 750, 760}; - ACE_barrelLengths[]={203.2, 254.0, 304.8}; -}; \ No newline at end of file +class RH_B_6x35: BulletBase { + ACE_caliber=5.69; + ACE_bulletLength=11.303; + ACE_bulletMass=4.212; + ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; + ACE_ballisticCoefficients[]={0.26}; + ACE_velocityBoundaries[]={}; + ACE_standardAtmosphere="ASM"; + ACE_dragModel=1; + ACE_muzzleVelocities[]={730, 750, 760}; + ACE_barrelLengths[]={203.2, 254.0, 304.8}; +}; diff --git a/optionals/compat_rh_pdw/CfgWeapons.hpp b/optionals/compat_rh_pdw/CfgWeapons.hpp index e435ef131a..e64a9f2e67 100644 --- a/optionals/compat_rh_pdw/CfgWeapons.hpp +++ b/optionals/compat_rh_pdw/CfgWeapons.hpp @@ -1,9 +1,6 @@ - -class CfgWeapons -{ +class CfgWeapons { class Rifle_Base_F; - class RH_PDW: Rifle_Base_F - { + class RH_PDW: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=254.0; }; diff --git a/optionals/compat_rhs_afrf3/CfgMagazines.hpp b/optionals/compat_rhs_afrf3/CfgMagazines.hpp index 5a14b037fa..1cbc43ce08 100644 --- a/optionals/compat_rhs_afrf3/CfgMagazines.hpp +++ b/optionals/compat_rhs_afrf3/CfgMagazines.hpp @@ -11,7 +11,7 @@ class cfgMagazines { class rhs_mag_127x108mm_150: rhs_mag_127x108mm_50 { ace_isbelt = 0; }; - class rhs_mag_127x108mm_1470 : rhs_mag_127x108mm_50 { + class rhs_mag_127x108mm_1470: rhs_mag_127x108mm_50 { ace_isbelt = 0; }; class RHS_mag_VOG30_30: VehicleMagazine { diff --git a/optionals/compat_rhs_afrf3/CfgVehicles.hpp b/optionals/compat_rhs_afrf3/CfgVehicles.hpp index 6570105c78..94dcb00948 100644 --- a/optionals/compat_rhs_afrf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_afrf3/CfgVehicles.hpp @@ -24,8 +24,7 @@ class CfgVehicles { class Wheeled_APC_F: Car_F { class NewTurret; class Turrets { - class MainTurret: NewTurret - { + class MainTurret: NewTurret { class ViewOptics; }; }; diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index 359f1c0056..266c09b1df 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -58,7 +58,7 @@ class CfgWeapons { ACE_RailHeightAboveBore = 4.3348; }; class rhs_weap_rpk_base; - class rhs_weap_rpk74_base : rhs_weap_rpk_base { + class rhs_weap_rpk74_base: rhs_weap_rpk_base { ACE_barrelLength = 590.00; ACE_barrelTwist = 195.072; }; diff --git a/optionals/compat_rhs_afrf3/config.cpp b/optionals/compat_rhs_afrf3/config.cpp index c6424b4089..ddd2d598fe 100644 --- a/optionals/compat_rhs_afrf3/config.cpp +++ b/optionals/compat_rhs_afrf3/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {}; + weapons[] = {QGVAR(2b14_carry), QGVAR(nsv_carry), QGVAR(kord_carry), QGVAR(ags30_carry), QGVAR(spg9_carry), QGVAR(spg9m_carry), QGVAR(metis_carry), QGVAR(kornet_carry)}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_explosives", "ace_csw", "ace_rearm", "ace_refuel", "ace_repair", "rhs_main_loadorder"}; author = ECSTRING(common,ACETeam); diff --git a/optionals/compat_rhs_gref3/CfgWeapons.hpp b/optionals/compat_rhs_gref3/CfgWeapons.hpp index 9728eb1547..2b04217cf3 100644 --- a/optionals/compat_rhs_gref3/CfgWeapons.hpp +++ b/optionals/compat_rhs_gref3/CfgWeapons.hpp @@ -107,12 +107,12 @@ class CfgWeapons { ACE_barrelLength = 610.0; }; - class rhs_weap_Izh18 : Rifle_Base_F { - ace_overheating_jamTypesAllowed = ["Fire","Dud"]; + class rhs_weap_Izh18: Rifle_Base_F { + ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; }; - class rhs_weap_m79 : Rifle_Base_F { - ace_overheating_jamTypesAllowed = ["Fire","Dud"]; + class rhs_weap_m79: Rifle_Base_F { + ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; }; CREATE_CSW_PROXY(rhs_weap_DSHKM); diff --git a/optionals/compat_rhs_gref3/config.cpp b/optionals/compat_rhs_gref3/config.cpp index ae782a9cf1..5e9f6d21a0 100644 --- a/optionals/compat_rhs_gref3/config.cpp +++ b/optionals/compat_rhs_gref3/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {}; + weapons[] = {QGVAR(dshkm_carry)}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_explosives", "ace_csw", "rhsgref_main_loadorder"}; author = ECSTRING(common,ACETeam); diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 721184d200..dbf35096a7 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -26,6 +26,7 @@ class CfgAmmo { ACE_dragModel = 1; ACE_muzzleVelocities[] = {900}; ACE_barrelLengths[] = {736.6}; + EGVAR(vehicle_damage,incendiary) = 1.0; // Raufoss Mk 211 HEIAP (high-explosive, incendiary, armor-piercing) }; class B_762x54_Ball; class rhsusf_B_300winmag: B_762x54_Ball { // ACE_762x67_Ball_Mk248_Mod_1 (ballistics/CfgAmmo.hpp) diff --git a/optionals/compat_rhs_usf3/CfgVehicles.hpp b/optionals/compat_rhs_usf3/CfgVehicles.hpp index e0b43e8ce6..4e3c5d235f 100644 --- a/optionals/compat_rhs_usf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_usf3/CfgVehicles.hpp @@ -273,7 +273,7 @@ class CfgVehicles { class Wheeled_APC_F; class APC_Tracked_03_base_F; - class RHS_M2A2_Base : APC_Tracked_03_base_F { + class RHS_M2A2_Base: APC_Tracked_03_base_F { EGVAR(refuel,fuelCapacity) = 746; EGVAR(vehicle_damage,canHaveFireRing) = 1; EGVAR(vehicle_damage,hullDetonationProb) = 0.2; @@ -284,7 +284,7 @@ class CfgVehicles { EGVAR(vehicle_damage,engineFireProb) = 0.8; EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5; }; - class rhsusf_M1117_base : Wheeled_APC_F { + class rhsusf_M1117_base: Wheeled_APC_F { EGVAR(vehicle_damage,hullDetonationProb) = 0.2; EGVAR(vehicle_damage,turretDetonationProb) = 0.2; EGVAR(vehicle_damage,engineDetonationProb) = 0; @@ -302,7 +302,7 @@ class CfgVehicles { EGVAR(vehicle_damage,engineFireProb) = 0.7; EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5; }; - class rhsusf_m1a1tank_base : MBT_01_base_F { + class rhsusf_m1a1tank_base: MBT_01_base_F { EGVAR(refuel,fuelCapacity) = 1909; EGVAR(vehicle_damage,hullDetonationProb) = 0; EGVAR(vehicle_damage,turretDetonationProb) = 0; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 9b9dec9343..ebb76be932 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -157,8 +157,8 @@ class CfgWeapons { ACE_twistDirection = 0; ACE_barrelLength = 508.0; }; - class rhs_weap_m32_Base_F : Rifle_Base_F { - ace_overheating_jamTypesAllowed = ["Fire","Dud"]; + class rhs_weap_m32_Base_F: Rifle_Base_F { + ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; }; class SMG_02_base_F; class rhsusf_weap_MP7A1_base_f: SMG_02_base_F { @@ -184,7 +184,7 @@ class CfgWeapons { ACE_barrelLength = 124.46; }; class rhs_weap_M320_Base_F: Pistol_Base_F { - ace_overheating_jamTypesAllowed = ["Fire","Dud"]; + ace_overheating_jamTypesAllowed[] = {"Fire", "Dud"}; }; // RHS sniper scopes diff --git a/optionals/compat_rhs_usf3/config.cpp b/optionals/compat_rhs_usf3/config.cpp index b59e4f7185..1e169fdf6a 100644 --- a/optionals/compat_rhs_usf3/config.cpp +++ b/optionals/compat_rhs_usf3/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {}; + weapons[] = {QGVAR(m252_carry), QGVAR(m2_carry), QGVAR(mk19_carry), QGVAR(tow_carry)}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_explosives", "ace_javelin", "ace_rearm", "ace_refuel", "ace_repair", "ace_csw", "rhsusf_main_loadorder"}; author = ECSTRING(common,ACETeam); diff --git a/optionals/compat_sma3_iansky/CfgWeapons.hpp b/optionals/compat_sma3_iansky/CfgWeapons.hpp index a387b76c1a..57fe1c8a48 100644 --- a/optionals/compat_sma3_iansky/CfgWeapons.hpp +++ b/optionals/compat_sma3_iansky/CfgWeapons.hpp @@ -3,12 +3,12 @@ class CfgWeapons { class ItemCore; class InventoryOpticsItem_Base_F; - class iansky_nfbeast : ItemCore { + class iansky_nfbeast: ItemCore { ACE_ScopeAdjust_Vertical[] = { -0.9, 34 }; ACE_ScopeAdjust_Horizontal[] = { -11, 11 }; ACE_ScopeAdjust_VerticalIncrement = 0.2; ACE_ScopeAdjust_HorizontalIncrement = 0.1; - class ItemInfo : InventoryOpticsItem_Base_F { + class ItemInfo: InventoryOpticsItem_Base_F { class OpticsModes { class NF25_MILDOT { discreteDistance[] = { 100 }; diff --git a/optionals/compat_sog/CfgEventHandlers.hpp b/optionals/compat_sog/CfgEventHandlers.hpp index 56cf5f0c87..ad6f4e3740 100644 --- a/optionals/compat_sog/CfgEventHandlers.hpp +++ b/optionals/compat_sog/CfgEventHandlers.hpp @@ -1,12 +1,12 @@ class Extended_PreStart_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); }; }; class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); + init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; diff --git a/optionals/compat_sog/CfgMagazines/belts.hpp b/optionals/compat_sog/CfgMagazines/belts.hpp index 54f7ebc1df..0a8d6a1d28 100644 --- a/optionals/compat_sog/CfgMagazines/belts.hpp +++ b/optionals/compat_sog/CfgMagazines/belts.hpp @@ -8,3 +8,7 @@ class vn_pk_100_mag: vn_lmgmag_base { class vn_rpd_100_mag: vn_lmgmag_base { ACE_isBelt = 1; }; +class vn_m16_mag_base; +class vn_m63a_100_mag: vn_m16_mag_base { + ACE_isBelt = 1; +}; diff --git a/optionals/compat_sog/CfgVehicles/wheeled.hpp b/optionals/compat_sog/CfgVehicles/wheeled.hpp index 4a745ba580..dcd8c31ff2 100644 --- a/optionals/compat_sog/CfgVehicles/wheeled.hpp +++ b/optionals/compat_sog/CfgVehicles/wheeled.hpp @@ -16,7 +16,7 @@ class vn_wheeled_m151_base: vn_wheeled_car_base { }; // ZIL-157 -class vn_wheeled_z157_base : vn_wheeled_truck_base { +class vn_wheeled_z157_base: vn_wheeled_truck_base { EGVAR(refuel,fuelCapacity) = 150; }; class vn_wheeled_z157_fuel_base: vn_wheeled_z157_base { diff --git a/optionals/compat_sog/CfgWeapons/csw.hpp b/optionals/compat_sog/CfgWeapons/csw.hpp index 07f72e25eb..cda84c3bb4 100644 --- a/optionals/compat_sog/CfgWeapons/csw.hpp +++ b/optionals/compat_sog/CfgWeapons/csw.hpp @@ -71,7 +71,7 @@ class GVAR(m1919a4_carry): Launcher_Base_F { }; class GVAR(m1919a6_carry): Launcher_Base_F { - displayName = CSTRING(csw_m1919a4); + displayName = CSTRING(csw_m1919a6); author = ECSTRING(common,ACETeam); scope = 2; model = QPATHTOEF(apl,ACE_CSW_Bag.p3d); diff --git a/optionals/noactionmenu/README.md b/optionals/noactionmenu/README.md index c2e247bf44..fa34f9350d 100644 --- a/optionals/noactionmenu/README.md +++ b/optionals/noactionmenu/README.md @@ -2,10 +2,3 @@ ace_noactionmenu =========== Removes weapon select action. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/optionals/nocrosshair/README.md b/optionals/nocrosshair/README.md index ac9bcf43e0..c4992f1da9 100644 --- a/optionals/nocrosshair/README.md +++ b/optionals/nocrosshair/README.md @@ -2,10 +2,3 @@ ace_nocrosshair =========== Removes weapon crosshair. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/optionals/nouniformrestrictions/README.md b/optionals/nouniformrestrictions/README.md index cb7dfe4c5b..ba21f3efe5 100644 --- a/optionals/nouniformrestrictions/README.md +++ b/optionals/nouniformrestrictions/README.md @@ -2,11 +2,3 @@ ace_nouniformrestrictions ======= Removes side restrictions from all vanilla uniforms. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [654wak654](https://github.com/654wak654) -- [Jonpas](https://github.com/jonpas) diff --git a/optionals/particles/README.md b/optionals/particles/README.md index 5f03b880b2..e9c72d1380 100644 --- a/optionals/particles/README.md +++ b/optionals/particles/README.md @@ -2,9 +2,3 @@ ace_particles ========== Changes smoke particles from smoke hand grenades, 40mm grenades and artillery shells to be more realistic and useful. - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [BaerMitUmlaut](https://github.com/BaerMitUmlaut) diff --git a/optionals/tracers/CfgAmmo.hpp b/optionals/tracers/CfgAmmo.hpp index 9da774a4fb..5e316b8176 100644 --- a/optionals/tracers/CfgAmmo.hpp +++ b/optionals/tracers/CfgAmmo.hpp @@ -88,14 +88,14 @@ class CfgAmmo { class B_338_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red class B_338_NM_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class ACE_338_NM_Ball_green : B_338_NM_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; - class ACE_338_NM_Ball_yellow : B_338_NM_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; + class ACE_338_NM_Ball_green: B_338_NM_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; + class ACE_338_NM_Ball_yellow: B_338_NM_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; class B_127x54_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green class B_93x64_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class ACE_93x64_Ball_tracer_red : B_93x64_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; - class ACE_93x64_Ball_tracer_yellow : B_93x64_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; + class ACE_93x64_Ball_tracer_red: B_93x64_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; + class ACE_93x64_Ball_tracer_yellow: B_93x64_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Autocannon class B_19mm_HE: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white diff --git a/optionals/tracers/CfgMagazines.hpp b/optionals/tracers/CfgMagazines.hpp index df887520e4..40f19bfda7 100644 --- a/optionals/tracers/CfgMagazines.hpp +++ b/optionals/tracers/CfgMagazines.hpp @@ -5,34 +5,34 @@ class CfgMagazines { // 5.56mm class 150Rnd_556x45_Drum_Mag_F; - class ACE_150Rnd_556x45_Drum_green : 150Rnd_556x45_Drum_Mag_F { + class ACE_150Rnd_556x45_Drum_green: 150Rnd_556x45_Drum_Mag_F { ammo = "B_556x45_Ball_tracer_green"; STRINGS(150Rnd_556x45_Drum_green); }; - class ACE_150Rnd_556x45_Drum_yellow : 150Rnd_556x45_Drum_Mag_F { + class ACE_150Rnd_556x45_Drum_yellow: 150Rnd_556x45_Drum_Mag_F { ammo = "B_556x45_Ball_tracer_yellow"; STRINGS(150Rnd_556x45_Drum_yellow); }; class 150Rnd_556x45_Drum_Mag_tracer_F; - class ACE_150Rnd_556x45_Drum_tracer_green : 150Rnd_556x45_Drum_Mag_tracer_F { + class ACE_150Rnd_556x45_Drum_tracer_green: 150Rnd_556x45_Drum_Mag_tracer_F { ammo = "B_556x45_Ball_tracer_green"; STRINGS(150Rnd_556x45_Drum_tracer_green); descriptionShort = CSTRING(150Rnd_556x45_Drum_tracer_green_description); }; - class ACE_150Rnd_556x45_Drum_tracer_yellow : 150Rnd_556x45_Drum_Mag_tracer_F { + class ACE_150Rnd_556x45_Drum_tracer_yellow: 150Rnd_556x45_Drum_Mag_tracer_F { ammo = "B_556x45_Ball_tracer_yellow"; STRINGS(150Rnd_556x45_Drum_tracer_yellow); descriptionShort = CSTRING(150Rnd_556x45_Drum_tracer_green_description); }; class 200Rnd_556x45_Box_F; - class ACE_200Rnd_556x45_Box_green : 200Rnd_556x45_Box_F { + class ACE_200Rnd_556x45_Box_green: 200Rnd_556x45_Box_F { ammo = "B_556x45_Ball_tracer_green"; STRINGS(200Rnd_556x45_Box_green); }; class 200Rnd_556x45_Box_tracer_F; - class ACE_200Rnd_556x45_Box_tracer_green : 200Rnd_556x45_Box_tracer_F { + class ACE_200Rnd_556x45_Box_tracer_green: 200Rnd_556x45_Box_tracer_F { ammo = "B_556x45_Ball_tracer_green"; STRINGS(200Rnd_556x45_Box_tracer_green); descriptionShort = CSTRING(200Rnd_556x45_Box_tracer_green_description); @@ -40,44 +40,44 @@ class CfgMagazines { // 5.8mm class 30Rnd_580x42_Mag_F; - class ACE_30Rnd_580x42_Mag_red : 30Rnd_580x42_Mag_F { + class ACE_30Rnd_580x42_Mag_red: 30Rnd_580x42_Mag_F { ammo = "ACE_580x42_Ball_tracer_red"; STRINGS(30Rnd_580x42_Mag_red); }; - class ACE_30Rnd_580x42_Mag_yellow : 30Rnd_580x42_Mag_F { + class ACE_30Rnd_580x42_Mag_yellow: 30Rnd_580x42_Mag_F { ammo = "ACE_580x42_Ball_tracer_yellow"; STRINGS(30Rnd_580x42_Mag_yellow); }; class 30Rnd_580x42_Mag_tracer_F; - class ACE_30Rnd_580x42_Mag_tracer_red : 30Rnd_580x42_Mag_tracer_F { + class ACE_30Rnd_580x42_Mag_tracer_red: 30Rnd_580x42_Mag_tracer_F { ammo = "ACE_580x42_Ball_tracer_red"; STRINGS(30Rnd_580x42_Mag_tracer_red); descriptionShort = CSTRING(30Rnd_580x42_Mag_tracer_red_description); }; - class ACE_30Rnd_580x42_Mag_tracer_yellow : 30Rnd_580x42_Mag_tracer_F { + class ACE_30Rnd_580x42_Mag_tracer_yellow: 30Rnd_580x42_Mag_tracer_F { ammo = "ACE_580x42_Ball_tracer_yellow"; STRINGS(30Rnd_580x42_Mag_tracer_yellow); descriptionShort = CSTRING(30Rnd_580x42_Mag_tracer_yellow_description); }; class 100Rnd_580x42_Mag_F; - class ACE_100Rnd_580x42_Drum_red : 100Rnd_580x42_Mag_F { + class ACE_100Rnd_580x42_Drum_red: 100Rnd_580x42_Mag_F { ammo = "ACE_580x42_Ball_tracer_red"; STRINGS(100Rnd_580x42_Drum_red); }; - class ACE_100Rnd_580x42_Drum_yellow : 100Rnd_580x42_Mag_F { + class ACE_100Rnd_580x42_Drum_yellow: 100Rnd_580x42_Mag_F { ammo = "ACE_580x42_Ball_tracer_yellow"; STRINGS(100Rnd_580x42_Drum_yellow); }; class 100Rnd_580x42_Mag_tracer_F; - class ACE_100Rnd_580x42_Drum_tracer_red : 100Rnd_580x42_Mag_tracer_F { + class ACE_100Rnd_580x42_Drum_tracer_red: 100Rnd_580x42_Mag_tracer_F { ammo = "ACE_580x42_Ball_tracer_red"; STRINGS(100Rnd_580x42_Drum_tracer_red); descriptionShort = CSTRING(100Rnd_580x42_Drum_tracer_red_description); }; - class ACE_100Rnd_580x42_Drum_tracer_yellow : 100Rnd_580x42_Mag_tracer_F { + class ACE_100Rnd_580x42_Drum_tracer_yellow: 100Rnd_580x42_Mag_tracer_F { ammo = "ACE_580x42_Ball_tracer_yellow"; STRINGS(100Rnd_580x42_Drum_tracer_yellow); descriptionShort = CSTRING(100Rnd_580x42_Drum_tracer_yellow_description); @@ -85,25 +85,25 @@ class CfgMagazines { // 6.5mm Caseless MX class 30Rnd_65x39_caseless_mag; - class ACE_30Rnd_65x39_mx_green : 30Rnd_65x39_caseless_mag { + class ACE_30Rnd_65x39_mx_green: 30Rnd_65x39_caseless_mag { ammo = "B_65x39_Caseless_green"; STRINGS(30Rnd_65x39_mx_green); descriptionShort = CSTRING(30Rnd_65x39_mx_green_description); }; - class ACE_30Rnd_65x39_mx_yellow : 30Rnd_65x39_caseless_mag { + class ACE_30Rnd_65x39_mx_yellow: 30Rnd_65x39_caseless_mag { ammo = "B_65x39_Caseless_yellow"; STRINGS(30Rnd_65x39_mx_yellow); descriptionShort = CSTRING(30Rnd_65x39_mx_yellow_description); }; class 30Rnd_65x39_caseless_mag_tracer; - class ACE_30Rnd_65x39_mx_tracer_green : 30Rnd_65x39_caseless_mag_tracer { + class ACE_30Rnd_65x39_mx_tracer_green: 30Rnd_65x39_caseless_mag_tracer { ammo = "B_65x39_Caseless_green"; picture = "a3\weapons_f\Data\UI\m_30stanag_caseless_green_CA.paa"; STRINGS(30Rnd_65x39_mx_tracer_green); descriptionShort = CSTRING(30Rnd_65x39_mx_tracer_green_description); }; - class ACE_30Rnd_65x39_mx_tracer_yellow : 30Rnd_65x39_caseless_mag_tracer { + class ACE_30Rnd_65x39_mx_tracer_yellow: 30Rnd_65x39_caseless_mag_tracer { ammo = "B_65x39_Caseless_yellow"; picture = "a3\weapons_f\Data\UI\m_30stanag_caseless_yellow_CA.paa"; STRINGS(30Rnd_65x39_mx_tracer_yellow); @@ -111,23 +111,23 @@ class CfgMagazines { }; class 100Rnd_65x39_caseless_mag; - class ACE_100Rnd_65x39_mx_green : 100Rnd_65x39_caseless_mag { + class ACE_100Rnd_65x39_mx_green: 100Rnd_65x39_caseless_mag { ammo = "B_65x39_Caseless_green"; STRINGS(100Rnd_65x39_mx_green); }; - class ACE_100Rnd_65x39_mx_yellow : 100Rnd_65x39_caseless_mag { + class ACE_100Rnd_65x39_mx_yellow: 100Rnd_65x39_caseless_mag { ammo = "B_65x39_Caseless_yellow"; STRINGS(100Rnd_65x39_mx_yellow); }; class 100Rnd_65x39_caseless_mag_tracer; - class ACE_100Rnd_65x39_mx_tracer_green : 100Rnd_65x39_caseless_mag_tracer { + class ACE_100Rnd_65x39_mx_tracer_green: 100Rnd_65x39_caseless_mag_tracer { ammo = "B_65x39_Caseless_green"; picture = "a3\weapons_f\Data\UI\M_100Rnd_65x39_green_CA.paa"; STRINGS(100Rnd_65x39_mx_tracer_green); descriptionShort = CSTRING(100Rnd_65x39_mx_tracer_green_description); }; - class ACE_100Rnd_65x39_mx_tracer_yellow : 100Rnd_65x39_caseless_mag_tracer { + class ACE_100Rnd_65x39_mx_tracer_yellow: 100Rnd_65x39_caseless_mag_tracer { ammo = "B_65x39_Caseless_yellow"; picture = "a3\weapons_f\Data\UI\M_100Rnd_65x39_yellow_CA.paa"; STRINGS(100Rnd_65x39_mx_tracer_yellow); @@ -136,23 +136,23 @@ class CfgMagazines { // 6.5mm Caseless Katiba class 30Rnd_65x39_caseless_green; - class ACE_30Rnd_65x39_katiba_red : 30Rnd_65x39_caseless_green { + class ACE_30Rnd_65x39_katiba_red: 30Rnd_65x39_caseless_green { ammo = "B_65x39_Caseless"; STRINGS(30Rnd_65x39_katiba_red); }; - class ACE_30Rnd_65x39_katiba_yellow : 30Rnd_65x39_caseless_green { + class ACE_30Rnd_65x39_katiba_yellow: 30Rnd_65x39_caseless_green { ammo = "B_65x39_Caseless_yellow"; STRINGS(30Rnd_65x39_katiba_yellow); }; class 30Rnd_65x39_caseless_green_mag_Tracer; - class ACE_30Rnd_65x39_katiba_tracer_red : 30Rnd_65x39_caseless_green_mag_Tracer { + class ACE_30Rnd_65x39_katiba_tracer_red: 30Rnd_65x39_caseless_green_mag_Tracer { ammo = "B_65x39_Caseless"; picture = "a3\weapons_f\Data\UI\m_20stanag_red_CA.paa"; STRINGS(30Rnd_65x39_katiba_tracer_red); descriptionShort = CSTRING(30Rnd_65x39_katiba_tracer_red_description); }; - class ACE_30Rnd_65x39_katiba_tracer_yellow : 30Rnd_65x39_caseless_green_mag_Tracer { + class ACE_30Rnd_65x39_katiba_tracer_yellow: 30Rnd_65x39_caseless_green_mag_Tracer { ammo = "B_65x39_Caseless_yellow"; picture = "a3\weapons_f\Data\UI\m_20stanag_yellow_CA.paa"; STRINGS(30Rnd_65x39_katiba_tracer_yellow); @@ -161,25 +161,25 @@ class CfgMagazines { // 6.5mm Cased class 200Rnd_65x39_cased_Box; - class ACE_200Rnd_65x39_cased_Box_green : 200Rnd_65x39_cased_Box { + class ACE_200Rnd_65x39_cased_Box_green: 200Rnd_65x39_cased_Box { ammo = "B_65x39_Case_green"; STRINGS(200Rnd_65x39_cased_Box_green); descriptionShort = CSTRING(200Rnd_65x39_cased_Box_green_description); }; - class ACE_200Rnd_65x39_cased_Box_red : 200Rnd_65x39_cased_Box { + class ACE_200Rnd_65x39_cased_Box_red: 200Rnd_65x39_cased_Box { ammo = "B_65x39_Case"; STRINGS(200Rnd_65x39_cased_Box_red); descriptionShort = CSTRING(200Rnd_65x39_cased_Box_red_description); }; class 200Rnd_65x39_cased_Box_tracer; - class ACE_200Rnd_65x39_cased_Box_tracer_green : 200Rnd_65x39_cased_Box_tracer { + class ACE_200Rnd_65x39_cased_Box_tracer_green: 200Rnd_65x39_cased_Box_tracer { ammo = "B_65x39_Case_green"; picture = "a3\weapons_f\Data\UI\M_200Rnd_65x39_green_CA.paa"; STRINGS(200Rnd_65x39_cased_Box_tracer_green); descriptionShort = CSTRING(200Rnd_65x39_cased_Box_tracer_green_description); }; - class ACE_200Rnd_65x39_cased_Box_tracer_red : 200Rnd_65x39_cased_Box_tracer { + class ACE_200Rnd_65x39_cased_Box_tracer_red: 200Rnd_65x39_cased_Box_tracer { ammo = "B_65x39_Case"; picture = "a3\weapons_f\Data\UI\M_200Rnd_65x39_red_CA.paa"; STRINGS(200Rnd_65x39_cased_Box_tracer_red); @@ -188,12 +188,12 @@ class CfgMagazines { // 7.62x51 (NATO) class ACE_20Rnd_762x51_Mag_tracer; - class ACE_20Rnd_762x51_Mag_tracer_green : ACE_20Rnd_762x51_Mag_tracer { + class ACE_20Rnd_762x51_Mag_tracer_green: ACE_20Rnd_762x51_Mag_tracer { ammo = "B_762x51_tracer_green"; STRINGS(20Rnd_762x51_Mag_tracer_green); descriptionShort = CSTRING(20Rnd_762x51_Mag_tracer_green_description); }; - class ACE_20Rnd_762x51_Mag_tracer_yellow : ACE_20Rnd_762x51_Mag_tracer { + class ACE_20Rnd_762x51_Mag_tracer_yellow: ACE_20Rnd_762x51_Mag_tracer { ammo = "B_762x51_tracer_yellow"; STRINGS(20Rnd_762x51_Mag_tracer_yellow); descriptionShort = CSTRING(20Rnd_762x51_Mag_tracer_green_description); @@ -201,22 +201,22 @@ class CfgMagazines { // 7.62x54 (Russian) class 150Rnd_762x54_Box; - class ACE_150Rnd_762x54_Box_red : 150Rnd_762x54_Box { + class ACE_150Rnd_762x54_Box_red: 150Rnd_762x54_Box { ammo = "B_762x54_tracer_red"; STRINGS(150Rnd_762x54_Box_red); }; - class ACE_150Rnd_762x54_Box_yellow : 150Rnd_762x54_Box { + class ACE_150Rnd_762x54_Box_yellow: 150Rnd_762x54_Box { ammo = "B_762x54_tracer_yellow"; STRINGS(150Rnd_762x54_Box_yellow); }; class 150Rnd_762x54_Box_tracer; - class ACE_150Rnd_762x54_Box_tracer_red : 150Rnd_762x54_Box_tracer { + class ACE_150Rnd_762x54_Box_tracer_red: 150Rnd_762x54_Box_tracer { ammo = "B_762x54_tracer_red"; STRINGS(150Rnd_762x54_Box_tracer_red); descriptionShort = CSTRING(150Rnd_762x54_Box_tracer_red_description); }; - class ACE_150Rnd_762x54_Box_tracer_yellow : 150Rnd_762x54_Box_tracer { + class ACE_150Rnd_762x54_Box_tracer_yellow: 150Rnd_762x54_Box_tracer { ammo = "B_762x54_tracer_yellow"; STRINGS(150Rnd_762x54_Box_tracer_yellow); descriptionShort = CSTRING(150Rnd_762x54_Box_tracer_yellow_description); @@ -224,22 +224,22 @@ class CfgMagazines { // 9.3x64 class 150Rnd_93x64_Mag; - class ACE_150Rnd_93x64_Mag_red : 150Rnd_93x64_Mag { + class ACE_150Rnd_93x64_Mag_red: 150Rnd_93x64_Mag { ammo = "ACE_93x64_Ball_tracer_red"; STRINGS(150Rnd_93x64_Mag_red); }; - class ACE_150Rnd_93x64_Mag_yellow : 150Rnd_93x64_Mag { + class ACE_150Rnd_93x64_Mag_yellow: 150Rnd_93x64_Mag { ammo = "ACE_93x64_Ball_tracer_yellow"; STRINGS(150Rnd_93x64_Mag_yellow); }; // .338 NM class 130Rnd_338_Mag; - class ACE_130Rnd_338_Mag_green : 130Rnd_338_Mag { + class ACE_130Rnd_338_Mag_green: 130Rnd_338_Mag { ammo = "ACE_338_NM_Ball_green"; STRINGS(130Rnd_338_Mag_green); }; - class ACE_130Rnd_338_Mag_yellow : 130Rnd_338_Mag { + class ACE_130Rnd_338_Mag_yellow: 130Rnd_338_Mag { ammo = "ACE_338_NM_Ball_yellow"; STRINGS(130Rnd_338_Mag_yellow); }; diff --git a/optionals/tracers/README.md b/optionals/tracers/README.md index 868b697cff..a8d7bbf24d 100644 --- a/optionals/tracers/README.md +++ b/optionals/tracers/README.md @@ -2,9 +2,3 @@ ace_balltracers =========== Ball tracers for Arma 3 ported from ACE2. - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [jaynus](https://github.com/walterpearce) diff --git a/optionals/tracers/model.cfg b/optionals/tracers/model.cfg index e98687c3b4..fd53eb557e 100644 --- a/optionals/tracers/model.cfg +++ b/optionals/tracers/model.cfg @@ -4,7 +4,7 @@ class CfgSkeletons { skeletonInherit = ""; skeletonBones[] = {}; }; - class ACE_Tracer_Skeleton : Default {}; + class ACE_Tracer_Skeleton: Default {}; class ACE_Tracer_Skeleton_Default: ACE_Tracer_Skeleton { // BWC skeletonInherit = "ACE_Tracer_Skeleton"; skeletonBones[]= { diff --git a/tools/config_style_checker.py b/tools/config_style_checker.py index 535ae7c58f..afa78a2d6b 100644 --- a/tools/config_style_checker.py +++ b/tools/config_style_checker.py @@ -16,6 +16,14 @@ def check_config_style(filepath): def popClosing(): closing << closingStack.pop() + reIsClass = re.compile(r'^\s*class(.*)') + reIsClassInherit = re.compile(r'^\s*class(.*):') + reIsClassBody = re.compile(r'^\s*class(.*){') + reBadColon = re.compile(r'\s*class (.*) :') + reSpaceAfterColon = re.compile(r'\s*class (.*): ') + reSpaceBeforeCurly = re.compile(r'\s*class (.*) {') + reClassSingleLine = re.compile(r'\s*class (.*)[{;]') + with open(filepath, 'r', encoding='utf-8', errors='ignore') as file: content = file.read() @@ -118,6 +126,23 @@ def check_config_style(filepath): if brackets_list.count('{') != brackets_list.count('}'): print("ERROR: A possible missing curly brace {{ or }} in file {0} {{ = {1} }} = {2}".format(filepath,brackets_list.count('{'),brackets_list.count('}'))) bad_count_file += 1 + + file.seek(0) + for lineNumber, line in enumerate(file.readlines()): + if reIsClass.match(line): + if reBadColon.match(line): + print(f"WARNING: bad class colon {filepath} Line number: {lineNumber+1}") + # bad_count_file += 1 + if reIsClassInherit.match(line): + if not reSpaceAfterColon.match(line): + print(f"WARNING: bad class missing space after colon {filepath} Line number: {lineNumber+1}") + if reIsClassBody.match(line): + if not reSpaceBeforeCurly.match(line): + print(f"WARNING: bad class inherit missing space before curly braces {filepath} Line number: {lineNumber+1}") + if not reClassSingleLine.match(line): + print(f"WARNING: bad class braces placement {filepath} Line number: {lineNumber+1}") + # bad_count_file += 1 + return bad_count_file def main(): diff --git a/tools/make.py b/tools/make.py index 96808c9580..33d57c9f98 100644 --- a/tools/make.py +++ b/tools/make.py @@ -1134,9 +1134,10 @@ See the make.cfg file for additional build options. if ret == 0: print_green("Created: {}".format(os.path.join(private_key_path, key_name + ".biprivatekey"))) print("Removing any old signature keys...") - purge(os.path.join(module_root, release_dir, project, "addons"), "^.*\.bisign$","*.bisign") - purge(os.path.join(module_root, release_dir, project, "optionals"), "^.*\.bisign$","*.bisign") - purge(os.path.join(module_root, release_dir, project, "keys"), "^.*\.bikey$","*.bikey") + for root, _dirs, files in os.walk(os.path.join(module_root, release_dir)): + for file in files: + if file.endswith(".bisign") or file.endswith(".bikey"): + os.remove(os.path.join(root, file)) else: print_error("Failed to create key!")