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

Jump to bottom

Closes #76534 Hair Growth After Haircutting is normal now. #76705

Merged
merged 4 commits into from
Sep 30, 2024
Merged

Closes #76534 Hair Growth After Haircutting is normal now. #76705

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
377b8aa
Fixes appearance_eocs.json
Fabiang120 Sep 28, 2024
c2f736d
Update data/json/effects_on_condition/npc_eocs/appearance_eocs.json
Fabiang120 Sep 28, 2024
1314d02
Update data/json/effects_on_condition/npc_eocs/appearance_eocs.json
Fabiang120 Sep 28, 2024
b510463
Update data/json/effects_on_condition/npc_eocs/appearance_eocs.json
Fabiang120 Sep 28, 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
8 changes: 5 additions & 3 deletions data/json/effects_on_condition/npc_eocs/appearance_eocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
"//3": "For ease of calculation, all math will be done with centimeters for hair growth.",
"//4": "For reference starting point, a buzzcut is 0.32 centimeters long.",
"//5": "1 inch is 2.54 centimeters.",
"recurrence": { "math": [ "(6480000 - ((u_val('health') * 180000) ) )" ] },
"//6": "Currently hair changes traits about every 20 days",
"recurrence": { "math": [ "150000" ] },
Fabiang120 marked this conversation as resolved.
Show resolved Hide resolved
"global": false,
"condition": { "u_has_trait": "natural_hair_growth" },
"condition": { "or": [ { "u_has_trait": "natural_hair_growth" } ] },
Fabiang120 marked this conversation as resolved.
Show resolved Hide resolved
"effect": [
{
"if": { "u_has_trait": "hair_buzzcut" },
Expand Down Expand Up @@ -125,7 +126,8 @@
"type": "effect_on_condition",
"id": "EOC_beard_growth_tracking",
"//": "Use the same notes as hair growth. However, facial hair grows faster than head hair, averaging 1.25 inches per month.",
"recurrence": { "math": [ "(43200000 - ((u_val('health') * 86400) ) )" ] },
"//2": "Currently beard changes traits every 14 days",
"recurrence": { "math": [ "604800" ] },
Fabiang120 marked this conversation as resolved.
Show resolved Hide resolved
"global": false,
"condition": { "u_has_trait": "natural_hair_growth" },
"effect": [
Expand Down
Loading