From 0e7b43250d062833ed7190cb403a1dd2ba11bdfb Mon Sep 17 00:00:00 2001 From: Sotirios Pupakis Date: Fri, 31 May 2024 00:19:44 +0200 Subject: [PATCH] basic 105mm ammo - cluster and laser are broken thank you arma --- .hemtt/missions/test.Stratis/mission.sqm | Bin 10880 -> 12539 bytes addons/m119/functions/fnc_load.sqf | 41 ++++ addons/m119/functions/fnc_unload.sqf | 30 +++ addons/m119/script_component.hpp | 45 ++++ addons/m119/stringtable.xml | 20 ++ addons/m119/tbd_m119/CfgVehicles.hpp | 296 ++++++++++++++++++----- addons/m119/tbd_m119/CfgWeapons.hpp | 7 +- addons/m119/tbd_m119/model.cfg | 6 +- 8 files changed, 376 insertions(+), 69 deletions(-) diff --git a/.hemtt/missions/test.Stratis/mission.sqm b/.hemtt/missions/test.Stratis/mission.sqm index cdf27072239ec2d1ad7d8bb041be5cfc62644096..780ddb7ea410b7674cb576bc22fae93ad6b79c2e 100644 GIT binary patch literal 12539 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 delta 3233 zcmZWrdrX_x6+hnvzc6ou4aV5m7;F=oV4KIx+$*M`!v}Tc@NSmUlO{MG=bxlUAbc-tf*dLYBC`r4WbNzib zXh;^n^ZK28?>Xn*@4horMzRt^SYW%0uTy2bGbZTpAXW z$qXq=|4_cHocpkPS$S=&IVNVNNw?%*SyJM4dt=Jq)~@#pHJh9~o*@1CtNk$|osB5} zzR(fNuK;!?vpM(?t!9BYP@{-sE-{sbY7$@v!7kWSs=+Ya&|w4;22C48k7&c+ftco{H zc-?$JRGVe&nB|Cg)r^0#WQEm&kCYt{S&KCMt}G+&SukW(#dsOMY)y%)W%$5)Nc36p zKzWk;;#zsVL-vJ2rOzb}rZdO7-~(FX-75UDyrscdPCXz}gSlKLIWdze6v7Y7%dEF_;`O22& z)}if#-+g>=@8hlcSS^u}f>$eKqK-U#t;*pY(<#GnN@|NMn;`jA1yP1;*`zP{4e3T| zKi;jZtCefgQv8QZm#bt7Tcw1YVk<#yFAA-iSFUqCK_(?1kj_I6_+>HRJ*h1QoF)0a zO8ix|+fGV?Mbk&p6~hi+9g`LfH8QDORZkvrl5zInE)B!H)D{D#NS?2vB)(cU>5Dxh z-DHB<*!o>uCj(X2SmW`^k_gz5$|VkigQsmcl}qN5)C1dV`0{xBv6_%_oH1DRq2wWv zOX-3OY{;+bUcCk*aH~m!Q8?|=U^k35Yp@4QZVmRrk`DV|OMo+yr8HlkZyuXYz)tm8 z0$sLPRYfiBOe80P$?w(U8HdBzK{|pKn+q3ho2yRfE_9;0%jl=}_h2a*b{^$-`C2=VlWg-|QE+?YP_1E<6q_ zZ-^Kdozf6*=w;3G4G%x`9R~nw!2&a>wBd$2Z;spPrR%!BzOO4ps)GNqNgH_YS>(00E2tms5Uw?-fapF5o zAwklnwk?myy_FOXtP4KksKNn;L6rx%{tgx7K*zV!6}PvMksb81^+=h^hVJ$O6nL*ldxKWOeXpW<1giIX0t zX6X@Y#;4s)xV@nkf9!6z#kjtT0x9|gfJ5n{G?dc&iu5j1Xc%Q1d;>>2TL$Eq3V!$L zN}%tF5~X}(HLhgLZx1N9m+A3WQwI;zRZ+t4#jKL}-tGZLz%)QZ&eX~*hTXxkcXZ}4 zW{%0J-@v>zs56iMKl6tzd-BXo1F(eex;s5)55YnSvJj%{LoR+V>9+)AQ?-##D8N0e zoX1_BfN~3GJW<2GHd5nnJbfhp%j4Z?X#rpzSYbMooKiE#o=T|GwByTUfJ16(^59Gg z=DZ~6{rwpWvcEs|5i0a|5XV}cRrcYPmY*A*CZ9PR_jW6D_zQ2yutf4__^!9ZD5Fd9 zNMkp4IxFkrOi}Fg1rk5?@dgYk!3BKAHy{@Bie#9-=i0mI3-@DrJ3$lmLd>2kleDz%2R<{ZPvK3@MBFMtjVDo0Qxvy3-d@mQ2n- zwMm*_3x)%JD#<0<@{rDBk#tK X#bfm1%2!vTds50wR|W&pKotK2H}DV= diff --git a/addons/m119/functions/fnc_load.sqf b/addons/m119/functions/fnc_load.sqf index 236aba2..8618dbb 100644 --- a/addons/m119/functions/fnc_load.sqf +++ b/addons/m119/functions/fnc_load.sqf @@ -40,6 +40,30 @@ switch (_shell) do { case QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_5): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_5)}; case QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_6): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_6)}; case QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_7): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_7)}; + + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_1): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_1)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_2): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_2)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_3): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_3)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_4): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_4)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_5): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_5)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_6): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_6)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_7): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_7)}; + + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_1): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_1)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_2): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_2)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_3): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_3)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_4): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_4)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_5): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_5)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_6): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_6)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_7): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_7)}; + + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_1): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_1)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_2): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_2)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_3): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_3)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_4): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_4)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_5): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_5)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_6): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_6)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_7): {_mag = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_7)}; }; [QGVAR(loadShell), [_arty, _mag, _turret], _arty, [-1]] call CBA_fnc_turretEvent; @@ -50,6 +74,23 @@ private _veh = nearestObjects [player, [_shell], 3]; if (typeOf _x == _shell) exitWith {deleteVehicle _x}; } forEach _veh; +if ("laser" in _shell) exitWith { + _arty animateSource ["magazine_laser_load_source", 0, true]; + _arty animateSource ["magazine_laser_hide_source", 0, true]; + _arty animateSource ["magazine_laser_load_source", 0.36, 0.2]; +}; + +if ("smoke" in _shell) exitWith { + _arty animateSource ["magazine_smoke_load_source", 0, true]; + _arty animateSource ["magazine_smoke_hide_source", 0, true]; + _arty animateSource ["magazine_smoke_load_source", 0.36, 0.2]; +}; +if ("dpicm" in _shell) exitWith { + _arty animateSource ["magazine_dpicm_load_source", 0, true]; + _arty animateSource ["magazine_dpicm_hide_source", 0, true]; + _arty animateSource ["magazine_dpicm_load_source", 0.36, 0.2]; +}; + _arty animateSource ["magazine_load_source", 0, true]; _arty animateSource ["magazine_hide_source", 0, true]; _arty animateSource ["magazine_load_source", 0.36, 0.2]; diff --git a/addons/m119/functions/fnc_unload.sqf b/addons/m119/functions/fnc_unload.sqf index 891a8fc..2d4a1cb 100644 --- a/addons/m119/functions/fnc_unload.sqf +++ b/addons/m119/functions/fnc_unload.sqf @@ -43,10 +43,40 @@ switch (_mags#0) do { case QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_5): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_5)}; case QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_6): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_6)}; case QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_7): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_7)}; + + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_1): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_1)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_2): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_2)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_3): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_3)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_4): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_4)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_5): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_5)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_6): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_6)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_7): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_7)}; + + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_1): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_1)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_2): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_2)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_3): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_3)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_4): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_4)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_5): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_5)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_6): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_6)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_7): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_7)}; + + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_1): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_1)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_2): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_2)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_3): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_3)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_4): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_4)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_5): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_5)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_6): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_6)}; + case QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_7): {_veh = QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_7)}; }; _arty animateSource ["magazine_hide_source", 1]; _arty animateSource ["magazine_load_source", 0]; +_arty animateSource ["magazine_laser_hide_source", 1]; +_arty animateSource ["magazine_laser_load_source", 0]; +_arty animateSource ["magazine_smoke_hide_source", 1]; +_arty animateSource ["magazine_smoke_load_source", 0]; +_arty animateSource ["magazine_dpicm_hide_source", 1]; +_arty animateSource ["magazine_dpicm_load_source", 0]; private _s = _veh createVehicle (getPos player); [player, _s] call ace_dragging_fnc_startCarry; diff --git a/addons/m119/script_component.hpp b/addons/m119/script_component.hpp index 747eed1..cb5d170 100644 --- a/addons/m119/script_component.hpp +++ b/addons/m119/script_component.hpp @@ -39,5 +39,50 @@ #define TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_6 tbd_mortars_105mm_round_he_charge_mag_6 #define TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_7 tbd_mortars_105mm_round_he_charge_mag_7 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_1 tbd_mortars_105mm_round_smoke_charge_1 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_2 tbd_mortars_105mm_round_smoke_charge_2 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_3 tbd_mortars_105mm_round_smoke_charge_3 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_4 tbd_mortars_105mm_round_smoke_charge_4 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_5 tbd_mortars_105mm_round_smoke_charge_5 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_6 tbd_mortars_105mm_round_smoke_charge_6 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_7 tbd_mortars_105mm_round_smoke_charge_7 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_1 tbd_mortars_105mm_round_smoke_charge_mag_1 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_2 tbd_mortars_105mm_round_smoke_charge_mag_2 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_3 tbd_mortars_105mm_round_smoke_charge_mag_3 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_4 tbd_mortars_105mm_round_smoke_charge_mag_4 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_5 tbd_mortars_105mm_round_smoke_charge_mag_5 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_6 tbd_mortars_105mm_round_smoke_charge_mag_6 +#define TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_7 tbd_mortars_105mm_round_smoke_charge_mag_7 + +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_1 tbd_mortars_105mm_round_dpicm_charge_1 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_2 tbd_mortars_105mm_round_dpicm_charge_2 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_3 tbd_mortars_105mm_round_dpicm_charge_3 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_4 tbd_mortars_105mm_round_dpicm_charge_4 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_5 tbd_mortars_105mm_round_dpicm_charge_5 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_6 tbd_mortars_105mm_round_dpicm_charge_6 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_7 tbd_mortars_105mm_round_dpicm_charge_7 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_1 tbd_mortars_105mm_round_dpicm_charge_mag_1 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_2 tbd_mortars_105mm_round_dpicm_charge_mag_2 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_3 tbd_mortars_105mm_round_dpicm_charge_mag_3 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_4 tbd_mortars_105mm_round_dpicm_charge_mag_4 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_5 tbd_mortars_105mm_round_dpicm_charge_mag_5 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_6 tbd_mortars_105mm_round_dpicm_charge_mag_6 +#define TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_7 tbd_mortars_105mm_round_dpicm_charge_mag_7 + +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_1 tbd_mortars_105mm_round_laser_charge_1 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_2 tbd_mortars_105mm_round_laser_charge_2 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_3 tbd_mortars_105mm_round_laser_charge_3 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_4 tbd_mortars_105mm_round_laser_charge_4 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_5 tbd_mortars_105mm_round_laser_charge_5 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_6 tbd_mortars_105mm_round_laser_charge_6 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_7 tbd_mortars_105mm_round_laser_charge_7 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_1 tbd_mortars_105mm_round_laser_charge_mag_1 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_2 tbd_mortars_105mm_round_laser_charge_mag_2 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_3 tbd_mortars_105mm_round_laser_charge_mag_3 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_4 tbd_mortars_105mm_round_laser_charge_mag_4 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_5 tbd_mortars_105mm_round_laser_charge_mag_5 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_6 tbd_mortars_105mm_round_laser_charge_mag_6 +#define TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_7 tbd_mortars_105mm_round_laser_charge_mag_7 + #define TOW_RADIUS 10 #define ATTACH_RADIUS 2 \ No newline at end of file diff --git a/addons/m119/stringtable.xml b/addons/m119/stringtable.xml index ff36458..d7ac62b 100644 --- a/addons/m119/stringtable.xml +++ b/addons/m119/stringtable.xml @@ -66,5 +66,25 @@ Otočit celou houfnici vpravo Повернуть орудие вправо + + HE + Tříštivé + ОФ + + + Laser Guided + Laserové + управляемыми + + + Smoke + Dýmové + дымовыми + + + DPICM + Kazetové + Кассетный + diff --git a/addons/m119/tbd_m119/CfgVehicles.hpp b/addons/m119/tbd_m119/CfgVehicles.hpp index 494760b..4babc40 100644 --- a/addons/m119/tbd_m119/CfgVehicles.hpp +++ b/addons/m119/tbd_m119/CfgVehicles.hpp @@ -55,6 +55,7 @@ class CfgVehicles { gunnergetInAction = "GetInLow"; gunnergetOutAction = "GetOutLow"; weapons[] = {QUOTE(TBD_M119_WEAPON)}; + //weapons[] = {"mortar_155mm_AMOS"}; elevationMode = 1; initCamElev = 20; minCamElev = -35; @@ -102,7 +103,8 @@ class CfgVehicles { memoryPointsGetInGunnerDir = "pos_gunner_dir"; proxyType = "CPGunner"; proxyIndex = 1; - magazines[] = {}; + //magazines[] = {}; + magazines[] = {"2Rnd_155mm_Mo_Cluster"}; }; }; htMin = 1; @@ -334,25 +336,6 @@ class CfgVehicles { animPeriod = 0; }; - - - - - - - - - - - - - - - - - - - class mainTurretT_source { source = "user"; initPhase = 0; @@ -418,62 +401,245 @@ class CfgVehicles { selection = "casing_spawn"; icon = "x\tbd_mortars\addons\main\data\load.paa"; - class TBD_LoadHECh1 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_1"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_1)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_1)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; + class TBD_LoadHE { + displayName = CSTRING(HE); + class TBD_LoadHECh1 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_1"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_1)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_1)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadHECh2 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_2"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_2)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_2)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadHECh3 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_3"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_3)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_3)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadHECh4 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_4"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_4)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_4)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadHECh5 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_5"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_5)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_5)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadHECh6 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_6"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_6)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_6)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadHECh7 { + displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_7"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_7)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_7)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; }; - class TBD_LoadHECh2 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_2"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_2)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_2)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; + class TBD_LoadLASERCh6 { + displayName = CSTRING(LASER); + class TBD_LoadLASERCh1 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_1"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_1)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_1)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadLASERCh2 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_2"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_2)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_2)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadLASERCh3 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_3"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_3)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_3)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadLASERCh4 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_4"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_4)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_4)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadLASERCh5 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_5"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_5)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_5)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadLASERCh6 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_6"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_6)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_6)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadLASERCh7 { + displayName = "$STR_TBD_MORTARS_105mm_LASER_CHARGE_7"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_7)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_7)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; }; - class TBD_LoadHECh3 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_3"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_3)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_3)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; + class TBD_LoadSMOKECh6 { + displayName = CSTRING(SMOKE); + class TBD_LoadSMOKECh1 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_1"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_1)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_1)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadSMOKECh2 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_2"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_2)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_2)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadSMOKECh3 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_3"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_3)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_3)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadSMOKECh4 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_4"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_4)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_4)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadSMOKECh5 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_5"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_5)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_5)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadSMOKECh6 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_6"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_6)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_6)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadSMOKECh7 { + displayName = "$STR_TBD_MORTARS_105mm_SMOKE_CHARGE_7"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_7)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_7)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; }; - class TBD_LoadHECh4 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_4"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_4)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_4)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; - }; + class TBD_LoadDPICMCh6 { + displayName = CSTRING(DPICM); + class TBD_LoadDPICMCh1 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_1"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_1)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_1)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; - class TBD_LoadHECh5 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_5"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_5)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_5)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; - }; + class TBD_LoadDPICMCh2 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_2"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_2)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_2)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; - class TBD_LoadHECh6 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_6"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_6)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_6)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; - }; + class TBD_LoadDPICMCh3 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_3"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_3)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_3)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; - class TBD_LoadHECh7 { - displayName = "$STR_TBD_MORTARS_105mm_HE_CHARGE_7"; - condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_7)))] call FUNC(canLoad)); - statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_7)),0)] call FUNC(load)); - showDisabled = 0; - exceptions[] = {}; + class TBD_LoadDPICMCh4 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_4"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_4)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_4)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadDPICMCh5 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_5"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_5)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_5)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadDPICMCh6 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_6"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_6)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_6)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; + + class TBD_LoadDPICMCh7 { + displayName = "$STR_TBD_MORTARS_105mm_DPICM_CHARGE_7"; + condition = QUOTE([ARR_2(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_7)))] call FUNC(canLoad)); + statement = QUOTE([ARR_3(_target,QUOTE(QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_7)),0)] call FUNC(load)); + showDisabled = 0; + exceptions[] = {}; + }; }; }; +/* + + };*/ class TBD_Unload { selection = "casing_spawn"; diff --git a/addons/m119/tbd_m119/CfgWeapons.hpp b/addons/m119/tbd_m119/CfgWeapons.hpp index b0db27c..327aa1a 100644 --- a/addons/m119/tbd_m119/CfgWeapons.hpp +++ b/addons/m119/tbd_m119/CfgWeapons.hpp @@ -11,7 +11,12 @@ class CfgWeapons { class TBD_M119_WEAPON: mortar_82mm { displayName = "M119 howitzer"; - magazines[] = {QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_7)}; + magazines[] = { + QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_7), + QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_7), + QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_7), + QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_7), "2Rnd_155mm_Mo_Cluster" + }; modes[] = {"Single"}; reloadSound[] = {QPATHTOF(TBD_M119\sounds\reload.ogg), 3, 1, 50}; reloadMagazineSound[] = {QPATHTOF(TBD_M119\sounds\reload.ogg), 3, 1, 50}; diff --git a/addons/m119/tbd_m119/model.cfg b/addons/m119/tbd_m119/model.cfg index dc36e79..8991a4b 100644 --- a/addons/m119/tbd_m119/model.cfg +++ b/addons/m119/tbd_m119/model.cfg @@ -358,19 +358,19 @@ class CfgModels { class magazine_smoke_hide { type = "hide"; source = "magazine_smoke_hide_source"; - selection = "magazine"; + selection = "magazine_smoke"; hideValue = 1; }; class magazine_laser_hide { type = "hide"; source = "magazine_laser_hide_source"; - selection = "magazine"; + selection = "magazine_laser"; hideValue = 1; }; class magazine_dpicm_hide { type = "hide"; source = "magazine_dpicm_hide_source"; - selection = "magazine"; + selection = "magazine_dpicm"; hideValue = 1; };