Remove food monotony penalty from junk foods and psychoactives #38928

Soadreqm · 2020-03-21T18:18:17Z

Summary

SUMMARY: Bugfixes "Removes food monotony penalty from junk foods"

Purpose of change

Fixes #38625
~~While I was at it, I also excluded caffeine and alcohol products from having the penalty, on the basis that taste doesn't matter as much for stimulants and depressants.~~

Describe the solution

Moved the junk food check so that both "material" and "primary_material" get checked. ~~Added check for nonzero "stim" value, which covers all stimulants and depressants.~~

Describe alternatives you've considered

Giving a monotony penalty to bee balm tea and chamomile tea. Removing penalty from herbal tea, pine needle tea, dandelion tea, brownies (both kinds) and semi-fancy foods with small portion sizes.
Since the monotony penalty is applied per portion, foods with high charges are affected more. The various pies are the worst right now, coming in stacks of 8 and losing all flavor by the third slice. That's something that should be considered per-item, though.
Brownies are interestingly enough not junk food, despite having chocolate, and don't have a stim effect, despite having marijuana, so they still get boring.
The non-tea teas are kind of borderline. I don't think any of them have any caffeine in reality, but in-game bee balm tea has 1 stim, chamomile is copied from regular tea, and the rest are just mildly flavored water.

Testing

Spawned chocolate waffles, chocolate drink, regular chocolate, cola, coffee, tea, vodka and lasagne. Chocolate products, ~~caffeine and booze~~ did not get boring when eaten, while lasagne did.
Searched through json files in data/items/comestibles for "stim" to see if anything weird was using it. Noted that "alien fronds" and "leech flowers" act as stimulants, but that seems fairly reasonable considering the item descriptions.
Spawned alien fronds and leech flowers, which did not get boring when eaten.

anothersimulacrum · 2020-03-21T18:38:58Z

src/item_factory.cpp

