From b8778dc61f4611a100e0aebfb5a76173a390c765 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 22 Jun 2023 19:47:06 -0400 Subject: [PATCH 1/4] added player_display --- data/json/mutations/mutations.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index cdea166fa0c22..58000058d5c37 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -8327,6 +8327,7 @@ "name": { "str": "Ignores Sounds" }, "points": 99, "valid": false, + "player_display": false, "description": "NPC ignores sounds and does not investigate them.", "purifiable": false }, @@ -8336,6 +8337,7 @@ "name": { "str": "Will Not Bash" }, "points": 99, "valid": false, + "player_display": false, "description": "NPC will not bash to reach things.", "purifiable": false }, From e328eb86dd05dc392762deeabaa355c6c8a4df5f Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 23 Jun 2023 22:13:28 -0400 Subject: [PATCH 2/4] addeded npc_lose_trait to talk_agree_follow --- .../npcs/common_chat/TALK_COMMON_OTHER.json | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/data/json/npcs/common_chat/TALK_COMMON_OTHER.json b/data/json/npcs/common_chat/TALK_COMMON_OTHER.json index 18676d838327a..e63cfe562e534 100644 --- a/data/json/npcs/common_chat/TALK_COMMON_OTHER.json +++ b/data/json/npcs/common_chat/TALK_COMMON_OTHER.json @@ -124,7 +124,16 @@ "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 } } }, { @@ -132,7 +141,16 @@ "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 } } }, { @@ -140,7 +158,16 @@ "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" } From 3e858884b98c8f097f51ad4baac33b1804e823e0 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 23 Jun 2023 23:03:39 -0400 Subject: [PATCH 3/4] revert changes to mutations.json --- data/json/mutations/mutations.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 58000058d5c37..cdea166fa0c22 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -8327,7 +8327,6 @@ "name": { "str": "Ignores Sounds" }, "points": 99, "valid": false, - "player_display": false, "description": "NPC ignores sounds and does not investigate them.", "purifiable": false }, @@ -8337,7 +8336,6 @@ "name": { "str": "Will Not Bash" }, "points": 99, "valid": false, - "player_display": false, "description": "NPC will not bash to reach things.", "purifiable": false }, From 6ce51dc97647d6f6b371e8383c15f02a2057dbd9 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 23 Jun 2023 23:05:40 -0400 Subject: [PATCH 4/4] thats a bug. THATS A BUG, THAT IS A BUG. --- data/json/mutations/mutations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index cdea166fa0c22..ac8a185d4a284 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -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 }, { @@ -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 }, {