From 684fbf84c149bc7c639e38218133aa9559a27f93 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Wed, 17 Apr 2024 20:23:26 +0200
Subject: [PATCH] are we going somewhere?

---
 data/json/effects_on_condition/effects_eocs.json     | 12 ++++++++++--
 .../monster_special_attacks/monster_attacks.json     |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/data/json/effects_on_condition/effects_eocs.json b/data/json/effects_on_condition/effects_eocs.json
index 8be307ae10fb8..bc565fcb3fe72 100644
--- a/data/json/effects_on_condition/effects_eocs.json
+++ b/data/json/effects_on_condition/effects_eocs.json
@@ -69,12 +69,20 @@
     "id": "dermatik_pregnancy_early",
     "eoc_type": "EVENT",
     "required_event": "character_gains_effect",
-    "condition": { "u_has_effect": "dermatik" },
+    "condition": { "compare_string": [ "dermatik", { "context_val": "effect" } ] },
     "effect": [
-      { "u_add_effect": "formication", "duration": "15 minutes", "target_part": "RANDOM" },
+      { "queue_eocs": "dermatik_formication", "duration": "15 minutes", "target_part": "RANDOM" },
       { "queue_eocs": "dermatik_pregnancy", "time_in_future": "1 days" }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "dermatik_formication",
+    "effect": [
+      { "u_add_effect": "formication", "duration": "15 minutes", "target_part": { "context_val": "bodypart" } },
+      { "queue_eocs": "dermatik_formication", "time_in_future": [ "20 seconds", "3 days" ] }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "dermatik_pregnancy",
diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json
index e7e7c4fbc4c1c..08dec8bf5c040 100644
--- a/data/json/monster_special_attacks/monster_attacks.json
+++ b/data/json/monster_special_attacks/monster_attacks.json
@@ -675,7 +675,7 @@
     "id": "dermatik_impale",
     "condition": {
       "and": [
-        { "and": [ { "u_has_flag": "GRAB_FILTER" }, { "npc_has_flag": "GRAB" } ] },
+        { "and": [ { "u_has_flag": "GRAB_FILTER" } } ] },
         {
           "not": { "or": [ { "u_has_flag": "ACIDBLOOD" }, { "u_has_flag": "PARAIMMUNE" }, { "u_has_effect": "dermatik" } ] }
         }