Skip to content

Commit

Permalink
Merge branch 'unstable' into IFA-AIO
Browse files Browse the repository at this point in the history
  • Loading branch information
@ante185
ante185 committed Dec 26, 2023
2 parents 55e70b4 + e77cf0d commit 2dab3eb
Show file tree
Hide file tree
Showing 15 changed files with 836 additions and 214 deletions.
4 changes: 2 additions & 2 deletions A3A/addons/core/Includes/script_version.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define MAJOR 3
#define MINOR 4
#define PATCHLVL 1
#define MINOR 5
#define PATCHLVL 0
#define BUILD 0
9 changes: 9 additions & 0 deletions A3A/addons/core/functions/Base/fn_startBreachVehicle.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ else
_damageDealt = 0.15 + random 0.15;
};

_caller setCaptive false;
_caller setVariable ["timeToBreach",time + _time];
_caller playMoveNow selectRandom medicAnims;
_caller setVariable ["breachVeh", _vehicle];
Expand Down Expand Up @@ -163,6 +164,14 @@ if
_vehicle call A3A_fnc_addActionBreachVehicle;
};
};
//Check the explosives are still there
if ({_x == _explosive} count magazines _caller < _explosiveCount) exitWith {
[_titleStr, localize "STR_A3A_fn_base_breachveh_no_noexpl"] call A3A_fnc_customHint;
_caller setVariable ["cancelBreach",nil];
if(alive _vehicle) then {
_vehicle call A3A_fnc_addActionBreachVehicle;
};
};

//Remove the correct amount of explosives
for "_count" from 1 to _explosiveCount do
Expand Down
3 changes: 2 additions & 1 deletion A3A/addons/core/functions/CREATE/fn_AAFroadPatrol.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ _roads = [];
private _players = allPlayers - entities "HeadlessClient_F";
private _bases = (seaports + airportsX + outposts) select {
call {
if ((_players inAreaArray [markerPos _x, 2000, 2000] isEqualTo []) && !(_players inAreaArray [markerPos _x, 350, 350] isEqualTo [])) exitWith {false};
if ((_players inAreaArray [markerPos _x, 2000, 2000] isEqualTo [])) exitWith {false};
if (!(_players inAreaArray [markerPos _x, 350, 350] isEqualTo [])) exitWith {false};
private _side = sidesX getVariable [_x, sideUnknown];
if (_side == teamPlayer) exitWith {false};
if (_x in seaports and Faction(_side) get "vehiclesGunBoats" isEqualTo []) exitWith {false};
Expand Down
187 changes: 113 additions & 74 deletions A3A/addons/core/functions/Templates/fn_aceModCompat.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,80 +72,116 @@ advItems = [
"adv_aceCPR_AED"
];

katMedItems = [
"kat_accuvac", //KAT Airway
"kat_guedel", //KAT Airway
"kat_larynx", //KAT Airway

"kat_aatKit", //KAT Breathing
"kat_chestSeal", //KAT Breathing
"kat_Pulseoximeter", //KAT Breathing
"kat_stethoscope", //KAT Breathing
"kat_ncdKit", //standalone alternative to AAT Kit - added in V2.10.2

"kat_bloodIV_A", //KAT Circulation
"kat_bloodIV_A_250", //KAT Circulation
"kat_bloodIV_A_250_N", //KAT Circulation
"kat_bloodIV_A_500", //KAT Circulation
"kat_bloodIV_A_500_N", //KAT Circulation
"kat_bloodIV_A_N", //KAT Circulation
"kat_bloodIV_AB", //KAT Circulation
"kat_bloodIV_AB_250", //KAT Circulation
"kat_bloodIV_AB_250_N", //KAT Circulation
"kat_bloodIV_AB_500", //KAT Circulation
"kat_bloodIV_AB_500_N", //KAT Circulation
"kat_bloodIV_AB_N", //KAT Circulation
"kat_bloodIV_B", //KAT Circulation
"kat_bloodIV_B_250", //KAT Circulation
"kat_bloodIV_B_250_N", //KAT Circulation
"kat_bloodIV_B_500", //KAT Circulation
"kat_bloodIV_B_500_N", //KAT Circulation
"kat_bloodIV_B_N", //KAT Circulation
"kat_bloodIV_O", //KAT Circulation
"kat_bloodIV_O_250", //KAT Circulation
"kat_bloodIV_O_250_N", //KAT Circulation
"kat_bloodIV_O_500", //KAT Circulation
"kat_bloodIV_O_500_N", //KAT Circulation
"kat_bloodIV_O_N", //KAT Circulation

"kat_crossPanel", //KAT Circulation
"KAT_Empty_bloodIV_250", //KAT Circulation
"KAT_Empty_bloodIV_500", //KAT Circulation

"kat_AED", //KAT Circulation
"kat_X_AED", //KAT Circulation

"kat_IO_FAST", //KAT Pharmacy
"kat_IV_16", //KAT Pharmacy

"kat_amiodarone", //KAT Pharmacy
"kat_atropine", //KAT Pharmacy
//"kat_Carbonate", //KAT Pharmacy - dublicate in Magazines
"kat_CarbonateItem", //KAT Pharmacy
"kat_EACA", //KAT Pharmacy
"kat_fentanyl", //KAT Pharmacy
"kat_ketamine", //KAT Pharmacy
"kat_lidocaine", //KAT Pharmacy
"kat_nalbuphine", //KAT Pharmacy
"kat_naloxone", //KAT Pharmacy
"kat_nitroglycerin", //KAT Pharmacy
"kat_norepinephrine", //KAT Pharmacy
//"kat_Painkiller", //KAT Pharmacy - dublicate in Magazines
"kat_PainkillerItem", //KAT Pharmacy
"kat_phenylephrine", //KAT Pharmacy
"kat_TXA", //KAT Pharmacy

"kat_etomidate", //KAT Surgery (Pharmacy)
"kat_flumazenil", //KAT Surgery (Pharmacy)
"kat_lorazepam", //KAT Surgery (Pharmacy)
"kat_clamp", //KAT Surgery
"kat_plate", //KAT Surgery
"kat_retractor", //KAT Surgery
"kat_scalpel", //KAT Surgery
"kat_vacuum", //KAT Surgery

"Attachable_Helistretcher", //KAT Misc
"kat_stretcherBag" //KAT Misc
katMedItems = [ //Support and tested with KAM 2.13.3 Stable
"kat_accuvac", //KAT Airway - Item
"kat_guedel", //KAT Airway - Item
"kat_larynx", //KAT Airway - Item

"kat_Pulseoximeter", //KAT Breathing - Item
"kat_chestSeal", //KAT Breathing - Item
"kat_aatKit", //KAT Breathing - Item
"kat_ncdKit", //KAT Breathing - Item
"kat_stethoscope", //KAT Breathing - Item
"kat_BVM", //KAT Breathing - Item
"kat_pocketBVM", //KAT Breathing - Item
"kat_oxygenTank_150_Empty", //KAT Breathing - Item
"kat_oxygenTank_150_Item", //KAT Breathing - Item
"kat_oxygenTank_300_Empty", //KAT Breathing - Item
"kat_oxygenTank_300_Item", //KAT Breathing - Item
"kat_oxygenTank_150", //KAT Breathing - Magazine
"kat_oxygenTank_300", //KAT Breathing - Magazine

//"kat_mask_M04", //KAT Chemical - Glasses
//"kat_mask_M50", //KAT Chemical - Glasses
"kat_gasmaskFilter", //KAT Chemical - Item
"kat_sealant", //KAT Chemical - Item
//"KAT_1Rnd_82mm_Mo_Type0", //KAT Chemical - Magazine for Mortar shell
//"KAT_1Rnd_82mm_Mo_TypeCS", //KAT Chemical - Magazine for Mortar shell
//"KAT_M7A3", //KAT Chemical - Magazine for HandGrenade
//"KAT_Gas_TripWireMine_Mag", //KAT Chemical - Magazine for TripWireMine

"kat_bloodIV_A", //KAT Circulation - Item
"kat_bloodIV_A_250", //KAT Circulation - Item
"kat_bloodIV_A_500", //KAT Circulation - Item
"kat_bloodIV_A_N", //KAT Circulation - Item
"kat_bloodIV_A_N_250", //KAT Circulation - Item
"kat_bloodIV_A_N_500", //KAT Circulation - Item
"kat_bloodIV_AB", //KAT Circulation - Item
"kat_bloodIV_AB_250", //KAT Circulation - Item
"kat_bloodIV_AB_500", //KAT Circulation - Item
"kat_bloodIV_AB_N", //KAT Circulation - Item
"kat_bloodIV_AB_N_250", //KAT Circulation - Item
"kat_bloodIV_AB_N_500", //KAT Circulation - Item
"kat_bloodIV_B", //KAT Circulation - Item
"kat_bloodIV_B_250", //KAT Circulation - Item
"kat_bloodIV_B_500", //KAT Circulation - Item
"kat_bloodIV_B_N", //KAT Circulation - Item
"kat_bloodIV_B_N_250", //KAT Circulation - Item
"kat_bloodIV_B_N_500", //KAT Circulation - Item
"kat_bloodIV_O", //KAT Circulation - Item
"kat_bloodIV_O_250", //KAT Circulation - Item
"kat_bloodIV_O_500", //KAT Circulation - Item
"kat_bloodIV_O_N", //KAT Circulation - Item
"kat_bloodIV_O_N_250", //KAT Circulation - Item
"kat_bloodIV_O_N_500", //KAT Circulation - Item
"KAT_Empty_bloodIV_250", //KAT Circulation - Item
"KAT_Empty_bloodIV_500", //KAT Circulation - Item
"kat_AED", //KAT Circulation - Item
"kat_X_AED", //KAT Circulation - Item
"kat_crossPanel", //KAT Circulation - Item

"kat_PainkillerItem", //KAT Pharmacy - Item
"kat_Painkiller", //KAT Pharmacy - Magazine
"kat_CarbonateItem", //KAT Pharmacy - Item
"kat_Carbonate", //KAT Pharmacy - Magazine
"kat_PervitinItem", //KAT Pharmacy - Item
"kat_Pervitin", //KAT Pharmacy - Magazine
"kat_CaffeineItem", //KAT Pharmacy - Item
"kat_Caffeine", //KAT Pharmacy - Magazine
"kat_PenthroxItem", //KAT Pharmacy - Item
"kat_Penthrox", //KAT Pharmacy - Magazine
"kat_IV_16", //KAT Pharmacy - Item
"kat_IO_FAST", //KAT Pharmacy - Item
"kat_naloxone", //KAT Pharmacy - Item
"kat_EACA", //KAT Pharmacy - Item
"kat_TXA", //KAT Pharmacy - Item
"kat_norepinephrine", //KAT Pharmacy - Item
"kat_phenylephrine", //KAT Pharmacy - Item
"kat_nitroglycerin", //KAT Pharmacy - Item
"kat_amiodarone", //KAT Pharmacy - Item
"kat_lidocaine", //KAT Pharmacy - Item
"kat_atropine", //KAT Pharmacy - Item
"kat_ketamine", //KAT Pharmacy - Item
"kat_fentanyl", //KAT Pharmacy - Item
"kat_nalbuphine", //KAT Pharmacy - Item
"kat_lorazepam", //KAT Pharmacy (Used in Surgery) - Item
"kat_flumazenil", //KAT Pharmacy (Used in Surgery) - Item
"kat_etomidate", //KAT Pharmacy (Used in Surgery) - Item

"kat_scalpel", //KAT Surgery - Item
"kat_retractor", //KAT Surgery - Item
"kat_clamp", //KAT Surgery - Item
"kat_plate", //KAT Surgery - Item
"kat_vacuum", //KAT Surgery - Item

//"kat_armband_doctor", //KAT Misc - Glasses (Cosmetics)
//"kat_Armband_Doctor_Item", //KAT Misc - Item (Cosmetics)
//"kat_armband_kat", //KAT Misc - Glasses (Cosmetics)
//"kat_Armband_Kat_Item", //KAT Misc - Item (Cosmetics)
//"kat_armband_medic", //KAT Misc - Glasses (Cosmetics)
//"kat_Armband_Medic_Item", //KAT Misc - Item (Cosmetics)
//"kat_armband_red_cross", //KAT Misc - Glasses (Cosmetics)
//"kat_Armband_Red_Cross_Item", //KAT Misc - Item (Cosmetics)
"Attachable_Helistretcher", //KAT Misc - Item
"kat_Bubble_Wrap_Item", //KAT Misc - Item
"kat_Bubble_Wrap", //KAT Misc - Magazine
"kat_IFAK", //KAT Misc - Item
"kat_IFAK_Magazine", //KAT Misc - Magazine
"kat_AFAK", //KAT Misc - Item
"kat_AFAK_Magazine", //KAT Misc - Magazine
"kat_MFAK", //KAT Misc - Item
"kat_MFAK_Magazine", //KAT Misc - Magazine
"kat_stretcherBag" //KAT Misc - Vehicle (Backpack)
];

aceCoolingItems = [
Expand All @@ -161,6 +197,9 @@ aceCoolingItems = [
];

aceFoodItems = [
"ACE_Banana",
"ACE_Sunflower_Seeds",
"ACE_Humanitarian_Ration",
"ACE_MRE_BeefStew",
"ACE_MRE_ChickenTikkaMasala",
"ACE_MRE_ChickenHerbDumplings",
Expand Down
5 changes: 4 additions & 1 deletion A3A/addons/garage/Public/fn_addVehicle.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ private _refreshCode = {
} forEach _cats;
call HR_GRG_fnc_updateVehicleCount;
};
[ _catsRequiringUpdate, _refreshCode ] remoteExecCall ["call", HR_GRG_Users];

if !(HR_GRG_Users isEqualTo []) then {
[ _catsRequiringUpdate, _refreshCode ] remoteExecCall ["call", HR_GRG_Users];
};

["STR_HR_GRG_Feedback_addVehicle_Success", [cfgDispName(_class)] ] remoteExec ["HR_GRG_fnc_Hint", _client];
true;
6 changes: 5 additions & 1 deletion A3A/addons/garage/Public/fn_addVehiclesByClass.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,9 @@ private _refreshCode = {
} forEach _cats;
call HR_GRG_fnc_updateVehicleCount;
};
[ _catsRequiringUpdate, _refreshCode ] remoteExecCall ["call", HR_GRG_Users];

if !(HR_GRG_Users isEqualTo []) then {
[ _catsRequiringUpdate, _refreshCode ] remoteExecCall ["call", HR_GRG_Users];
};

true
4 changes: 2 additions & 2 deletions A3A/addons/garage/StatePreservation/fn_setFuel.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ if !(local _vehicle) exitWith {};
_fuelStats params [["_fuel",1, [0]], ["_fuelCargo",-1,[0]], "_aceFuel"];
_vehicle setFuel _fuel;
_vehicle setFuelCargo _fuelCargo;
if (!isNil "_aceFuel") then {
_vehicle setVariable ["ace_refuel_currentFuelCargo", _aceFuel, true];
if (!isNil "_aceFuel" and !isNil "ace_refuel_fnc_setFuel") then {
[_vehicle, _aceFuel] call ace_refuel_fnc_setFuel;
};
3 changes: 3 additions & 0 deletions A3A/addons/logistics/Private/fn_packObject.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ if(!(isNull attachedTo _object)) exitWith {};
private _packageClassName = getText (configFile >> "A3A" >> "A3A_Logistics_Packable" >> typeOf _object >> "packObject");
if (_packageClassName isEqualTo "") then {_packageClassName = "CargoNet_01_box_F"};

private _objectPrice = _object getVariable ['A3A_itemPrice', 0];
//create package
private _package = objNull;
isNil {
_package = createVehicle [_packageClassName, getPosATL _object, [], 0, "CAN_COLLIDE"];
_package setVariable ["A3A_packedObject", typeOf _object, true];
_package allowDamage false;
if(A3A_hasAce) then { [_package, 4] call ACE_cargo_fnc_setSize };
deleteVehicle _object;
};

[_package] call A3A_fnc_initObject;
_package setVariable ["A3A_itemPrice", _objectPrice, true];
Loading

0 comments on commit 2dab3eb

Please sign in to comment.