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

Add Weapon Attachments interaction #7706

Merged
merged 12 commits into from
Mar 4, 2021
Merged

Add Weapon Attachments interaction #7706

merged 12 commits into from
Mar 4, 2021

Conversation

Dystopian
Copy link
Contributor

@Dystopian Dystopian commented May 11, 2020

When merged this pull request will:

  • title;
  • move No inventory space string from attach, chemlights and hearing components to common;
  • correct fnc_cbaSettings_convertHelper;
  • convert interaction settings to sqf.

This PR ports @mharis001 Attachment Switching mod with some fixes/additions. It adds ability to take weapon attachment off/on or switch it to another one.

To avoid translation string creating and visual separating take off from switch to actions I used existing string Take it off and red attachment icon instead of its picture. From all of my tests it looks the best. Of course it can be discussed.

String No inventory space has different translation in each component. Only English, German, Polish and Hungarian are the same. If you see some mistakes in other languages suggest correct versions.

This PR requires CBATeam/CBA_A3#1330.

@mharis001 mharis001 added the kind/feature Release Notes: **ADDED:** label May 11, 2020
@mharis001 mharis001 added this to the 3.13.3 milestone May 11, 2020
@jonpas
Copy link
Member

jonpas commented May 11, 2020

Any reason this isn't under "Equipment"? There are many things that different components add to the root menu already and this doesn't seem to be anything that has to be done in a quick manner.

We need another main interaction point on the weapon on the bottom right.

Dystopian and others added 2 commits May 12, 2020 23:33
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
@PabstMirror PabstMirror modified the milestones: 3.13.3, Ongoing Jun 13, 2020
@Dystopian Dystopian marked this pull request as ready for review November 22, 2020 09:00
@Dystopian
Copy link
Contributor Author

ready for review

@mharis001 mharis001 self-requested a review November 22, 2020 15:32
Copy link
Member

@mharis001 mharis001 left a comment

Choose a reason for hiding this comment

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

Works well for primary, secondary, and handgun weapons. Just some minor cleanup.

addons/interaction/initSettings.sqf Outdated Show resolved Hide resolved
addons/interaction/CfgVehicles.hpp Show resolved Hide resolved
Copy link
Member

@mharis001 mharis001 left a comment

Choose a reason for hiding this comment

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

Works well. Very minor suggestions to use isNotEqualTo in some places.

@PabstMirror PabstMirror modified the milestones: Ongoing, 3.13.6 Mar 4, 2021
@PabstMirror PabstMirror merged commit 69c3d2b into acemod:master Mar 4, 2021
@Dystopian Dystopian deleted the asw branch March 4, 2021 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants