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 Filth Tolerant trait #18229

Closed
wants to merge 10 commits into from

Conversation

Projects
None yet
7 participants
@DangerNoodle
Copy link
Contributor

commented Sep 8, 2016

Adds trait to mitigate filthy clothing effect. Reasoning: psychopath is a trait that affects morale-only things, and flithy clothes are currently a morale effect. Trait point cost is inverse of squeamish, can be increased if desired.

Practical effects for filthy clothes will still apply if they exist or are added.

Noodle
@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

?

Not very used to this.

@Treah

This comment has been minimized.

Copy link
Contributor

commented Sep 8, 2016

Should make it so that they actively enjoy being filthy and will get a hit in moral if they are clean.

@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

Would be odd, plus this is just tolerance, not enjoyment. Working on fixing code in general.

Noodle
@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

astyle regressions found.
Formatted  src/morale.cpp
make: *** [astyle-check] Error 1
make: INTERNAL: Exiting with 3 jobserver tokens available; should be 2!

This is new. I do not know how I styled it wrong. Surprised this is the only error reported in second commit.

Noodle and others added some commits Sep 8, 2016

Noodle
DangerNoodle
@Zilenan91

This comment has been minimized.

Copy link

commented Sep 8, 2016

This is just a band-aid fix to a problem that should just be removed.

If people don't like filthiness they'll just be told to take the trait rather than there being actual debate on if it's worth keeping it in the game in the first place

@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

I agree, but the feature likely will not be removed. It is better to have some way around this trait, than to leave it simultaneously annoying and mandatory.

Now, what am I missing here? I seem to have fixed the actual code, but some part of my formatting is generating an error. I'm not very familiar with the astyle demands.

DangerNoodle added some commits Sep 8, 2016

DangerNoodle
DangerNoodle
DangerNoodle
@@ -299,6 +300,7 @@ player_morale::player_morale() :
const auto set_badtemper = std::bind( &player_morale::set_permanent, _1, MORALE_PERM_BADTEMPER,
_2, nullptr );
const auto set_stylish = std::bind( &player_morale::set_stylish, _1, _2 );
const auto set_filth_tolerant = std::bind( &player_morale::set_filth_tolerant, _1, _2 );

This comment has been minimized.

Copy link
@BorkBorkGoesTheCode

BorkBorkGoesTheCode Sep 8, 2016

Contributor

Is this it?

This comment has been minimized.

Copy link
@DangerNoodle

DangerNoodle Sep 8, 2016

Author Contributor

Outdated. Fixing solved nothing.

@Zireael07

This comment has been minimized.

Copy link
Contributor

commented Sep 8, 2016

To fix the style part you need to find astyle program and run it. @Coolthulhu probably knows more than I :P

@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

I have no idea where to look for this, but I will try.

DangerNoodle
@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

Still working on procuring astyle checker, updating repository, and trying it. But the only visible possible style failure I can see might be caused by FILTH_TOLERANT being just long enough to affect spacing for player_morale::mutation_data::clear()

Noodle
@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

There. Just a matter of getting astyle instead of relying upon my poor memory of style rules.

Now I will just need to make Squeamish and Filth Tolerance cancel each other out. In addition, should I add the trait to the medieval peasant profession, to add to the intended humorous flavor?

Or we could merely add Squeamish as a banned trait, if adding a 1-point trait is a bad idea.

Noodle
@Coolthulhu

This comment has been minimized.

Copy link
Contributor

commented Sep 8, 2016

I'd much rather get rid of the whole filthiness morale thing.
Quick fixes like that make it look like we're OK with it.

@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 8, 2016

But is that ever going to happen? We can always remove this trait if we remove filth morale entirely.

Dropping this pull request because of that leaves the current system broken, and still forces it upon players.

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 9, 2016

Superseded by #18233

@mugling mugling closed this Sep 9, 2016

@DangerNoodle DangerNoodle deleted the DangerNoodle:unsqueamish branch Sep 9, 2016

@DangerNoodle

This comment has been minimized.

Copy link
Contributor Author

commented Sep 9, 2016

Ah, thank you. Apologies for not being on to close this myself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.