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
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
d18bc02
Fix schizophrenia
zachary-kaelan Sep 27, 2019
ef20495
Buff schizophrenia point gain
zachary-kaelan Sep 27, 2019
54eb5eb
Add delusion snippets and grandiosity
zachary-kaelan Sep 27, 2019
b513a17
Update src/player.cpp
zachary-kaelan Sep 27, 2019
3843bca
Create snippets file and add schizo_self_talk category
zachary-kaelan Sep 27, 2019
cd25684
Convert broken limb and talk to self to use snippets
zachary-kaelan Sep 27, 2019
a7590a0
Add broken_limb snippet category to health_msgs
zachary-kaelan Sep 27, 2019
644f142
Add schizo_weapon_talk snippet categories
zachary-kaelan Sep 27, 2019
0be5de2
Convert weapon hallucinations to use snippets
zachary-kaelan Sep 27, 2019
f2cc049
Add schizo_delusion snippet categories
zachary-kaelan Sep 27, 2019
b3be028
Convert delusions to use snippets and rebalance morale
zachary-kaelan Sep 27, 2019
630ac2c
Make thorazine actually useful and realistic, and remove formication …
zachary-kaelan Sep 27, 2019
51dd886
Revert "Make thorazine actually useful and realistic, and remove form…
zachary-kaelan Sep 27, 2019
da94713
Make thorazine actually useful and realistic
zachary-kaelan Sep 27, 2019
007e717
Add schizo_formication snippet category
zachary-kaelan Sep 27, 2019
50f8e70
Convert formication to use snippets, and make numbers less harsh
zachary-kaelan Sep 27, 2019
21e649d
Add schizo_self_shout snippet category
zachary-kaelan Sep 27, 2019
68306d1
Convert self shout to work with snippets
zachary-kaelan Sep 27, 2019
27d08bc
Make valium prevent schizophrenia shakes
zachary-kaelan Sep 27, 2019
c3cc8b9
Add schizo_weapon_drop snippet category
zachary-kaelan Sep 27, 2019
f890419
Convert weapon drop to work with snippets, and move up done_effect fo…
zachary-kaelan Sep 27, 2019
52dced1
Remove broken_limb snippet category from health_msgs
zachary-kaelan Sep 27, 2019
f318ec0
Add broken_limb snippet category
zachary-kaelan Sep 27, 2019
2973503
Add shout translation support
zachary-kaelan Sep 27, 2019
be8202b
Remove extra comma
zachary-kaelan Sep 27, 2019
464311d
Fix delusion snips and formatting
zachary-kaelan Sep 28, 2019
f1e765c
Add starting thorazine for schizophrenic trait
zachary-kaelan Sep 28, 2019
3cf0d8e
Merge branch 'patch-1' of https://github.com/zachary-kaelan/Cataclysm…
zachary-kaelan Sep 28, 2019
59ae00d
Linted schizophrenia.json
zachary-kaelan Sep 28, 2019
b345e07
Lint effects.json
zachary-kaelan Sep 28, 2019
ac458da
RNG styling issue
zachary-kaelan Oct 1, 2019
293524a
Astyle format
zachary-kaelan Oct 1, 2019
5c29828
Astyle merge
zachary-kaelan Oct 1, 2019
a35dcf0
Astyle, again
zachary-kaelan Oct 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,20 @@
"desc": [ "You're stuck in a pit. Sight distance is limited and you have to climb out." ],
"show_in_info": true
},
{
"type": "effect_type",
"id": "took_thorazine"
},
{
"type": "effect_type",
"id": "took_thorazine_bad"
},
{
"type": "effect_type",
"id": "took_thorazine_visible",
"name": [ "Took Thorazine" ],
"desc": [ "You took Thorazine some time ago and you might still be under its influence." ]
},
{
"type": "effect_type",
"id": "no_sight",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mutations/mutations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@
"type": "mutation",
"id": "SCHIZOPHRENIC",
"name": "Schizophrenic",
"points": -2,
"points": -3,
"description": "You will periodically suffer from delusions, ranging from minor effects to full visual hallucinations. Some of these effects may be controlled through the use of Thorazine.",
"starting_trait": true,
"valid": false,
Expand Down
1 change: 1 addition & 0 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
{ "item": "glasses_bifocal", "bonus": [ [ "HYPEROPIC", "MYOPIC" ] ] },
{ "item": "glasses_reading", "bonus": [ [ "HYPEROPIC" ], [ "MYOPIC" ] ] },
{ "item": "inhaler", "bonus": [ [ "ASTHMA" ] ] },
{ "item": "thorazine", "bonus": [ [ "SCHIZOPHRENIC" ] ] },
{ "item": "cookbook_human", "bonus": [ [ "CANNIBAL" ] ] },
{ "item": "teleumbrella", "bonus": [ [ "ALBINO" ] ] }
]
Expand Down
158 changes: 158 additions & 0 deletions data/json/snippets/schizophrenia.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
[
{
"type": "snippet",
"category": "schizo_self_talk",
"text": [
"Hey, can you hear me?",
"Don't touch me.",
"What's your name?",
"I thought you were my friend.",
"How are you today?",
"Shut up! Don't lie to me.",
"Why would you do that?",
"Please, don't go.",
"Don't leave me alone!",
"Yeah, sure.",
"No way, man.",
"Do you really think so?",
"Is it really time for that?",
"Sorry, I can't hear you.",
"You've told me already.",
"I know!",
"Why are you following me?",
"This place is dangerous, you shouldn't be here.",
"What are you doing out here?",
"That's not true, is it?",
"Are you hurt?"
]
},
{
"type": "snippet",
"category": "schizo_weapon_talk_monster",
"text": [
"Hey, let's go kill that %1$s!",
"Did you see that %1$s!?",
"I want to kill that %1$s!",
"Let me kill that %1$s!",
"Hey, I need to kill that %1$s!",
"I want to watch that %1$s bleed!",
"Wait, that %1$s needs to die!",
"Go kill that %1$s!",
"Look at that %1$s!",
"That %1$s doesn't deserve to live!"
]
},
{
"type": "snippet",
"category": "schizo_weapon_talk_bleeding",
"text": [
"Hey, you're bleeding.",
"Your wound looks pretty bad.",
"Shouldn't you put a bandage on that?",
"Please don't die! No one else lets me kill things!",
"You look hurt, did I do that?",
"Are you supposed to be bleeding?",
"You're not going to die, are you?",
"Kill a few more before you bleed out!"
]
},
{
"type": "snippet",
"category": "schizo_weapon_talk_damaged",
"text": [
"Hey fix me up.",
"I need healing!",
"I hurt all over...",
"You can put me back together, right?",
"I... I can't move my legs!",
"Medic!",
"I can still fight, don't replace me!",
"They got me!",
"*cough cough* Go on without me...",
"Am I gonna die?"
]
},
{
"type": "snippet",
"category": "schizo_weapon_talk_misc",
"text": [
"Let me kill something already!",
"I'm your best friend, right?",
"I love you!",
"How are you today?",
"Do you think it will rain today?",
"Did you hear that?",
"Try not to drop me.",
"How many do you think we've killed?",
"I'll keep you safe!"
]
},
{
"type": "snippet",
"category": "schizo_delusion_paranoid",
"text": [
"You feel like the world is out to get you.",
"You feel a mounting sense of impending doom.",
"You gain the sudden realization that you must have been responsible for the cataclysm.",
"You get the odd feeling that your thoughts are not your own.",
"You feel as if everyone in the world must be playing a sick prank on you.",
"You are being watched... by THEM."
]
},
{
"type": "snippet",
"category": "schizo_delusion_grandiose",
"text": [
"You gain the sudden realization that you are the creator of the universe.",
"You increase all your skills to level 10.",
"You gain the sudden realization that you must have been responsible for the cataclysm.",
"You feel that this must be a global reality show, in which you are the star.",
"You now know that you are a secret agent, kept alive to continue serving the government.",
"You feel in full control of the situation."
]
},
{
"type": "snippet",
"category": "schizo_formication",
"text": [ "Your skin feels itchy.", "You feel larvae wriggling beneath the skin.", "You feel bugs crawling on you." ]
},
{
"type": "snippet",
"category": "schizo_self_shout",
"text": [
"\"Get away from there!\"",
"\"What do you think you're doing?\"",
"\"Stop laughing at me!\"",
"\"Don't point that thing at me!\"",
"\"Stay away from me!\"",
"\"No! Stop!\"",
"\"Get the fuck away from me!\"",
"\"That's not true!\"",
"\"What do you want from me?\"",
"\"I didn't mean to do it!\"",
"\"It wasn't my fault!\"",
"\"I had to do it!\"",
"\"They made me do it!\"",
"\"What are you!?\"",
"\"I should never have trusted you!\""
]
},
{
"type": "snippet",
"category": "schizo_weapon_drop",
"text": [
"%1$s starts burning your hands!",
"%1$s feels freezing cold!",
"An electric shock shoots into your hand from %1$s!",
"%1$s lied to you.",
"%1$s was working for... THEM",
"%1$s said something stupid.",
"%1$s is running away!"
]
},
{
"type": "snippet",
"category": "broken_limb",
"text": [ "Your limb breaks!" ]
}
]
10 changes: 10 additions & 0 deletions src/iuse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ const efftype_id effect_took_flumed( "took_flumed" );
const efftype_id effect_took_prozac( "took_prozac" );
const efftype_id effect_took_prozac_bad( "took_prozac_bad" );
const efftype_id effect_took_prozac_visible( "took_prozac_visible" );
const efftype_id effect_took_thorazine("took_thorazine");
zachary-kaelan marked this conversation as resolved.
Show resolved Hide resolved
const efftype_id effect_took_thorazine_bad("took_thorazine_bad");
zachary-kaelan marked this conversation as resolved.
Show resolved Hide resolved
const efftype_id effect_took_thorazine_visible("took_thorazine_visible");
zachary-kaelan marked this conversation as resolved.
Show resolved Hide resolved
const efftype_id effect_took_xanax( "took_xanax" );
const efftype_id effect_took_xanax_visible( "took_xanax_visible" );
const efftype_id effect_valium( "valium" );
Expand Down Expand Up @@ -858,6 +861,11 @@ int iuse::meditate( player *p, item *it, bool t, const tripoint & )

int iuse::thorazine( player *p, item *it, bool, const tripoint & )
{
if ( p->has_effect( effect_took_thorazine ) ) {
zachary-kaelan marked this conversation as resolved.
Show resolved Hide resolved
p->remove_effect( effect_took_thorazine );
p->mod_fatigue( 15 );
}
p->add_effect( effect_took_thorazine, 12_hours );
p->mod_fatigue( 5 );
p->remove_effect( effect_hallu );
p->remove_effect( effect_visuals );
Expand All @@ -868,9 +876,11 @@ int iuse::thorazine( player *p, item *it, bool, const tripoint & )
if( one_in( 50 ) ) { // adverse reaction
p->add_msg_if_player( m_bad, _( "You feel completely exhausted." ) );
p->mod_fatigue( 15 );
p->add_effect( effect_took_thorazine_bad, p->get_effect_dur( effect_took_thorazine ) );
} else {
p->add_msg_if_player( m_warning, _( "You feel a bit wobbly." ) );
}
p->add_effect( effect_took_prozac_visible, rng( 9_hours, 15_hours ) );
return it->type->charges_to_use();
}

Expand Down