+        is_not_boring = is_not_boring || mat == "junk";
+    }
+    if (jo.has_member("material")) {
+        for (auto& m : jo.get_tags("material")) {


Please replace auto with the proper type.

What's the proper type? String? I didn't write that, just copied it from the existing material check.

Looks like std::string.

It didn't crash on item load, so that seems to be it. Thanks. Switched both of them.

It would fail to compile if you put the wrong type, so you can know you've got it right.

anothersimulacrum

You need to astyle your changes.

actual types instead of auto astyle

anothersimulacrum · 2020-03-21T19:41:59Z

src/item_factory.cpp

    } else if( jo.has_member( "material" ) ) {
        float specific_heat_solid = 0;
        float specific_heat_liquid = 0;
        float latent_heat = 0;

-        for( auto &m : jo.get_tags( "material" ) ) {
+        for( std::string m : jo.get_tags( "material" ) ) {


Suggested change

for( std::string m : jo.get_tags( "material" ) ) {

for( const std::string &m : jo.get_tags( "material" ) ) {

This doesn't work. I'm not actually sure why it did before, with auto.

Try again, I was missing the const.

anothersimulacrum · 2020-03-21T19:42:07Z

src/item_factory.cpp

+        is_not_boring = is_not_boring || mat == "junk";
+    }
+    if( jo.has_member( "material" ) ) {
+        for( std::string m : jo.get_tags( "material" ) ) {


Suggested change

for( std::string m : jo.get_tags( "material" ) ) {

for( const std::string &m : jo.get_tags( "material" ) ) {

kevingranade

I don't follow the rationale that a wide variety of junkfoods aren't subject to the monotony effect.

Soadreqm · 2020-03-22T08:35:40Z

@kevingranade I assumed it's because they're made of mostly fat and sugar. It was the intended behaviour back in #35910, you'd have to ask @Davi-DeGanne for his original reason.

… into boringfood2

wapcaplet · 2020-03-22T19:25:08Z

@Soadreqm Did you test that items with an explicitly-defined monotony_penalty override the default penalty of 0?

Soadreqm · 2020-03-22T19:41:46Z

@wapcaplet No, I didn't. I actually don't think there are any. I don't think messing with the default should change how that works, but I guess I should try it out anyway.

Soadreqm · 2020-03-22T19:54:07Z

Set monotony_penalty of meat pie to 0 and meat pizza to 1, spawned and ate several pieces. It works as advertised.

anothersimulacrum · 2020-03-22T22:51:53Z

src/item_factory.cpp

+        is_not_boring = is_not_boring || jo.get_int( "stim" ) != 0;
+    }
+
+    if( is_not_boring ) { // Junk food, stimulants and depressants never get old by default, but this can still be overriden.


Please out the comment on the line above or below, this can be hard to read.

kevingranade · 2020-03-22T23:02:57Z

After revisiting the parent issue, I see what you're doing now, part of the problem is you mixed a bugfix with a balance change, which made me think that it was all balance change.
That doesn't change the fact that I still don't agree with the concept that all food suffers from a monotony penalty except for junk food. If anything my intuition says it's the opposite, junk food is habit forming in the short term, but eating a large amount of it quickly erodes the things about it your body finds rewarding.
The stim issue is similar, I can buy the argument that the the stimulant effect itself is not subject to the monotony penalty, but that is not what you've implemented here, which is that any degree of stimulant effect makes a food eternally novel.

The bugfix part of this that prevents "primary_material" from making the code ignore "materials" can go in as-is, but please drop the stimulant part.

Also I'm going to be reconsidering the junkfood exclusion in general in the future, because I'm very unconvinced it should be immune to this effect.

Soadreqm · 2020-03-23T08:24:25Z

Sure, I really should have separated the changes to begin with.
What do you mean by

I can buy the argument that the the stimulant effect itself is not subject to the monotony penalty, but that is not what you've implemented here, which is that any degree of stimulant effect makes a food eternally novel.

though? If I did a new PR for the stims, what would you actually expect it to have?

Soadreqm · 2020-03-23T23:49:29Z

By the way, I don't know why the automated tests are failing. It says it's the distribution of attacks to body parts, but I don't see how anything I've done could have messed with that.

anothersimulacrum · 2020-03-24T00:14:08Z

Test failures are due to randomness and #38983.

wapcaplet · 2020-03-24T00:39:13Z

Other failures you may have seen will be fixed by #38979

Soadreqm added 2 commits March 21, 2020 19:25

check both "primary_material" and "material" for junk food

a4b70fe

no monotony penalty for items with nonzero stim value

56e609c

anothersimulacrum reviewed Mar 21, 2020

View reviewed changes

Soadreqm changed the title ~~Boringfood2~~ Remove food monotony penalty from junk foods and psychoactives Mar 21, 2020

no monotony penalty for items with nonzero stim value

81471ee

actual types instead of auto astyle

anothersimulacrum reviewed Mar 21, 2020

View reviewed changes

kevingranade requested changes Mar 22, 2020

View reviewed changes

Merge branch 'boringfood2' of https://github.com/Soadreqm/Cataclysm-DDA…

1c043d2

… into boringfood2

Soadreqm force-pushed the boringfood2 branch from 3f3e7d8 to 1c043d2 Compare March 22, 2020 19:24

anothersimulacrum reviewed Mar 22, 2020

View reviewed changes

gave stimulants and depressants their monotony penalty back

324cf68

kevingranade merged commit a4f5758 into CleverRaven:master Apr 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove food monotony penalty from junk foods and psychoactives #38928

Remove food monotony penalty from junk foods and psychoactives #38928

Soadreqm commented Mar 21, 2020 •

edited

Loading

anothersimulacrum Mar 21, 2020

Soadreqm Mar 21, 2020

anothersimulacrum Mar 21, 2020

Soadreqm Mar 21, 2020

anothersimulacrum Mar 21, 2020

anothersimulacrum left a comment

anothersimulacrum Mar 21, 2020 •

edited

Loading

Soadreqm Mar 21, 2020

anothersimulacrum Mar 22, 2020

anothersimulacrum Mar 21, 2020 •

edited

Loading

kevingranade left a comment

Soadreqm commented Mar 22, 2020

wapcaplet commented Mar 22, 2020

Soadreqm commented Mar 22, 2020

Soadreqm commented Mar 22, 2020

anothersimulacrum Mar 22, 2020

kevingranade commented Mar 22, 2020

Soadreqm commented Mar 23, 2020

Soadreqm commented Mar 23, 2020

anothersimulacrum commented Mar 24, 2020

wapcaplet commented Mar 24, 2020 •

edited

Loading

	for( std::string m : jo.get_tags( "material" ) ) {
	for( const std::string &m : jo.get_tags( "material" ) ) {

Remove food monotony penalty from junk foods and psychoactives #38928

Remove food monotony penalty from junk foods and psychoactives #38928

Conversation

Soadreqm commented Mar 21, 2020 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anothersimulacrum left a comment

Choose a reason for hiding this comment

anothersimulacrum Mar 21, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anothersimulacrum Mar 21, 2020 • edited Loading

Choose a reason for hiding this comment

kevingranade left a comment

Choose a reason for hiding this comment

Soadreqm commented Mar 22, 2020

wapcaplet commented Mar 22, 2020

Soadreqm commented Mar 22, 2020

Soadreqm commented Mar 22, 2020

Choose a reason for hiding this comment

kevingranade commented Mar 22, 2020

Soadreqm commented Mar 23, 2020

Soadreqm commented Mar 23, 2020

anothersimulacrum commented Mar 24, 2020

wapcaplet commented Mar 24, 2020 • edited Loading

Soadreqm commented Mar 21, 2020 •

edited

Loading

anothersimulacrum Mar 21, 2020 •

edited

Loading

anothersimulacrum Mar 21, 2020 •

edited

Loading

wapcaplet commented Mar 24, 2020 •

edited

Loading