Skip to content

Commit

Permalink
Uncaring is annoying not intimidating (CleverRaven#79320)
Browse files Browse the repository at this point in the history
* Uncaring is annoying not intimidating

* Update TALK_COMMON_ALLY.json

* fix condition

---------

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
  • Loading branch information
Maleclypse and GuardianDll authored Jan 28, 2025
1 parent e5624c2 commit b68eb06
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions data/json/mutations/mutations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1315,11 +1315,11 @@
"id": "PSYCHOPATH",
"name": { "str": "Uncaring" },
"points": 2,
"description": "You don't feel any remorse or guilt for harming your fellow man.",
"description": "You don't feel any strong feelings for your fellow man.",
"starting_trait": true,
"random_at_chargen": false,
"valid": false,
"social_modifiers": { "intimidate": 5 },
"social_modifiers": { "lie": -5, "persuade": -5 },
"types": [ "HUMAN_EMPATHY" ],
"flags": [ "PSYCHOPATH" ]
},
Expand Down
6 changes: 5 additions & 1 deletion data/json/npcs/common_chat/TALK_COMMON_ALLY.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@
},
{ "text": "Please go to this location.", "topic": "TALK_GOTO_LOCATION", "effect": "goto_location" },
{ "text": "There's something I want you to do.", "topic": "TALK_ALLY_ORDERS" },
{ "text": "I just wanted to talk for a bit.", "topic": "TALK_ALLY_SOCIAL" },
{
"text": "I just wanted to talk for a bit.",
"condition": { "not": { "u_has_trait": "PSYCHOPATH" } },
"topic": "TALK_ALLY_SOCIAL"
},
{ "text": "Can you help me understand something? (HELP/TUTORIAL)", "topic": "TALK_ALLY_TUTORIAL" },
{
"text": "[DEBUG MIND CONTROL] Now listen closely… (DEBUG FUNCTIONS)",
Expand Down

0 comments on commit b68eb06

Please sign in to comment.