From 7d3234efc1da6b16bd76c5957c12625fa4981d38 Mon Sep 17 00:00:00 2001
From: Kevin Granade <kevin.granade@gmail.com>
Date: Tue, 5 Mar 2024 11:14:47 -0800
Subject: [PATCH] Revert #71460 Altered Mindstates partially resist Flaming
 Eyes (#72186)

Drunkenness as a protective measure is a pernicious and dangerous concept and I will not be party to it.

Mental illness as a protective measure is also extremely problematic, and encouraging people to not take their medication is beyond the pale.
---
 data/json/monster_special_attacks/spells.json | 29 ---------------
 .../beggars/BEGGAR_2_Dino_Dave.json           | 37 -------------------
 2 files changed, 66 deletions(-)

diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
index 7148005f6b73f..a300145c5b6ee 100644
--- a/data/json/monster_special_attacks/spells.json
+++ b/data/json/monster_special_attacks/spells.json
@@ -1188,35 +1188,6 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_STARE2",
-    "condition": {
-      "and": [
-        { "u_has_trait": "SCHIZOPHRENIC" },
-        { "not": { "u_has_effect": "took_thorazine" } },
-        { "x_in_y_chance": { "x": 2, "y": 3 } }
-      ]
-    },
-    "effect": [
-      {
-        "if": "player_see_u",
-        "then": { "u_message": "The <npc_name> quickly looks away from you.", "type": "warning" },
-        "else": { "u_message": "A chorus of whispers chatter raucously around you.", "type": "warning" }
-      }
-    ],
-    "false_effect": { "run_eocs": [ "EOC_STARE3" ] }
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_STARE3",
-    "condition": { "math": [ "rand(6) < u_effect_intensity('drunk')" ] },
-    "effect": [
-      { "u_message": "The world lurches drunkenly around you.", "type": "warning" },
-      { "u_add_effect": "stunned", "duration": 4 }
-    ],
-    "false_effect": { "run_eocs": [ "EOC_STARE4" ] }
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_STARE4",
     "condition": "player_see_npc",
     "effect": [
       { "u_message": "The <npc_name> stares at you, and you shudder.", "type": "bad" },
diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
index 7b9b7e5f218a4..fbc34e5ad6765 100644
--- a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
+++ b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
@@ -202,43 +202,6 @@
     "type": "talk_topic",
     "id": "TALK_REFUGEE_BEGGAR_2_WEARING",
     "dynamic_line": "You ask me what I can see, but I don't tell you what you see.  Sometimes we have shields up, to protect ourselves.",
-    "responses": [
-      { "text": "Shields?", "topic": "TALK_REFUGEE_BEGGAR_2_FLAMINGEYE" },
-      { "text": "What was that about cardboard?", "topic": "TALK_REFUGEE_BEGGAR_2_CARDBOARD" },
-      { "text": "Why are you sitting out here?", "topic": "TALK_REFUGEE_BEGGAR_2_REFUGEE" },
-      { "text": "I think I have to get going…", "topic": "TALK_DONE" }
-    ]
-  },
-  {
-    "type": "talk_topic",
-    "id": "TALK_REFUGEE_BEGGAR_2_FLAMINGEYE",
-    "dynamic_line": "Once I saw the full moon, and it was staring right at me - only it couldn't see me, because the sandman kept it away.  Understand?",
-    "responses": [
-      {
-        "condition": { "u_has_trait": "SCHIZOPHRENIC" },
-        "text": "[Kaluptic Psychosis] I think I do.  Are we the same?",
-        "topic": "TALK_REFUGEE_BEGGAR_2_FLAMINGEYE_YES"
-      },
-      { "text": "No, I don't.", "topic": "TALK_REFUGEE_BEGGAR_2_FLAMINGEYE_NO" },
-      { "text": "What was that about cardboard?", "topic": "TALK_REFUGEE_BEGGAR_2_CARDBOARD" },
-      { "text": "Why are you sitting out here?", "topic": "TALK_REFUGEE_BEGGAR_2_REFUGEE" },
-      { "text": "I think I have to get going…", "topic": "TALK_DONE" }
-    ]
-  },
-  {
-    "type": "talk_topic",
-    "id": "TALK_REFUGEE_BEGGAR_2_FLAMINGEYE_NO",
-    "dynamic_line": "That's OK, nobody's perfect, ha ha…",
-    "responses": [
-      { "text": "What was that about cardboard?", "topic": "TALK_REFUGEE_BEGGAR_2_CARDBOARD" },
-      { "text": "Why are you sitting out here?", "topic": "TALK_REFUGEE_BEGGAR_2_REFUGEE" },
-      { "text": "I think I have to get going…", "topic": "TALK_DONE" }
-    ]
-  },
-  {
-    "type": "talk_topic",
-    "id": "TALK_REFUGEE_BEGGAR_2_FLAMINGEYE_YES",
-    "dynamic_line": "Nobody's the same, not even twins.  But I'll tell you something.  The big eye looked at me.  When it did, it heard the voices, and it blinked.",
     "responses": [
       { "text": "What was that about cardboard?", "topic": "TALK_REFUGEE_BEGGAR_2_CARDBOARD" },
       { "text": "Why are you sitting out here?", "topic": "TALK_REFUGEE_BEGGAR_2_REFUGEE" },