Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions addons/aiaircommander/functions/fnc_handleDelete.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@
*/
params ["_leader"];

// TODO: Change this to use a common component for spawned AI deletion

(_leader getVariable [QEGVAR(common,assignedVehicle), objNull]) call CBA_fnc_deleteEntity;
(vehicle _leader) call CBA_fnc_deleteEntity;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why has this changed? This is designed to delete the vehicle given to the unit at spawn, to cover cases where the unit is no longer inside the vehicle

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I first looked at it, I didn't remember assigning the vehicle with a setVar so thought it would return nothing. I've reverted it back.

(group _leader) call CBA_fnc_deleteEntity;
1 change: 1 addition & 0 deletions addons/ailogistics/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
u\uksf\addons\ailogistics
20 changes: 20 additions & 0 deletions addons/ailogistics/Cfg3den.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// class Cfg3DEN {
// class Object {
// class AttributeCategories {
// class uksf_attributes {
// class Attributes {
// class GVAR(excluded) {
// property = QGVAR(excluded);
// control = "Checkbox";
// displayName = QUOTE(Cleanup exclude);
// tooltip = QUOTE(Excludes object from cleanup);
// expression = QUOTE(_this setVariable [ARR_3(QQGVAR(excluded),_value,true)]);
// typeName = "BOOL";
// defaultValue = "(false)";
// condition = "1";
// };
// };
// };
// };
// };
// };
3 changes: 3 additions & 0 deletions addons/ailogistics/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# AI Logistics

An AI system for emulating logistics
9 changes: 9 additions & 0 deletions addons/ailogistics/XEH_postInit.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "script_component.hpp"

if (!isServer) exitWith {};

if (GVAR(groundVehiclePool) isEqualTo [] && {GVAR(airVehiclePool) isEqualTo [] && {GVAR(counterBatteryUnits) isEqualTo []}}) exitWith {
WARNING("No counter units defined");
};

["UK3CB_BAF_Static_Mortar_Base", "Fired", {call FUNC(selectResponse)}, true, [], true] call CBA_fnc_addClassEventHandler;
Comment on lines +3 to +9
Copy link
Member

@tbeswick96 tbeswick96 Mar 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unused code here

18 changes: 18 additions & 0 deletions addons/ailogistics/XEH_preInit.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#include "script_component.hpp"

ADDON = false;

#include "XEH_PREP.hpp"

// #include "initSettings.sqf"

GVAR(unitPoolString) = [];
GVAR(logisticVehiclePoolString) = [];
GVAR(routePickets) = false;
GVAR(picketLocations) = [];
GVAR(picketUnitPoolString) = [];
GVAR(picketGroupSize) = 0;
GVAR(logisticsObject) = ObjNull;
GVAR(logisticalVehicleNumber) = 0;
Comment on lines +9 to +16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If these variables are not used, remove them. Looks like everything is done via the module variables?


ADDON = true;
24 changes: 24 additions & 0 deletions addons/ailogistics/initSettings.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// [
// QGVAR(enabled),
// "CHECKBOX",
// ["Cleanup", "Enables cleanup of dead units/vehicles"],
// ["UKSF", QUOTE(COMPONENT_BEAUTIFIED)],
// false,
// 1,
// {
// params ["_value"];

// if (isServer && _value) then {
// [{call FUNC(cleanupCheck)}, [], 0] call CBA_fnc_waitAndExecute;
// };
// }
// ] call CBA_settings_fnc_init;

// [
// QGVAR(delay),
// "SLIDER",
// ["Cleanup Delay", "Delay in seconds between death and cleanup"],
// ["UKSF", QUOTE(COMPONENT_BEAUTIFIED)],
// [5, 600, 300, 0],
// 1
// ] call CBA_settings_fnc_init;
1 change: 0 additions & 1 deletion addons/ied/$PBOPREFIX$

This file was deleted.

17 changes: 0 additions & 17 deletions addons/ied/CfgEventHandlers.hpp

This file was deleted.

199 changes: 0 additions & 199 deletions addons/ied/CfgVehicles.hpp

This file was deleted.

3 changes: 0 additions & 3 deletions addons/ied/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions addons/ied/XEH_PREP.hpp

This file was deleted.

1 change: 0 additions & 1 deletion addons/ied/XEH_postInit.sqf

This file was deleted.

12 changes: 0 additions & 12 deletions addons/ied/XEH_preInit.sqf

This file was deleted.

3 changes: 0 additions & 3 deletions addons/ied/XEH_preStart.sqf

This file was deleted.

24 changes: 0 additions & 24 deletions addons/ied/config.cpp

This file was deleted.

Loading