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

feat(balance): Convert drugdeal itemgroup to collection #5635

Merged
merged 6 commits into from
Oct 31, 2024

Conversation

RoyalFox2140
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 commented Oct 31, 2024

Checklist

Required

Purpose of change

When map extras were jsonized, the drugdeal map extra had all of its firearm spawns in a distribution that contained large amounts of clothing and other items like cigs, lighters, the drugs, etc. This meant it was nearly impossible for the game to roll for weapons.

Describe the solution

Update into a collection and heavily change what can spawn, being a collection means each item has a chance to roll instead.

Describe alternatives you've considered

Better distribution?

Testing

image
image
image

Additional context

@chaosvolt You must update Cataclysm++ as it sets drugdeals to a collection and that stops my game from loading. Basegame loads just fine, in fact most mods load fine.

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Oct 31, 2024
@github-actions github-actions bot added the mods PR changes related to mods. label Oct 31, 2024
@chaosvolt
Copy link
Member

chaosvolt commented Oct 31, 2024

Interesting, a lot of single-item spawns in the collection could still potentially be rolled up into itemgroup calls I suspect.

We can roll the rest up in a follow-up PR if need be though, since the file changes are so jumbled now that it's not going to be convenient to add change suggestions to it. XD

@RoyalFox2140
Copy link
Collaborator Author

Interesting, a lot of single-item spawns in the collection could still potentially be rolled up into itemgroup calls I suspect.

Wasn't sure generally how we wanted to handle it, I think it could use more work grouping some spawns but I didn't know where to go with it generally.

@chaosvolt
Copy link
Member

Fair enough. I could mess with it if you'd like. Currently preparing draft updates for mods (and also waking up bleh).

@chaosvolt
Copy link
Member

Went ahead and condensed the itemgroups a lot more, lemme know if it looks okay.

Copy link
Contributor

autofix-ci bot commented Oct 31, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@RoyalFox2140
Copy link
Collaborator Author

Chaos's tweaks look good to me. Think this will be good overall

@chaosvolt chaosvolt merged commit a763bf6 into cataclysmbnteam:main Oct 31, 2024
9 checks passed
@RoyalFox2140 RoyalFox2140 deleted the mapextra-touchup branch November 1, 2024 04:56
chrsrns added a commit to chrsrns/Cataclysm-BN that referenced this pull request Nov 3, 2024
To account for cataclysmbnteam#5635, moved to `guns_pistol_common`, as the items being injected are pistols.
chaosvolt pushed a commit that referenced this pull request Nov 3, 2024
…ler` (#5655)

Inject to `guns_pistol_common` instead of `drugdealer`

To account for #5635, moved to `guns_pistol_common`, as the items being injected are pistols.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants