JSONize formication

EOCs all done by Guardian Co-Authored-By: Anton Simakov <[email protected]>
CleverRaven · May 25, 2024 · 68f401a · 68f401a
1 parent 9116ace
commit 68f401a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 18 deletions.
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -5001,5 +5001,13 @@
     "rating": "bad",
     "remove_message": "The wriggling under your skin stops.",
     "blood_analysis_description": "Unknown parasitic infection"
+  },
+  {
+    "type": "effect_type",
+    "id": "formication",
+    "name": [ "PLACEHOLDER" ],
+    "desc": [ "PLACEHOLDER" ],
+    "main_parts_only": true,
+    "rating": "bad"
   }
 ]
diff --git a/data/json/effects_on_condition/effects_eocs.json b/data/json/effects_on_condition/effects_eocs.json
@@ -91,5 +91,49 @@
       { "u_spawn_monster": "mon_dermatik_larva", "real_count": 1, "min_radius": 1, "max_radius": 4 },
       { "u_lose_effect": "dermatik" }
     ]
-  }
+  },
+  [
+    {
+      "type": "effect_on_condition",
+      "id": "EOC_FORMICATION_INIT",
+      "eoc_type": "EVENT",
+      "required_event": "character_gains_effect",
+      "condition": { "compare_string": [ "formication", { "context_val": "effect" } ] },
+      "effect": [ { "queue_eocs": "EOC_FORMICATION", "time_in_future": "1 s" } ]
+    },
+    {
+      "type": "effect_on_condition",
+      "id": "EOC_FORMICATION",
+      "condition": { "u_has_effect": "formication" },
+      "effect": [
+        {
+          "if": { "or": [ { "u_has_effect": "narcosis" }, { "u_has_effect": "sleep" } ] },
+          "else": { "run_eocs": [ "EOC_TRY_SCRATCH" ] }
+        },
+        { "queue_eocs": "EOC_FORMICATION", "time_in_future": "1 s" }
+      ]
+    },
+    {
+      "type": "effect_on_condition",
+      "id": "EOC_TRY_SCRATCH",
+      "effect": [
+        {
+          "if": {
+            "x_in_y_chance": {
+              "x": { "math": [ "u_effect_intensity('formication', 'bodypart': _bodypart)" ] },
+              "y": { "math": [ "600 + 300 * u_val('intelligence')" ] }
+            }
+          },
+          "then": [
+            { "u_message": "You start scratching yourself!" },
+            { "npc_message": "<npc_name> stars scratching themselves!" },
+            { "turn_cost": 1.5 },
+            { "math": [ "u_pain()", "++" ] },
+            { "math": [ "hp(_bodypart)", "--" ] }
+          ],
+          "else": { "u_message": "You want to scratch yourself badly, but you force yourself to stop." }
+        }
+      ]
+    }
+  ]
 ]
diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp
@@ -1268,23 +1268,7 @@ void Character::hardcoded_effects( effect &it )
     map &here = get_map();
     Character &player_character = get_player_character();
     creature_tracker &creatures = get_creature_tracker();
-    if( id == effect_formication ) {
-        ///\EFFECT_INT decreases occurrence of itching from formication effect
-        if( x_in_y( intense, 600 + 300 * get_int() ) && !has_effect( effect_narcosis ) ) {
-            if( !is_npc() ) {
-                //~ %s is bodypart in accusative.
-                add_msg( m_warning, _( "You start scratching your %s!" ),
-                         body_part_name_accusative( bp ) );
-            } else {
-                //~ 1$s is NPC name, 2$s is bodypart in accusative.
-                add_msg_if_player_sees( pos(), _( "%1$s starts scratching their %2$s!" ), get_name(),
-                                        body_part_name_accusative( bp ) );
-            }
-            mod_moves( -to_moves<int>( 1_seconds ) * 1.5 );
-            mod_pain( 1 );
-            apply_damage( nullptr, bp, 1 );
-        }
-    } else if( id == effect_evil ) {
+    if( id == effect_evil ) {
         // Major effects, all bad.
         mod_str_bonus( -( dur > 500_minutes ? 10.0 : dur / 50_minutes ) );
         int dex_mod = -( dur > 600_minutes ? 10.0 : dur / 60_minutes );