-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into unlock-malaria-civs
- Loading branch information
Showing
40 changed files
with
451 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| blank_issues_enabled: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| #include "script_component.hpp" | ||
| /* ---------------------------------------------------------------------------- | ||
| Function: CBA_fnc_canAddItem | ||
| Description: | ||
| Checks if unit has enough free space in inventory to store item. | ||
| Doesn't take current unit load into account unlike canAdd command. | ||
| Parameters: | ||
| _unit - Unit <OBJECT> | ||
| _item - Item to store <STRING> | ||
| _count - Item count <NUMBER> (Default: 1) | ||
| _checkUniform - Check space in uniform <BOOLEAN> (Default: true) | ||
| _checkVest - Check space in vest <BOOLEAN> (Default: true) | ||
| _checkBackpack - Check space in backpack <BOOLEAN> (Default: true) | ||
| Returns: | ||
| True if unit has free space, false otherwise <BOOLEAN> | ||
| Examples: | ||
| (begin example) | ||
| [player, "acc_flashlight"] call CBA_fnc_canAddItem | ||
| [player, "30Rnd_556x45_Stanag", 7, false, true, false] call CBA_fnc_canAddItem | ||
| (end) | ||
| Author: | ||
| Dystopian | ||
| ---------------------------------------------------------------------------- */ | ||
| SCRIPT(canAddItem); | ||
|
|
||
| params [ | ||
| ["_unit", objNull, [objNull]], | ||
| ["_item", "", [""]], | ||
| ["_count", 1, [0]], | ||
| ["_checkUniform", true, [false]], | ||
| ["_checkVest", true, [false]], | ||
| ["_checkBackpack", true, [false]] | ||
| ]; | ||
|
|
||
| if (isNull _unit || {_item isEqualTo ""}) exitWith {false}; | ||
|
|
||
| #define TYPE_VEST 701 | ||
| #define TYPE_UNIFORM 801 | ||
| #define TYPE_BACKPACK 901 | ||
|
|
||
| if (isNil QGVAR(itemMassAllowedSlots)) then { | ||
| GVAR(itemMassAllowedSlots) = [] call CBA_fnc_createNamespace; | ||
| }; | ||
|
|
||
| (GVAR(itemMassAllowedSlots) getVariable [_item, []]) params ["_mass", "_allowedSlots"]; | ||
|
|
||
| if (isNil "_mass") then { | ||
| _allowedSlots = [TYPE_UNIFORM, TYPE_VEST, TYPE_BACKPACK]; | ||
| private _cfgWeaponsItem = configFile >> "CfgWeapons" >> _item; | ||
| private _cfgMagazinesItem = configFile >> "CfgMagazines" >> _item; | ||
| private _cfgGlassesItem = configFile >> "CfgGlasses" >> _item; | ||
| switch true do { | ||
| case (isClass _cfgWeaponsItem): { | ||
| private _cfgItemInfo = _cfgWeaponsItem >> "ItemInfo"; | ||
| private _cfgWeaponSlotsInfo = _cfgWeaponsItem >> "WeaponSlotsInfo"; | ||
| if (isNumber (_cfgItemInfo >> "mass")) then { | ||
| _mass = getNumber (_cfgItemInfo >> "mass"); | ||
| } else { | ||
| _mass = getNumber (_cfgWeaponSlotsInfo >> "mass"); | ||
| }; | ||
|
|
||
| { | ||
| if (isArray _x) exitWith { | ||
| _allowedSlots = getArray _x; | ||
| }; | ||
| } forEach [ | ||
| _cfgWeaponsItem >> "allowedSlots", | ||
| _cfgItemInfo >> "allowedSlots", | ||
| _cfgWeaponSlotsInfo >> "allowedSlots" | ||
| ]; | ||
| }; | ||
| case (isClass _cfgMagazinesItem): { | ||
| _mass = getNumber (_cfgMagazinesItem >> "mass"); | ||
| private _cfgAllowedSlots = _cfgMagazinesItem >> "allowedSlots"; | ||
| if (isArray _cfgAllowedSlots) then { | ||
| _allowedSlots = getArray _cfgAllowedSlots; | ||
| }; | ||
| }; | ||
| case (isClass _cfgGlassesItem): { | ||
| _mass = getNumber (_cfgGlassesItem >> "mass"); | ||
| }; | ||
| default { | ||
| _mass = -1; | ||
| _allowedSlots = []; | ||
| }; | ||
| }; | ||
| TRACE_3("caching",_item,_mass,_allowedSlots); | ||
| GVAR(itemMassAllowedSlots) setVariable [_item, [_mass, _allowedSlots]]; | ||
| }; | ||
|
|
||
| if (_mass == -1) exitWith {false}; // item doesn't exist | ||
|
|
||
| if ( | ||
| _checkUniform | ||
| && {TYPE_UNIFORM in _allowedSlots} | ||
| && { | ||
| _mass == 0 | ||
| || { | ||
| // each time subtract whole number of items which can be put in container | ||
| _count = _count - floor (getContainerMaxLoad uniform _unit * (1 - loadUniform _unit) / _mass); | ||
| _count <= 0 | ||
| } | ||
| } | ||
| ) exitWith {true}; | ||
|
|
||
| if ( | ||
| _checkVest | ||
| && {TYPE_VEST in _allowedSlots} | ||
| && { | ||
| _mass == 0 | ||
| || { | ||
| _count = _count - floor (getContainerMaxLoad vest _unit * (1 - loadVest _unit) / _mass); | ||
| _count <= 0 | ||
| } | ||
| } | ||
| ) exitWith {true}; | ||
|
|
||
| if ( | ||
| _checkBackpack | ||
| && {TYPE_BACKPACK in _allowedSlots} | ||
| && { | ||
| _mass == 0 | ||
| || { | ||
| _count = _count - floor (getContainerMaxLoad backpack _unit * (1 - loadBackpack _unit) / _mass); | ||
| _count <= 0 | ||
| } | ||
| } | ||
| ) exitWith {true}; | ||
|
|
||
| false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.