Port over and update 'Streamline aim and fire experience (#59977)' #2468

KheirFerrum · 2023-03-23T20:26:24Z

Summary

SUMMARY: Interface "Port over 'Streamline aim and fire experience (#59977)' "

Purpose of change

Ports over #59977.

Fixes issues with RELOAD_AND_SHOOT weapons described in #54997. No need to fix issue described in #50571 as it is already fixed in BN

Describe the solution

Allows re-entering of aim UI immediately after firing so long as there are still targets. Option is default on but can be turned off from the settings menu under Interface.

Add "reload_time" to aim_activity_actor as a member variable, which will save moves needed to load weapon. This will allow it to be refunded if the player starts the aim activity then immediately exits. This cost will then be referenced in the aiming UI. Displayed separately from the firing cost. If the "first turn" has passed, the firing cost is triggered and the unload cost is shown instead.

Describe alternatives you've considered

Testing

Spawn rifle, test that when firing rifle at targets, we return to the UI, check that it doesn't do anything stupid when it runs out of ammo, whether we have appropriate ammo/magazines or not.
Repeat test with revolver and similar weapons with integral magazines.
Repeat test with bow and crossbow, using multiple different types of ammo.
Ensure first_turn is reset and removed appropriately during each cycle.

Additional context

~~Not sure if we want to add unload cost to the menu as well. It might be useful for players to know.~~

Added.

* Re-enter aiming ui after shooting * Calm down player's view snapping around while aiming * Temporary workaround for RAS bugs * Option to disable reaiming

Fix translation

…im-and-fire-experience-

Now displays loading cost and unloading costs. First turn changed to indicate whether the player has chosen to aim or use the aim_and_shoot function.

Was causing aim_and_shoot actions to abort prematurely.

It should appear under the SNAP_TO_TARGET instead of under the disassemble query.

…im-and-fire-experience-

Coolthulhu · 2023-03-26T17:24:14Z

src/ranged.cpp

+    if( activity->first_turn ) {
+        you->moves -= activity->reload_time;
+        activity->first_turn = false;
+    }


I don't like this bit at all. It's "realistic", but it won't be communicated well and is unintuitive.
Instead, it's better to have the cost be added to cost of firing and only that. Having RAS weapons go through normal reload function and apply all the associated move costs immediately is a mistake.

The action cost of loading can be two turns easily though, I'm concerned about this forcing players to commit to a rather long action in a tense situation. If we're going to have this cost at all, at least if you decide to aim you're likely in a "relatively" safe position.

I'm also not entirely sure how it's unintuitive, the goal of this PR is pretty much to try and communicate it. I'm essentially mimicking the original function but allowing a cancel out of it. The original loading cost could never be cancelled (Edit: And was applied just by entering the firing menu).

Had to move the reload into `fire_gun()` otherwise the item location becomes a nullpointer and the game crashes.

Fix test

olanti-p · 2023-03-29T22:44:57Z

Ammo type doesn't show up anymore when aiming with a RAS weapon

olanti-p

Found a neat interaction: you can shoot your bow, then walk over to the arrow, then shoot the bow again without explicitly picking up arrow first.

src/ranged.h

src/activity_actor.cpp

KheirFerrum · 2023-03-30T15:17:59Z

Found a neat interaction: you can shoot your bow, then walk over to the arrow, then shoot the bow again without explicitly picking up arrow first.

You could always do this I recall, it just has to be within 1 tile.

Use class instead of item_location.h Add read arguments for arguments added to save.

olanti-p

Ok, this PR is a definite improvement overall.
Drastically cuts down on the keypresses, and spaghetti removal is always good.

…ataclysmbnteam#2468) * Streamline aim and fire experience (#59977) * Re-enter aiming ui after shooting * Calm down player's view snapping around while aiming * Temporary workaround for RAS bugs * Option to disable reaiming * Update options.cpp Fix translation * Fix RELOAD_AND_SHOOT weapons Now displays loading cost and unloading costs. First turn changed to indicate whether the player has chosen to aim or use the aim_and_shoot function. * Properly set first_turn for non-ras weapons. Was causing aim_and_shoot actions to abort prematurely. * Reorder options It should appear under the SNAP_TO_TARGET instead of under the disassemble query. * Redo move calculation of RAS weapons. Had to move the reload into `fire_gun()` otherwise the item location becomes a nullpointer and the game crashes. * Convert all item locations in this chain to not be references. Fix test * Fix Ammo Display * Fixes Use class instead of item_location.h Add read arguments for arguments added to save. --------- Co-authored-by: Alexey <irwiss@users.noreply.github.com>

* Update ranged.cpp Fix dumb code I made * Update src/ranged.cpp Co-authored-by: scarf <greenscarf005@gmail.com> --------- Co-authored-by: scarf <greenscarf005@gmail.com>

