feat(balance): Allow for use of multiple sleep aids #5848

RobbieNeko · 2024-12-28T18:01:50Z

Checklist

Required

I wrote the PR title in conventional commit format.
I ran the code formatter.
I linked any relevant issues using github keyword syntax so it can be closed automatically.
I have committed my changes to new branch that isn't main so it won't cause conflict when updating main branch later.

Purpose of change

As expressed by many, not allowing the survivor to use a pillow and a teddy bear at the same time is ridiculous. People use multiple pillows, cuddle a stuffed animal or body pillow while using a normal pillow, etc. As such, this is clearly a highly-desired change and is in-fact more realistic than how it was before.

Also, if any balance hinges on only one sleep aid being allowed, we have bigger problems.

Describe the solution

Removes the break lines that prevent multiple sleep aids from being used
Converts comfort_response.aid into a vector instead of an item pointer
Prints out each comfort aid you're making use of instead of just one

Describe alternatives you've considered

Pillow (not body pillow) specific flag to allow you to use a pillow and a normal sleep aid

Doesn't adequately account for the use cases.

Simply adjust the limit to be higher
Implode
Let someone else do it

Testing

It builds and it works on my machine

Additional context

I hope my conversion of comfort_response.aid to a vector isn't bad code.
Can't wait for the pillow-stacking meta of sleep comfort

And print them out too!

autofix-ci · 2024-12-28T18:02:48Z

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix

Run git pull. this will merge the automated commit into your local copy of the PR branch.
Continue working.

I do not want the automated commit

Format your code locally, then commit it.
Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
Continue working.

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

RobbieNeko · 2024-12-28T18:04:44Z

Huh, I accidentally made use of curly brace-less for loop. That's funny, good thing the tree caught it though

scarf005

code looks alright but needs playtesting

src/character_functions.cpp

thanks scarf, very cool Co-authored-by: scarf <[email protected]>

scarf005

~~also found some more nitpicks but that doesn't stop the PR from shipping~~

src/character_functions.cpp

scarf005 · 2024-12-28T18:34:08Z

src/character_functions.cpp

