Skip to content

Add Switch Weapon context menu actions for vehicles#537

Merged
ampersand38 merged 66 commits intozen-mod:masterfrom
ampersand38:vehicle-select-weapon
Mar 8, 2023
Merged

Add Switch Weapon context menu actions for vehicles#537
ampersand38 merged 66 commits intozen-mod:masterfrom
ampersand38:vehicle-select-weapon

Conversation

@ampersand38
Copy link
Copy Markdown
Member

@ampersand38 ampersand38 commented Feb 1, 2021

When merged this pull request will:

  • Add vehicle switch weapon actions to make a vehicle's primary turret select a particular weapon/muzzle/magazine
    https://youtu.be/l1e4R2cQZFM

@mharis001 mharis001 added the feature Adds a new feature label Feb 1, 2021
@mharis001 mharis001 added this to the 1.11.0 milestone Feb 1, 2021
CreepPork
CreepPork reviewed Feb 24, 2021
View reviewed changes
Comment thread addons/common/XEH_postInit.sqf Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
Comment thread addons/context_actions/functions/fnc_switchWeaponModifier.sqf Outdated
Comment thread addons/common/XEH_postInit.sqf Outdated
Comment thread addons/context_actions/CfgContext.hpp Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
ampersand38 and others added 21 commits February 26, 2021 10:32
@ampersand38
Add weapon selection actions under Loadout
99d70dd
@ampersand38
Add Vehicle Logistics > Switch Weapons context actions
df56795
@ampersand38
Disable on player, fix macros
203792c
@ampersand38
Keybinds
bd38a6f
@ampersand38
getPosFromScreen already exists
9344e03 
zen-mod#496 (comment)
@ampersand38
Add Watch Curator Camera and Force Fire
dca7fd6 
Watch Curator Camera
Makes selected units watch the current curator camera location. This keybind is useful when making units look at upper floors, or when you are near players inside buildings where geometry may make `getPosFromScreen` intersections a little tricky.

Force Fire
Hold to force all selected to fire their current weapon.
https://www.youtube.com/watch?v=ml0xGoXfGY4
@ampersand38 @neilzar
Update addons/editor/stringtable.xml
ef47dfc 
Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>
@ampersand38
Fire individual gunners and driver horn
3d1c6b5
@ampersand38
tabs to spaces
88ea381
@ampersand38
actually tabs to spaces
bb86b91
@ampersand38
Fixed super rapid fire
60367d0
@ampersand38
Load correct magazine
381dfbe
@ampersand38
Use targetEvent for action
ab0d510
@ampersand38
Menu layer and weapon name/picture
99bdc66 
https://youtu.be/5hq_pCK9_UM
@ampersand38
Updated description
0ba22b3
@ampersand38
Dynamic child actions for switchable weapons
2c1b74b
@ampersand38
Comments
919ffde
@ampersand38
params
6247b88
@ampersand38
remove diag
2e521b6
@ampersand38
fix args and example
b4d6e6b
@ampersand38 @CreepPork
Update addons/common/XEH_postInit.sqf
efc07ab 
Co-authored-by: Ralfs Garkaklis <ralfs@garkaklis.com>
@ampersand38 ampersand38 force-pushed the vehicle-select-weapon branch from f4cbdef to efc07ab Compare February 26, 2021 15:41
neilzar
neilzar reviewed Feb 26, 2021
View reviewed changes
Comment thread addons/context_actions/functions/fnc_canSelectVehicleWeapon.sqf Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
Comment thread addons/context_actions/functions/fnc_selectVehicleWeaponDialog.sqf Outdated
ampersand38 and others added 3 commits February 26, 2021 10:51
@ampersand38 @neilzar
Update addons/context_actions/functions/fnc_selectVehicleWeaponDialog…
ef647d7 
….sqf

Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>
@ampersand38 @neilzar
Update addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf
333dac4 
Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>
@ampersand38 @neilzar
Update addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf
154f840 
Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>
ampersand38
ampersand38 commented Jan 11, 2023
View reviewed changes
Comment thread addons/context_actions/CfgContext.hpp Outdated
mharis001
mharis001 requested changes Mar 6, 2023
View reviewed changes
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
Comment thread addons/context_actions/functions/script_component.hpp Outdated
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
rautamiekka
rautamiekka reviewed Mar 6, 2023
View reviewed changes
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
rautamiekka
rautamiekka reviewed Mar 6, 2023
View reviewed changes
Comment thread addons/context_actions/functions/fnc_getVehicleWeaponActions.sqf Outdated
@mharis001 mharis001 changed the title Add Vehicle Logistics > Switch Weapon context action Add Switch Weapon context menu actions for vehicles Mar 7, 2023
@mharis001 mharis001 modified the milestones: Backlog, 1.13.0 Mar 7, 2023
@mharis001
Copy link
Copy Markdown
Member

mharis001 commented Mar 7, 2023

I have extended the functionality to include all turrets of a vehicle (not just the primary one) and not require a unit to be present. Also, now uses loadMagazineInstantly, which prevents the long magazine load times for certain weapons. Pylon magazines are a bit weird and for some reason are not switched to in certain (unknown) situations. I think this is good to go for now and we can revisit that and look at improving the icons later.

@ampersand38
Copy link
Copy Markdown
Member Author

ampersand38 commented Mar 8, 2023

I have extended the functionality to include all turrets of a vehicle (not just the primary one) and not require a unit to be present. Also, now uses loadMagazineInstantly, which prevents the long magazine load times for certain weapons. Pylon magazines are a bit weird and for some reason are not switched to in certain (unknown) situations. I think this is good to go for now and we can revisit that and look at improving the icons later.

Minor issue of muzzle flash showing on switch weapon. https://youtu.be/5RQSWuFWnUY
If you feel that's ok then I'm good with it! Love the multi-turret stuff!

@mharis001
Copy link
Copy Markdown
Member

mharis001 commented Mar 8, 2023

I think it is a fine trade-off for loading the magazine instantly and not requiring a gunner to be present.

@ampersand38 ampersand38 merged commit bd5c438 into zen-mod:master Mar 8, 2023
@ampersand38 ampersand38 deleted the vehicle-select-weapon branch March 8, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CreepPork CreepPork CreepPork left review comments

@neilzar neilzar neilzar approved these changes

@mharis001 mharis001 mharis001 approved these changes

+1 more reviewer

@rautamiekka rautamiekka rautamiekka left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

feature Adds a new feature

Projects

None yet

Milestone

1.13.0

Development

Successfully merging this pull request may close these issues.

5 participants

@ampersand38 @mharis001 @rautamiekka @CreepPork @neilzar