Merge pull request #76225 from Standing-Storm/next-backport

[MoM] Backport #70729, #70615, #71260, #70910, and #71399 to 0.H
CleverRaven · Sep 6, 2024 · dec9eec · dec9eec
2 parents 675ea0d + 4f470a0
commit dec9eec
Show file tree

Hide file tree

Showing 20 changed files with 5,407 additions and 1,519 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json
@@ -983,7 +983,6 @@
     "effect": [
       {
         "run_eocs": [
-          "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_SLOW_BLEEDING",
           "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_HEALTH_POWER",
           "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_STOP_BLEEDING",
           "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_HURT_TOUCH",
@@ -1004,12 +1003,6 @@
       }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_SLOW_BLEEDING",
-    "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, { "math": [ "u_spell_level('vita_slow_bleeding')", ">=", "0" ] } ] },
-    "effect": [ { "u_learn_recipe": "practice_vita_slow_bleeding" } ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_CHECK_GAMEBEGIN_VITAKIN_RECIPE_HEALTH_POWER",

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -366,7 +366,7 @@
     "type": "effect_type",
     "id": "effect_biokin_metabolism_enhance",
     "name": [ "Hyperenhanced Metabolism" ],
-    "desc": [ "c ." ],
+    "desc": [ "Your metabolism is far more efficient than before." ],
     "apply_message": "",
     "remove_message": "Your stomach rumbles.",
     "rating": "good",

diff --git a/data/mods/MindOverMatter/items/teleporter_start_items.json b/data/mods/MindOverMatter/items/teleporter_start_items.json
@@ -22,7 +22,7 @@
     "range": 45,
     "ammo_effects": [ "PLASMA", "PLASMA_BUBBLE", "INCENDIARY" ],
     "ammo": [ "mom_fusion_ammo" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mom_fusion_mag" ] } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "25 ml", "item_restriction": [ "mom_fusion_mag" ] } ],
     "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ]
   },
   {
@@ -45,8 +45,8 @@
     "type": "AMMO",
     "name": { "str": "Ch47 power cartridge" },
     "description": "Power cartridges for the Ch47.  You had better make every shot count, because there's no way you're finding any more of these.",
-    "weight": "20 g",
-    "volume": "192 ml",
+    "weight": "1 g",
+    "volume": "1 ml",
     "price": 160,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -84,7 +84,19 @@
     "copy-from": "holster",
     "type": "ARMOR",
     "name": { "str": "Ch47 holster" },
-    "description": "A holster for the Ch47.  You could put one of the primitive local ranged weapons in here too, if you had to."
+    "description": "A holster for the Ch47.  You could put one of the primitive local ranged weapons in here too, if you had to.",
+    "pocket_data": [
+      {
+        "magazine_well": "350 ml",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "30 cm",
+        "moves": 50
+      }
+    ]
   },
   {
     "id": "itzcuauhtli_tunic",

diff --git a/data/mods/MindOverMatter/mutations/traits.json b/data/mods/MindOverMatter/mutations/traits.json
@@ -93,12 +93,7 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "spells_learned": [
-      [ "telekinetic_pull", 2 ],
-      [ "telekinetic_push", 2 ],
-      [ "telekinetic_momentum", 2 ],
-      [ "classless_toggleable_concentration_end", 1 ]
-    ]
+    "spells_learned": [ [ "telekinetic_pull", 2 ], [ "telekinetic_push", 2 ], [ "classless_toggleable_concentration_end", 1 ] ]
   },
   {
     "type": "mutation",
@@ -109,12 +104,7 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "spells_learned": [
-      [ "teleport_blink", 2 ],
-      [ "teleport_slow", 2 ],
-      [ "teleport_transpose", 2 ],
-      [ "classless_toggleable_concentration_end", 1 ]
-    ]
+    "spells_learned": [ [ "teleport_blink", 2 ], [ "teleport_slow", 2 ], [ "classless_toggleable_concentration_end", 1 ] ]
   },
   {
     "type": "mutation",
@@ -125,12 +115,16 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "spells_learned": [
-      [ "vita_stop_bleeding", 2 ],
-      [ "vita_health_power", 2 ],
-      [ "vita_hurt_touch", 2 ],
-      [ "classless_toggleable_concentration_end", 1 ]
-    ]
+    "spells_learned": [ [ "vita_stop_bleeding", 2 ], [ "vita_health_power", 2 ], [ "classless_toggleable_concentration_end", 1 ] ]
+  },
+  {
+    "type": "mutation",
+    "id": "FIFTH_SUN_PEOPLE",
+    "name": { "str": "Fifth Sun People" },
+    "points": 0,
+    "description": "You aren't from this universe and hopefully someday you can go home.  This is a hidden trait, used for dialogue.",
+    "valid": false,
+    "player_display": false
   },
   {
     "type": "mutation",

diff --git a/data/mods/MindOverMatter/powers/biokinesis.json b/data/mods/MindOverMatter/powers/biokinesis.json
@@ -234,7 +234,7 @@
     "id": "biokin_adrenaline",
     "type": "SPELL",
     "name": "[Ψ]Adrenaline Trigger",
-    "description": "With a moment of concentration, you can trigger a surge of adrenaline.  This provides a .",
+    "description": "With a moment of concentration, you can trigger a surge of adrenaline.  This provides a speed boost, albeit at a draining cost when the boost expires.",
     "message": "Your heartbeat surges as your body floods with adrenaline.",
     "teachable": false,
     "valid_targets": [ "self" ],