Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finalized settings

Browse Source
This commit is contained in:
Glowbal 2015-08-09 00:21:59 +02:00
parent 54ad9d1444
commit c7ac190f58
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/captives/ACE_Settings.hpp
View File

@ -8,8 +8,9 @@ class ACE_Settings {
class GVAR(requireSurrender) { class GVAR(requireSurrender) {
displayName = CSTRING(ModuleSettings_requireSurrender_name); displayName = CSTRING(ModuleSettings_requireSurrender_name);
description = CSTRING(ModuleSettings_requireSurrender_description); description = CSTRING(ModuleSettings_requireSurrender_description);
typeName = "BOOL"; typeName = "SCALAR";
value = 0; values[] = {ECSTRING(common,Disabled), CSTRING(SurrenderOnly), CSTRING(SurrenderOrNoWeapon)};
value = 1;
}; };
class GVAR(allowSurrender) { class GVAR(allowSurrender) {
displayName = CSTRING(ModuleSettings_allowSurrender_name); displayName = CSTRING(ModuleSettings_allowSurrender_name);

20
addons/captives/CfgVehicles.hpp
View File

@ -189,6 +189,26 @@ class CfgVehicles {
typeName = "BOOL"; typeName = "BOOL";
defaultValue = 1; defaultValue = 1;
}; };
class requireSurrender {
displayName = CSTRING(ModuleSettings_allowSurrender_name);
description = CSTRING(ModuleSettings_allowSurrender_description);
typeName = "NUMBER";
class values {
class disable {
name = ECSTRING(common,No);
value = 0;
};
class Surrender {
name = CSTRING(SurrenderOnly);
value = 1;
default = 1;
};
class SurrenderOrNoWeapon {
name = CSTRING(SurrenderOrNoWeapon);
value = 2;
};
};
};
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription: ModuleDescription {
description = CSTRING(ModuleSettings_Description); description = CSTRING(ModuleSettings_Description);

2
addons/captives/functions/fnc_canApplyHandcuffs.sqf
View File

@ -23,4 +23,4 @@ params ["_unit", "_target"];
("ACE_CableTie" in (items _unit)) && ("ACE_CableTie" in (items _unit)) &&
{alive _target} && {alive _target} &&
{!(_target getVariable [QGVAR(isHandcuffed), false])} && {!(_target getVariable [QGVAR(isHandcuffed), false])} &&
(!GVAR(requireSurrender) || (_target getVariable [QGVAR(isSurrendering), false]) || currentWeapon _target == "") (GVAR(requireSurrender) == 0 || ((_target getVariable [QGVAR(isSurrendering), false]) || (currentWeapon _target == "" && GVAR(requireSurrender) == 2)))

1
addons/captives/functions/fnc_moduleSettings.sqf
View File

@ -17,3 +17,4 @@ params ["_logic"];
[_logic, QGVAR(allowHandcuffOwnSide), "allowHandcuffOwnSide"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(allowHandcuffOwnSide), "allowHandcuffOwnSide"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(allowSurrender), "allowSurrender"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(allowSurrender), "allowSurrender"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(requireSurrender), "requireSurrender"] call EFUNC(common,readSettingFromModule);

6
addons/captives/stringtable.xml
View File

@ -227,5 +227,11 @@
<Key ID="STR_ACE_Captives_ModuleSettings_requireSurrender_description"> <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrender_description">
<English>Require Players to surrender before they can be arrested</English> <English>Require Players to surrender before they can be arrested</English>
</Key> </Key>
<Key ID="STR_ACE_Captives_SurrenderOnly">
<English>Surrendering only</English>
</Key>
<Key ID="STR_ACE_Captives_SurrenderOrNoWeapon">
<English>Surrendering or No weapon</English>
</Key>
</Package> </Package>
</Project> </Project>