Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Captives - Add modded cable tie support #9350

Merged
merged 21 commits into from Aug 30, 2023
Merged

Conversation

SpicyBagpipes
Copy link
Contributor

@SpicyBagpipes SpicyBagpipes commented Aug 29, 2023

When merged this pull request will:

  • Title, child classes will be compatible

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@PabstMirror
Copy link
Contributor

need to update ACE_captives_fnc_doApplyHandcuffs as well

@SpicyBagpipes
Copy link
Contributor Author

need to update ACE_captives_fnc_doApplyHandcuffs as well

Just want first instance of kind of ace_cabletie or child found removed?

@johnb432
Copy link
Contributor

@SpicyBagpipes
Copy link
Contributor Author

Why not go with the approach found here? https://github.com/acemod/ACE3/blob/master/addons/trenches/functions/fnc_hasEntrenchingTool.sqf

Don't see any benefit to it in this instance as no backpacks etc for entrenching tools and anyone who has already tried to create their own likely inherits from cable tie

@johnb432
Copy link
Contributor

Don't see any benefit to it in this instance as no backpacks etc for entrenching tools and anyone who has already tried to create their own likely inherits from cable tie

Reasonable.

The only benefit I see in adding a function is for public usage, but I'm not sure how needed such a function would be.

@commy2
Copy link
Contributor

commy2 commented Aug 29, 2023

I propose making it an attribute. I don't like using inheritance for this.

ace_captives_is_cable_tie = 1;

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@Drofseh
Copy link
Contributor

Drofseh commented Aug 29, 2023

I think isRestraint might be better than isCabletie.
It's more generic and fits better for rope or handcuff items

@SpicyBagpipes
Copy link
Contributor Author

I think isRestraint might be better than isCabletie. It's more generic and fits better for rope or handcuff items

As is not exposed to end users I think isCabletie is better as is in keeping with ace item name

@SpicyBagpipes
Copy link
Contributor Author

Though not opposed to adding a rope restraint or something to expand on it? 🤷‍♀️

Copy link
Member

@BaerMitUmlaut BaerMitUmlaut left a comment

Choose a reason for hiding this comment

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

Attribute is currently not set on the default cable ties.

addons/captives/CfgWeapons.hpp Outdated Show resolved Hide resolved
@PabstMirror PabstMirror added this to the 3.16.0 milestone Aug 29, 2023
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Aug 29, 2023
@SpicyBagpipes
Copy link
Contributor Author

SpicyBagpipes commented Aug 29, 2023

Can do this for all the other "tools" currently present (think it's just the defusal kit left with no modded support) if desired, changes only add .0012ms to the condition.

Makes no sense to leave the defusal kit out if all the rest have modded support imo

@Drofseh
Copy link
Contributor

Drofseh commented Aug 29, 2023

I think isRestraint might be better than isCabletie. It's more generic and fits better for rope or handcuff items

As is not exposed to end users I think isCabletie is better as is in keeping with ace item name

Right, I'm saying it should be different than the item name because if I add a handcuff item in the future it will be odd to call it a cable tie.

@SpicyBagpipes
Copy link
Contributor Author

Right, I'm saying it should be different than the item name because if I add a handcuff item in the future it will be odd to call it a cable tie.

Done

@LinkIsGrim LinkIsGrim merged commit c88695f into acemod:master Aug 30, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants