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 WIP Limb Stuff mod and move mainline limby stuff over #70721

Merged
merged 5 commits into from
Jan 13, 2024

Conversation

Venera3
Copy link
Member

@Venera3 Venera3 commented Jan 6, 2024

Summary

Content "Add WIP Limb Stuff Mod"

Purpose of change

Begin #70703 with moving in-progress content to a mod that communicates its WIP-ness.

Describe the solution

Added a WIP Limb Stuff Mod, made myself its code owner
Moved limby JSON over to the mod

  • Gastropod Foot's limb and enchantment
  • All prosthetics including spawns and EoC
  • Vitakinetic's limb regrowth power
  • Some slight prosthetic spawn adjustments
  • Reset in-progress amputees - prosthetics are migrated to planks, on load amputee chars get a nice popup with instructions should they insist on continuing as such and get reset to full limbs.

Describe alternatives you've considered

Obsoleting all of it to keep in-progress amputee characters safe, but that just shifts breakage down the line to when this stuff will have been reworked and begins its migration back to mainline.
Went with the safe way.

Testing

Started a normal save without the mod - no errors
Started a canned amputee save - some missing EOC errors, on load (and waiting one tick) get the informative popup and my limbs back
Started a modded save - no errors

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Scenarios New Scenarios, balancing, bugs with scenarios Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing EOC: Effects On Condition Anything concerning Effects On Condition Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Mind Over Matter labels Jan 6, 2024
@Venera3 Venera3 added the Limbs Limbs, mutable limbs, and code related to them. label Jan 6, 2024
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jan 6, 2024
@worm-girl
Copy link
Contributor

#70443 adds two new limbs for bird wings, replacing the mutant's arms and hands. The PR will still function without those parts being limbified, but given that it's about ready to merge, would it be possible to wait for that to happen, then move the limbs over to the mod? It would make my life easier.

@worm-girl
Copy link
Contributor

Whoops, I mean #70479

@Venera3
Copy link
Member Author

Venera3 commented Jan 7, 2024

The law of the land is "first merged wins" - if yours makes it in first the conflict resolution is on me and vice versa.

@Venera3 Venera3 mentioned this pull request Jan 7, 2024
45 tasks
@Venera3 Venera3 marked this pull request as ready for review January 7, 2024 18:28
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @Standing-Storm @Light-Wave

data/json/obsoletion/prosthetics.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/effects.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/enchantments.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/enchantments.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/mod_integration/vitakinesis_eoc.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/professions.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/professions.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/professions.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/recipes.json Outdated Show resolved Hide resolved
data/mods/Limb_WIP/scenarios.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jan 7, 2024
@Maleclypse
Copy link
Member

So many conflicts

@Venera3
Copy link
Member Author

Venera3 commented Jan 9, 2024

So many conflicts

Well if only y'all didn't merge limby stuff... Migrated bird wings over and rebased, should be ready now.

@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 9, 2024
@Maleclypse
Copy link
Member

Proceeded to fail tests I didn’t even know existed ;)

@github-actions github-actions bot added the Mods: Magiclysm Anything to do with the Magiclysm mod label Jan 9, 2024
@github-actions github-actions bot requested a review from KorGgenT January 9, 2024 21:34
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @GuardianDll

@Maleclypse
Copy link
Member

I see you ran into the same confusion I did when I was trying to fix the ravenfolk errors. I was gonna be helpful and instead I just complained in discord.

@github-actions github-actions bot added Code: Tooling Tooling that is not part of the main game but is part of the repo. BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jan 10, 2024
From Hell's Heart I lint at thee

We'll get there
Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 13, 2024
@worm-girl
Copy link
Contributor

I am not 100% sure what the design intent for ravenfolk is. They were using Bird's bird_wings mutation so I gave them parity with that, but it may be the original contributor's intent that they have wings separate from their arms.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 13, 2024
@Maleclypse Maleclypse merged commit d8e3414 into CleverRaven:master Jan 13, 2024
24 checks passed
@peearler
Copy link

I don’t see recipes for making prosthetic legs and arms after the system was added to a separate mod. for now just look in spawn places?

@Venera3
Copy link
Member Author

Venera3 commented Jan 20, 2024

I don’t see recipes for making prosthetic legs and arms after the system was added to a separate mod. for now just look in spawn places?

Slight migration problem, I'll have a fix up soonish.

@Venera3 Venera3 deleted the limb_wip_mod branch January 20, 2024 20:43
@BrettDong BrettDong added the 0.H Backport PR to backport to the 0.H stable release canddiate label Jan 30, 2024
@worm-girl worm-girl mentioned this pull request Feb 19, 2024
43 tasks
@Procyonae Procyonae removed the 0.H Backport PR to backport to the 0.H stable release canddiate label May 24, 2024
harakka pushed a commit to harakka/Cataclysm-DDA that referenced this pull request Sep 3, 2024
…n#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin
harakka pushed a commit to harakka/Cataclysm-DDA that referenced this pull request Sep 3, 2024
…n#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin
harakka pushed a commit to harakka/Cataclysm-DDA that referenced this pull request Sep 3, 2024
…n#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin
harakka pushed a commit to harakka/Cataclysm-DDA that referenced this pull request Sep 3, 2024
…n#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin
harakka pushed a commit to harakka/Cataclysm-DDA that referenced this pull request Sep 4, 2024
…n#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin
harakka pushed a commit to harakka/Cataclysm-DDA that referenced this pull request Sep 4, 2024
…n#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin
Maleclypse pushed a commit that referenced this pull request Sep 7, 2024
* Add WIP Limb Stuff mod and move mainline limby stuff over (#70721)

* First migration

* Second

* Migration

From Hell's Heart I lint at thee

We'll get there

* Ravenfolk fix

Actual fix fix maybe?

Fix fix fix + test armor

Imma have to squash this mess to oblivion

I swear to Glob

This is getting awkward

* Done playin

* Ravenfolk test failures

* Try to fix WINGS_BIRD categories

---------

Co-authored-by: Venera3 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling EOC: Effects On Condition Anything concerning Effects On Condition Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Limbs Limbs, mutable limbs, and code related to them. Mechanics: Enchantments / Spells Enchantments and spells Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods Issues related to mods or modding Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants