From 8ddd4bfb0dc99649914c50b70b101edea6bbabdf Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 6 Nov 2024 21:03:32 -0600 Subject: [PATCH 1/6] Initial commit --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 188 ++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index 4044ff6ea9a73..a796f059f8baa 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -8,6 +8,15 @@ "width": 58, "widgets": [ "spacebar_separator_2", "ruach_counter_meter" ] }, + { + "id": "spacebar_ruach_graph_block", + "type": "widget", + "style": "layout", + "label": "Ruach", + "arrange": "minimum_columns", + "width": 58, + "widgets": [ "spacebar_separator_2", "ruach_counter_graph" ] + }, { "id": "ruach_counter_meter", "type": "widget", @@ -79,5 +88,184 @@ } ], "padding": 0 + }, + { + "id": "ruach_counter_meter", + "type": "widget", + "style": "text", + "label": "Ruach", + "flags": [ "W_DISABLED_WHEN_EMPTY" ], + "width": 56, + "clauses": [ + { + "id": "ruach_graph_01", + "text": "..............................................", + "color": "c_pink", + "condition": { + "or": [ + { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { + "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } + }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "10" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "20" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "30" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "40" ] } + ] + } + ] + } + ] + } + }, + { + "id": "ruach_graph_02", + "text": "o.............................................", + "color": "c_pink", + "condition": { + "or": [ + { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { + "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } + }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "20" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "40" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "60" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "80" ] } + ] + } + ] + } + ] + } + }, + { + "id": "ruach_graph_03", + "text": "O.............................................", + "color": "c_pink", + "condition": { + "or": [ + { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { + "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } + }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "30" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "60" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "90" ] } + ] + } + ] + }, + { + "and": [ + { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, + { + "and": [ + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "120" ] } + ] + } + ] + } + ] + } + } + ], + "padding": 0 } ] From 8ccaf63305760e80da692e2f3b7b5e9a391136ff Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 6 Nov 2024 21:08:43 -0600 Subject: [PATCH 2/6] Fix numbers --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index a796f059f8baa..3320273bf3349 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -167,7 +167,7 @@ }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "11" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "20" ] } ] } @@ -178,7 +178,7 @@ { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "21" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "40" ] } ] } @@ -189,7 +189,7 @@ { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "31" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "60" ] } ] } @@ -200,7 +200,7 @@ { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "41" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "80" ] } ] } @@ -223,7 +223,7 @@ }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "21" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "30" ] } ] } @@ -234,7 +234,7 @@ { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "41" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "60" ] } ] } @@ -245,7 +245,7 @@ { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "61" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "90" ] } ] } @@ -256,7 +256,7 @@ { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, { "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "81" ] }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "120" ] } ] } From 83669c9487a93a5283cfa61beafd7dbeda3e5dc0 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 7 Nov 2024 15:56:27 -0600 Subject: [PATCH 3/6] Updates --- .../mutations/xe_lilin_eocs.json | 82 +++++--- data/mods/Xedra_Evolved/ui/ruach_counter.json | 180 +----------------- data/mods/Xedra_Evolved/ui/sidebar.json | 18 +- 3 files changed, 80 insertions(+), 200 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json b/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json index 085758a5d2626..f32521d85a40d 100644 --- a/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json @@ -19,28 +19,7 @@ "if": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "==", "0" ] }, "then": { "u_add_effect": "effect_lilin_no_ruach", "duration": "PERMANENT", "intensity": 1 } }, - { - "if": { - "math": [ - "u_vitamin('lilin_ruach_vitamin')", - ">=", - "1680 + (u_has_trait('LILIN_HOLD_MORE_RUACH') * 1680) + (u_has_trait('LILIN_HOLD_MORE_RUACH_2') * 3360) + (u_has_trait('LILIN_HOLD_MORE_RUACH_3') * 5040)" - ] - }, - "then": { - "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, - "then": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "6720" ] }, - "else": { - "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, - "then": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "5040" ] }, - "else": { - "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, - "then": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "3360" ] }, - "else": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "1680" ] } - } - } - } - } + { "run_eocs": "EOC_LILIN_UPDATE_MAX_RUACH_LEVELS" } ], "false_effect": [ { @@ -55,6 +34,30 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_LILIN_UPDATE_MAX_RUACH_LEVELS", + "condition": { + "math": [ + "u_vitamin('lilin_ruach_vitamin')", + ">=", + "1680 + (u_has_trait('LILIN_HOLD_MORE_RUACH') * 1680) + (u_has_trait('LILIN_HOLD_MORE_RUACH_2') * 3360) + (u_has_trait('LILIN_HOLD_MORE_RUACH_3') * 5040)" + ] + }, + "effect": { + "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, + "then": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "6720" ] }, + "else": { + "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, + "then": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "5040" ] }, + "else": { + "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, + "then": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "3360" ] }, + "else": { "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "1680" ] } + } + } + } + }, { "type": "effect_on_condition", "id": "EOC_LILIN_SPEND_RUACH_FOR_POWERS", @@ -186,5 +189,40 @@ "type": "effect_on_condition", "id": "EOC_LILIN_GAINS_STRENGTH_TO_STRENGTH_CHOOSE_PERCEPTION", "effect": [ { "u_add_trait": "LILIN_ATTRIBUTE_BONUSES_PERCEPTION" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_LILIN_RUACH_UI_UPDATER", + "//": "Not great but required for now", + "recurrence": 1, + "condition": { "u_has_trait": "LILIN_TRAITS" }, + "deactivate_condition": { "not": { "u_has_trait": "LILIN_TRAITS" } }, + "effect": [ + { + "if": { "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } }, + "then": { "math": [ "u_ruach_amount_for_graph", "=", "min(u_vitamin('lilin_ruach_vitamin'),1680)" ] }, + "else": { + "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, + "then": { "math": [ "u_ruach_amount_for_graph", "=", "min(u_vitamin('lilin_ruach_vitamin'),3360)" ] }, + "else": { + "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, + "then": { "math": [ "u_ruach_amount_for_graph", "=", "min(u_vitamin('lilin_ruach_vitamin'),5040)" ] }, + "else": { + "if": { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, + "then": { "math": [ "u_ruach_amount_for_graph", "=", "min(u_vitamin('lilin_ruach_vitamin'),6720)" ] } + } + } + } + }, + { + "math": [ + "u_ruach_max_amount_for_graph", + "=", + "1680 + (u_has_trait('LILIN_HOLD_MORE_RUACH') * 1680) + (u_has_trait('LILIN_HOLD_MORE_RUACH_2') * 3360) + (u_has_trait('LILIN_HOLD_MORE_RUACH_3') * 5040)" + ] + }, + { "math": [ "u_ruach_days_left", "=", "trunc(u_vitamin('lilin_ruach_vitamin') / 240)" ] }, + { "run_eocs": "EOC_LILIN_UPDATE_MAX_RUACH_LEVELS" } + ] } ] diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index 3320273bf3349..bf820c11febe1 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -3,19 +3,19 @@ "id": "spacebar_ruach_counter_block", "type": "widget", "style": "layout", - "label": "Ruach", + "label": "Ruach Descriptor", "arrange": "minimum_columns", "width": 58, "widgets": [ "spacebar_separator_2", "ruach_counter_meter" ] }, { - "id": "spacebar_ruach_graph_block", + "id": "spacebar_ruach_numbers_block", "type": "widget", "style": "layout", - "label": "Ruach", + "label": "Ruach Numbers", "arrange": "minimum_columns", "width": 58, - "widgets": [ "spacebar_separator_2", "ruach_counter_graph" ] + "widgets": [ "spacebar_separator_2", "ruach_counter_numbers" ] }, { "id": "ruach_counter_meter", @@ -90,180 +90,16 @@ "padding": 0 }, { - "id": "ruach_counter_meter", + "id": "ruach_counter_numbers", "type": "widget", "style": "text", "label": "Ruach", "flags": [ "W_DISABLED_WHEN_EMPTY" ], - "width": 56, "clauses": [ { - "id": "ruach_graph_01", - "text": "..............................................", - "color": "c_pink", - "condition": { - "or": [ - { - "and": [ - { "u_has_trait": "LILIN_TRAITS" }, - { - "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } - }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "10" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "20" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "30" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "40" ] } - ] - } - ] - } - ] - } - }, - { - "id": "ruach_graph_02", - "text": "o.............................................", - "color": "c_pink", - "condition": { - "or": [ - { - "and": [ - { "u_has_trait": "LILIN_TRAITS" }, - { - "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } - }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "11" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "20" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "21" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "40" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "31" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "60" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "41" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "80" ] } - ] - } - ] - } - ] - } - }, - { - "id": "ruach_graph_03", - "text": "O.............................................", - "color": "c_pink", - "condition": { - "or": [ - { - "and": [ - { "u_has_trait": "LILIN_TRAITS" }, - { - "not": { "u_has_any_trait": [ "LILIN_HOLD_MORE_RUACH", "LILIN_HOLD_MORE_RUACH_2", "LILIN_HOLD_MORE_RUACH_3" ] } - }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "21" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "30" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "41" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "60" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH_2" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "61" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "90" ] } - ] - } - ] - }, - { - "and": [ - { "u_has_trait": "LILIN_HOLD_MORE_RUACH_3" }, - { - "and": [ - { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "81" ] }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<=", "120" ] } - ] - } - ] - } - ] - } + "id": "ruach_numbers", + "text": " Max: Days: ", + "parse_tags": true } ], "padding": 0 diff --git a/data/mods/Xedra_Evolved/ui/sidebar.json b/data/mods/Xedra_Evolved/ui/sidebar.json index dee5365aa0167..3cef9d1a1eacd 100644 --- a/data/mods/Xedra_Evolved/ui/sidebar.json +++ b/data/mods/Xedra_Evolved/ui/sidebar.json @@ -79,7 +79,8 @@ "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels", - "ruach_counter_meter" + "ruach_counter_meter", + "ruach_counter_numbers" ] } }, @@ -94,7 +95,8 @@ "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels", - "ruach_counter_meter" + "ruach_counter_meter", + "ruach_counter_numbers" ] } }, @@ -109,7 +111,8 @@ "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels", - "ruach_counter_meter" + "ruach_counter_meter", + "ruach_counter_numbers" ] } }, @@ -124,7 +127,8 @@ "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels", - "ruach_counter_meter" + "ruach_counter_meter", + "ruach_counter_numbers" ] } }, @@ -139,7 +143,8 @@ "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels", - "ruach_counter_meter" + "ruach_counter_meter", + "ruach_counter_numbers" ] } }, @@ -226,7 +231,8 @@ "xe_spacebar_mana_numbers_block", "xe_spacebar_mana_bar_block", "vampire_blood_levels", - "spacebar_ruach_counter_block" + "spacebar_ruach_counter_block", + "spacebar_ruach_numbers_block" ] } }, From a7bb64a5542eae8af9b98240b2e8eac4b4c4d3e8 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 7 Nov 2024 16:01:41 -0600 Subject: [PATCH 4/6] Fix non-spacebar --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index bf820c11febe1..a8c718a9fb44d 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -15,7 +15,7 @@ "label": "Ruach Numbers", "arrange": "minimum_columns", "width": 58, - "widgets": [ "spacebar_separator_2", "ruach_counter_numbers" ] + "widgets": [ "spacebar_separator_2", "ruach_counter_spacebar_numbers" ] }, { "id": "ruach_counter_meter", @@ -95,6 +95,21 @@ "style": "text", "label": "Ruach", "flags": [ "W_DISABLED_WHEN_EMPTY" ], + "clauses": [ + { + "id": "ruach_numbers", + "text": " Max: Days: ", + "parse_tags": true + } + ], + "padding": 0 + }, + { + "id": "ruach_counter_spacebar_numbers", + "type": "widget", + "style": "text", + "label": "Ruach", + "flags": [ "W_DISABLED_WHEN_EMPTY" ], "clauses": [ { "id": "ruach_numbers", From a089de4e3e2ef5fdb39e8a28748c468442aeb99f Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 7 Nov 2024 19:11:01 -0600 Subject: [PATCH 5/6] UI only shows up for lilit --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index a8c718a9fb44d..01cd79341a4db 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -114,7 +114,8 @@ { "id": "ruach_numbers", "text": " Max: Days: ", - "parse_tags": true + "parse_tags": true, + "condition": { "u_has_trait": "LILIN_TRAITS" } } ], "padding": 0 From e03c8078446d6e6f664677208809c223bb36b6c3 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 7 Nov 2024 19:11:04 -0600 Subject: [PATCH 6/6] UI only shows up for lilit --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index 01cd79341a4db..d61a121d3f8f8 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -99,7 +99,8 @@ { "id": "ruach_numbers", "text": " Max: Days: ", - "parse_tags": true + "parse_tags": true, + "condition": { "u_has_trait": "LILIN_TRAITS" } } ], "padding": 0