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

Automatic Fireteams #4714

Closed

Conversation

Kitsunemitsu
Copy link
Contributor

@Kitsunemitsu Kitsunemitsu commented Oct 18, 2023

About the pull request

Adds in 4 more fireteam leaders, one for each squad.
Marines automatically have their headset swapped to FTL instead of SL.

Sets up automatic Fireteams along this scheme:

Fireteam Leaders, Medics and Engis - Fill FT1 > FT2 > FT3
Specialist - FT1
Smartgunner - FT2
Marines - Fill randomly.

Possible Alternative 1

Fill FTLs in FT3 > FT2 > FT1
Set Spec/SG to FTL until one wakes up

Possible Alternative 2

Remove FTL role Slot back to 2 per round, Fill FTL1 and FTL2.
SG fills FTL3. (Possible bump back to CPL just like the good old days)
Spec goes to FT3
Marines are half as likely to join FT3.

Explain why it's good for the game

FTL is just a Cpl rank PFC+. This PR makes them more useful by automatically assigning Fireteams, and encourages Marines to stick with their FTL by automatically setting their headsets.
This may lead to a more Platoon-like structure, with smaller squad-like cells.

I would at least like a test on this.

Testing Photographs and Procedure

Screenshots & Videos Example of auto-generated Squad. ![image](https://github.com/cmss13-devs/cmss13/assets/77302679/cd72a012-bb9b-439f-8eeb-542acd5f8027)

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

Changelog

🆑
add: Marines are now automatically added into fireteams.
balance: Headsets track FTL instead of SL by default, except on the FTLs and SLs.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Oct 18, 2023
@koltoast
Copy link

It would be cool if you expanded this to intel squad @Kitsunemitsu

Comment on lines +457 to +458
var/rng_fireteam = pick("FT1", "FT2", "FT3")
assign_fireteam(rng_fireteam, M)
Copy link
Contributor

Choose a reason for hiding this comment

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

I'll admit I haven't looked at the entire functionality but if you're going with automatic assignment I would personally fill the fireteams evenly rather than randomly. As funny as it would be to roll the rng to have all the marines in one fireteam.

Copy link
Contributor Author

@Kitsunemitsu Kitsunemitsu Oct 18, 2023

Choose a reason for hiding this comment

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

The odds of that are astronomicslly low. Its an easy fix though, but it lookd worse.

Copy link
Contributor

Choose a reason for hiding this comment

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

Very true but I just used the most extreme example to illustrate that - more likely is you'll have things like 4 marines in one fireteam and 1 and 1 in the others which just seems a bit off. But it's of course your choice I just think evening it out would be a better implementation here.

@Kitsunemitsu
Copy link
Contributor Author

It would be cool if you expanded this to intel squad @Kitsunemitsu

Unlike most squads intel is 3 people.

@github-actions
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 Oct 26, 2023
@mullenpaul mullenpaul self-assigned this Oct 27, 2023
@mullenpaul mullenpaul removed the Stale beg a maintainer to review your PR label Oct 27, 2023
@mullenpaul
Copy link
Contributor

I'll review this later today

@mullenpaul
Copy link
Contributor

I'm sorry I haven't gotten to this yet. I will do ASAP

Copy link
Contributor

github-actions bot commented Nov 7, 2023

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 Nov 7, 2023
@Huffie56 Huffie56 closed this Nov 10, 2023
@Huffie56 Huffie56 reopened this Nov 10, 2023
@Huffie56
Copy link
Contributor

sorry misc-lick wanted to comment sorry....

@Huffie56
Copy link
Contributor

I'm sorry I haven't gotten to this yet. I will do ASAP

@mullenpaul your probably forgot.

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Nov 11, 2023
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 Nov 18, 2023
@github-actions github-actions bot closed this Nov 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants