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

New core content pack: Aftershock #28386

Merged
merged 13 commits into from Mar 13, 2019

Conversation

@Ilysen
Copy link
Contributor

Ilysen commented Feb 25, 2019

Summary

SUMMARY: Mods "A core content pack called Aftershock is now available in the mods list, focusing around reintroducing old content and adding science fiction stuff."

Purpose of change

I've been using this mod personally for some time now, and I wanted to share it with the community. @mlangsdorf and @kevingranade told me to PR it here to the development branch, so I think I did everything right.

Describe the solution

This PR adds the core content pack Aftershock into mainline. The details of the mod can be found at the Discourse thread.

Being on mainline, all contributions to the mod are welcomed, although I'd like to have some say in whether or not changes get in. If that's too much to ask, I'm fine with it officially entering the public domain as soon as this pull request goes through.

If something is being removed due to not fitting in the main game, chances are it could go into Aftershock. Similarly, if someone thinks that something in Aftershock would fit fine into the base game, as long as they handle item migration correctly, I'm fine with it being ported. I'm mostly using this as my personal playground for things I think would be fun to have but wouldn't fit into mainline, so I don't tend to think much about that.

A lot of items, like the rope lighter, could fit into the main game, but I've not included them. This is because of the crafting recipes; because the mod centers around game logic for balance and not realism, I have no problem with people putting together advanced things out of scraps, as long as they have the skills and it makes sense within the context.

Additional context

Screenshots from the thread:

@kevingranade

This comment has been minimized.

Copy link
Member

kevingranade commented Feb 25, 2019

This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/aftershock-a-core-content-pack-to-restore-removed-content-and-drift-the-game-towards-sci-fi/18955/5

@mlangsdorf

This comment has been minimized.

Copy link
Contributor

mlangsdorf commented Feb 25, 2019

The PR itself looks pretty good. I didn't review the content so I'm not approving it.

It won't be merged until 0.D releases into 2 weeks or more, but this is a great start.

Ilysen added 2 commits Feb 26, 2019
@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Feb 26, 2019

I touched up on the returns; hopefully that's all that's needed with regards to linting. I used the linter for most of the files, but I must've missed a few.

While taking a walk today, I also thought: "You know what Cataclysm needs? Atomic smartphones." So I made atomic smartphones.

Ilysen added 3 commits Feb 26, 2019
@paulenka-aleh

This comment has been minimized.

Copy link

paulenka-aleh commented Feb 26, 2019

Just out of curiosity... I was under impression that idea behind Bright Nights was to drive game more towards unrealist fun sci-fi things. There's even a level up Crazy Cataclysm for things that are crazy even for sci-fi.

Why can't it just be part of Bright Nights? As a player I usually get lost in number of mods and really have hard times to figure out what exactly such content mods do the game and if / why it worth to add them. Eventually it will be one of such mods.

@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Feb 26, 2019

I'm not a maintainer for Bright Nights, and its own vision (of strict science-fantasy) clashes with my own (which is a world that was on the cusp of developing such things before the Cataclysm.) I've adopted some things from Bright Nights, but things such as municipal nuclear reactors felt too far-fetched for my ideas. The most advanced, sci-fi-like things are restricted to very rare drops in difficult areas.

Also, hate to bother you again @mlangsdorf, but if I wanted to add things such as bionics to Aftershock that required C++ code, how would I go about that? Is it allowed to implement code solely for mods?

@kevingranade

This comment has been minimized.

Copy link
Member

kevingranade commented Feb 26, 2019

It's totally fine to add c++ content that's only exercised by a mod.

@Night-Pryanik

This comment has been minimized.

Copy link
Member

Night-Pryanik commented Feb 27, 2019

It's totally fine to add c++ content that's only exercised by a mod.

@codemime said the opposite in #16396 (comment):

Pure mods should never ever change compilable code. If mod isn't enabled or abandoned, you just have pieces of dead code scattered over the project.

@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Feb 28, 2019

I keep adding more content as I have ideas for it, since I imagine the wait on this PR will be long and more things could be introduced in that wait. If it'd be better for me to halt commits for a time, let me know.

"description": "The slopes of New England are nice this time of year, and you were spending the month on vacation at a resort when you were evacuated.",
"points": 2,
"traits": [ "AFS_PROF_SKIIER" ],
"skills": [ { "level": 3, "name": "dodge" }, { "level": 2, "name": "survival" } ],

This comment has been minimized.

Copy link
@Night-Pryanik

Night-Pryanik Mar 1, 2019

Member

Why the survival? It could be the most ordinary skiier in the world.

This comment has been minimized.

Copy link
@Ilysen

Ilysen Mar 4, 2019

Author Contributor

This is implied to be an experienced skiier, due to their profession trait. The survival skill represents their knowledge of alpine conditions and precautions they might unconsciously take. Survival 2 isn't very high at all.

[ [ "small_lcd_screen", 1 ] ],
[ [ "RAM", 1 ] ],
[ [ "processor", 1 ] ],
[ [ "lens", 1 ] ],

This comment has been minimized.

Copy link
@anothersimulacrum

anothersimulacrum Mar 1, 2019

Contributor

Should be "lens_small".

@adamkad1

This comment has been minimized.

Copy link

adamkad1 commented Mar 1, 2019

are we gonna get a freezer version of converted fridge?

@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Mar 4, 2019

I can't think of any kind of full-size freezer other than a walk-in, but perhaps I can make a version that involves overclocking it to make the temperature run much lower, or just refurbishing it. Most fridges do have a freezer, after all.

@thethunderhawk

This comment has been minimized.

Copy link

thethunderhawk commented Mar 6, 2019

I can't think of any kind of full-size freezer other than a walk-in...

These things, right? People put them in garages and sheds, sometimes hunters store their butchered meat in them. I bet most serious hunters would have one, how else do you store a whole butchered elk?

https://m.lowes.com/pl/Upright-freezers-Freezers-ice-makers-Appliances/4294857902

@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Mar 6, 2019

That makes sense. I don't think I can edit mapgen of some houses, but perhaps I could make a cabin variation that has one.

The Discourse thread's version of Aftershock is updated quite a bit and has a vehicle freezer that's converted from the vehicle fridge in a further construction recipe, if you're looking for that.

@ifreund ifreund removed the 0.D Freeze label Mar 8, 2019
@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Mar 12, 2019

This should be the final update in this pull request for now, so it should be ready for review. Please keep me posted on if I need to do anything or can help out at all with the process.

@kevingranade

This comment has been minimized.

Copy link
Member

kevingranade commented Mar 13, 2019

Please run json styler over your files.
You have two copies of bn_bio_solar.

@kevingranade kevingranade merged commit 90bfde2 into CleverRaven:development Mar 13, 2019
2 of 3 checks passed
2 of 3 checks passed
gorgon-ghprb Build finished.
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Ilysen Ilysen deleted the Ilysen:AftershockBranch branch Mar 13, 2019
kevingranade added a commit that referenced this pull request Mar 14, 2019
* origin/development:
  New core content pack: Aftershock (#28386)
@l29ah

This comment has been minimized.

Copy link
Contributor

l29ah commented Mar 31, 2019

Cargo trough is much cheaper and has more volume than a cargo space :/

@Ilysen

This comment has been minimized.

Copy link
Contributor Author

Ilysen commented Mar 31, 2019

I'm aware, and it was intentional. It was mainly intended because I found 250 L to still be too low for hoarders like myself - and, according to some math I did, cargo spaces should hold 1500 L anyway, so I figured a bandaid would be fine for Aftershock. I believe the update tweaks the storage values of the cargo space and trunk, but it's been in limbo for a while.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.