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.

Sign up for GitHub

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

Jump to bottom

Freezer recipe and disassemble #63895

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Freezer recipe and disassemble #63895

merged 1 commit into from
Mar 8, 2023

Conversation

KHeket
Copy link
Contributor

@KHeket KHeket commented Mar 3, 2023 •
edited
Loading

Recipe for freezer and disassemble functionality for it, also reduced taking down time for freezers as appliance from 30 minutes to 2 minutes, simular to fridges. My first Pr, so dont punch me hard

Summary

Bugfixes "Adding recipe for craft freezer and adding ability to disassemble it, reducing taking dawn time"

Purpose of change

There was no ability to disassemble freezer to parts and craft it, but standard fridge have. I want to fix this
Fixes #58083
Also fixed time of taking down from 30 to 2 minutes, like maded in #60789 for fridge

Describe the solution

Adding disassembled functionalyty to freezer items. Adding freezer recipe. Reducing taking down time

Describe alternatives you've considered

Leave all as it is, because there is no alternatives

Testing

Launch the game. Spawned frezeer and saw, that I can disassemble it. Learned all recipes by debug menu. Opened craft menu, search for freezer - I can finally craft it
Place freezer as appliance, take it down - it costs 2 minutes, like fridge

Additional context

Recipe and disasseble ability

image

image

@KHeket
Freezer recipe and disassemble
2c7788c 
Recipe for freezer and disassemble functionality for it
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Appliance/Power Grid Anything to do with appliances and power grid Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Bugfix> This is a fix for a bug (or closes open issue) labels Mar 3, 2023
@cake-pie
Copy link
Contributor

cake-pie commented Mar 4, 2023

Could you please look into updating the breaks_into so that it better reflects the components that went into building it? From a quick glance there's a total lack of plastic. Note: yield should be lossy; it's a destructive process so we won't be able to get everything back intact.

@KHeket
Copy link
Contributor Author

KHeket commented Mar 4, 2023

Could you please look into updating the breaks_into so that it better reflects the components that went into building it? From a quick glance there's a total lack of plastic. Note: yield should be lossy; it's a destructive process so we won't be able to get everything back intact.

Okey, I will try to check it

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 4, 2023
@bombasticSlacks
Copy link
Contributor

Could you please look into updating the breaks_into so that it better reflects the components that went into building it? From a quick glance there's a total lack of plastic. Note: yield should be lossy; it's a destructive process so we won't be able to get everything back intact.

This should be done, but I think could be handled in a separate PR. This just brings the freezer to a parity similar to the fridge, which is reasonable as is.

@bombasticSlacks bombasticSlacks merged commit 2f71c08 into CleverRaven:master Mar 8, 2023
@KHeket KHeket deleted the testbranch branch March 8, 2023 15:28
@KHeket
Copy link
Contributor Author

KHeket commented Mar 8, 2023

I will make breaks_into fix at the separate pr

@adamkad1
Copy link
Contributor

adamkad1 commented Mar 8, 2023

Nice. Before that I made a recipe myself inspired by blaze industries vehicle freezer

Dan1ss1mo added a commit to Dan1ss1mo/Cataclysm-DDA that referenced this pull request Mar 14, 2023
@Dan1ss1mo
Squashed commit of the following:
f2a3a63 
commit c6d7d31
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 19:34:50 2023 +0300

    Update torso_armor.json

commit 6d44c3a
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 19:34:02 2023 +0300

    Update torso_armor.json

commit f153105
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 19:29:10 2023 +0300

    Update suits_protection.json

commit 2f71c08
Author: KHeket <[email protected]>
Date:   Wed Mar 8 18:12:52 2023 +0300

    Freezer recipe and disassemble (CleverRaven#63895)

    Recipe for freezer and disassemble functionality for it
Dan1ss1mo added a commit to Dan1ss1mo/Cataclysm-DDA that referenced this pull request Mar 23, 2023
@Dan1ss1mo
Squashed commit of the following:
98e6019 
commit 81dfd3a
Merge: d195323 4ad1388
Author: Dan1ss1mo <[email protected]>
Date:   Thu Mar 23 20:46:11 2023 +0300

    Merge branch 'master' into painres

commit d195323
Merge: d0292a7 53f9146
Author: Dan1ss1mo <[email protected]>
Date:   Thu Mar 16 10:58:40 2023 +0300

    Merge branch 'CleverRaven:master' into painres

commit d0292a7
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 15 22:30:19 2023 +0300

    Update MUTATIONS.md

commit a09ce31
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 15 22:27:34 2023 +0300

    docs

commit d240fd4
Author: Dan1ss1mo <[email protected]>
Date:   Tue Mar 14 15:33:11 2023 +0300

    Update src/activity_handlers.cpp

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit f2a3a63
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 22:51:44 2023 +0300

    Squashed commit of the following:

    commit c6d7d31
    Author: Dan1ss1mo <[email protected]>
    Date:   Wed Mar 8 19:34:50 2023 +0300

        Update torso_armor.json

    commit 6d44c3a
    Author: Dan1ss1mo <[email protected]>
    Date:   Wed Mar 8 19:34:02 2023 +0300

        Update torso_armor.json

    commit f153105
    Author: Dan1ss1mo <[email protected]>
    Date:   Wed Mar 8 19:29:10 2023 +0300

        Update suits_protection.json

    commit 2f71c08
    Author: KHeket <[email protected]>
    Date:   Wed Mar 8 18:12:52 2023 +0300

        Freezer recipe and disassemble (CleverRaven#63895)

        Recipe for freezer and disassemble functionality for it

commit 07827cf
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 17:54:34 2023 +0300

    Update character.cpp

commit fb28325
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 17:53:54 2023 +0300

    Update character.cpp

commit cd96311
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 17:14:20 2023 +0300

    Update src/character.cpp

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit b53ea93
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 17:13:30 2023 +0300

    more fixes

commit bab702c
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 17:07:41 2023 +0300

    some fixes

commit f3ab69d
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 16:56:55 2023 +0300

    Update character.cpp

commit f178740
Merge: 9e352aa 2579396
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 16:44:50 2023 +0300

    Merge branch 'master' into painres

commit 9e352aa
Author: Dan1ss1mo <[email protected]>
Date:   Sun Feb 19 20:01:10 2023 +0300

    Update character.cpp

commit 460e05a
Author: Dan1ss1mo <[email protected]>
Date:   Sun Feb 19 15:04:24 2023 +0300

    linting linting

commit eab3f07
Author: Dan1ss1mo <[email protected]>
Date:   Sun Feb 19 14:58:40 2023 +0300

    Update character.cpp

commit 684d174
Merge: 4e5a4cf 19cdc74
Author: Dan1ss1mo <[email protected]>
Date:   Fri Feb 17 22:03:13 2023 +0300

    Merge branch 'painres' of https://github.com/Dan1ss1mo/Cataclysm-DDA into painres

commit 4e5a4cf
Author: Dan1ss1mo <[email protected]>
Date:   Fri Feb 17 22:02:25 2023 +0300

    more linting

commit 19cdc74
Author: Dan1ss1mo <[email protected]>
Date:   Fri Feb 17 21:48:31 2023 +0300

    linting

commit db14729
Merge: 53d2559 17a7444
Author: Dan1ss1mo <[email protected]>
Date:   Fri Feb 17 21:41:05 2023 +0300

    Merge branch 'painres' of https://github.com/Dan1ss1mo/Cataclysm-DDA into painres

commit 53d2559
Author: Dan1ss1mo <[email protected]>
Date:   Fri Feb 17 21:40:26 2023 +0300

    jsonized suffering
dseguin pushed a commit that referenced this pull request Apr 15, 2023
@Dan1ss1mo @github-actions @kevingranade
Pain immunity flag + flat pain modifier (#63636)
13f8d81 
* jsonized suffering

* linting

* more linting

* Update character.cpp

* linting linting

* Update character.cpp

* Update character.cpp

* some fixes

* more fixes

* Update src/character.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update character.cpp

* Update character.cpp

* Squashed commit of the following:

commit c6d7d31
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 19:34:50 2023 +0300

    Update torso_armor.json

commit 6d44c3a
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 19:34:02 2023 +0300

    Update torso_armor.json

commit f153105
Author: Dan1ss1mo <[email protected]>
Date:   Wed Mar 8 19:29:10 2023 +0300

    Update suits_protection.json

commit 2f71c08
Author: KHeket <[email protected]>
Date:   Wed Mar 8 18:12:52 2023 +0300

    Freezer recipe and disassemble (#63895)

    Recipe for freezer and disassemble functionality for it

* Update src/activity_handlers.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* docs

* Update MUTATIONS.md

* Update mutation.h

* fix constant ordering

* ordering

* Update iuse.cpp

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kevin Granade <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Appliance/Power Grid Anything to do with appliances and power grid astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Disassembly of the freezer and its recipe
4 participants
@KHeket @cake-pie @bombasticSlacks @adamkad1