Merge pull request #76174 from Standing-Storm/patch-1

Backport MoM #70838, #70904, #70830, #71228, #71024, and #73529
CleverRaven · Sep 5, 2024 · 675ea0d · 675ea0d
2 parents d213187 + 7180f49
commit 675ea0d
Show file tree

Hide file tree

Showing 22 changed files with 5,313 additions and 1,180 deletions.
diff --git a/data/mods/MindOverMatter/damage_types.json b/data/mods/MindOverMatter/damage_types.json
@@ -8,7 +8,7 @@
     "skill": "metaphysics",
     "derived_from": [ "heat", 0.8 ],
     "immune_flags": { "character": [ "PHOTOKIN_CHAR_IMMUNE" ], "monster": [ "PHOTOKIN_MONSTER_IMMUNE" ] },
-    "ondamage_eocs": [ "EOC_PHOTOKINETIC_DAMAGE_BLIND_CHANCE" ]
+    "ondamage_eocs": [ "EOC_PHOTOKINETIC_DAMAGE_BLIND_CHANCE", "EOC_PHOTOKINETIC_DAMAGE_EXTRA_BLIND_CHANCE" ]
   },
   {
     "type": "effect_on_condition",
@@ -24,6 +24,20 @@
     },
     "effect": [ { "npc_add_effect": "blind", "duration": "3 s" } ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PHOTOKINETIC_DAMAGE_EXTRA_BLIND_CHANCE",
+    "condition": {
+      "and": [
+        { "x_in_y_chance": { "x": 1, "y": 20 } },
+        { "math": [ "_damage_taken", ">", "0" ] },
+        { "not": { "npc_has_trait": "PHOTOKINETIC" } },
+        { "not": { "npc_has_flag": "PHOTOKIN_CHAR_IMMUNE" } },
+        { "not": { "npc_has_flag": "PHOTOKIN_MONSTER_IMMUNE" } }
+      ]
+    },
+    "effect": [ { "npc_add_effect": "blind", "duration": "10 s" } ]
+  },
   {
     "id": "psi_photokinetic_damage",
     "type": "damage_info_order",

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json b/data/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json
@@ -5,70 +5,86 @@
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "BIOKINETIC" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_CLAIR",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "CLAIRSENTIENT" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_ELECTROKIN",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "ELECTROKINETIC" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_PHOTOKIN",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "PHOTOKINETIC" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_PYROKIN",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "PYROKINETIC" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_TELEKIN",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "TELEKINETIC" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_TELEPATH",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "TELEPATH" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_TELEPORT",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "TELEPORTER" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMESTART_VITAKIN",
     "eoc_type": "EVENT",
     "required_event": "game_start",
     "condition": { "u_has_trait": "VITAKINETIC" },
-    "effect": [ { "math": [ "awakening_countup", "+=", "1" ] } ]
+    "effect": [ { "math": [ "u_awakening_countup", "+=", "1" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_MOM_GAMESTART_POWER_LEARNING_VARIABLES",
+    "eoc_type": "EVENT",
+    "required_event": "game_start",
+    "effect": [
+      { "math": [ "global_insight_power_learning_time_low", "=", "43200" ] },
+      { "math": [ "global_insight_power_learning_time_high", "=", "604800" ] },
+      { "math": [ "global_tier_one_power_learning_time_low", "=", "43200" ] },
+      { "math": [ "global_tier_one_power_learning_time_high", "=", "86400" ] },
+      { "math": [ "global_tier_two_power_learning_time_low", "=", "129600" ] },
+      { "math": [ "global_tier_two_power_learning_time_high", "=", "259200" ] },
+      { "math": [ "global_tier_three_power_learning_time_low", "=", "345600" ] },
+      { "math": [ "global_tier_three_power_learning_time_high", "=", "604800" ] }
+    ]
   }
 ]