[MoM] Add two light-creating powers (CleverRaven#69355)

* Initial commit * Candle's Glow canceled by combat * Add min to math to constrain powers * Increase length of top-level field of light fields
zdlpoppa · Nov 16, 2023 · fe28a0b · fe28a0b
1 parent d0cd235
commit fe28a0b
Show file tree

Hide file tree

Showing 8 changed files with 480 additions and 87 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json
@@ -36,16 +36,18 @@
     "type": "effect_on_condition",
     "id": "EOC_TEACH_PHOTOKIN_CONTEMPLATE_RECIPES",
     "effect": [
+      { "u_learn_recipe": "practice_photokinetic_light_local" },
+      { "u_learn_recipe": "practice_photokinetic_create_light" },
       { "u_learn_recipe": "practice_photokinetic_snuff_light" },
       { "u_learn_recipe": "practice_photokinetic_light_dodge" },
       { "u_learn_recipe": "practice_photokinetic_invisibility" },
       { "u_learn_recipe": "practice_photokinetic_light_beam" },
       { "u_learn_recipe": "practice_photokinetic_light_image" },
       { "u_learn_recipe": "practice_photokinetic_rad_immunity" },
       { "u_learn_recipe": "practice_photokinetic_light_arms" },
-      { "u_learn_recipe": "practice_photokinetic_light_disintegrate" },
+      { "u_learn_recipe": "practice_photokinetic_light_flash" },
       { "u_learn_recipe": "practice_photokinetic_light_blinding_glare" },
-      { "u_learn_recipe": "practice_photokinetic_light_flash" }
+      { "u_learn_recipe": "practice_photokinetic_light_disintegrate" }
     ]
   },
   {
@@ -217,7 +219,10 @@
     "eoc_type": "EVENT",
     "required_event": "game_begin",
     "condition": { "u_has_trait": "PHOTOKINETIC" },
-    "effect": [ { "queue_eocs": "EOC_TEACH_PHOTOKIN_FOOD_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] } ]
+    "effect": [
+      { "queue_eocs": "EOC_TEACH_PHOTOKIN_CONTEMPLATE_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] },
+      { "queue_eocs": "EOC_TEACH_PHOTOKIN_FOOD_RECIPES", "time_in_future": [ "10 seconds", "15 seconds" ] }
+    ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
@@ -5,6 +5,7 @@
     "effect": [
       { "u_lose_trait": "CLAIR_SPEED_READ" },
       { "u_lose_effect": "effect_clair_speed_reader" },
+      { "u_lose_effect": "effect_photokin_light_local" },
       { "u_remove_item_with": "pyrokinetic_fire_tool" },
       { "u_remove_item_with": "pyrokinetic_torch_weld" },
       { "u_lose_effect": "effect_telekinetic_strength" },
@@ -42,6 +43,7 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
         { "u_has_effect": "effect_telekinetic_strength" },
@@ -81,6 +83,7 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
         { "u_has_effect": "effect_telekinetic_strength" },
@@ -120,6 +123,7 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
         { "u_has_effect": "effect_telekinetic_strength" },
@@ -159,6 +163,7 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
         { "u_has_effect": "effect_telekinetic_strength" },
@@ -200,6 +205,7 @@
           "or": [
             { "u_has_trait": "CLAIR_SPEED_READ" },
             { "u_has_effect": "effect_clair_speed_reader" },
+            { "u_has_effect": "effect_photokin_light_local" },
             { "u_has_item": "pyrokinetic_fire_tool" },
             { "u_has_item": "pyrokinetic_torch_weld" },
             { "u_has_effect": "effect_telekinetic_strength" },

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -765,6 +765,16 @@
     "flags": [ "SUPER_CLAIRVOYANCE" ],
     "vitamins": [ { "vitamin": "vitamin_psionic_drain", "rate": [ [ 1, 1 ] ], "tick": [ "2 s" ] } ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_photokin_light_local",
+    "name": [ "Candle's Light" ],
+    "desc": [ "The air above your hand glows faintly." ],
+    "apply_message": "A faint light springs up over your hand.",
+    "remove_message": "The glow above your hand fades.",
+    "rating": "good",
+    "enchantments": [ { "values": [ { "value": "LUMINATION", "add": 5 } ] } ]
+  },
   {
     "type": "effect_type",
     "id": "effect_photokin_dodge",
@@ -825,9 +835,13 @@
     "id": "effect_photokin_arms",
     "name": [ "refraction of arms" ],
     "desc": [ "Your arms refract light to create the illusion of having multiple arms and their wielded items." ],
-    "apply_message": "Light around your arms shimmers and refracts, creating the illusion of multiple arms.",
+    "apply_message": "",
+    "decay_messages": [
+      [ "Your illusionary arms are obviously translucent.", "bad" ],
+      [ "Your illusionary arms are losing some of their solid appearance.", "bad" ]
+    ],
     "remove_message": "The light around your arms returns to normal.",
-    "rating": "neutral",
+    "rating": "good",
     "show_in_info": true,
     "base_mods": { "hit_mod": [ 4 ] },
     "max_duration": "45 m",

diff --git a/data/mods/MindOverMatter/fields.json b/data/mods/MindOverMatter/fields.json
@@ -129,5 +129,47 @@
     "priority": 8,
     "half_life": "1 minutes",
     "phase": "gas"
+  },
+  {
+    "id": "fd_photokin_light_1",
+    "type": "field_type",
+    "intensity_levels": [
+      { "name": "glimmer", "sym": "*", "color": "yellow", "light_emitted": 30 },
+      { "name": "glow", "color": "yellow", "light_emitted": 60 },
+      { "name": "shine", "color": "yellow", "light_emitted": 90 }
+    ],
+    "description_affix": "illuminated_by",
+    "priority": 4,
+    "half_life": "5 minutes",
+    "phase": "plasma",
+    "display_field": true
+  },
+  {
+    "id": "fd_photokin_light_2",
+    "type": "field_type",
+    "intensity_levels": [
+      { "name": "glimmer", "sym": "*", "color": "yellow", "light_emitted": 50 },
+      { "name": "glow", "color": "yellow", "light_emitted": 100 },
+      { "name": "shine", "color": "yellow", "light_emitted": 150 }
+    ],
+    "description_affix": "illuminated_by",
+    "priority": 4,
+    "half_life": "15 minutes",
+    "phase": "plasma",
+    "display_field": true
+  },
+  {
+    "id": "fd_photokin_light_3",
+    "type": "field_type",
+    "intensity_levels": [
+      { "name": "glimmer", "sym": "*", "color": "yellow", "light_emitted": 80 },
+      { "name": "glow", "color": "yellow", "light_emitted": 160 },
+      { "name": "shine", "color": "yellow", "light_emitted": 240 }
+    ],
+    "description_affix": "illuminated_by",
+    "priority": 4,
+    "half_life": "30 minutes",
+    "phase": "plasma",
+    "display_field": true
   }
 ]
diff --git a/data/mods/MindOverMatter/mutations/traits.json b/data/mods/MindOverMatter/mutations/traits.json
@@ -41,7 +41,7 @@
     "purifiable": false,
     "valid": false,
     "flags": [ "PHOTOKINETIC" ],
-    "spells_learned": [ [ "photokinetic_snuff_light", 2 ], [ "photokinetic_light_dodge", 2 ], [ "photokinetic_light_beam", 2 ] ]
+    "spells_learned": [ [ "photokinetic_snuff_light", 2 ], [ "photokinetic_light_dodge", 2 ], [ "photokinetic_light_local", 2 ] ]
   },
   {
     "type": "mutation",