diff --git a/data/json/effects_on_condition/effects_eocs.json b/data/json/effects_on_condition/effects_eocs.json index 60d5c42bff2a4..65c3333e525e9 100644 --- a/data/json/effects_on_condition/effects_eocs.json +++ b/data/json/effects_on_condition/effects_eocs.json @@ -120,47 +120,46 @@ { "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" ] } + { + "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')" ] } + } }, - { "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": " 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." } - } - ] - } + "then": [ + { "u_message": "You start scratching yourself!" }, + { "npc_message": " 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." } + } + ] + } ]