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

Add looks_like for magazines #37748

Merged
merged 11 commits into from Feb 9, 2020
Merged

Add looks_like for magazines #37748

merged 11 commits into from Feb 9, 2020

Conversation

ghost
Copy link

@ghost ghost commented Feb 6, 2020

Summary

SUMMARY: Infrastructure "Add looks_like to vanilla magazines"

Purpose of change

Companion PR to #35361, and the recent mainlining of Ultimate Cataclysm means a lot of ASCII symbols would show up if there's no looks_like backup.

Describe the solution

Add looks_like to every magazine and speedloader, using the same whitelist as the guns. As some on those list didn't use external magazines, additional whitelist:

Explosive launchers: Mark 19's grenade belt
[X]throwers: 3L pressurized tank
Shotguns: shotshell belt

Describe alternatives you've considered

None.

Testing

Loading with Retrodays Tileset active.
Before:
image
After:
image

Additional context

@Brian-Otten
Copy link
Contributor

Less ascii showing up in the tilesets and less work for tileset makers is always good.

I reviewed the code real quick so for others convenience, all the rifle type magazines are now looks like the stanag_30 and the pistol type look like glock_17. I don't know enough about what tiles are commonly missing to say if this is the best choice, but it should definitely be an okay choice.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Items: Magazines Ammo holding items and objects. SDL: Tiles / Sound Tiles visual interface and sounds. Items / Item Actions / Item Qualities Items and how they work and interact labels Feb 7, 2020
@ghost ghost marked this pull request as ready for review February 9, 2020 01:31
@ghost ghost requested a review from I-am-Erk February 9, 2020 01:32
@I-am-Erk
Copy link
Member

I-am-Erk commented Feb 9, 2020

Besides Glock 17 and stanag 30, which item id's should I be drawing tiles for to get the most bang for my buck

@Rivet-the-Zombie Rivet-the-Zombie merged commit 0e870ea into CleverRaven:master Feb 9, 2020
fengjixuchui added a commit to fengjixuchui/Cataclysm-DDA that referenced this pull request Feb 9, 2020
Merge pull request CleverRaven#37748 from LaVeyanFiend/Looks_Like_Mags
@ghost ghost deleted the Looks_Like_Mags branch February 10, 2020 01:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants