diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-27 09:34:12 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-27 09:34:12 -0700 |
| commit | bfb2f66f24d64747cc883e4a9c8cd3246dcad780 (patch) | |
| tree | ff3da46813d8bcea9678e2e52b6053ac9b408b1e /vamp_stuff/Modification_Files/NPC/v_npc_responds | |
| parent | Fix mutant forced blood drinking appearing on non-mutants (diff) | |
| download | cataclysm-dda-mod_vampire-stuff-redone-bfb2f66f24d64747cc883e4a9c8cd3246dcad780.tar.xz | |
Fix human forced blood drinking appearing on mutants
Diffstat (limited to 'vamp_stuff/Modification_Files/NPC/v_npc_responds')
| -rw-r--r-- | vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json index 07ca2ad..a45eadd 100644 --- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json +++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json @@ -258,25 +258,24 @@ "text": "*Forcefully take blood*", "note": "Take blood by force. Mutants with traits that make biting them a bad idea. Cut/Stab Armour 5 or higher, acid, spines, but not poison.", "condition": { "and": [ - { "npc_has_any_trait": [ - "THICK_SCALES", - "CHITIN", - "CHITIN2", - "CHITIN3", - "CHITIN_FUR", - "CHITIN_FUR2", - "CHITIN_FUR3", - "CF_HAIR", - "SPINES", - "QUILLS", - "BARBS", - "BARK", - "THORNS", - "INK_GLANDS", - "ACIDBLOOD" - ] - }, - { "not": { "npc_has_trait": "THRESH_VAMP" } } + { "not": { "npc_has_trait": "THRESH_VAMP" } }, + { "npc_has_any_trait": [ + "THICK_SCALES", + "CHITIN", + "CHITIN2", + "CHITIN3", + "CHITIN_FUR", + "CHITIN_FUR2", + "CHITIN_FUR3", + "CF_HAIR", + "SPINES", + "QUILLS", + "BARBS", + "BARK", + "THORNS", + "INK_GLANDS", + "ACIDBLOOD" + ] } ] }, "topic": "TALK_BLOODDRINK_BY_FORCE_MUTANT" }, @@ -284,7 +283,24 @@ "text": "*Forcefully take blood*", "note": "Take blood by force. Humans.", "condition": { "and": [ - { "not": { "npc_has_trait": "THRESH_VAMP" } } + { "not": { "npc_has_trait": "THRESH_VAMP" } }, + { "not": { "npc_has_any_trait": [ + "THICK_SCALES", + "CHITIN", + "CHITIN2", + "CHITIN3", + "CHITIN_FUR", + "CHITIN_FUR2", + "CHITIN_FUR3", + "CF_HAIR", + "SPINES", + "QUILLS", + "BARBS", + "BARK", + "THORNS", + "INK_GLANDS", + "ACIDBLOOD" + ] } } ] }, "topic": "TALK_BLOODDRINK_BY_FORCE_ALLY" }, |