From a36144581817f520f87b75faae72eb134e1019e0 Mon Sep 17 00:00:00 2001 From: Migoyan Date: Sat, 9 Apr 2022 19:30:25 +0200 Subject: [PATCH] fixes --- gdc_lib_main/config.cpp | 14 +++++++++++++- .../gdc_mission_making/fn_3denFillBasicStuff.sqf | 15 ++------------- .../fn_3denFillMedicalBackpack.sqf | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gdc_lib_main/config.cpp b/gdc_lib_main/config.cpp index bcc584e..643c537 100644 --- a/gdc_lib_main/config.cpp +++ b/gdc_lib_main/config.cpp @@ -108,7 +108,13 @@ class display3DEN }; class Edit { - items[] += {"GDC_FillMedicalBackpack"}; + items[] += {"GDC_medical","GDC_radio"}; + }; + class GDC_medical + { + text = "GDC stuff médical"; + picture = "\gdc_lib_main\data\gdc_icon_32.paa"; + items[] = {"GDC_FillMedicalBackpack","GDC_FillHeavyMedicalBackpack"}; }; class GDC_FillMedicalBackpack { @@ -124,6 +130,12 @@ class display3DEN conditionShow = "selectedObject * hoverObject"; picture = "\gdc_lib_main\data\gdc_icon_32.paa"; }; + class GDC_radio + { + text = "GDC stuff de base"; + picture = "\gdc_lib_main\data\gdc_icon_32.paa"; + items[] = {"GDC_FillBasicItemsRadio","GDC_FillBasicItems"}; + }; class GDC_FillBasicItemsRadio { text = "Équipement de base avec radio (uniforme)"; diff --git a/gdc_lib_main/functions/gdc_mission_making/fn_3denFillBasicStuff.sqf b/gdc_lib_main/functions/gdc_mission_making/fn_3denFillBasicStuff.sqf index 86b585a..0c48338 100644 --- a/gdc_lib_main/functions/gdc_mission_making/fn_3denFillBasicStuff.sqf +++ b/gdc_lib_main/functions/gdc_mission_making/fn_3denFillBasicStuff.sqf @@ -24,7 +24,7 @@ _objects apply { _old_loadout = getUnitLoadout _x; _new_loadout = _old_loadout; _new_loadout#3 set [1, _new_loadout#3#1 + _items]; - _new_loadout#7 set [2, ""]; + _new_loadout#9 set [2, ""]; _uniform = (_old_loadout) #3; if (count _uniform > 0) then { @@ -39,17 +39,6 @@ _objects apply { }; save3DENInventory [_x]; } else { - systemchat (format ["Unité %1 : pas d'uniforme' trouvé.",str (str _x)]); + systemchat (format ["Unité %1 : pas d'uniforme trouvé.",str (str _x)]); }; }; -[ - ["arifle_MX_ACO_pointer_F","","acc_pointer_IR","optic_Aco",["30Rnd_65x39_caseless_mag",30],[],""], - [], - ["hgun_P07_F","","","",["16Rnd_9x21_Mag",17],[],""], - ["U_B_CombatUniform_mcam",[["FirstAidKit",1],["30Rnd_65x39_caseless_mag",2,30]]], - ["V_PlateCarrier1_rgr",[["30Rnd_65x39_caseless_mag",7,30],["16Rnd_9x21_Mag",2,17],["SmokeShell",1,1],["SmokeShellGreen",1,1],["Chemlight_green",2,1],["HandGrenade",2,1]]], - [], - "H_HelmetB","G_Aviator", - [], - ["ItemMap","","ItemRadio","ItemCompass","ItemWatch","NVGoggles"] -] \ No newline at end of file diff --git a/gdc_lib_main/functions/gdc_mission_making/fn_3denFillMedicalBackpack.sqf b/gdc_lib_main/functions/gdc_mission_making/fn_3denFillMedicalBackpack.sqf index df72677..571c6d6 100644 --- a/gdc_lib_main/functions/gdc_mission_making/fn_3denFillMedicalBackpack.sqf +++ b/gdc_lib_main/functions/gdc_mission_making/fn_3denFillMedicalBackpack.sqf @@ -79,7 +79,7 @@ if (_heavy_medical) then { if (_heavy_medical) then { systemchat (format ["Unité %1 : pas assez de place dans le sac (6,35Kg minimum).",str (str _x)]); } else { - systemchat (format ["Unité %1 : pas assez de place dans le sac (6,35Kg minimum).",str (str _x)]); + systemchat (format ["Unité %1 : pas assez de place dans le sac (11,25Kg minimum).",str (str _x)]); }; } else { systemchat (format ["Unité %1 : loadout modifié.",str (str _x)]);