Captives - Blindfold captive units

[mrschick]

When merged this pull request will:

• Add an interaction that puts a Contact DLC blindfold from one's own inventory onto a captive unit;
• If the captive unit already has some form of goggles on they will be preserved by being moved to the capturer's inventory before being replaced with a blindfold;

[PabstMirror]

ace_goggles_effects is a user setting
we could make this only show if setting is forced on by mission/server
or just always show and know that it might not have any real effect

[mrschick]

I guess showing it only when the setting is forced would cause it to not work on most servers, since I doubt many communities force that setting or would start doing so in response to this feature.
IMO it's best to always show it and accept that it won't have an effect if users disable their goggle effects, which I guess very few would do anyway.

[PabstMirror]

I don't like the user text box setting for classes
I think it's going to be confusing for most mission makers
have to worry about capitilization

I would rather just goto a config based lookup with e724b3e

[johnb432]

I don't like the user text box setting for classes I think it's going to be confusing for most mission makers have to worry about capitilization

I would rather just goto a config based lookup with e724b3e

We can easily convert to config case, but I agree - such a setting is not necessary imo.

[mrschick]

I don't like the user text box setting for classes I think it's going to be confusing for most mission makers have to worry about capitilization

I would rather just goto a config based lookup with e724b3e

When you wrote "make this config based?" I first assumed you meant CBA Settings, wasn't familiar enough with config overriding to make the correct connection.
IMO it's not really confusing, also takes control over what is a blindfold away from the mission designer and gives it exclusively to modders.
Though I can see how, security risks considered, it's ultimately the cleanest option. I'll just copy your implementation 👍🏻

[mrschick]

I implemented @PabstMirror's changes, everything seems to work as intended except for the item dropping if neither inventory can hold the captive's previous goggles, not yet sure what broke it 🤔

[Mike-MF]

Additionally during testing, I blindfolded a captive yet canBlindfoldCaptive returns true. I can essentially just keep switching out blindfolds over and over.

[johnb432]

I implemented @PabstMirror's changes, everything seems to work as intended except for the item dropping if neither inventory can hold the captive's previous goggles, not yet sure what broke it 🤔

Because CBA_fnc_dropItem can only drop items that are within a unit's inventory, of which goggles aren't part of.

[johnb432]

My suggestion includes some minor formatting changes and fixes (such as item dropping on ground if inventories are full). However, also included is an action allowing the removal of blindfolds on captive units.

---

If my suggestion is accepted, the following function would still need to be added in its own file:

#include "script_component.hpp"
/*
 * Author: johnb43
 * Checks if caller can remove blindfold from the captive.
 *
 * Arguments:
 * 0: Caller (player) <OBJECT>
 * 1: Target <OBJECT>
 *
 * Return Value:
 * Can remove blindfold <BOOL>
 *
 * Example:
 * [player, cursorTarget] call ace_captives_fnc_canRemoveBlindfoldCaptive
 *
 * Public: No
 */

params ["_unit", "_target"];

// Alive, handcuffed, not being escorted, and target is wearing a blindfold
(_target getVariable [QGVAR(isHandcuffed), false]) &&
{isNull (attachedTo _target)} &&
{alive _target} &&
{isNull objectParent _unit} &&
{isNull objectParent _target} &&
{(goggles _target) in GVAR(blindfolds)}

[mrschick]

Because CBA_fnc_dropItem can only drop items that are within a unit's inventory, of which goggles aren't part of.

That's what I thought too, but it worked without issues 2 days ago, with the drop animation and everything.

[mrschick]

Additionally during testing, I blindfolded a captive yet canBlindfoldCaptive returns true. I can essentially just keep switching out blindfolds over and over.

True, I guess that could be avoided by also checking if the captive already has a blindfold on.

[johnb432]

True, I guess that could be avoided by also checking if the captive already has a blindfold on.

This suggestion implements that exactly:
#9361 (comment)

[mrschick]

My suggestion includes some minor formatting changes and fixes (such as item dropping on ground if inventories are full). However, also included is an action allowing the removal of blindfolds on captive units.

@johnb432 Didn't see the need for a "remove blindfold" interaction initially because it can be removed almost as quickly by accessing the captive's inventory. Will gladly implement your provided code though, since it's a quicker way to retain blindfolds when freeing captives.

Changed the formatting of fnc_doBlindfoldCaptive.sqf around a bit to be more in line with other functions, especially the original can/doEscortCaptive. Tested and everything works as intended, there was just a tiny oversight where the blindfold wasn't removed from _target after dropping it to the ground 👍🏻

My suggestion can probably be optimised, as some of the code is identical.

True, though I don't think this is critical enough to require its own function, maybe it can be done outside the if/else. Alternatively there might be some combination of vanilla functions to move the goggles to inventory and drop them with the CBA function, will try some things out.

[LinkIsGrim]

I think we can allow blindfolding in vehicles in a follow-up PR.

[rautamiekka]

I think we can allow blindfolding in vehicles in a follow-up PR.

I don't see why it shouldn't be, sounds like a totally arbitrary restriction.

Hell, it would allow for transportation of ppl in an enclosed vehicle and blindfold them before disembarking if you didn't remember to do it before heading out.

[mrschick]

Agreed, could have been done in this PR even.