From 377b8aabba403f6f84a4d77ad3fb4a7f74ef510f Mon Sep 17 00:00:00 2001 From: Fabiang120 <117304307+Fabiang120@users.noreply.github.com> Date: Sat, 28 Sep 2024 06:46:33 -0400 Subject: [PATCH 1/4] Fixes appearance_eocs.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’ve addressed the issue related to hair growing instantly. Issue - #76534. The problem was indeed with the recurrence values in the appearance_eocs.json file. I’ve updated the recurrence math to use a fixed number, which should prevent hair growth from happening too quickly. --- .../effects_on_condition/npc_eocs/appearance_eocs.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json index 8e43870cf242b..002bfc453ba74 100644 --- a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json @@ -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" ] }, "global": false, - "condition": { "u_has_trait": "natural_hair_growth" }, + "condition": { "or": [ { "u_has_trait": "natural_hair_growth" } ] }, "effect": [ { "if": { "u_has_trait": "hair_buzzcut" }, @@ -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" ] }, "global": false, "condition": { "u_has_trait": "natural_hair_growth" }, "effect": [ From c2f736d2b10b22d48951871a648f275539d89b82 Mon Sep 17 00:00:00 2001 From: Fabiang120 <117304307+Fabiang120@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:48:07 -0400 Subject: [PATCH 2/4] Update data/json/effects_on_condition/npc_eocs/appearance_eocs.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> --- data/json/effects_on_condition/npc_eocs/appearance_eocs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json index 002bfc453ba74..8fbd120eda689 100644 --- a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json @@ -127,7 +127,7 @@ "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.", "//2": "Currently beard changes traits every 14 days", - "recurrence": { "math": [ "604800" ] }, + "recurrence": { "math": [ "time('14 d')" ] }, "global": false, "condition": { "u_has_trait": "natural_hair_growth" }, "effect": [ From 1314d02a5ccde5e0ed482c7b468a6c84d36d823b Mon Sep 17 00:00:00 2001 From: Fabiang120 <117304307+Fabiang120@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:48:28 -0400 Subject: [PATCH 3/4] Update data/json/effects_on_condition/npc_eocs/appearance_eocs.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> --- data/json/effects_on_condition/npc_eocs/appearance_eocs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json index 8fbd120eda689..48ce34c6b8024 100644 --- a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json @@ -8,7 +8,7 @@ "//4": "For reference starting point, a buzzcut is 0.32 centimeters long.", "//5": "1 inch is 2.54 centimeters.", "//6": "Currently hair changes traits about every 20 days", - "recurrence": { "math": [ "150000" ] }, + "recurrence": { "math": [ "time('20 d')" ] }, "global": false, "condition": { "or": [ { "u_has_trait": "natural_hair_growth" } ] }, "effect": [ From b51046308c1c24a1fde74387a3c609571d11547f Mon Sep 17 00:00:00 2001 From: Fabiang120 <117304307+Fabiang120@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:48:38 -0400 Subject: [PATCH 4/4] Update data/json/effects_on_condition/npc_eocs/appearance_eocs.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> --- data/json/effects_on_condition/npc_eocs/appearance_eocs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json index 48ce34c6b8024..875c1b241181a 100644 --- a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json @@ -10,7 +10,7 @@ "//6": "Currently hair changes traits about every 20 days", "recurrence": { "math": [ "time('20 d')" ] }, "global": false, - "condition": { "or": [ { "u_has_trait": "natural_hair_growth" } ] }, + "condition": { "u_has_trait": "natural_hair_growth" }, "effect": [ { "if": { "u_has_trait": "hair_buzzcut" },