remove legacy mod e-storage

CleverRaven · Jan 24, 2025 · 809f3e4 · 809f3e4
1 parent 302c44e
commit 809f3e4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 66 deletions.
diff --git a/data/mods/Aftershock/items/armor.json b/data/mods/Aftershock/items/armor.json
@@ -110,13 +110,7 @@
     "flags": [ "WATCH", "BELTED", "STURDY", "WATER_FRIENDLY" ],
     "ammo": [ "battery" ],
     "charges_per_use": 1,
-    "use_action": [
-      "EINKTABLETPC",
-      "EBOOKREAD",
-      "ELECTRICSTORAGE",
-      "PORTABLE_GAME",
-      { "type": "link_up", "cable_length": 5, "charge_rate": "140 W" }
-    ],
+    "use_action": [ "E_FILE_DEVICE", "PORTABLE_GAME", { "type": "link_up", "cable_length": 5, "charge_rate": "140 W" } ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -125,7 +119,7 @@
         "default_magazine": "medium_battery_cell"
       },
       {
-        "pocket_type": "EBOOK",
+        "pocket_type": "E_FILE_STORAGE",
         "rigid": true,
         "max_contains_volume": "1 ml",
         "max_contains_weight": "1 g",

diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json
@@ -23,15 +23,13 @@
       "MP3",
       "CALORIES_INTAKE_TRACKER",
       "PORTABLE_GAME",
-      "EINKTABLETPC",
-      "ELECTRICSTORAGE",
-      "EBOOKSAVE",
-      "EBOOKREAD"
+      "E_FILE_DEVICE",
+      "EBOOKSAVE"
     ],
     "flags": [ "WATCH", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD", "CALORIES_INTAKE" ],
     "pocket_data": [
       {
-        "pocket_type": "EBOOK",
+        "pocket_type": "E_FILE_STORAGE",
         "rigid": true,
         "max_contains_volume": "1 ml",
         "max_contains_weight": "1 g",
@@ -160,7 +158,7 @@
     "name": { "str": "atomic smartphone - music", "str_pl": "atomic smartphones - music" },
     "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
     "revert_to": "afs_atomic_smartphone",
-    "use_action": [ "PORTABLE_GAME", "EINKTABLETPC", "EBOOKSAVE", "EBOOKREAD", "MP3_DEACTIVATE" ],
+    "use_action": [ "PORTABLE_GAME", "E_FILE_DEVICE", "EBOOKSAVE", "MP3_DEACTIVATE" ],
     "tick_action": [ "MP3_ON" ],
     "extend": { "flags": [ "TRADER_AVOID" ] }
   },
@@ -172,9 +170,8 @@
     "revert_to": "afs_atomic_smartphone",
     "use_action": [
       "PORTABLE_GAME",
-      "EINKTABLETPC",
+      "E_FILE_DEVICE",
       "EBOOKSAVE",
-      "EBOOKREAD",
       {
         "target": "afs_atomic_smartphone",
         "msg": "You deactivate the flashlight app.",
@@ -205,14 +202,12 @@
       "ROBOTCONTROL",
       "CALORIES_INTAKE_TRACKER",
       "PORTABLE_GAME",
-      "EINKTABLETPC",
-      "ELECTRICSTORAGE",
-      "EBOOKSAVE",
-      "EBOOKREAD"
+      "E_FILE_DEVICE",
+      "EBOOKSAVE"
     ],
     "pocket_data": [
       {
-        "pocket_type": "EBOOK",
+        "pocket_type": "E_FILE_STORAGE",
         "rigid": true,
         "max_contains_volume": "1 ml",
         "max_contains_weight": "1 g",
@@ -227,7 +222,7 @@
     "name": { "str": "Wraitheon executive's smartphone - music", "str_pl": "Wraitheon executive's smartphones - music" },
     "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
     "revert_to": "afs_atomic_smartphone",
-    "use_action": [ "PORTABLE_GAME", "EINKTABLETPC", "EBOOKSAVE", "EBOOKREAD", "MP3_DEACTIVATE" ],
+    "use_action": [ "PORTABLE_GAME", "E_FILE_DEVICE", "EBOOKSAVE", "MP3_DEACTIVATE" ],
     "extend": { "flags": [ "TRADER_AVOID" ] },
     "tick_action": [ "MP3_ON" ]
   },
@@ -239,9 +234,8 @@
     "revert_to": "afs_atomic_smartphone",
     "use_action": [
       "PORTABLE_GAME",
-      "EINKTABLETPC",
+      "E_FILE_DEVICE",
       "EBOOKSAVE",
-      "EBOOKREAD",
       {
         "target": "afs_wraitheon_smartphone",
         "msg": "You deactivate the flashlight app.",
@@ -462,7 +456,7 @@
     "charges_per_use": 2,
     "use_action": [
       "ROBOTCONTROL",
-      "EINKTABLETPC",
+      "E_FILE_DEVICE",
       "PORTABLE_GAME",
       {
         "target": "control_laptop_screen_lit",
@@ -514,7 +508,7 @@
     "ammo": [ "battery" ],
     "charges_per_use": 2,
     "use_action": [
-      "EINKTABLETPC",
+      "E_FILE_DEVICE",
       "PORTABLE_GAME",
       {
         "target": "vr_laptop_holosuite",

diff --git a/data/mods/BombasticPerks/perkdata/flawless_memory.json b/data/mods/BombasticPerks/perkdata/flawless_memory.json
@@ -6,11 +6,11 @@
     "name": { "str_sp": "Flawless memory" },
     "description": "You can remember with perfect detail everything you've ever lived, even allowing you to read books and play games by remembering them.",
     "charges_per_use": 0,
-    "use_action": [ "CAMERA", "PORTABLE_GAME", "EBOOKSAVE", "EBOOKREAD" ],
+    "use_action": [ "CAMERA", "PORTABLE_GAME", "EBOOKSAVE", "E_FILE_DEVICE" ],
     "tick_action": [ "EPIC_MUSIC" ],
     "pocket_data": [
       {
-        "pocket_type": "EBOOK",
+        "pocket_type": "E_FILE_STORAGE",
         "rigid": true,
         "max_contains_volume": "1 ml",
         "max_contains_weight": "1 g",

diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
@@ -954,35 +954,7 @@
     "id": "test_ebook_reader",
     "name": { "str": "eBook reader" },
     "description": "Test book reader.",
-    "weight": "250 g",
-    "volume": "250 ml",
-    "longest_side": "25 cm",
-    "price": "200 USD",
-    "price_postapoc": "1 USD",
-    "to_hit": -1,
-    "material": [ "plastic" ],
-    "symbol": ";",
-    "color": "green",
-    "ammo": [ "battery" ],
-    "charges_per_use": 1,
-    "use_action": [ "EBOOKSAVE", "EBOOKREAD" ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "rigid": true,
-        "holster": true,
-        "max_contains_volume": "20 L",
-        "max_contains_weight": "20 kg",
-        "item_restriction": [ "test_battery_disposable" ]
-      },
-      {
-        "pocket_type": "EBOOK",
-        "rigid": true,
-        "max_contains_volume": "1 ml",
-        "max_contains_weight": "1 g",
-        "weight_multiplier": 0.0
-      }
-    ]
+    "copy-from": "eink_tablet_pc"
   },
   {
     "id": "test_battery_disposable",

diff --git a/data/mods/Xedra_Evolved/items/inventor/armor.json b/data/mods/Xedra_Evolved/items/inventor/armor.json
@@ -366,10 +366,8 @@
       "CAMERA",
       "CALORIES_INTAKE_TRACKER",
       "PORTABLE_GAME",
-      "EINKTABLETPC",
-      "ELECTRICSTORAGE",
+      "E_FILE_DEVICE",
       "EBOOKSAVE",
-      "EBOOKREAD",
       {
         "target": "vision_halo_on",
         "msg": "Turn on.",
@@ -405,7 +403,7 @@
         "default_magazine": "light_minus_disposable_cell"
       },
       {
-        "pocket_type": "EBOOK",
+        "pocket_type": "E_FILE_STORAGE",
         "rigid": true,
         "max_contains_volume": "1 ml",
         "max_contains_weight": "1 g",
@@ -451,10 +449,8 @@
     "revert_to": "vision_halo",
     "use_action": [
       "CAMERA",
-      "EINKTABLETPC",
-      "ELECTRICSTORAGE",
+      "E_FILE_DEVICE",
       "EBOOKSAVE",
-      "EBOOKREAD",
       {
         "target": "vision_halo",
         "msg": "Turn off.",

diff --git a/data/mods/Xedra_Evolved/items/inventor/misc.json b/data/mods/Xedra_Evolved/items/inventor/misc.json
@@ -111,10 +111,10 @@
   },
   {
     "id": "software_AI",
-    "copy-from": "software",
+    "copy-from": "abstract_software",
     "type": "TOOL",
     "name": { "str_sp": "IA software" },
-    "description": "A USB thumb drive with a simple intelligent agent to provide support in parsing big layers of information.",
+    "description": "A simple intelligent agent to provide support in parsing big layers of information.",
     "extend": { "flags": [ "INVENTOR_CRAFTED" ] },
     "qualities": [ [ "AI_TOOL", 1 ] ]
   },