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

Fix Schizophrenia #34267

Merged
merged 34 commits into from Oct 3, 2019
Merged

Fix Schizophrenia #34267

merged 34 commits into from Oct 3, 2019

Conversation

zachary-kaelan
Copy link
Contributor

Summary

SUMMARY: Bugfixes "Unblocked various additional effects while holding a weapon with schizophrenia"

Purpose of change

It obviously didn't seem right for holding a weapon to prevent the effect of dropping a weapon, among others.

I've also buffed the schizophrenia point gain, to account for the additional effects, and because it sorely needed it.

Finally, I've added delusion flavor text to the bad feelings, as well as added good feelings (schizophrenia can cause grandiose delusions), and made them a little less common (even though they basically never happened at all before).

Describe the solution

Moved the done_effect assignment to only occur if the weapon speaks.

@Fris0uman
Copy link
Contributor

Could you move the messages to use the snippet system, so that it's easier to mod? See killing drive trait as an exemple of how that works.
I don't get what was the change regarding dropped weapon though? all I can see in your change are the morale effects.

src/player.cpp Outdated Show resolved Hide resolved
@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies labels Sep 27, 2019
Co-Authored-By: BevapDin <tho_ki@gmx.de>
@zachary-kaelan
Copy link
Contributor Author

@Fris0uman If a weapon was being held, done_effect was set to true regardless of if anything actually happened, meaning none of the following effects can occur if a weapon is being held. One of the following effects required you to hold a weapon, and caused you to drop it.

None of the weapon quotes used snippets, so I followed suit. I can move all those into snippets as well.

@ghost
Copy link

ghost commented Sep 27, 2019

_("You gain the sudden realization that you must have been responsible for the cataclysm."),

Why is this line under both grandoise and paranoid? 😕

@zachary-kaelan
Copy link
Contributor Author

@laveyanfiend I put that in both as a joke. It can go either way, depending on how you feel about the world at the time.

src/player.cpp Outdated Show resolved Hide resolved
@dunstad
Copy link
Contributor

dunstad commented Sep 28, 2019

I think it'd be nice if in a description somewhere we could specify that this is paranoid schizophrenia, since there are different types.

@zachary-kaelan
Copy link
Contributor Author

@dunstad Not according to the DSM-V. Besides, this isn't really schizophrenia, it's just a rough approximation. Real schizophrenia has negative symptoms, disordered thoughts, and sometimes catatonia.

src/iuse.cpp Outdated Show resolved Hide resolved
src/iuse.cpp Outdated Show resolved Hide resolved
src/iuse.cpp Outdated Show resolved Hide resolved
src/iuse.cpp Outdated Show resolved Hide resolved
src/player.cpp Outdated Show resolved Hide resolved
src/player.cpp Outdated Show resolved Hide resolved
src/player.cpp Outdated Show resolved Hide resolved
src/player.cpp Outdated Show resolved Hide resolved
src/player.cpp Outdated Show resolved Hide resolved
zachary-kaelan and others added 4 commits October 1, 2019 10:40
Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
@ZhilkinSerg ZhilkinSerg merged commit b49b48e into CleverRaven:master Oct 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants