Merge pull request #79306 from ShnitzelX2/e-files-remove-legacy

Remove legacy electronic storage code + small e-storage fixes
CleverRaven · Jan 25, 2025 · a40b4ff · a40b4ff
2 parents e1dae62 + a77f726
commit a40b4ff
Show file tree

Hide file tree

Showing 34 changed files with 127 additions and 866 deletions.
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -374,21 +374,11 @@
     "id": "EHANDCUFFS",
     "name": { "str": "Take off" }
   },
-  {
-    "type": "item_action",
-    "id": "EINKTABLETPC",
-    "name": { "str": "Use SD-Card apps" }
-  },
   {
     "type": "item_action",
     "id": "EBOOKSAVE",
     "name": { "str": "Store books" }
   },
-  {
-    "type": "item_action",
-    "id": "EBOOKREAD",
-    "name": { "str": "Read stored books" }
-  },
   {
     "type": "item_action",
     "id": "EMF_PASSIVE_ON",
@@ -699,11 +689,6 @@
     "id": "PROZAC",
     "name": { "str": "Take" }
   },
-  {
-    "type": "item_action",
-    "id": "ELECTRICSTORAGE",
-    "name": { "str": "Manage external storage" }
-  },
   {
     "type": "item_action",
     "id": "E_FILE_DEVICE",

diff --git a/data/json/item_category.json b/data/json/item_category.json
@@ -1,4 +1,20 @@
 [
+  {
+    "id": "e_files",
+    "type": "ITEM_CATEGORY",
+    "name_header": { "str": "Files" },
+    "name_noun": { "ctxt": "item_category", "str": "file" },
+    "zone": "LOOT_OTHER",
+    "sort_rank": -25
+  },
+  {
+    "id": "software",
+    "type": "ITEM_CATEGORY",
+    "name_header": { "str": "Software" },
+    "name_noun": { "ctxt": "item_category", "str_sp": "software" },
+    "zone": "LOOT_OTHER",
+    "sort_rank": -24
+  },
   {
     "id": "guns",
     "type": "ITEM_CATEGORY",

diff --git a/data/json/itemgroups/efiles.json b/data/json/itemgroups/efiles.json
@@ -1,14 +1,4 @@
 [
-  {
-    "id": "laptop_files_work",
-    "type": "item_group",
-    "subtype": "collection",
-    "entries": [
-      { "item": "book_nonf_hard_homemk_anythingcan", "prob": 100, "count": 1 },
-      { "item": "book_nonf_hard_homemk_grtrms", "prob": 100, "count": 1 },
-      { "item": "book_nonf_hard_homemk_handshome", "prob": 100, "count": 1 }
-    ]
-  },
   {
     "id": "edevice_work",
     "type": "item_group",

diff --git a/data/json/items/fake.json b/data/json/items/fake.json
@@ -119,7 +119,7 @@
     "name": { "str": "Integrated AR System" },
     "description": "Extremely thin lenses provides user with augmented reality overlay allowing the user to zoom, and it displays handy information about local topology.",
     "charges_per_use": 1,
-    "use_action": [ "CAMERA", "PORTABLE_GAME", "EINKTABLETPC", "ELECTRICSTORAGE", "EBOOKSAVE", "EBOOKREAD" ],
+    "use_action": [ "CAMERA", "PORTABLE_GAME", "EBOOKSAVE", "E_FILE_DEVICE" ],
     "pocket_data": [
       {
         "pocket_type": "EBOOK",

diff --git a/data/json/items/software.json b/data/json/items/software.json
@@ -1,16 +1,16 @@
 [
   {
-    "id": "software",
+    "id": "abstract_software",
+    "copy-from": "abstract_efile",
     "type": "GENERIC",
-    "name": { "str_sp": "software" },
-    "symbol": "#",
-    "container": "usb_drive",
-    "description": { "str": "IF YOU ARE SEEING THIS IT IS A BUG.", "//~": "NO_I18N" },
-    "flags": [ "IRREMOVABLE", "NO_DROP" ]
+    "category": "software",
+    "name": { "str_sp": "abstract software" },
+    "description": "Copy from this for any software",
+    "ememory_size": "1 KB"
   },
   {
     "id": "software_useless",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "misc software" },
     "description": "A miscellaneous piece of hobby software.  Probably useless.",
@@ -20,7 +20,7 @@
   },
   {
     "id": "software_hacking",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "hackPRO" },
     "description": "A piece of hacking software.",
@@ -30,7 +30,7 @@
   },
   {
     "id": "software_medical",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "MediSoft" },
     "description": "A piece of medical software.",
@@ -40,7 +40,7 @@
   },
   {
     "id": "software_math",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "MatheMAX" },
     "description": "A piece of mathematical software.",
@@ -50,7 +50,7 @@
   },
   {
     "id": "software_blood_data",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "infection data" },
     "description": "Medical data on zombie blood.",
@@ -60,7 +60,7 @@
   },
   {
     "id": "software_lab_data",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "lab data" },
     "description": "Research archives from a government laboratory.",
@@ -70,7 +70,7 @@
   },
   {
     "id": "software_encryption_codes",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "encryption codes" },
     "description": "There are numerous security keys with dates for potential future access to encrypted archived data.",
@@ -80,7 +80,7 @@
   },
   {
     "id": "software_archived_data",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str_sp": "archive data" },
     "description": "Extremely compressed research data, observation and experiment statistics.  The only pattern you manage to recognize is an increase in the amount of report closer to the Cataclysm, but also a reduction in the number of facilities still submitting reports.",
@@ -90,7 +90,7 @@
   },
   {
     "id": "software_electronics_reference",
-    "copy-from": "abstract_efile",
+    "copy-from": "abstract_software",
     "type": "GENERIC",
     "name": { "str": "integrated circuit datasheet archives", "str_pl": "misc software" },
     "description": "Huge archives of numerous IC circuit datasheets from several major manufacturers.  Probably valuable to the right person, as it would be hard to salvage and reuse these components without them.",
@@ -101,6 +101,7 @@
   {
     "abstract": "abstract_efile",
     "type": "GENERIC",
+    "category": "e_files",
     "symbol": "o",
     "name": "abstract electronic file",
     "description": "abstract electronic file, copy-from for any item that should solely be on an electronic storage medium",
@@ -110,13 +111,13 @@
   },
   {
     "abstract": "abstract_efile_copiable",
+    "copy-from": "abstract_efile",
     "type": "GENERIC",
     "symbol": "o",
     "name": "abstract copiable electronic file",
     "description": "abstract copiable electronic file",
     "ememory_size": "1 KB",
-    "flags": [ "E_STORABLE", "ZERO_WEIGHT", "NO_DROP", "IRREMOVABLE", "E_COPIABLE" ],
-    "variables": { "browsed": "false" }
+    "extend": { "flags": [ "E_COPIABLE" ] }
   },
   {
     "abstract": "abstract_efile_read",

diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json
@@ -252,6 +252,7 @@
     "revert_to": "eink_tablet_pc",
     "use_action": [
       "E_FILE_DEVICE",
+      "EBOOKSAVE",
       {
         "ammo_scale": 0,
         "type": "transform",

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -1124,7 +1124,7 @@
     "color": "light_gray",
     "ammo": "battery",
     "charges_per_use": 1,
-    "use_action": [ "CAMERA", "PORTABLE_GAME", "EINKTABLETPC", "ELECTRICSTORAGE", "EBOOKSAVE", "EBOOKREAD" ],
+    "use_action": [ "CAMERA", "PORTABLE_GAME", "EBOOKSAVE", "E_FILE_DEVICE" ],
     "tick_action": [ "EPIC_MUSIC" ],
     "pocket_data": [
       {
@@ -1134,7 +1134,7 @@
         "default_magazine": "light_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/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,18 +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" ],
+    "copy-from": "eink_tablet_pc",
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -976,7 +965,7 @@
         "item_restriction": [ "test_battery_disposable" ]
       },
       {
-        "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/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -254,7 +254,6 @@
       "test_balanced_sword",
       "test_clumsy_sword",
       "test_compbow",
-      "test_ebook_reader",
       "test_fire_ax",
       "test_fire_ax_mostly_steel",
       "test_fire_ax_mostly_wood",