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 visual sprite display of ammo count for dropships, add toggle to auto deploy to sentries/MGs on landing, dropship fabricator build queue #7084

Merged
merged 21 commits into from
Oct 7, 2024

Conversation

Sindorman
Copy link
Contributor

@Sindorman Sindorman commented Sep 2, 2024

About the pull request

  1. Added ability to set Dropship Sentries and MG modules on dropship to auto deploy after each landing. Default set to off, can be enabled/disable in the equipment menu of the sentry via dropship equipment computer.

  2. Added visual representation for gunship ammo to display how much is left in sprite

  3. Added visual representation of how many rockets loaded into mini rocket launcher when mounted on wings

  4. Added a build queue system for dropship build fabricator with ability to cancel items in the queue too.

Explain why it's good for the game

  1. This will help dropship pilot by removing tedious slow process of deploying every external Sentry/MG after landing

  2. This will help gunship pilot or DCC be able to tell ammo count left for used ammo that is sitting on the ground

  3. This will help gunship pilot or DCC be able to tell how many rockets is loaded into the mini rocket launcher when they are mounted on the wings

  4. This will help people to queue up things to build to allow multi tasking.

Testing Photographs and Procedure

  1. Installed Sentry and MG on dropship and flew it to LZ
  2. Flew Gunship loaded with every type of weapon, fired them and then pulled them out to see. Also tested the wing module, also tested by changing VV.
  3. Same thing as 2
  4. Tested on the fabricator by queuing up things to be built and cancelling some.
Screenshots & Videos

Sentries and MG deploying after landing:
https://github.com/user-attachments/assets/d36529b1-d94b-44af-907a-9a6706cd62ec

New gunship ammo visual representation:
dreamseeker_GtK0jZV2VQ

Auto deploy Toggle:
xJkTiBTI1b

Auto deploy preference in action:
dreamseeker_8W8C9LEt98

New Dropship lights
dreamseeker_gSFIfKyLZj

Dropship fabricator queue:
https://github.com/user-attachments/assets/254b80cd-159e-4991-bae7-6d58409c6e9f

Changelog

🆑 PoZe
add: Added ability to set Dropship Sentries and MG modules on dropship to auto deploy after each landing. Default set to off, can be enabled/disable in the equipment menu of the sentry via dropship equipment computer.
add: Added visual display in Gunship ammo for all ammo types so that you can tell how much is left by looking at it on the ground.
qol: Added ability to queue up items to be fabricated in dropship fabricator as well as ability to remove items from the queue too. Crew will no longer need to babysit the fabricator to produce multiple things as soon as possible.
qol: Made Sentry and MG dropship equipment UI a bit more consistent
add: Added visual display of how many mini rockets loaded into mini rocket launcher when attached to the wing.
balance: Increased dropship spotlight module brightness from 11 tiles to 14 tiles.
add: Added external lights to all dropships. The red and green wing lights that all aircraft usually have and two blue lights on the inner part of the tail to illuminate the unloading area
code: Misc code cleanup in dropship equipment and ammo code
refactor: Moved dropship equipment and ammo into their own sprite files
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Code Improvement Make the code longer Refactor Make the code harder to read labels Sep 2, 2024
@JackieEstegado
Copy link
Contributor

Make the auto-deploy a toggle, or have it remember it's previous state. As otherwise they may annihilate survivors despite the PO knowing about them.

@Sindorman Sindorman requested a review from fira as a code owner September 2, 2024 21:07
@github-actions github-actions bot added the UI deletes nanoui/html label Sep 2, 2024
@Sindorman
Copy link
Contributor Author

Sindorman commented Sep 2, 2024

Make the auto-deploy a toggle, or have it remember it's previous state. As otherwise they may annihilate survivors despite the PO knowing about them.

Sure, was originally planning to do so. But then decided to cut corners thinking having them always on is fine. Updated PR with toggle ability for both Sentry and MG via the equipment interface of the dropship

@github-actions github-actions bot added the Quality of Life Make the game harder to play label Sep 2, 2024
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Sep 3, 2024
@Sindorman Sindorman changed the title Add visual sprite display of ammo count for dropships and add auto deploy to sentries/MGs on lading Add visual sprite display of ammo count for dropships, auto deploy to sentries/MGs on landing, dropship fabricator build queue Sep 3, 2024
@Sindorman Sindorman changed the title Add visual sprite display of ammo count for dropships, auto deploy to sentries/MGs on landing, dropship fabricator build queue Add visual sprite display of ammo count for dropships, add toggle to auto deploy to sentries/MGs on landing, dropship fabricator build queue Sep 3, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

mapping lgtm

maps/shuttles/dropship_normandy.dmm Outdated Show resolved Hide resolved
maps/shuttles/dropship_alamo.dmm Outdated Show resolved Hide resolved
maps/shuttles/dropship_resolute.dmm Outdated Show resolved Hide resolved
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Sep 7, 2024
kiVts
kiVts previously requested changes Sep 14, 2024
Copy link
Contributor

@kiVts kiVts left a comment

Choose a reason for hiding this comment

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

first glance

code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
@kiVts kiVts marked this pull request as draft September 14, 2024 05:53
@Sindorman Sindorman marked this pull request as ready for review September 15, 2024 19:35
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 19, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 21, 2024
@cm13-github
Copy link
Contributor

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

code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/vehicle_part_fabricator.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft September 23, 2024 08:33
@Sindorman Sindorman marked this pull request as ready for review September 24, 2024 06:16
@harryob harryob added this pull request to the merge queue Oct 7, 2024
Merged via the queue into cmss13-devs:master with commit 4aff6b0 Oct 7, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Oct 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Code Improvement Make the code longer Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Quality of Life Make the game harder to play Refactor Make the code harder to read Sprites Remove the soul from the game. UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants