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

improved job code TM first #8254

Open
wants to merge 19 commits into
base: master
Choose a base branch
from

Conversation

cuberound
Copy link
Contributor

@cuberound cuberound commented Jan 26, 2025

About the pull request

Aims to make job assignment code more readable, and simplifies the code. you only need to set min max pop per slot and how many steps are not needed for first increment and it works

Explain why it's good for the game

medic and engi slots are increased one by one not 4 at a time.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
qol: medic and engi slots are added one by one not four at a time
code: removes crazy repeated code in jobslot assignment
/:cl:

@cmss13-ci cmss13-ci bot added Quality of Life Make the game harder to play Code Improvement Make the code longer labels Jan 26, 2025
@@ -7,49 +7,7 @@

// https://docs.google.com/spreadsheets/d/1PlnIwKhq-bVWWFPoBrzWYh1mWK04pyBSQUtUMEw3qSw/edit#gid=1290768907

/proc/job_slot_formula(marine_count, factor, c, min, max)
/proc/job_slot_formula(marine_count, marine_per_slot, factor, min, max)
Copy link
Contributor

Choose a reason for hiding this comment

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

Factor isn’t very descriptive, it’s a constant. Not a factor

Copy link
Contributor Author

@cuberound cuberound Jan 26, 2025

Choose a reason for hiding this comment

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

it is not constant and describing what it does is... complicated and I do not know any proper word to describe it... and it was c before

Copy link
Contributor

@TheGamerdk TheGamerdk Jan 29, 2025

Choose a reason for hiding this comment

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

it is a constant. only weird thing it does is not apply when marine_count < marine_per_slot

Copy link
Contributor Author

@cuberound cuberound Jan 31, 2025

Choose a reason for hiding this comment

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

I have just kept that part, yes it is strange indded, but in general you assume that the constant is less then min, else you have wrong min value. so in that seonce it is set correctly

Co-authored-by: TheGamerdk <[email protected]>
@cuberound cuberound changed the title improved job code improved job code TM first Jan 26, 2025
…max values and with total_positions_so_far
…max values and with total_positions_so_far
@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 Jan 31, 2025
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 31, 2025
@cm13-github
Copy link
Contributor

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

@realforest2001 realforest2001 added the Needs Testing Need to test it on the guinea pigs (production server) label Feb 5, 2025
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 10, 2025
@cm13-github
Copy link
Contributor

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

@cmss13-ci
Copy link
Contributor

cmss13-ci bot commented Feb 18, 2025

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

@cmss13-ci cmss13-ci bot added the Stale beg a maintainer to review your PR label Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Merge Conflict PR can't be merged because it touched too much code Needs Testing Need to test it on the guinea pigs (production server) Quality of Life Make the game harder to play Stale beg a maintainer to review your PR
Projects
Status: Awaiting Review
Development

Successfully merging this pull request may close these issues.

None yet

5 participants