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

Vehicle projectile origin adjustment #6245

Merged
merged 5 commits into from
May 25, 2024

Conversation

Doubleumc
Copy link
Contributor

@Doubleumc Doubleumc commented May 6, 2024

About the pull request

Vehicle projectiles now start on the vehicle and travel outward, without hitting the vehicle. As a side effect, Adjacent() checks now accept a list of objects to ignore.

Origins are adjusted to the point visually closest to the hardpoint's sprite. For most hardpoints this is the center of the vehicle, with the only exceptions being the APC weapons (all along different edges) and the secondary flamer (flame origin is walked until not on the vehicle).

Since projectiles now must travel farther to reach the front of the vehicle, some shorter ranged ammos are adjusted to compensate.

The hardpoint check clear_los() is removed since now all origins are inside the vehicle's bounds.

Removed redundant call to display_ammo() when firing secondary flamer.

Explain why it's good for the game

Projectiles originating from the tile in front of a vehicle make it extremely hard or even impossible to engage targets adjacent to it. With this change the projectile, and resulting cone of fire, starts where you would expect it to.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
qol: vehicle weapon projectiles start from the weapon
/:cl:

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label May 6, 2024
@github-actions github-actions bot added the Quality of Life Make the game harder to play label May 6, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label May 6, 2024
removed redundant code, handled by the changes to `projectile` and `adjacent`
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label May 14, 2024
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label May 15, 2024
@Drulikar Drulikar requested a review from Zonespace27 May 18, 2024 06:12
code/modules/projectiles/projectile.dm Outdated Show resolved Hide resolved
code/modules/vehicles/hardpoints/secondary/flamer.dm Outdated Show resolved Hide resolved
@Zonespace27 Zonespace27 added this pull request to the merge queue May 25, 2024
Merged via the queue into cmss13-devs:master with commit 3624cdc May 25, 2024
27 checks passed
cm13-github added a commit that referenced this pull request May 25, 2024
@Doubleumc Doubleumc deleted the vehicle-projectile-origin branch May 25, 2024 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Quality of Life Make the game harder to play
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants