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

Dark Skies Part 4: Overrides #38526

Merged
merged 5 commits into from
Mar 6, 2020
Merged

Dark Skies Part 4: Overrides #38526

merged 5 commits into from
Mar 6, 2020

Conversation

ephemeralstoryteller
Copy link
Contributor

@ephemeralstoryteller ephemeralstoryteller commented Mar 2, 2020

Summary

SUMMARY: Mods "Part 4 of Dark Skies Above, adds override files"

Purpose of change

Adds most of the override files, except for evac_shelter and scenarios, which were fairly big.

Describe the solution

  • For brevity: Most files are edits to descriptions, stripping out references to zombies or other base game lore.
  • Cemetery: edits out the bone seer until I get a chance to work with her more explicitly
  • Carnivore also tweaks the names of tainted meat and mutant meat to represent alien flesh or heavily mutated flesh, and flesh from creatures tampered with by the aliens.
  • Newspaper was changed to call Dark Skies's own list of snippets.
  • Mapgen: Lowers the frequency of toxic waste dumps, because they were spawning quite frequently with some of the other locations being blacklisted.
  • Monsters gives manhacks the "alien" category, so they will spawn if called by enemies that deploy manhacks. It also nixes the "wildlife" category for giant rattlesnakes and naked mole rats.

Testing

Tested copy-from to cut down on the diffs of professions.json, it worked.

Adds override files
Ran through the web-linter again and edited a bit of grammar I noticed anyway.
@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding labels Mar 3, 2020
@ephemeralstoryteller
Copy link
Contributor Author

After running this through the web linter several times, I've come to the conclusion that I don't know how to fix the JSON formatting. If anyone else has an idea of what the problem, do highlight it for me.

@Maleclypse
Copy link
Member

After running this through the web linter several times, I've come to the conclusion that I don't know how to fix the JSON formatting. If anyone else has an idea of what the problem, do highlight it for me.

In cases where I'm having difficulties I use this link https://jsonlint.com/?json= then once that link tells me I have a valid json I run it through the cata linter.

Uses suggestions provided by AMurkin

Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com>
@ephemeralstoryteller
Copy link
Contributor Author

Thanks for the suggestions! I'm a bit baffled, the json checker reads both what I had and the review as valid, but there's still an issue that I must not be picking up on.

@ZhilkinSerg ZhilkinSerg changed the base branch from master to dev March 6, 2020 10:20
@ZhilkinSerg ZhilkinSerg merged commit 6f05032 into CleverRaven:dev Mar 6, 2020
@ZhilkinSerg ZhilkinSerg mentioned this pull request Mar 6, 2020
13 tasks
ZhilkinSerg pushed a commit that referenced this pull request Mar 7, 2020
* Dark Skies Part 4: Overrides

Adds override files
ZhilkinSerg pushed a commit that referenced this pull request Mar 10, 2020
* Dark Skies Part 4: Overrides

Adds override files
ZhilkinSerg pushed a commit that referenced this pull request Mar 15, 2020
* Dark Skies Part 4: Overrides

Adds override files
ZhilkinSerg pushed a commit that referenced this pull request Mar 15, 2020
* Dark Skies Part 4: Overrides

Adds override files
ZhilkinSerg pushed a commit that referenced this pull request Mar 16, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 18, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 29, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants