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

feat(content): mainline some assorted content from MST Extra #5468

Merged

Conversation

chaosvolt
Copy link
Member

@chaosvolt chaosvolt commented Sep 29, 2024

Checklist

Required

Optional

Purpose of change

This finally aims to give another mainlining pass to port some stuff over from MST Extra mod into vanilla BN. Mostly focusing on stuff that required more overrides to vanilla content to include, but did include a few of the most useful standalone bits of content from it.

Describe the solution

  1. Ported over leather cordage, including recipe and inclusion in crafting requirements cordage and cordage_short.
  2. Ported over the production of pitch. Used in the adhesive_proper and waterproofing crafting requirements.
  3. Obsoleted rosin in favor of using pitch directly in the recipe for solder, grabbing the tool qualities used by it previously. Pitch also now gets used as an alternative to plastic in the production of carbon fiber filaments, as mentioned in a JSON comment I added that it's a potential option.
  4. Phased out pine variant of torch recipe in favor of permitting pitch as a direct alternative to flammable_liquid in the standard torch recipe.
  5. Consistency-checked superglue recipe accordingly.
  6. Added makeshift repair kit and associated recipe.
  7. Ported over changes making rubber slugs, chunks of sulfur, and limestone count as ammo for slings.
  8. Brought back the recipe for stone spears. This time instead of making it annoyingly more complicated as a nod to DDA's realism concerns that caused us to inherit the recipe having been obsoleted, it's correctly set to be in between the wooden and copper spears in difficulty.
  9. Mainlined recipe for flint and steel. We already specifically need to play with knapping a striking mechanism for flintlock guns so it's weird how that never got mainlined.
  10. Mainlined recipe for knapping a sharp rock. They're already common from smashing boulders and we don't really treat them as very special compared to regular rocks, so not much point in the restriction.
  11. Mainlined recipe for plastic tarp. I'm astounded that one never made it in.
  12. Mainlined alternative waterskin recipes using sealed stomachs.
  13. Mainlined sled runners, a simple part that can be used mainly to allow for easier dragging of carts without easy access to stable wheels innawoods (and since casters suck a lot worse off-road than they used to).
  14. Merged the "use adhesive" alternative door frame construction into the baseline one by using nail_glue (note: we may have to make door frames no longer give nails when deconstructed due to Unlimited free nails exploit using door frames #5359), mainlined MST Extra's option to convert a window frame into a door frame.
  15. Went ahead and mainlined beehives from MST Extra. Works via seasonal transformation, now that it can support furniture doing this. DDA has beekeeping as a thing involving harvesting wild hives using masses of loose bees as an item-based hack, whereas this implementation abstracts it away and assumes you attract a wild hive to move in a season after it's constructed.
  16. Added UDP external tileset sprites for beehives, and in the process moved our overrides for berry bushes from External_Tileset_DP_Normal to External_Tileset_DP_Normal.
  17. And finally, ported over the feature of domestic farm animals gradually filtering into GROUP_FOREST in small amounts.
  18. Misc: In the process of replacing rosin with pitch, sanity-checked tool demands of solder recipe a lil.

Describe alternatives you've considered

  1. Keeping rosin and having you specifically make it out of pitch instead of implying it by having solder use pitch in the recipe.
  2. Worrying about fixing the door frame exploit now in the same PR.
  3. Adding bee field emissions to beehives would require some serious sanity-checking of bee field behavior. In particular we'd need to fix the issue of bees FUCKING TELEPORTING to the player's location the instant you get in range, and also have to sanity-check how the stung effect works to not spam infinite pain incrementally every single turn. I checked DDA and after some searching it seems they completely removed all the effects bee fields have, so it prompts you as if it's a dangerous field and has immunity data required to be "safe" from it but no longer inflicts any effects on the player when standing in it (but also it seems they no longer teleport to you, so that's one good thing at least).
  4. Waiting to include filtration of escaped domestic animals into GROUP_FOREST until after whenever I finally sanity-check that monstergroup like I really oughta.

Testing

  1. Checked affected files for syntax and lint errors.
  2. Load-tested in compiled test build.

Additional context

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Sep 29, 2024
@RoyalFox2140 RoyalFox2140 merged commit 3e695c3 into cataclysmbnteam:main Sep 30, 2024
9 checks passed
@chaosvolt chaosvolt deleted the mst-extra-mainlining-pass branch September 30, 2024 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants