[Xedra Evolved] Fix Arvore Commune with Nature scaling + add standard…

… jmath post-threshold doubling (#72231) * Initial commit * Duration increase
CleverRaven · Mar 8, 2024 · 9f08089 · 9f08089
1 parent 0ea4865
commit 9f08089
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/data/mods/Xedra_Evolved/jmath.json b/data/mods/Xedra_Evolved/jmath.json
@@ -68,5 +68,12 @@
     "id": "paraclesian_passive_spell_exp",
     "num_args": 1,
     "return": "u_skill('deduction') * 100 + _0"
+  },
+  {
+    "type": "jmath_function",
+    "id": "paraclesian_post_threshold_doubler",
+    "//": "Used to double various factors for a post-threshold bonus.  Should never more than double the initial input.",
+    "num_args": 1,
+    "return": "_0 + (1 * (u_has_trait('THRESH_ARVORE') + u_has_trait('THRESH_IERDE') + u_has_trait('THRESH_HOMULLUS') + u_has_trait('THRESH_SALAMANDER') + u_has_trait('THRESH_SYLPH') + u_has_trait('THRESH_UNDINE')) )"
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json
@@ -50,14 +50,26 @@
     "effect": [
       {
         "u_add_effect": "natures_commune",
-        "duration": { "math": [ "( 300 + (u_spell_level('arvore_commune_with_nature') * 165)) " ] }
+        "duration": {
+          "math": [
+            "( 600 + (u_spell_level('arvore_commune_with_nature') * 240)) * scaling_factor(u_val('perception') ) * paraclesian_post_threshold_doubler(1) "
+          ]
+        }
       },
       {
         "u_add_morale": "morale_forest_unity",
         "bonus": 10,
         "max_bonus": 15,
-        "duration": { "math": [ "( 300 + (u_spell_level('arvore_commune_with_nature') * 165) )" ] },
-        "decay_start": { "math": [ "(( 300 + (u_spell_level('arvore_commune_with_nature') * 165) ) / 2)" ] }
+        "duration": {
+          "math": [
+            "( 600 + (u_spell_level('arvore_commune_with_nature') * 240) ) * scaling_factor(u_val('perception') ) * paraclesian_post_threshold_doubler(1)"
+          ]
+        },
+        "decay_start": {
+          "math": [
+            "(( 600 + (u_spell_level('arvore_commune_with_nature') * 240) ) * scaling_factor(u_val('perception') ) *  paraclesian_post_threshold_doubler(1)) / 2"
+          ]
+        }
       }
     ],
     "false_effect": [ { "u_message": "You must be surrounded by nature to commune with nature.", "type": "bad" } ]

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json
@@ -217,9 +217,16 @@
     "base_energy_cost": 500,
     "final_energy_cost": 250,
     "energy_increment": -12,
-    "min_duration": 30000,
-    "max_duration": 1080000,
-    "duration_increment": 16500,
+    "min_duration": {
+      "math": [
+        "( 60000 + (u_spell_level('arvore_commune_with_nature') * 24000) ) * scaling_factor(u_val('perception') ) * paraclesian_post_threshold_doubler(1)"
+      ]
+    },
+    "max_duration": {
+      "math": [
+        "( 60000 + (u_spell_level('arvore_commune_with_nature') * 24000 ) ) * scaling_factor(u_val('perception') ) * paraclesian_post_threshold_doubler(1)"
+      ]
+    },
     "learn_spells": { "arvore_summon_preservation_container": 6 }
   },
   {