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

Make Aftershock atomic smartphone a valid music-playing device. #37584

Merged

Conversation

eilaattwood
Copy link
Contributor

Summary

SUMMARY: Bugfixes "Aftershock atomic smartphone not playing music"

Purpose of change

Fixes #37420

Describe the solution

Added checks for afs_atomic_smartphone item in iuse::mp3 method

Describe alternatives you've considered

Rework that function to avoid item id hardcoding.

Testing

Created game with aftershock mod, spawned atomic smartphone, smartphone and mp3 player, tried to use all of them.
Created world without Aftershock, spawned mp3 and smartphone, used them.

Additional context

@Maleclypse please comment if I should add something else into that check.

Make afs_atomic_smartphone a valid music-playing device.
@Maleclypse
Copy link
Member

The Wraitheon smartphone could potentially also use MP3 playing. If making play mp3 a flag or some other form of json using instead of a hardcore is within the realm of possibility then that would benefit more than just Aftershock. But if that’s too much to ask no stress. I appreciate what you are doing.

@eilaattwood
Copy link
Contributor Author

The Wraitheon smartphone could potentially also use MP3 playing. If making play mp3 a flag or some other form of json using instead of a hardcore is within the realm of possibility then that would benefit more than just Aftershock. But if that’s too much to ask no stress. I appreciate what you are doing.
Yeah, changing the code is too so deeply is too much for me as for now. Maybe later.

So should I also add Wraitheon smartphone to the list? Unfortunally, I would be away from my work computer with C++ development setup for a weekend, so I'll do it next week.

@Maleclypse
Copy link
Member

So should I also add Wraitheon smartphone to the list? Unfortunally, I would be away from my work computer with C++ development setup for a weekend, so I'll do it next week.

Please add Wraitheon Smartphone to the list. Whenever you get to it is great. :)

@ifreund ifreund added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact Mods: Aftershock Anything to do with the Aftershock mod labels Feb 1, 2020
@eilaattwood eilaattwood changed the title [CR] Make Aftershock atomic smartphone a valid music-playing device. Make Aftershock atomic smartphone a valid music-playing device. Feb 3, 2020
@eilaattwood
Copy link
Contributor Author

I'm done for now, this can be merged.

@ZhilkinSerg ZhilkinSerg merged commit 8a00dcf into CleverRaven:master Feb 3, 2020
@eilaattwood eilaattwood deleted the atomic-smartphone-mp3-fix branch February 4, 2020 06:03
wapcaplet added a commit to wapcaplet/Cataclysm-DDA that referenced this pull request Feb 13, 2020
This makes mp3 players take the same amount of time to activate or
deactivate as music-playing smartphones.

PR CleverRaven#37584 added 200 (de-)activation time to the smartphones, but
since the mp3 player already had its own 200 move cost, this made the
mp3 player take twice as long as the other devices.
ZhilkinSerg pushed a commit that referenced this pull request Feb 14, 2020
* Avoid double activation penalty for mp3 player

This makes mp3 players take the same amount of time to activate or
deactivate as music-playing smartphones.

PR #37584 added 200 (de-)activation time to the smartphones, but
since the mp3 player already had its own 200 move cost, this made the
mp3 player take twice as long as the other devices.

* Mention music instead of earbuds in message

Previous message was vague

Fixes #37996
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON Mods: Aftershock Anything to do with the Aftershock mod
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aftershock atomic smartphone not playing music
4 participants