Merge pull request #79512 from Standing-Storm/hes-just-not-that-into-you

`Uncaring` characters can socialize with NPCs but they don't like it
CleverRaven · Feb 3, 2025 · c4a84a2 · c4a84a2
2 parents d875aa6 + 732eb72
commit c4a84a2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/data/json/morale_types.json b/data/json/morale_types.json
@@ -14,6 +14,11 @@
     "type": "morale_type",
     "text": "Enjoyed a conversation"
   },
+  {
+    "id": "morale_chat_uncaring",
+    "type": "morale_type",
+    "text": "Had to suffer through an inane conversation"
+  },
   {
     "id": "morale_ate_with_table",
     "type": "morale_type",

diff --git a/data/json/npcs/common_chat/TALK_COMMON_ALLY.json b/data/json/npcs/common_chat/TALK_COMMON_ALLY.json
@@ -52,11 +52,7 @@
       },
       { "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.",
-        "condition": { "not": { "u_has_trait": "PSYCHOPATH" } },
-        "topic": "TALK_ALLY_SOCIAL"
-      },
+      { "text": "I just wanted to talk for a bit.", "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)",

diff --git a/data/json/npcs/common_chat/TALK_FRIEND_CONVERSATION.json b/data/json/npcs/common_chat/TALK_FRIEND_CONVERSATION.json
@@ -126,7 +126,24 @@
         "text": "<chitchat_player_responses>",
         "topic": "TALK_DONE",
         "switch": true,
+        "condition": { "not": { "u_has_trait": "PSYCHOPATH" } },
         "effect": [ "morale_chat_activity", { "npc_add_effect": "asked_to_socialize", "duration": 7000 } ]
+      },
+      {
+        "text": "<chitchat_player_responses>",
+        "topic": "TALK_DONE",
+        "switch": true,
+        "condition": { "u_has_trait": "PSYCHOPATH" },
+        "effect": [
+          {
+            "u_add_morale": "morale_chat_uncaring",
+            "bonus": -10,
+            "max_bonus": -20,
+            "duration": "120 minutes",
+            "decay_start": "60 minutes"
+          },
+          { "npc_add_effect": "asked_to_socialize", "duration": 7000 }
+        ]
       }
     ]
   }