Skip to content

Commit

Permalink
recruiting static NPCs makes them lose their static traits (#66397)
Browse files Browse the repository at this point in the history
* added player_display

* addeded npc_lose_trait to talk_agree_follow

* revert changes to mutations.json

* thats a bug. THATS A BUG, THAT IS A BUG.
  • Loading branch information
Daved27hundred authored Jun 24, 2023
1 parent 8776427 commit d505f22
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 5 deletions.
4 changes: 2 additions & 2 deletions data/json/mutations/mutations.json
Original file line number Diff line number Diff line change
Expand Up @@ -8327,7 +8327,7 @@
"name": { "str": "Ignores Sounds" },
"points": 99,
"valid": false,
"description": "NPC ignores sounds and does not investigate them.",
"description": "NPC ignores sounds and does not investigate them. If you see this, it's is a bug.",
"purifiable": false
},
{
Expand All @@ -8336,7 +8336,7 @@
"name": { "str": "Will Not Bash" },
"points": 99,
"valid": false,
"description": "NPC will not bash to reach things.",
"description": "NPC will not bash to reach things. If you see this, it's a bug.",
"purifiable": false
},
{
Expand Down
33 changes: 30 additions & 3 deletions data/json/npcs/common_chat/TALK_COMMON_OTHER.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,23 +124,50 @@
"difficulty": 0,
"mod": [ [ "ALTRUISM", 6 ], [ "POS_FEAR", -6 ], [ "BRAVERY", 2 ], [ "ANGER", -6 ], [ "VALUE", 2 ] ]
},
"success": { "topic": "TALK_AGREE_FOLLOW", "effect": "follow", "opinion": { "value": -1 } },
"success": {
"topic": "TALK_AGREE_FOLLOW",
"effect": [
"follow",
{ "npc_lose_trait": "RETURN_TO_START_POS" },
{ "npc_lose_trait": "NO_BASH" },
{ "npc_lose_trait": "IGNORE_SOUND" }
],
"opinion": { "value": -1 }
},
"failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "fear": -1, "value": -1, "anger": 1 } }
},
{
"switch": true,
"default": true,
"text": "We're friends, aren't we?",
"trial": { "type": "PERSUADE", "difficulty": 0, "mod": [ [ "TRUST", 3 ], [ "VALUE", 3 ], [ "ANGER", -3 ] ] },
"success": { "topic": "TALK_AGREE_FOLLOW", "effect": "follow", "opinion": { "trust": 2, "anger": -1 } },
"success": {
"topic": "TALK_AGREE_FOLLOW",
"effect": [
"follow",
{ "npc_lose_trait": "RETURN_TO_START_POS" },
{ "npc_lose_trait": "NO_BASH" },
{ "npc_lose_trait": "IGNORE_SOUND" }
],
"opinion": { "trust": 2, "anger": -1 }
},
"failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": 1, "fear": -2, "value": -1, "anger": 1 } }
},
{
"switch": true,
"default": true,
"text": "I'll kill you if you don't.",
"trial": { "type": "INTIMIDATE", "difficulty": 20, "mod": [ [ "FEAR", 8 ], [ "VALUE", 2 ], [ "TRUST", 2 ], [ "BRAVERY", -2 ] ] },
"success": { "topic": "TALK_AGREE_FOLLOW", "effect": "follow", "opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 } },
"success": {
"topic": "TALK_AGREE_FOLLOW",
"effect": [
"follow",
{ "npc_lose_trait": "RETURN_TO_START_POS" },
{ "npc_lose_trait": "NO_BASH" },
{ "npc_lose_trait": "IGNORE_SOUND" }
],
"opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 }
},
"failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": 4, "value": -5, "anger": 10 } }
},
{ "switch": true, "default": true, "text": "Nevermind.", "topic": "TALK_NONE" }
Expand Down

0 comments on commit d505f22

Please sign in to comment.