Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy electronic storage code + small e-storage fixes #79306

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

ShnitzelX2
Copy link
Contributor

@ShnitzelX2 ShnitzelX2 commented Jan 23, 2025

Summary

Infrastructure "remove legacy electronic storage code + small e-storage fixes"

Purpose of change

One of many planned follow-ups to #79097

Removes/modifies most code that was made obsolete by that PR.

  • Fixes a small bug where reading external devices didn't check for compatibility
  • Adds EBOOKSAVE to eink_tablet_pc
  • Removes a test item group that I forgot

Describe the solution

Remove code, fix bug; this was part of #79097 but was left out to reduce size.

Part of reworking the legacy content was making e-files and software separate item categories.

Describe alternatives you've considered

Testing

Verified bug was fixed, ran clang-tidy and tests locally.

Additional context

More coming soon

@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Items: Containers Things that hold other things Items: Armor / Clothing Armor and clothing <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 23, 2025
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • softwares

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@ShnitzelX2 ShnitzelX2 force-pushed the e-files-remove-legacy branch from c46106f to cd4e1ac Compare January 23, 2025 19:02
@ZhilkinSerg
Copy link
Contributor

add_contained_ebooks should be obsoleted too in favor of add_contained_efiles

@ShnitzelX2 ShnitzelX2 changed the title Remove legacy electronic storage code Remove legacy electronic storage code + small e-storage fixes Jan 24, 2025
@ShnitzelX2 ShnitzelX2 force-pushed the e-files-remove-legacy branch from cd4e1ac to 9f8fa6a Compare January 24, 2025 02:18
@GuardianDll
Copy link
Member

(continued from above) ERROR : D:\a\Cataclysm-DDA\Cataclysm-DDA\src\item.cpp:1826 [put_in] tried to put an item (test_textbook_fabrication) count (1) in a container (test_ebook_reader) that cannot contain it: pocket with type (E_FILE_STORAGE) not found

@ShnitzelX2 ShnitzelX2 force-pushed the e-files-remove-legacy branch from 9f8fa6a to 809f3e4 Compare January 24, 2025 18:05
@github-actions github-actions bot added Mods: Aftershock Anything to do with the Aftershock mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Bombastic Perks labels Jan 24, 2025
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @bombasticSlacks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Info / User Interface Game - player communication, menus, etc. Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods: Bombastic Perks Mods: Xedra Evolved Anything to do with Xedra Evolved Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants