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

Blazemod Mini-PR: Refactor and modernise blazemod ammo #40010

Merged
merged 3 commits into from
Apr 29, 2020

Conversation

Soup-de-Loop
Copy link
Contributor

Summary

SUMMARY: Mods "Refactor and modernise blazemod ammo"

Purpose of change

This is the twenty fifth PR in bringing the changes in #37497 about, by breaking each change into small parts that are easier to skim and understand.

Describe the solution

Modernises damage to vanilla standard for ammo in blazemod; separates out the charcoal override used by diamond content into its own derivative that has been given a placebo recipe; and gives proper prefixes to diamond and vortex items related to this ammo to provide clarity.

Testing

Straightforward changes inspired by but not included in #37497, probably might work for now but its compatibility will be broken again when ID's are changed.

Additional context

More PR's to come, consider incomplete by itself, part of a whole.

P.S: Some changes inspired by a misplaced entry that is reminiscent of vortex stuff but definitely diamond, causing confusion.

Modernises damage to vanilla standard for ammo in blazemod, separates out the charcoal override used by diamond content into its own derivative that has been given a placebo recipe, and gives proper prefixes to related content. Some changes inspired by a misplaced entry that is reminiscent of vortex stuff but definitely diamond.
Modernises damage to vanilla standard for ammo in blazemod, separates out the charcoal override used by diamond content into its own derivative that has been given a placebo recipe, and gives proper prefixes to related content. Some changes inspired by a misplaced entry that is reminiscent of vortex stuff but definitely diamond.
@Soup-de-Loop
Copy link
Contributor Author

Yikes, that linting commit wasn't as clean as I'd like. Sorry!

@@ -63,19 +63,6 @@
[ [ "vortex_stone", 1 ] ]
]
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The spiral_matrix is actually something belonging to the diamond group, renamed to diamond_matrix in the diamond group to avoid this confusion.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Vehicles Vehicles, parts, mechanics & interactions labels Apr 29, 2020
@ZhilkinSerg ZhilkinSerg merged commit ef52e5b into CleverRaven:master Apr 29, 2020
Drewscriver pushed a commit to Drewscriver/Cataclysm-DDA that referenced this pull request Apr 30, 2020
@Soup-de-Loop Soup-de-Loop deleted the soupdeloop-blazemod-PR25 branch April 30, 2020 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants