From 629ad767c389940be3e15b50e5806c40f6e9fb96 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Wed, 23 Oct 2024 14:57:20 -0500 Subject: [PATCH 1/4] Update sidebar.json --- data/mods/Xedra_Evolved/ui/sidebar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/ui/sidebar.json b/data/mods/Xedra_Evolved/ui/sidebar.json index 86d6daddba560..a2d53b133109c 100644 --- a/data/mods/Xedra_Evolved/ui/sidebar.json +++ b/data/mods/Xedra_Evolved/ui/sidebar.json @@ -191,7 +191,7 @@ "copy-from": "spacebar", "type": "widget", "id": "spacebar", - "extend": { "widgets": [ "xe_spacebar_mana_numbers_block", "xe_spacebar_mana_bar_block", "vampire_blood_levels" ] } + "extend": { "widgets": [ "xe_spacebar_mana_numbers_block", "xe_spacebar_mana_bar_block", "vampire_blood_levels", "spacebar_ruach_counter_block" ] } }, { "//": "Extend the custom sidebar with Xedra-specific sections", From 5213b65ba07d7ec44cf4533db1bca69d93eea674 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:11:53 -0500 Subject: [PATCH 2/4] Create ruach_counter.json --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 data/mods/Xedra_Evolved/ui/ruach_counter.json diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json new file mode 100644 index 0000000000000..281cc182a42aa --- /dev/null +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -0,0 +1,82 @@ +[ + { + "id": "spacebar_ruach_counter_block", + "type": "widget", + "style": "layout", + "label": "Ruach", + "arrange": "minimum_columns", + "width": 58, + "widgets": [ "spacebar_separator_2", "spacebar_ruach_counter_meter" ] + }, + { + "id": "spacebar_nether_attunement_meter", + "type": "widget", + "style": "text", + "label": "Ruach", + "flags": [ "W_DISABLED_WHEN_EMPTY" ], + "width": 56, + "clauses": [ + { + "id": "out_of_ruach", + "text": "Starving", + "color": "c_pink", + "condition": { "and": [ { "u_has_trait": "LILIN_TRAITS" }, { "math": [ "u_vitamin('lilin_ruach_vitamin')", "==", "0" ] } ] } + }, + { + "id": "ruach_level_1", + "text": "Almost Spent", + "condition": { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<", "241" ] } + ] + } + }, + { + "id": "ruach_level_2", + "text": "Drained", + "condition": { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "241" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<", "481" ] } + ] + } + }, + { + "id": "ruach_level_3", + "text": "Refreshed", + "condition": { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "480" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<", "1201" ] } + ] + } + }, + { + "id": "ruach_level_4", + "text": "Satiated", + "condition": { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "1200" ] }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "<", "2401" ] } + ] + } + }, + { + "id": "ruach_level_5", + "text": "Suffused", + "condition": { + "and": [ + { "u_has_trait": "LILIN_TRAITS" }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "2400" ] } + ] + } + } + ], + "padding": 0 + } +] From 8064a57dc844dd823af35614d4d50015a601c75d 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: Mon, 28 Oct 2024 22:18:45 -0500 Subject: [PATCH 3/4] Initial commit --- data/mods/Xedra_Evolved/ui/ruach_counter.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/data/mods/Xedra_Evolved/ui/ruach_counter.json b/data/mods/Xedra_Evolved/ui/ruach_counter.json index 281cc182a42aa..4044ff6ea9a73 100644 --- a/data/mods/Xedra_Evolved/ui/ruach_counter.json +++ b/data/mods/Xedra_Evolved/ui/ruach_counter.json @@ -1,15 +1,15 @@ [ - { + { "id": "spacebar_ruach_counter_block", "type": "widget", "style": "layout", "label": "Ruach", "arrange": "minimum_columns", "width": 58, - "widgets": [ "spacebar_separator_2", "spacebar_ruach_counter_meter" ] + "widgets": [ "spacebar_separator_2", "ruach_counter_meter" ] }, { - "id": "spacebar_nether_attunement_meter", + "id": "ruach_counter_meter", "type": "widget", "style": "text", "label": "Ruach", @@ -33,7 +33,7 @@ ] } }, - { + { "id": "ruach_level_2", "text": "Drained", "condition": { @@ -61,8 +61,8 @@ "condition": { "and": [ { "u_has_trait": "LILIN_TRAITS" }, - { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "1200" ] }, - { "math": [ "u_vitamin('vitamin_psionic_drain')", "<", "2401" ] } + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "1200" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", "<", "2401" ] } ] } }, @@ -72,7 +72,8 @@ "condition": { "and": [ { "u_has_trait": "LILIN_TRAITS" }, - { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "2400" ] } + { "u_has_trait": "LILIN_HOLD_MORE_RUACH" }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')", ">=", "2400" ] } ] } } From d7d7935ce4575baa716d03d55fec3bf36c75823a 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: Mon, 28 Oct 2024 22:18:49 -0500 Subject: [PATCH 4/4] Add to sidebars --- data/mods/Xedra_Evolved/ui/sidebar.json | 49 ++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/data/mods/Xedra_Evolved/ui/sidebar.json b/data/mods/Xedra_Evolved/ui/sidebar.json index a2d53b133109c..dee5365aa0167 100644 --- a/data/mods/Xedra_Evolved/ui/sidebar.json +++ b/data/mods/Xedra_Evolved/ui/sidebar.json @@ -74,7 +74,13 @@ "type": "widget", "id": "legacy_classic_sidebar", "extend": { - "widgets": [ "xe_current_max_mana_nums_layout", "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels" ] + "widgets": [ + "xe_current_max_mana_nums_layout", + "xe_mana_graph_layout", + "xe_mana_pool_layout", + "vampire_blood_levels", + "ruach_counter_meter" + ] } }, { @@ -83,7 +89,13 @@ "type": "widget", "id": "legacy_compact_sidebar", "extend": { - "widgets": [ "xe_current_max_mana_nums_layout", "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels" ] + "widgets": [ + "xe_current_max_mana_nums_layout", + "xe_mana_graph_layout", + "xe_mana_pool_layout", + "vampire_blood_levels", + "ruach_counter_meter" + ] } }, { @@ -92,7 +104,13 @@ "type": "widget", "id": "legacy_labels_narrow_sidebar", "extend": { - "widgets": [ "xe_current_max_mana_nums_layout", "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels" ] + "widgets": [ + "xe_current_max_mana_nums_layout", + "xe_mana_graph_layout", + "xe_mana_pool_layout", + "vampire_blood_levels", + "ruach_counter_meter" + ] } }, { @@ -101,7 +119,13 @@ "type": "widget", "id": "legacy_labels_sidebar", "extend": { - "widgets": [ "xe_current_max_mana_nums_layout", "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels" ] + "widgets": [ + "xe_current_max_mana_nums_layout", + "xe_mana_graph_layout", + "xe_mana_pool_layout", + "vampire_blood_levels", + "ruach_counter_meter" + ] } }, { @@ -110,7 +134,13 @@ "type": "widget", "id": "structured_sidebar", "extend": { - "widgets": [ "xe_current_max_mana_nums_layout", "xe_mana_graph_layout", "xe_mana_pool_layout", "vampire_blood_levels" ] + "widgets": [ + "xe_current_max_mana_nums_layout", + "xe_mana_graph_layout", + "xe_mana_pool_layout", + "vampire_blood_levels", + "ruach_counter_meter" + ] } }, { @@ -191,7 +221,14 @@ "copy-from": "spacebar", "type": "widget", "id": "spacebar", - "extend": { "widgets": [ "xe_spacebar_mana_numbers_block", "xe_spacebar_mana_bar_block", "vampire_blood_levels", "spacebar_ruach_counter_block" ] } + "extend": { + "widgets": [ + "xe_spacebar_mana_numbers_block", + "xe_spacebar_mana_bar_block", + "vampire_blood_levels", + "spacebar_ruach_counter_block" + ] + } }, { "//": "Extend the custom sidebar with Xedra-specific sections",