Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Xedra Evolved] Add direct number ruach gauge for lilin #77659

Merged
merged 8 commits into from
Nov 8, 2024
+114 −29
Merged

[Xedra Evolved] Add direct number ruach gauge for lilin #77659

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ddd4bf
Initial commit
Standing-Storm Nov 7, 2024
8ccaf63
Fix numbers
Standing-Storm Nov 7, 2024
83669c9
Updates
Standing-Storm Nov 7, 2024
a7bb64a
Fix non-spacebar
Standing-Storm Nov 7, 2024
d4debcf
Merge branch 'CleverRaven:master' into lilit-gauge
Standing-Storm Nov 8, 2024
a089de4
UI only shows up for lilit
Standing-Storm Nov 8, 2024
e03c807
UI only shows up for lilit
Standing-Storm Nov 8, 2024
88b6758
Merge branch 'lilit-gauge' of https://github.com/Standing-Storm/Catac…
Standing-Storm Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updates
@Standing-Storm
Standing-Storm committed Nov 7, 2024
commit 83669c9487a93a5283cfa61beafd7dbeda3e5dc0
82 changes: 60 additions & 22 deletions data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json
View file
Original file line number Diff line number Diff line change
@@ -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" }
]
}
]
180 changes: 8 additions & 172 deletions data/mods/Xedra_Evolved/ui/ruach_counter.json
View file
Original file line number Diff line number Diff line change
@@ -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": "<color_green><u_val:ruach_amount_for_graph></color> Max: <color_green><u_val:ruach_max_amount_for_graph></color> Days: <color_green><u_val:ruach_days_left></color>",
"parse_tags": true
}
],
"padding": 0
18 changes: 12 additions & 6 deletions data/mods/Xedra_Evolved/ui/sidebar.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
},