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

Second nail into the battery coffin #75865

Merged
merged 14 commits into from
Aug 26, 2024

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Aug 21, 2024

Summary

Balance "Small battery edits"

Purpose of change

While most people watch at #75361 and how the game is not very playable after it, i decided it is a great opportunity to do what i wanted to do for a very long time: make our batteries less abstract and actually make sense

Describe the solution

Brought batteries to more real specs - names are intentionally left abstract by Kevin request, for the sake of not dealing with "hey this tool should not accept AA batteries but AAA"
todo:

  • change the names and descriptions?
  • change the id of batteries? just reused old ids mostly
  • remove more atomic batteries?

Testing

Loaded the game, walked around, seems okay

Additional context

image
image

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons Missions Quests and missions Map / Mapgen Overmap, Mapgen, Map extras, Map display Items: Battery / UPS Electric power management Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Items: Armor / Clothing Armor and clothing Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter Mods: Sky Island Anything about the Sky Island mod Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol Game: Balance Balancing of (existing) in-game features. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Aug 21, 2024
@Hyperseeker
Copy link
Contributor

Moving towards real battery names would be lovely.

  • It's what these batteries actually are (or are supposed to be)
  • The non-hierarchical naming would allow the introduction of other popular types of batteries (like AAA and 9-volt), without having to worry about "fitting" them "in" with the rest of the battery types
  • It would allow people to more-easily understand these batteries' purpose and usability (a flashlight probably runs off of AAs or AAAs, depending on how large the flashlight is etc.)

@HadeanLake
Copy link
Contributor

HadeanLake commented Aug 21, 2024

Some tools in items/tool/workshop.json should use tool batteries instead of D's - Angle grinder, cordless drill etc
Some Innawood characters might actually use disposable heavy batteries for some niche applications. They are not as heavy as car clay lead-acid batteries.

@fairyarmadillo
Copy link
Contributor

There is this thing called "lantern battery", 6v disposable large battery made of 4 cells, each cell about 1.5 times the size of D cell. I always thought about those when seen heavy battery in cdda.

Heavy batteries in the game mostly run heavy-duty power tools, so the tool battery is most appropriate imo.

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
  • A medium battery cell, wildly used in modern tools: heavy flashlights, two-way radios, security cameras, multiple of them make a tool battery, and some older generation of EV use thousands of this as the power storage.

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.

@Void-Seeker
Copy link
Contributor

Void-Seeker commented Aug 23, 2024

There is this thing called "lantern battery", 6v disposable large battery made of 4 cells

Never heard of those ones, yet alone encountered one...
The lanterns I owned had miniature 4v(2 cells in one casing) lead-acid battery inside. For some reason a lot of even more modern, but cheap rechargable lanterns and flashlights have miniature lead-acid batteries inside. Cheap radio I recently repaired had 1-cell lead-acid battery inside. That's actually ridiculous.

EDIT:
Oh, it's like this one? Interesting... Apparently, they are called type 4R25X.

зображення

@Miner239
Copy link
Contributor

Heavy batteries in the game mostly run heavy-duty power tools, so the tool battery is most appropriate imo.

Heavy duty power tools are now plug-in tools instead of using batteries. Currently, only exoskeletons, resonance measuring tool, and UPS have a reasonable use case for heavy batteries, while the rest should be migrated to use plugs.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Aug 23, 2024
@github-actions github-actions bot added the EOC: Effects On Condition Anything concerning Effects On Condition label Aug 23, 2024
@Hydrogen-Deuteride
Copy link

EDIT: Oh, it's like this one? Interesting... Apparently, they are called type 4R25X.

зображення

Yes, according to some sources these can go up to 25Ah which gives us 500+ kJ of charge which is comparable with rachargable tool battery(heavy battery). Potential candidate for disposable heavy battery.

@GuardianDll GuardianDll marked this pull request as ready for review August 23, 2024 17:58
@github-actions github-actions bot added the Vehicles Vehicles, parts, mechanics & interactions label Aug 24, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 25, 2024
@kevingranade kevingranade merged commit 2db2a2e into CleverRaven:master Aug 26, 2024
25 of 27 checks passed
@GuardianDll GuardianDll deleted the batteries branch August 26, 2024 19:43
@Alm999 Alm999 mentioned this pull request Aug 27, 2024
@batekulve
Copy link
Contributor

Heads up, there's a typo in line 205 of data/json/items/armor/robofac_armor.json
"default_magazine": "medimedium_battery_cellum_atomic_battery_cell"

@bird-ee

This comment was marked as off-topic.

chaosvolt added a commit to chaosvolt/nocts_cata_mod that referenced this pull request Aug 28, 2024
Fixes DDA version due to CleverRaven/Cataclysm-DDA#75865 having removed nice things from DDA yet again.

Not only do Omnitech batteries have to be standalone and no longer streamlined by copy-from, but now have to fully replace the standard atomic batteries for Omnitech stuff.

Did all this for heavy ones too even though those are still in DDA because zero ability to trust those will stay.
Knut-Aage-Hofseth pushed a commit to Knut-Aage-Hofseth/Cataclysm-DDA that referenced this pull request Aug 29, 2024
* update batteries

* migrate all removed batteries, clean up

* sprinkle occasional batteries in boxes around the world

* fix density test fail

* fix wrong chemistry on some batteries

* obsolete medium_disposable_cell, replace current medium_battery_cell(D battery) with modern 18650 battery

* fix redefinition of 'itype_medium_battery_cell'

* remove light_disposable_cell, change the names and descriptions of baterries to match what they are

* migrate light_disposable_cell, astyle battery density test

* fix test failures

* swap battery to please ups crafting test

* swap ids for tool batteries to make more sense (and not replace all ids in the entire game)

* migrate removed vehicle parts, fix unreachable cell recipe

* fix missed afs battery
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 BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Documentation> Design documents, internal info, guides and help. EOC: Effects On Condition Anything concerning Effects On Condition Game: Balance Balancing of (existing) in-game features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Battery / UPS Electric power management Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display [Markdown] Markdown issues and PRs Missions Quests and missions Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol Mods: Mind Over Matter Mods: Sky Island Anything about the Sky Island mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership Spawn Creatures, items, vehicles, locations appearing on map Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.