[MoM] Add electronoetic batteries (#79010)

* Initial commit * Add electronoetic to dictionary * Update belts and mindsight glasses * Adjust power draw * Add electronoetic batteries to itemgroups * Price update * Re-add missing relic_data
CleverRaven · Jan 8, 2025 · 9d108ee · 9d108ee
1 parent 564e9f9
commit 9d108ee
Show file tree

Hide file tree

Showing 5 changed files with 252 additions and 29 deletions.
diff --git a/data/mods/MindOverMatter/itemgroups/matrix_technology_labs.json b/data/mods/MindOverMatter/itemgroups/matrix_technology_labs.json
@@ -41,6 +41,7 @@
       { "item": "chem_sulphuric_acid", "prob": 20, "container-item": "bottle_glass" },
       { "item": "chem_muriatic_acid", "prob": 15, "container-item": "bottle_glass" },
       { "item": "chem_nitric_acid", "prob": 15, "container-item": "bottle_glass" },
+      { "group": "dist_electronoetic_batteries", "prob": 25 },
       { "item": "denat_alcohol", "prob": 10, "charges": [ 250, -1 ] },
       { "item": "methed_alcohol", "prob": 10, "charges": [ 250, -1 ] },
       { "item": "mortar_pestle", "prob": 20 },
@@ -72,17 +73,69 @@
     "subtype": "distribution",
     "id": "dist_shield_belts",
     "items": [
-      { "item": "psionic_shield_belt_broken", "prob": 3, "charges": [ 0, 15 ] },
-      { "item": "psionic_shield_belt", "prob": 1, "charges": [ 0, 90 ] }
+      {
+        "item": "medium_battery_electronoetic_refined",
+        "ammo-item": "battery",
+        "charges": [ 100, 448 ],
+        "container-item": "psionic_shield_belt",
+        "prob": 1
+      },
+      {
+        "item": "medium_battery_electronoetic_refined",
+        "ammo-item": "battery",
+        "charges": [ 100, 448 ],
+        "container-item": "psionic_shield_belt_broken",
+        "prob": 6
+      },
+      {
+        "item": "medium_battery_electronoetic",
+        "ammo-item": "battery",
+        "charges": [ 20, 168 ],
+        "container-item": "psionic_shield_belt",
+        "prob": 4
+      },
+      {
+        "item": "medium_battery_electronoetic",
+        "ammo-item": "battery",
+        "charges": [ 20, 168 ],
+        "container-item": "psionic_shield_belt_broken",
+        "prob": 14
+      }
     ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "dist_fire_shield_belts",
     "items": [
-      { "item": "psionic_fire_shield_belt_broken", "prob": 3, "charges": [ 0, 15 ] },
-      { "item": "psionic_fire_shield_belt", "prob": 1, "charges": [ 0, 300 ] }
+      {
+        "item": "medium_battery_electronoetic_refined",
+        "ammo-item": "battery",
+        "charges": [ 100, 448 ],
+        "container-item": "psionic_fire_shield_belt",
+        "prob": 1
+      },
+      {
+        "item": "medium_battery_electronoetic_refined",
+        "ammo-item": "battery",
+        "charges": [ 100, 448 ],
+        "container-item": "psionic_fire_shield_belt_broken",
+        "prob": 6
+      },
+      {
+        "item": "medium_battery_electronoetic",
+        "ammo-item": "battery",
+        "charges": [ 20, 168 ],
+        "container-item": "psionic_fire_shield_belt",
+        "prob": 4
+      },
+      {
+        "item": "medium_battery_electronoetic",
+        "ammo-item": "battery",
+        "charges": [ 20, 168 ],
+        "container-item": "psionic_fire_shield_belt_broken",
+        "prob": 14
+      }
     ]
   },
   {
@@ -107,14 +160,47 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "collection_mindsight_and_note",
-    "items": [ { "item": "psionic_mindsight_glasses", "prob": 100 }, { "item": "lab_file_QD944_P_item", "prob": 100 } ]
+    "items": [
+      {
+        "distribution": [
+          {
+            "item": "light_battery_electronoetic",
+            "ammo-item": "battery",
+            "charges": [ 20, 48 ],
+            "container-item": "psionic_mindsight_glasses",
+            "prob": 80
+          },
+          {
+            "item": "light_battery_electronoetic_refined",
+            "ammo-item": "battery",
+            "charges": [ 60, 128 ],
+            "container-item": "psionic_mindsight_glasses",
+            "prob": 20
+          }
+        ]
+      },
+      { "item": "lab_file_QD944_P_item", "prob": 100 }
+    ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "id": "dist_matrix_translocation_items",
     "items": [ { "item": "psionic_transporter_remote", "prob": 5 }, { "item": "psionic_transporter_beacon", "prob": 1 } ]
   },
+  {
+    "id": "dist_electronoetic_batteries",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      { "item": "light_battery_electronoetic", "charges": 48, "prob": 160, "count": [ 1, 4 ] },
+      { "item": "light_battery_electronoetic_refined", "charges": 128, "prob": 16, "count": [ 1, 2 ] },
+      { "item": "medium_battery_electronoetic", "charges": 168, "prob": 80, "count": [ 1, 4 ] },
+      { "item": "medium_battery_electronoetic_refined", "charges": 448, "prob": 8, "count": [ 1, 2 ] },
+      { "item": "heavy_battery_electronoetic", "charges": 777, "prob": 20, "count": [ 1, 2 ] },
+      { "item": "heavy_battery_electronoetic_refined", "charges": 2072, "prob": 2 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",
@@ -157,6 +243,7 @@
       { "item": "chem_sulphuric_acid", "prob": 20, "container-item": "bottle_glass" },
       { "item": "chem_muriatic_acid", "prob": 15, "container-item": "bottle_glass" },
       { "item": "chem_nitric_acid", "prob": 15, "container-item": "bottle_glass" },
+      { "group": "dist_electronoetic_batteries", "prob": 25 },
       { "item": "denat_alcohol", "prob": 10, "charges": [ 250, -1 ] },
       { "item": "methed_alcohol", "prob": 10, "charges": [ 250, -1 ] },
       { "item": "mortar_pestle", "prob": 20 },
@@ -195,10 +282,10 @@
     "type": "item_group",
     "subtype": "distribution",
     "items": [
-      { "group": "collection_mindsight_and_note", "prob": 1 },
-      { "item": "psionic_telepathic_dampener", "prob": 1 },
-      { "item": "schematics_telepathic_focusing_tool", "prob": 1 },
-      { "item": "telepathic_focusing_tool", "prob": 1 }
+      { "group": "collection_mindsight_and_note", "prob": 4 },
+      { "item": "psionic_telepathic_dampener", "prob": 4 },
+      { "item": "schematics_telepathic_focusing_tool", "prob": 4 },
+      { "item": "telepathic_focusing_tool", "prob": 4 }
     ]
   }
 ]
diff --git a/data/mods/MindOverMatter/items/armor/belt.json b/data/mods/MindOverMatter/items/armor/belt.json
@@ -7,13 +7,14 @@
     "weight": "350 g",
     "volume": "500 ml",
     "price": "100 USD",
-    "price_postapoc": "5 USD",
+    "price_postapoc": "50 USD",
     "material": [ "nylon", "steel", "nether_crystal" ],
     "symbol": "[",
     "looks_like": "leather_belt",
     "color": "yellow",
     "material_thickness": 1.5,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "psionic_charge_power": 90 } } ],
+    "ammo": [ "battery" ],
+    "flags": [ "BELTED", "OVERSIZE", "NONCONDUCTIVE", "NO_REPAIR", "COMBAT_TOGGLEABLE" ],
     "use_action": [
       {
         "type": "transform",
@@ -26,7 +27,14 @@
         "menu_text": "Flip the switch"
       }
     ],
-    "flags": [ "BELTED", "OVERSIZE", "NONCONDUCTIVE", "NO_REPAIR", "COMBAT_TOGGLEABLE", "NO_UNLOAD" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "rigid": true,
+        "flag_restriction": [ "BATTERY_MEDIUM" ],
+        "default_magazine": "medium_battery_cell"
+      }
+    ],
     "armor": [
       {
         "encumbrance": 2,
@@ -41,6 +49,8 @@
         {
           "has": "WORN",
           "condition": "ACTIVE",
+          "name": "Active Shield Belt",
+          "description": "The air around you has a faint shimmer.",
           "ench_effects": [ { "effect": "effect_shield_belt_telekin_protection", "intensity": 1 } ],
           "incoming_damage_mod": [
             { "type": "bash", "add": -8 },
@@ -49,17 +59,15 @@
             { "type": "bullet", "add": -40 }
           ]
         }
-      ],
-      "charge_info": { "recharge_type": "periodic", "time": "60 s", "regenerate_ammo": true }
-    },
-    "//": "Recharge time is 60 seconds due to bug #48019, making it actually 30 seconds. Reduce to 30 seconds if that ever gets fixed."
+      ]
+    }
   },
   {
     "id": "psionic_shield_belt_on",
     "type": "TOOL_ARMOR",
     "name": { "str": "shield belt (active)", "str_pl": "shield belts (active)" },
     "copy-from": "psionic_shield_belt",
-    "turns_per_charge": 1,
+    "power_draw": "150 W",
     "revert_to": "psionic_shield_belt",
     "use_action": [
       {
@@ -78,6 +86,7 @@
     "name": { "str": "shield belt" },
     "copy-from": "psionic_shield_belt",
     "description": "A simple synthetic fabric belt with a box to the right of the belt loop.  The box has a toggleable switch and a stylized shield with Ψ and the XEDRA logo inside it.  It also has a large crack across it and rattles when moved.",
+    "price_postapoc": "5 USD",
     "use_action": [
       {
         "type": "transform",
@@ -86,8 +95,7 @@
         "need_worn": true,
         "menu_text": "Flip the switch"
       }
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "psionic_charge_power": 90 } } ]
+    ]
   },
   {
     "id": "psionic_fire_shield_belt",
@@ -97,13 +105,21 @@
     "weight": "350 g",
     "volume": "500 ml",
     "price": "100 USD",
-    "price_postapoc": "5 USD",
+    "price_postapoc": "50 USD",
     "material": [ "nylon", "steel", "nether_crystal" ],
     "symbol": "[",
     "looks_like": "leather_belt",
     "color": "red",
     "material_thickness": 1.5,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "psionic_charge_power": 300 } } ],
+    "ammo": [ "battery" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "rigid": true,
+        "flag_restriction": [ "BATTERY_MEDIUM" ],
+        "default_magazine": "medium_battery_electronoetic"
+      }
+    ],
     "use_action": [
       {
         "type": "transform",
@@ -116,7 +132,7 @@
         "menu_text": "Flip the switch"
       }
     ],
-    "flags": [ "BELTED", "OVERSIZE", "NONCONDUCTIVE", "NO_REPAIR", "COMBAT_TOGGLEABLE", "NO_UNLOAD" ],
+    "flags": [ "BELTED", "OVERSIZE", "NONCONDUCTIVE", "NO_REPAIR", "COMBAT_TOGGLEABLE" ],
     "armor": [
       {
         "encumbrance": 2,
@@ -131,21 +147,21 @@
         {
           "has": "WORN",
           "condition": "ACTIVE",
+          "name": "Active Suppresion Belt",
+          "description": "The air around you feels cool.",
           "incoming_damage_mod": [ { "type": "heat", "multiply": -1 } ],
           "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 } ],
           "ench_effects": [ { "effect": "effect_suppression_belt_fire_protection", "intensity": 1 } ]
         }
-      ],
-      "charge_info": { "recharge_type": "periodic", "time": "30 s", "regenerate_ammo": true }
-    },
-    "//": "Recharge time is 30 seconds due to bug #48019, making it actually 15 seconds. Reduce to 15 seconds if that ever gets fixed."
+      ]
+    }
   },
   {
     "id": "psionic_fire_shield_belt_on",
     "type": "TOOL_ARMOR",
     "name": { "str": "suppression belt (active)", "str_pl": "suppression belts (active)" },
     "copy-from": "psionic_fire_shield_belt",
-    "turns_per_charge": 1,
+    "power_draw": "50 W",
     "revert_to": "psionic_fire_shield_belt",
     "use_action": [
       {
@@ -164,6 +180,7 @@
     "copy-from": "psionic_fire_shield_belt",
     "name": { "str": "suppression belt" },
     "description": "A simple synthetic fabric belt with a box to the right of the belt loop.  The box has a toggleable switch and a stylized flame with a large circle and line superimposed over it and a Ψ behind the XEDRA logo inside it.  It also has a large crack across it and rattles when moved.",
+    "price_postapoc": "5 USD",
     "use_action": [
       {
         "type": "transform",
@@ -173,6 +190,13 @@
         "menu_text": "Flip the switch"
       }
     ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "psionic_charge_power": 300 } } ]
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "rigid": true,
+        "flag_restriction": [ "BATTERY_MEDIUM" ],
+        "default_magazine": "medium_battery_electronoetic"
+      }
+    ]
   }
 ]
diff --git a/data/mods/MindOverMatter/items/armor/head.json b/data/mods/MindOverMatter/items/armor/head.json
@@ -66,7 +66,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_electronoetic"
       }
     ],
     "armor": [ { "encumbrance": 4, "coverage": 100, "covers": [ "eyes" ] } ],