Streamline aim and fire experience (#59977)

99d8ae3

* Re-enter aiming ui after shooting * Calm down player's view snapping around while aiming * Temporary workaround for RAS bugs * Option to disable reaiming

github-actions bot added the src PR changes related to source code. label Mar 23, 2023

KheirFerrum added 2 commits March 23, 2023 20:38

Update options.cpp

2674f4b

Fix translation

Merge remote-tracking branch 'upstream/upload' into Port-Streamline-a…

8853f2c

…im-and-fire-experience-

KheirFerrum force-pushed the Port-Streamline-aim-and-fire-experience- branch from 4152838 to bd62de7 Compare March 24, 2023 01:25

KheirFerrum marked this pull request as ready for review March 24, 2023 02:07

Fix RELOAD_AND_SHOOT weapons

e647020

Now displays loading cost and unloading costs. First turn changed to indicate whether the player has chosen to aim or use the aim_and_shoot function.

KheirFerrum force-pushed the Port-Streamline-aim-and-fire-experience- branch from bd62de7 to e647020 Compare March 25, 2023 11:35

Properly set first_turn for non-ras weapons.

45d4acd

Was causing aim_and_shoot actions to abort prematurely.

KheirFerrum force-pushed the Port-Streamline-aim-and-fire-experience- branch from 3a8eba1 to 45d4acd Compare March 25, 2023 11:58

Reorder options

3cf6978

It should appear under the SNAP_TO_TARGET instead of under the disassemble query.

KheirFerrum changed the title ~~Port over 'Streamline aim and fire experience (#59977)'~~ Port over and update 'Streamline aim and fire experience (#59977)' Mar 25, 2023

Merge remote-tracking branch 'upstream/upload' into Port-Streamline-a…

aa47b70

…im-and-fire-experience-

Coolthulhu reviewed Mar 26, 2023

View reviewed changes

KheirFerrum force-pushed the Port-Streamline-aim-and-fire-experience- branch from f9a399a to 14048d5 Compare March 29, 2023 14:03

Redo move calculation of RAS weapons.

9a8bbab

Had to move the reload into `fire_gun()` otherwise the item location becomes a nullpointer and the game crashes.

KheirFerrum force-pushed the Port-Streamline-aim-and-fire-experience- branch from 14048d5 to 9a8bbab Compare March 29, 2023 14:11

Convert all item locations in this chain to not be references.

3ddd760

Fix test

KheirFerrum force-pushed the Port-Streamline-aim-and-fire-experience- branch from 7884e52 to 3ddd760 Compare March 29, 2023 19:14

github-actions bot added the tests PR changes related to tests label Mar 29, 2023

Fix Ammo Display

8a169af

olanti-p reviewed Mar 30, 2023

View reviewed changes

src/ranged.h Outdated Show resolved Hide resolved

src/activity_actor.cpp Show resolved Hide resolved

src/activity_actor.cpp Outdated Show resolved Hide resolved

Fixes

b066c82

Use class instead of item_location.h Add read arguments for arguments added to save.

olanti-p approved these changes Mar 30, 2023

View reviewed changes

olanti-p merged commit 5a69bd0 into cataclysmbnteam:upload Mar 30, 2023

KheirFerrum deleted the Port-Streamline-aim-and-fire-experience- branch March 30, 2023 22:06

Unrepentant-Atheist mentioned this pull request Mar 31, 2023

Game keeps crashing when trying to fire a turret from vehicle #2512

Closed

KheirFerrum mentioned this pull request Mar 31, 2023

Fix possible segfault caused by #2468 when guns are fired #2516

Merged

KheirFerrum mentioned this pull request Apr 1, 2023

Fix more segfault behaviour for turrets. #2533

Merged

scarf005 mentioned this pull request Apr 5, 2023

Auto aim occasionally re-aims dead enemy #2567

Closed

scarf005 mentioned this pull request May 22, 2023

docs: game objects joveeater/Cataclysm-BN#2

Closed

KheirFerrum mentioned this pull request Jun 3, 2023

Fix RAS weapon range in target_ui #2933

Merged

2 tasks

scarf005 mentioned this pull request Oct 1, 2023

feat: prettier ear/tail mutation graphics #3340

Merged

osuphobia mentioned this pull request Mar 13, 2024

Overhaul of RELOAD_AND_SHOOT weapons? CleverRaven/Cataclysm-DDA#72359

Closed

osuphobia mentioned this pull request Apr 26, 2024

Bow reload time fix CleverRaven/Cataclysm-DDA#73305

Merged

osuphobia mentioned this pull request May 6, 2024

Display RAS weapon reload time in aim ui CleverRaven/Cataclysm-DDA#73550

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port over and update 'Streamline aim and fire experience (#59977)' #2468

Port over and update 'Streamline aim and fire experience (#59977)' #2468

KheirFerrum commented Mar 23, 2023 •

edited

Coolthulhu Mar 26, 2023

KheirFerrum Mar 26, 2023 •

edited

olanti-p commented Mar 29, 2023

olanti-p left a comment

KheirFerrum commented Mar 30, 2023

olanti-p left a comment

Port over and update 'Streamline aim and fire experience (#59977)' #2468

Port over and update 'Streamline aim and fire experience (#59977)' #2468

Conversation

KheirFerrum commented Mar 23, 2023 • edited

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Coolthulhu Mar 26, 2023

Choose a reason for hiding this comment

KheirFerrum Mar 26, 2023 • edited

Choose a reason for hiding this comment

olanti-p commented Mar 29, 2023

olanti-p left a comment

Choose a reason for hiding this comment

KheirFerrum commented Mar 30, 2023

olanti-p left a comment

Choose a reason for hiding this comment

KheirFerrum commented Mar 23, 2023 •

edited

KheirFerrum Mar 26, 2023 •

edited