diff --git a/data/json/ui/bodypart_color_text.json b/data/json/ui/bodypart_color_text.json index e881b513dfc06..7403ec8fb8aab 100644 --- a/data/json/ui/bodypart_color_text.json +++ b/data/json/ui/bodypart_color_text.json @@ -7,19 +7,30 @@ "style": "text", "default_clause": { "text": "HEAD " }, "clauses": [ - { "id": "bitten", "text": "HEAD ", "color": "blue", "condition": { "u_has_effect": "bite" } }, - { "id": "infected", "text": "HEAD ", "color": "green", "condition": { "u_has_effect": "infected" } }, { - "id": "bleeding1", + "id": "bleedingAndBitten3", "text": "HEAD ", - "color": "light_red", + "color": "magenta_red", + "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } + }, + { + "id": "bleedingAndBitten12", + "text": "HEAD ", + "color": "magenta", "condition": { "and": [ + { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } }, + { + "id": "bleeding3", + "text": "HEAD ", + "color": "red_red", + "condition": { "u_has_effect": "bleed", "intensity": 21 } + }, { "id": "bleeding2", "text": "HEAD ", @@ -32,29 +43,18 @@ } }, { - "id": "bleeding2", - "text": "HEAD ", - "color": "red_red", - "condition": { "u_has_effect": "bleed", "intensity": 21 } - }, - { - "id": "bleedingAndBitten12", + "id": "bleeding1", "text": "HEAD ", - "color": "magenta", + "color": "light_red", "condition": { "and": [ - { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } ] } }, - { - "id": "bleedingAndBitten3", - "text": "HEAD ", - "color": "magenta_red", - "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } - } + { "id": "infected", "text": "HEAD ", "color": "green", "condition": { "u_has_effect": "infected" } }, + { "id": "bitten", "text": "HEAD ", "color": "blue", "condition": { "u_has_effect": "bite" } } ], "flags": [ "W_LABEL_NONE" ] }, @@ -65,26 +65,20 @@ "style": "text", "default_clause": { "text": "TORSO" }, "clauses": [ - { "id": "bitten", "text": "TORSO", "color": "blue", "condition": { "u_has_effect": "bite" } }, - { "id": "infected", "text": "TORSO", "color": "green", "condition": { "u_has_effect": "infected" } }, { - "id": "bleeding1", + "id": "bleedingAndBitten3", "text": "TORSO", - "color": "light_red", - "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } - ] - } + "color": "magenta_red", + "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } }, { - "id": "bleeding2", + "id": "bleedingAndBitten12", "text": "TORSO", - "color": "red", + "color": "magenta", "condition": { "and": [ - { "u_has_effect": "bleed", "intensity": 11 }, + { "u_has_effect": "bite" }, + { "u_has_effect": "bleed", "intensity": 1 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } @@ -96,23 +90,29 @@ "condition": { "u_has_effect": "bleed", "intensity": 21 } }, { - "id": "bleedingAndBitten12", + "id": "bleeding2", "text": "TORSO", - "color": "magenta", + "color": "red", "condition": { "and": [ - { "u_has_effect": "bite" }, - { "u_has_effect": "bleed", "intensity": 1 }, + { "u_has_effect": "bleed", "intensity": 11 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } }, { - "id": "bleedingAndBitten3", + "id": "bleeding1", "text": "TORSO", - "color": "magenta_red", - "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } - } + "color": "light_red", + "condition": { + "and": [ + { "u_has_effect": "bleed", "intensity": 1 }, + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } + ] + } + }, + { "id": "infected", "text": "TORSO", "color": "green", "condition": { "u_has_effect": "infected" } }, + { "id": "bitten", "text": "TORSO", "color": "blue", "condition": { "u_has_effect": "bite" } } ], "flags": [ "W_LABEL_NONE" ] }, @@ -123,26 +123,20 @@ "style": "text", "default_clause": { "text": "L ARM" }, "clauses": [ - { "id": "bitten", "text": "L ARM", "color": "blue", "condition": { "u_has_effect": "bite" } }, - { "id": "infected", "text": "L ARM", "color": "green", "condition": { "u_has_effect": "infected" } }, { - "id": "bleeding1", + "id": "bleedingAndBitten3", "text": "L ARM", - "color": "light_red", - "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } - ] - } + "color": "magenta_red", + "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } }, { - "id": "bleeding2", + "id": "bleedingAndBitten12", "text": "L ARM", - "color": "red", + "color": "magenta", "condition": { "and": [ - { "u_has_effect": "bleed", "intensity": 11 }, + { "u_has_effect": "bite" }, + { "u_has_effect": "bleed", "intensity": 1 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } @@ -154,23 +148,29 @@ "condition": { "u_has_effect": "bleed", "intensity": 21 } }, { - "id": "bleedingAndBitten12", + "id": "bleeding2", "text": "L ARM", - "color": "magenta", + "color": "red", "condition": { "and": [ - { "u_has_effect": "bite" }, - { "u_has_effect": "bleed", "intensity": 1 }, + { "u_has_effect": "bleed", "intensity": 11 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } }, { - "id": "bleedingAndBitten3", + "id": "bleeding1", "text": "L ARM", - "color": "magenta_red", - "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } - } + "color": "light_red", + "condition": { + "and": [ + { "u_has_effect": "bleed", "intensity": 1 }, + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } + ] + } + }, + { "id": "infected", "text": "L ARM", "color": "green", "condition": { "u_has_effect": "infected" } }, + { "id": "bitten", "text": "L ARM", "color": "blue", "condition": { "u_has_effect": "bite" } } ], "flags": [ "W_LABEL_NONE" ] }, @@ -181,26 +181,20 @@ "style": "text", "default_clause": { "text": "R ARM" }, "clauses": [ - { "id": "bitten", "text": "R ARM", "color": "blue", "condition": { "u_has_effect": "bite" } }, - { "id": "infected", "text": "R ARM", "color": "green", "condition": { "u_has_effect": "infected" } }, { - "id": "bleeding1", + "id": "bleedingAndBitten3", "text": "R ARM", - "color": "light_red", - "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } - ] - } + "color": "magenta_red", + "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } }, { - "id": "bleeding2", + "id": "bleedingAndBitten12", "text": "R ARM", - "color": "red", + "color": "magenta", "condition": { "and": [ - { "u_has_effect": "bleed", "intensity": 11 }, + { "u_has_effect": "bite" }, + { "u_has_effect": "bleed", "intensity": 1 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } @@ -212,23 +206,29 @@ "condition": { "u_has_effect": "bleed", "intensity": 21 } }, { - "id": "bleedingAndBitten12", + "id": "bleeding2", "text": "R ARM", - "color": "magenta", + "color": "red", "condition": { "and": [ - { "u_has_effect": "bite" }, - { "u_has_effect": "bleed", "intensity": 1 }, + { "u_has_effect": "bleed", "intensity": 11 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } }, { - "id": "bleedingAndBitten3", + "id": "bleeding1", "text": "R ARM", - "color": "magenta_red", - "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } - } + "color": "light_red", + "condition": { + "and": [ + { "u_has_effect": "bleed", "intensity": 1 }, + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } + ] + } + }, + { "id": "infected", "text": "R ARM", "color": "green", "condition": { "u_has_effect": "infected" } }, + { "id": "bitten", "text": "R ARM", "color": "blue", "condition": { "u_has_effect": "bite" } } ], "flags": [ "W_LABEL_NONE" ] }, @@ -239,26 +239,20 @@ "style": "text", "default_clause": { "text": "L LEG" }, "clauses": [ - { "id": "bitten", "text": "L LEG", "color": "blue", "condition": { "u_has_effect": "bite" } }, - { "id": "infected", "text": "L LEG ", "color": "green", "condition": { "u_has_effect": "infected" } }, { - "id": "bleeding1", + "id": "bleedingAndBitten3", "text": "L LEG", - "color": "light_red", - "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } - ] - } + "color": "magenta_red", + "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } }, { - "id": "bleeding2", + "id": "bleedingAndBitten12", "text": "L LEG", - "color": "red", + "color": "magenta", "condition": { "and": [ - { "u_has_effect": "bleed", "intensity": 11 }, + { "u_has_effect": "bite" }, + { "u_has_effect": "bleed", "intensity": 1 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } @@ -270,23 +264,29 @@ "condition": { "u_has_effect": "bleed", "intensity": 21 } }, { - "id": "bleedingAndBitten12", + "id": "bleeding2", "text": "L LEG", - "color": "magenta", + "color": "red", "condition": { "and": [ - { "u_has_effect": "bite" }, - { "u_has_effect": "bleed", "intensity": 1 }, + { "u_has_effect": "bleed", "intensity": 11 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } }, { - "id": "bleedingAndBitten3", + "id": "bleeding1", "text": "L LEG", - "color": "magenta_red", - "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } - } + "color": "light_red", + "condition": { + "and": [ + { "u_has_effect": "bleed", "intensity": 1 }, + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } + ] + } + }, + { "id": "infected", "text": "L LEG", "color": "green", "condition": { "u_has_effect": "infected" } }, + { "id": "bitten", "text": "L LEG", "color": "blue", "condition": { "u_has_effect": "bite" } } ], "flags": [ "W_LABEL_NONE" ] }, @@ -297,26 +297,20 @@ "style": "text", "default_clause": { "text": "R LEG" }, "clauses": [ - { "id": "bitten", "text": "R LEG", "color": "blue", "condition": { "u_has_effect": "bite" } }, - { "id": "infected", "text": "R LEG", "color": "green", "condition": { "u_has_effect": "infected" } }, { - "id": "bleeding1", + "id": "bleedingAndBitten3", "text": "R LEG", - "color": "light_red", - "condition": { - "and": [ - { "u_has_effect": "bleed", "intensity": 1 }, - { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } - ] - } + "color": "magenta_red", + "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } }, { - "id": "bleeding2", + "id": "bleedingAndBitten12", "text": "R LEG", - "color": "red", + "color": "magenta", "condition": { "and": [ - { "u_has_effect": "bleed", "intensity": 11 }, + { "u_has_effect": "bite" }, + { "u_has_effect": "bleed", "intensity": 1 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } @@ -328,23 +322,29 @@ "condition": { "u_has_effect": "bleed", "intensity": 21 } }, { - "id": "bleedingAndBitten12", + "id": "bleeding2", "text": "R LEG", - "color": "magenta", + "color": "red", "condition": { "and": [ - { "u_has_effect": "bite" }, - { "u_has_effect": "bleed", "intensity": 1 }, + { "u_has_effect": "bleed", "intensity": 11 }, { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] } ] } }, { - "id": "bleedingAndBitten3", + "id": "bleeding1", "text": "R LEG", - "color": "magenta_red", - "condition": { "and": [ { "u_has_effect": "bite" }, { "u_has_effect": "bleed", "intensity": 21 } ] } - } + "color": "light_red", + "condition": { + "and": [ + { "u_has_effect": "bleed", "intensity": 1 }, + { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] } + ] + } + }, + { "id": "infected", "text": "R LEG", "color": "green", "condition": { "u_has_effect": "infected" } }, + { "id": "bitten", "text": "R LEG", "color": "blue", "condition": { "u_has_effect": "bite" } } ], "flags": [ "W_LABEL_NONE" ] }