[XE/Magiclysm] Update Giant Growth with new TEMPORARY_SHAPESHIFT fl…

…ag (#75066) * Add shapeshift flags * Size calculations in EoCs * Add TEMPORARY_SHAPESHIFT * Account for size-based calories
CleverRaven · Jul 17, 2024 · e9e740f · e9e740f
1 parent d37ab3e
commit e9e740f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json
@@ -487,8 +487,18 @@
     "condition": { "and": [ { "not": { "u_has_trait": "HUGE" } }, { "not": { "u_has_trait": "HUGE_OK" } } ] },
     "effect": [
       { "u_message": "Your body swells and warps as your size increases!", "type": "good" },
+      { "math": [ "u_preshift_size", "=", "u_val('size')" ] },
+      {
+        "switch": { "math": [ "u_preshift_size" ] },
+        "cases": [
+          { "case": 1, "effect": [ { "math": [ "u_calories()", "*=", "12" ] } ] },
+          { "case": 2, "effect": [ { "math": [ "u_calories()", "*=", "6" ] } ] },
+          { "case": 3, "effect": [ { "math": [ "u_calories()", "*=", "2" ] } ] },
+          { "case": 4, "effect": [ { "math": [ "u_calories()", "*=", "1.5" ] } ] },
+          { "case": 5, "effect": [  ] }
+        ]
+      },
       { "u_add_trait": "BIO_GIANT_GROWTH" },
-      { "math": [ "u_calories()", "+=", "100000" ] },
       {
         "queue_eocs": "EOC_GIANT_GROWTH_MUTATION_REMOVE",
         "time_in_future": { "math": [ "(( u_spell_level('biomancer_giant_growth') * 40 ) + 300 )" ] }
@@ -501,8 +511,17 @@
     "id": "EOC_GIANT_GROWTH_MUTATION_REMOVE",
     "effect": [
       { "u_message": "Your body shrinks and warps as your size decreases!", "type": "bad" },
-      { "u_lose_trait": "BIO_GIANT_GROWTH" },
-      { "math": [ "u_calories()", "-=", "100000" ] }
+      {
+        "switch": { "math": [ "u_preshift_size" ] },
+        "cases": [
+          { "case": 1, "effect": [ { "math": [ "u_calories()", "/=", "12" ] } ] },
+          { "case": 2, "effect": [ { "math": [ "u_calories()", "/=", "6" ] } ] },
+          { "case": 3, "effect": [ { "math": [ "u_calories()", "/=", "2" ] } ] },
+          { "case": 4, "effect": [ { "math": [ "u_calories()", "/=", "1.5" ] } ] },
+          { "case": 5, "effect": [  ] }
+        ]
+      },
+      { "u_lose_trait": "BIO_GIANT_GROWTH" }
     ]
   },
   {

diff --git a/data/mods/Magiclysm/mutations/temporary.json b/data/mods/Magiclysm/mutations/temporary.json
@@ -9,7 +9,7 @@
     "ugliness": 8,
     "mixed_effect": true,
     "description": "Magic has made you grow to enormous size!",
-    "flags": [ "HUGE" ],
+    "flags": [ "TEMPORARY_SHAPESHIFT", "SHAPESHIFT_SIZE_HUGE" ],
     "restricts_gear": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r" ],
     "social_modifiers": { "intimidate": 15 },
     "enchantments": [

diff --git a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json
@@ -452,8 +452,18 @@
     "condition": { "and": [ { "not": { "u_has_trait": "HUGE" } }, { "not": { "u_has_trait": "HUGE_OK" } } ] },
     "effect": [
       { "u_message": "Your body swells and warps as your size increases!", "type": "good" },
+      { "math": [ "u_preshift_size", "=", "u_val('size')" ] },
+      {
+        "switch": { "math": [ "u_preshift_size" ] },
+        "cases": [
+          { "case": 1, "effect": [ { "math": [ "u_calories()", "*=", "12" ] } ] },
+          { "case": 2, "effect": [ { "math": [ "u_calories()", "*=", "6" ] } ] },
+          { "case": 3, "effect": [ { "math": [ "u_calories()", "*=", "2" ] } ] },
+          { "case": 4, "effect": [ { "math": [ "u_calories()", "*=", "1.5" ] } ] },
+          { "case": 5, "effect": [  ] }
+        ]
+      },
       { "u_add_trait": "GOBLIN_FRUIT_GIANT_GROWTH" },
-      { "math": [ "u_calories()", "+=", "100000" ] },
       { "queue_eocs": "EOC_GOBLIN_FRUIT_GIANT_GROWTH_REMOVE", "time_in_future": { "math": [ "3000 + rand(10000)" ] } }
     ],
     "false_effect": [ { "u_message": "You eat the goblin fruit but nothing happens.  Oh well." } ]
@@ -463,8 +473,17 @@
     "id": "EOC_GOBLIN_FRUIT_GIANT_GROWTH_REMOVE",
     "effect": [
       { "u_message": "Your body shrinks and warps as your size decreases!", "type": "mixed" },
-      { "u_lose_trait": "GOBLIN_FRUIT_GIANT_GROWTH" },
-      { "math": [ "u_calories()", "-=", "100000" ] }
+      {
+        "switch": { "math": [ "u_preshift_size" ] },
+        "cases": [
+          { "case": 1, "effect": [ { "math": [ "u_calories()", "/=", "12" ] } ] },
+          { "case": 2, "effect": [ { "math": [ "u_calories()", "/=", "6" ] } ] },
+          { "case": 3, "effect": [ { "math": [ "u_calories()", "/=", "2" ] } ] },
+          { "case": 4, "effect": [ { "math": [ "u_calories()", "/=", "1.5" ] } ] },
+          { "case": 5, "effect": [  ] }
+        ]
+      },
+      { "u_lose_trait": "GOBLIN_FRUIT_GIANT_GROWTH" }
     ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/temporary.json b/data/mods/Xedra_Evolved/mutations/temporary.json
@@ -9,7 +9,7 @@
     "ugliness": 8,
     "mixed_effect": true,
     "description": "Eating that goblin fruit has made you grow to enormous size!",
-    "flags": [ "HUGE" ],
+    "flags": [ "TEMPORARY_SHAPESHIFT", "SHAPESHIFT_SIZE_HUGE" ],
     "restricts_gear": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r" ],
     "social_modifiers": { "intimidate": 15 },
     "enchantments": [