@@ -243,12 +244,11 @@ comfort_response_t base_comfort_value( const Character &who, const tripoint &p )
            const std::optional<vpart_reference> board = vp.part_with_feature( "BOARDABLE", true );
            if( carg ) {
                const vehicle_stack items = vp->vehicle().get_items( carg->part_index() );
-                for( const item *items_it : items ) {
+                for( item *items_it : items ) {


does the const modifier here prevent putting it in comfort_info.aid? might go extra careful and could copy them (const good, mutability bad)

Yes, I had to remove the const modifier here to get rid of an error in the IDE

In particular, push_back complains when trying to put it into the vector

scarf005 · 2024-12-28T18:35:32Z

src/character_functions.cpp

@@ -278,14 +278,13 @@ comfort_response_t base_comfort_value( const Character &who, const tripoint &p )
            comfort -= here.move_cost( p );
        }

-        if( comfort_response.aid == nullptr ) {
+        if( comfort_response.aid.empty() ) {


this if condition prevents player from getting aid from both vehicle and floor, is this intended behavior?

e.g below a car on floor is teddy bear, the car also has teddy bear -> only 1 teddy bear bonus (car)

Not intentional in the sense that I had even thought of it, but I'd say it's sensible that only the item that's in the actual vehicle should count.

initialization should handle it

RobbieNeko · 2024-12-28T18:46:27Z

After applying the suggestion to remove the unncecessary vector clearing (and the other pertinent small changes and suggestions), can confirm it still builds and works as expected on my machine

chaosvolt · 2024-12-28T19:37:55Z

This definitely has potential to get spammy I suspect, but hmm.

RobbieNeko · 2024-12-28T19:56:00Z

This definitely has potential to get spammy I suspect, but hmm.

I think it's fairly reasonable to assume that people aren't likely to go anywhere near that many pillows, haha

chaosvolt · 2024-12-28T19:59:41Z

Hopefully, main thing however is that if you're bringing pillows from multiple houses one at a time, the stack-splitting might kick in and ensure every single one you add gets its own message line. That'll add up and will affect even a normal playthrough, just just someone who's hoardmaxxing.

RobbieNeko · 2024-12-28T20:02:54Z

Hmm.
I suppose we can just see how often that comes up in normal gameplay, and adjust accordingly if it ends up being an issue down the line?

chaosvolt · 2024-12-28T20:09:42Z

Fair, it hopefully won't be too cursed.

scarf005 · 2024-12-28T20:27:37Z

also wondering: does stacks work, e g is 40x teddy bear as effective as 1x teddy bear

RobbieNeko · 2024-12-28T20:28:49Z

... probably depends on if it's count / charges or individual items

RobbieNeko · 2024-12-28T20:29:20Z

It just iterates over the items on the tile, so it should work just fine if they're individual items?

RobbieNeko · 2024-12-28T20:32:12Z

In any case, looks like it behaves just fine. As such,
LGTM

Allow for use of multiple sleep aids

862b01c

And print them out too!

github-actions bot added the src changes related to source code. label Dec 28, 2024

style(autofix.ci): automated formatting

d9f3686

scarf005 previously approved these changes Dec 28, 2024

View reviewed changes

src/character_functions.cpp Outdated Show resolved Hide resolved

remove the uncessary if statement

ac28e38

thanks scarf, very cool Co-authored-by: scarf <[email protected]>

RobbieNeko dismissed scarf005’s stale review via ac28e38 December 28, 2024 18:16

style(autofix.ci): automated formatting

82aacfe

scarf005 previously approved these changes Dec 28, 2024

View reviewed changes

src/character_functions.cpp Outdated Show resolved Hide resolved

src/character_functions.cpp Show resolved Hide resolved

scarf005 reviewed Dec 28, 2024

View reviewed changes

Remove unnecessary vector clearing

cfd98ad

initialization should handle it

RobbieNeko dismissed scarf005’s stale review via cfd98ad December 28, 2024 18:42

scarf005 approved these changes Dec 28, 2024

View reviewed changes

chaosvolt approved these changes Dec 28, 2024

View reviewed changes

RobbieNeko merged commit ddc7bd7 into cataclysmbnteam:main Dec 28, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(balance): Allow for use of multiple sleep aids #5848

feat(balance): Allow for use of multiple sleep aids #5848

RobbieNeko commented Dec 28, 2024

autofix-ci bot commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

scarf005 left a comment

scarf005 left a comment

scarf005 Dec 28, 2024

RobbieNeko Dec 28, 2024

RobbieNeko Dec 28, 2024 •

edited

Loading

scarf005 Dec 28, 2024

RobbieNeko Dec 28, 2024

RobbieNeko commented Dec 28, 2024 •

edited

Loading

chaosvolt commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

chaosvolt commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

chaosvolt commented Dec 28, 2024

scarf005 commented Dec 28, 2024 •

edited

Loading

RobbieNeko commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

feat(balance): Allow for use of multiple sleep aids #5848

feat(balance): Allow for use of multiple sleep aids #5848

Conversation

RobbieNeko commented Dec 28, 2024

Checklist

Required

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

autofix-ci bot commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

scarf005 left a comment

Choose a reason for hiding this comment

scarf005 left a comment

Choose a reason for hiding this comment

scarf005 Dec 28, 2024

Choose a reason for hiding this comment

RobbieNeko Dec 28, 2024

Choose a reason for hiding this comment

RobbieNeko Dec 28, 2024 • edited Loading

Choose a reason for hiding this comment

scarf005 Dec 28, 2024

Choose a reason for hiding this comment

RobbieNeko Dec 28, 2024

Choose a reason for hiding this comment

RobbieNeko commented Dec 28, 2024 • edited Loading

chaosvolt commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

chaosvolt commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

chaosvolt commented Dec 28, 2024

scarf005 commented Dec 28, 2024 • edited Loading

RobbieNeko commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

RobbieNeko commented Dec 28, 2024

RobbieNeko Dec 28, 2024 •

edited

Loading

RobbieNeko commented Dec 28, 2024 •

edited

Loading

scarf005 commented Dec 28, 2024 •

edited

Loading