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

Adds Latejoin scaling to Vendors and ASRS #4939

Merged
merged 29 commits into from
Dec 7, 2023

Conversation

fira
Copy link
Member

@fira fira commented Nov 16, 2023

About the pull request

Simply fixes a few bugs, and makes it so Latejoiners contribute to ASRS Funds and Vendors stock of the main vendors (attachies, utilities, uniform, and reqs') much like they do contribute to larva count. See the CL for full details.

Balance overview:

  • ASRS budget and dynamic vendors (attachies, utility, gear, ammo) now get resupplied by latejoins at 60% of roundstart rate.
  • 33% less supply points per marine. This applies to both amount of Vendors' stock, and to ASRS budget - roundstart and latejoin.
  • Basic vendors like Squad Preps Weapons Rack do not use the dynamic scaling.
  • Marines' own ordering points are not affected by these changes.
  • ASRS random supplying is already scaled and unaffected.

I didn't really feel the strength to mass edit all ~500 scale() usage in codebase and risk to collateral the others, so affected vendors retain it for everything but floating point values.

Some vendor multipliers had to be edited so they can scale linearly `(0.1 * scale + 1) ---> 0.25, i'd add a static modifier but this vendor code is already a mess.

This is overall potentially a big marine supply buff, although it nerfs them at roundstart due to bugfixes. Related numbers might need to be adjusted.

Explain why it's good for the game

Less dependency on roundstart amount of players, smoothing the game so it's easier to balance. More gradual scaling as people join. More Reqs work despite more supplies.

Testing Photographs and Procedure

Tested chain spawning and that the vendors and ASRS amounts increased in appropriate amounts.

Changelog

🆑
fix: Cryoing someone now properly takes into account role weights for the purpose of latejoin larvas. This should very slightly increase larvas amount.
fix: Roundstart distributed amount of gear and ASRS points now takes shipside role weights into account. This should moderately decrease budget and starting gear.
fix: Roundstart distributed amount of gear and ASRS points does not count Survivors and Monkeys anymore. This should moderatly decrease budget and starting gear.
add: Main marine vendors and ASRS now get matching supply for every additional marine latejoining, similar to larvas. This should be a substantial increase over the course of a round. Supplies given are 60% of what a roundstart marine would give.
balance: Amount of gear in main marine vendors and ASRS supplies have been decreased by 40% to help counteract added supplies the marines will get in latejoining. Hopefully this also keeps reqs active to dispatch new supplies.
fix: Altered a few items vendor stock scalings to be linear for use with the new system, such as RTO pack, Drop Pouch and Machete Pouch.
/:cl:

@fira fira added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Nov 16, 2023
@github-actions github-actions bot added Fix Fix one bug, make ten more Feature Feature coder badge labels Nov 16, 2023
@fira fira added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Nov 16, 2023
@fira fira marked this pull request as ready for review November 16, 2023 16:34
@fira fira marked this pull request as draft November 16, 2023 18:05
@fira fira marked this pull request as ready for review November 16, 2023 18:07
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 24, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 25, 2023
@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 Nov 25, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 3, 2023
@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 Dec 3, 2023
@cm13-github
Copy link
Contributor

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

@fira fira mentioned this pull request Dec 3, 2023
@harryob harryob added this pull request to the merge queue Dec 7, 2023
Merged via the queue into cmss13-devs:master with commit ba6e6aa Dec 7, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants