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

Fill farm silos with silage #62610

Merged
merged 3 commits into from
Dec 8, 2022
Merged

Fill farm silos with silage #62610

merged 3 commits into from
Dec 8, 2022

Conversation

oosyrag
Copy link
Contributor

@oosyrag oosyrag commented Dec 7, 2022

Summary

Content "Fill farm silos with silage"

Purpose of change

Addresses #55540

Silos on farms are generally filled with silage, or feed for livestock, and not harvested crops from the farm. There are certain types of silos more commonly known as grain bins that would store harvested grains, but these are usually found at processing plants rather than on a farm. The idea of a silo on a farm storing grains is a misconception in the first place.

Describe the solution

Replace corn and wheat in silos found on farms with cattle fodder, the closest thing we have to silage. The aforementioned grains usually are rotten and disappeared in many players' games by the time the silos are breached, as mentioned in the linked issue. The silage would not spoil and remain there to be discovered by a player.

Describe alternatives you've considered

Leave as is.

Testing

N/A

Additional context

https://www.britannica.com/topic/silo-farm-building
https://stardewvalleywiki.com/Silo (half kidding)

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON 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 Dec 7, 2022
@dseguin dseguin merged commit 69f0819 into CleverRaven:master Dec 8, 2022
@oosyrag oosyrag deleted the silosilage branch December 8, 2022 04:24
LovamKicsiGazsii added a commit to LovamKicsiGazsii/Cataclysm-DDA that referenced this pull request Dec 13, 2022
@LovamKicsiGazsii
Squashed commit of the following:
73506ab 
commit e40157c
Author: Gabriel Pociecha <[email protected]>
Date:   Tue Dec 13 02:24:39 2022 -0500

    Update offal_dishes.json (CleverRaven#62702)

    Changed the amount of powder eggs required in the leverpostej recipe from 10 to 2 to be equal to all other egg types (as is consistent in similar recipes)

commit 1da901a
Author: andrei <[email protected]>
Date:   Tue Dec 13 09:16:58 2022 +0200

    construction: split partial constructions from traps (CleverRaven#62672)

    * construction: split partial constructions from traps

    * squash me

commit a4929e2
Author: Maleclypse <[email protected]>
Date:   Tue Dec 13 01:08:57 2022 -0600

    Remove Robots from receptive to scents (CleverRaven#62698)

    Update cyborgs.json

commit e52cdf3
Author: Maleclypse <[email protected]>
Date:   Tue Dec 13 01:04:44 2022 -0600

    Remove ability of humans to track humans by scent (CleverRaven#62697)

    Update scent_types.json

    Update scent_types.json

commit e980878
Author: Eric <[email protected]>
Date:   Tue Dec 13 02:03:43 2022 -0500

    Fixes (CleverRaven#62700)

commit 3541b75
Author: John Candlebury <[email protected]>
Date:   Tue Dec 13 00:58:43 2022 -0600

    Whitelists for Aftershock Exoplanet Map Specials (CleverRaven#62709)

    * Whitelists for Exoplanet Map Specials

    Much easier to maintain

    * Json format

commit 2bb1c04
Author: Binrui Dong <[email protected]>
Date:   Tue Dec 13 08:56:13 2022 +0200

    Fix random craft_available_via_vehicle_rig test failure (CleverRaven#62712)

commit eb42fe7
Author: MNG-cataclysm <[email protected]>
Date:   Tue Dec 13 01:55:39 2022 -0500

    Patch the Limeware Platter exploit (CleverRaven#62715)

    * Add the consequence

    * stuff

    * Restart Tests

commit ba570e5
Author: mqrause <[email protected]>
Date:   Tue Dec 13 07:51:13 2022 +0100

    only count applicable ammo charges in container pockets and only when there's no magazine or magazine well pocket (CleverRaven#62719)

    Co-authored-by: mqrause <[email protected]>

commit c397de2
Merge: b758c62 4b14b02
Author: Angela Graves <[email protected]>
Date:   Tue Dec 13 00:09:24 2022 -0600

    Merge pull request CleverRaven#62559 from MNG-cataclysm/horde_master_jsonify

    Migrate the "Kill Horde Master" mission to JSON

commit b758c62
Author: casswedson <[email protected]>
Date:   Mon Dec 12 06:31:29 2022 -0500

    fix: magiclysm's thunder pillar spells (CleverRaven#62676)

    - fix ranges from just a tile range e.g. [12-12] to a say [5-12]

    Co-authored-by: casswedson <[email protected]>

commit 054c0f9
Merge: f643cd5 47e2047
Author: Angela Graves <[email protected]>
Date:   Mon Dec 12 04:13:12 2022 -0600

    Merge pull request CleverRaven#62704 from CleverRaven/tileset-updates

    Routine tileset updates on 11 December 2022

commit 47e2047
Author: casswedson <[email protected]>
Date:   Sun Dec 11 23:03:31 2022 +0000

    Routine tileset updates on 11 December 2022

commit f643cd5
Author: MNG-cataclysm <[email protected]>
Date:   Sun Dec 11 11:32:04 2022 -0500

    Obsolete Dark Skies Above (CleverRaven#62504)

    * Update recipe_deconstruction.json

    * Update recipe_deconstruction.json

    * Update recipe_deconstruction.json

    * Add myself to comment commands list

    * Delete Dark Skies Above

    * Revert "Delete Dark Skies Above"

    This reverts commit 1a9d597.

    * Update modinfo.json

commit 8a94f30
Author: anoobindisguise <[email protected]>
Date:   Sun Dec 11 08:24:07 2022 -0800

    fix ordering for filament_canvas (CleverRaven#62532)

    * filaments ordering fix

    * fix an error

commit 78948f2
Author: MNG-cataclysm <[email protected]>
Date:   Sun Dec 11 11:23:39 2022 -0500

    Logging Camp managers will now take quest items (CleverRaven#62556)

    * Add the stuff

    * Specify globallity

    * Restart Tests

commit f16a17d
Author: MNG-cataclysm <[email protected]>
Date:   Sun Dec 11 11:23:05 2022 -0500

    Migrate the "Recover Priests Diary" mission to JSON (CleverRaven#62581)

    * Add the stuff

    * Update data/json/npcs/missiondef.json

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

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

commit eb54eb3
Author: AkkoRishtar <[email protected]>
Date:   Sun Dec 11 17:22:50 2022 +0100

    stomach_size_multiplier for dragon size mutations (CleverRaven#62613)

    Summary
    Added stomach_size_multiplier in line with mainline size mutations to black dragon size mutations.

    Purpose of change
    Makes the black dragon mutation line viable considering the increased necessary nutrient intake.

    Describe the solution
    Added stomach_size_multiplier in line with mainline size mutations to black dragon size mutations.

    Describe alternatives you've considered
    Increasing metabolism_modifier and vitamins_absorb_multi, but that would both be illogical and go against the creators' intent with this mutation line.

    Testing
    drank water till full, confirmed stomach contents, emptied stomach. Repeated this with all 4 concerned mutations.

    Additional context
    Exact values are copied from mainline, can be considered placeholder until whoever is working on this decides what they should be.

commit 5fc73dc
Author: gettingusedto <[email protected]>
Date:   Sun Dec 11 22:36:56 2022 +0700

    make the one metal door in hunting lodge pickable (CleverRaven#62666)

    * make the one metal door in lodge pickable

    * Update data/json/mapgen_palettes/lodge_palette.json

    Co-authored-by: Maleclypse <[email protected]>

    Co-authored-by: Maleclypse <[email protected]>

commit 6b1b9f5
Author: Ava <[email protected]>
Date:   Sun Dec 11 10:34:52 2022 -0500

    eg (CleverRaven#62669)

commit e164cbc
Author: casswedson <[email protected]>
Date:   Sun Dec 11 10:27:22 2022 -0500

    more typo fixes (CleverRaven#62675)

    * typo fixes

    * Apply suggestions from code review

    Co-authored-by: NetSysFire <[email protected]>

    * Apply suggestions from code review

    Co-authored-by: Maleclypse <[email protected]>

    * Apply suggestions from code review

    Co-authored-by: Maleclypse <[email protected]>

    * Apply suggestions from code review

    Co-authored-by: Maleclypse <[email protected]>

    Co-authored-by: casswedson <[email protected]>
    Co-authored-by: NetSysFire <[email protected]>
    Co-authored-by: Maleclypse <[email protected]>

commit 919632b
Author: David Kristoffersson <[email protected]>
Date:   Sun Dec 11 15:24:59 2022 +0000

    Allow doctors to trade without running out of space (CleverRaven#62677)

    The Tacoma ranch doctor rapidly runs out of space when you are paying for operations. If they are given a shopkeeper item group, then they don't run out of space.

    See CleverRaven#62673

commit 047902f
Author: casswedson <[email protected]>
Date:   Sun Dec 11 10:23:30 2022 -0500

    use parallel processes in ci specific astyle calls (CleverRaven#62680)

    usually half astyle's execution time for the astyle ci test and also the
    pr code reviewer

    total execution time is like 11 secs, still in the case of the code
    reviewer I'll take any time improvements

    use xargs' `-P` option
    ```
      -P, --max-procs=MAX-PROCS    run at most MAX-PROCS processes at a time
    ```

    Co-authored-by: casswedson <[email protected]>

commit 2150a13
Author: Maleclypse <[email protected]>
Date:   Sun Dec 11 09:18:20 2022 -0600

    Update MONSTERS.md (CleverRaven#62679)

commit 951eb01
Author: Anton Burmistrov <[email protected]>
Date:   Sun Dec 11 19:09:55 2022 +0400

    Removed adding bear trap on monster death to its inventory (CleverRaven#62693)

commit 27d447b
Author: Anton Burmistrov <[email protected]>
Date:   Sun Dec 11 19:08:30 2022 +0400

    Added `DRILL` 3 quality to drill_press_tool fake item (CleverRaven#62695)

commit 4e8ad92
Author: Binrui Dong <[email protected]>
Date:   Sun Dec 11 17:07:14 2022 +0200

    Migrate from set-output to GITHUB_OUTPUT in General Build Matrix GHA job (CleverRaven#62686)

commit ef8d33d
Merge: f5eec2f 4a88438
Author: Angela Graves <[email protected]>
Date:   Sun Dec 11 00:36:11 2022 -0600

    Merge pull request CleverRaven#62671 from reusityback/theoretical_knowledge_spelling

    Change spelling error

commit 4a88438
Author: reusityback <[email protected]>
Date:   Sat Dec 10 17:50:39 2022 +0100

    Change spelling error

    Theoretical knowledge is now possessed.

commit f5eec2f
Author: Hirmuolio <[email protected]>
Date:   Sat Dec 10 18:13:55 2022 +0200

    Item power_draw in units::power (CleverRaven#62363)

    * power_draw json

    * power_draw json

    * power_draw

    * doc

    * mods

    * assign

    * J->W

commit 89a86fc
Author: Hirmuolio <[email protected]>
Date:   Sat Dec 10 18:13:26 2022 +0200

    Vehicle energy_consumption in units::power (CleverRaven#62365)

    * energy_consumption json

    * energy_consumption

    * doc

commit f9cc1b1
Author: Kevin Granade <[email protected]>
Date:   Sat Dec 10 00:22:30 2022 -0800

    Update the table of contents (CleverRaven#62643)

    Co-authored-by: Rivet-the-Zombie <[email protected]>

commit 9735123
Author: gettingusedto <[email protected]>
Date:   Sat Dec 10 15:21:08 2022 +0700

    make lumbermill employees not spawn as random npcs (CleverRaven#62645)

    * make lumbermill employees not spawn as random

    npcs

    * oops didn't noticed that onr

commit 471a284
Author: Anton Burmistrov <[email protected]>
Date:   Sat Dec 10 12:19:53 2022 +0400

    Don't trigger any effect when setting and unsetting cosmetic traits (CleverRaven#62649)

commit 82677e6
Author: LyleSY <[email protected]>
Date:   Sat Dec 10 03:19:21 2022 -0500

    horns mutation fix (CleverRaven#62650)

commit 45fef5b
Author: Anton Burmistrov <[email protected]>
Date:   Sat Dec 10 12:19:03 2022 +0400

    Added canvas material to Magiclysm-specific sewing kit and tailor's kit (CleverRaven#62651)

commit 8e39d6f
Author: casswedson <[email protected]>
Date:   Sat Dec 10 03:18:18 2022 -0500

    fix: edge case ci error exit (CleverRaven#62660)

    so a step of the reviewer workflow always runs, good it is the actual
    magical step doing the hard work, but if the workflow gets canceled, the
    step exits with an error code, I actually knew this but me from like a
    day ago was like:
    "nah man this won't bother me in the future."

    guess what; after a couple hours I was felling the pain my perfectionist
    subconscious was putting me through, plus odd error code exits aren't
    very professional or clean or pleasing I'd say, also someone may think
    it's weird, look into it, waste time looking at my code

    title: do not draw much attention

    Co-authored-by: casswedson <[email protected]>

commit 8d1d4a8
Author: Kevin Granade <[email protected]>
Date:   Sat Dec 10 00:17:54 2022 -0800

    Routine i18n updates on 10 December 2022 (CleverRaven#62661)

    Co-authored-by: Brett Dong (BOT) <[email protected]>

commit 50d81a1
Merge: 5fd0f93 86f6561
Author: Angela Graves <[email protected]>
Date:   Fri Dec 9 00:49:16 2022 -0600

    Merge pull request CleverRaven#62525 from irwiss/veh-part-sizes

    Tidy up vehicle part "size" field

commit 5fd0f93
Author: Anton Burmistrov <[email protected]>
Date:   Fri Dec 9 07:13:48 2022 +0400

    If we upgrade into a blacklisted monster, treat it as though we are non-upgradeable (CleverRaven#62626)

    Co-Authored-By: Rhxydos <[email protected]>

    Co-authored-by: Rhxydos <[email protected]>

commit 6e617f6
Author: Anton Burmistrov <[email protected]>
Date:   Fri Dec 9 07:13:06 2022 +0400

    'Adding special items to monster inventory' section is now triggered earlier than 'Dropping items from monster inventory' section (CleverRaven#62615)

commit 52279d7
Merge: 11419ee deb666f
Author: David Seguin <[email protected]>
Date:   Thu Dec 8 22:12:36 2022 -0500

    Merge pull request CleverRaven#62627 from NetSysFire/doc-traps

    Reverse engineer trap docs

commit 11419ee
Author: casswedson <[email protected]>
Date:   Thu Dec 8 22:11:17 2022 -0500

    fix: run code style reviewer on file changes (CleverRaven#62629)

    I would like to just run on relevant file changes, not run always and
    skip if the previous run was successful + relevant file changes

    since this is not included in the branch protection rules it doesn't
    need to run on all prs, just on a few

    Co-authored-by: casswedson <[email protected]>

commit 8f1fb0b
Author: Maleclypse <[email protected]>
Date:   Thu Dec 8 21:09:55 2022 -0600

    Monster group and a specific comment (CleverRaven#62633)

commit 1935718
Author: Zhilkin Serg <[email protected]>
Date:   Fri Dec 9 06:09:39 2022 +0300

    Added android:exported="true" to Android manifest (CleverRaven#62631)

    This is needed for targeting Android 12 (API 31)

commit b1a88cc
Author: Numbuh474 <[email protected]>
Date:   Thu Dec 8 22:08:40 2022 -0500

    Fix crash caused by NW faction camp expansions not saving temp ui mission keys. (CleverRaven#62624)

commit a63662b
Merge: 04ce720 bc8d956
Author: David Seguin <[email protected]>
Date:   Thu Dec 8 20:04:42 2022 -0500

    Merge pull request CleverRaven#62628 from CleverRaven/kevingranade-deflake

    Addressing new flake warnings

commit 04ce720
Author: bean-b <[email protected]>
Date:   Thu Dec 8 16:06:55 2022 -0600

    Riot armor nerf (CleverRaven#62395)

    * balence

    * small

    * Update data/json/items/armor/suits_protection.json

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

    * lint

    * tests

    * Revert "tests"

    This reverts commit 5cba5bd.

    * back to 2 on limb lowers

    * 1.75

    * 85 -> 80 coverage

    * back to 2 for limbs

    * tests

    * tests

    * Update data/json/items/armor/suits_protection.json

    Co-authored-by: I-am-Erk <[email protected]>

    * Update data/json/items/armor/torso_armor.json

    Co-authored-by: I-am-Erk <[email protected]>

    * values

    * Update data/json/items/armor/torso_armor.json

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

    * less coverage

    * coverage

    * coverage

    * enc

    * lower thickness

    * 1.75 mm

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: I-am-Erk <[email protected]>

commit bc8d956
Author: Kevin Granade <[email protected]>
Date:   Thu Dec 8 09:51:59 2022 -0800

    demote more f-strings

commit c94319f
Author: Kevin Granade <[email protected]>
Date:   Thu Dec 8 09:47:57 2022 -0800

    slightly more infirmative name

commit ad5b01f
Author: Kevin Granade <[email protected]>
Date:   Thu Dec 8 09:46:31 2022 -0800

    demote strings to static that are improperly f-strings

commit 7346fab
Author: Kevin Granade <[email protected]>
Date:   Thu Dec 8 09:25:52 2022 -0800

    slightly less ambiguous nane

    Addressing new flake warnings

commit deb666f
Author: NetSysFire <[email protected]>
Date:   Thu Dec 8 17:57:16 2022 +0100

    address comfort and floor_bedding_warmth

commit 728bb9f
Author: NetSysFire <[email protected]>
Date:   Thu Dec 8 17:25:40 2022 +0100

    polish docs and reverse engineer trap docs

commit 6e4b17f
Merge: 8e428ca 1b43f55
Author: Zhilkin Serg <[email protected]>
Date:   Thu Dec 8 14:46:51 2022 +0300

    Merge pull request CleverRaven#62625 from CleverRaven/android-sdk-version-31

    Bump default SDK version for Android builds to 31

commit 1b43f55
Author: Zhilkin Serg <[email protected]>
Date:   Thu Dec 8 14:12:56 2022 +0300

    Bump default SDK version for Android builds to 31

commit 8e428ca
Merge: 69f0819 3fa674e
Author: Angela Graves <[email protected]>
Date:   Thu Dec 8 00:10:40 2022 -0600

    Merge pull request CleverRaven#62562 from anoobindisguise/anoobindisguise-22casing

    spawn primed 22 casings in gunsmith stores

commit 69f0819
Author: oosyrag <[email protected]>
Date:   Wed Dec 7 20:19:49 2022 -0800

    Fill farm silos with silage (CleverRaven#62610)

    * Update farm.json

    * Update farm_2side.json

    * Update farm_lots.json

commit ae1b845
Author: Binrui Dong <[email protected]>
Date:   Thu Dec 8 12:17:13 2022 +0800

    Update spell checker dictionary (CleverRaven#62599)

commit b33b40d
Author: casswedson <[email protected]>
Date:   Wed Dec 7 23:16:18 2022 -0500

    fix: nerf goblin encampment charcoal reserves (CleverRaven#62621)

    so one of the goblin encampment chunks makes calls to some
    itemgroups containing this line:

    { "item": "charcoal", "count": [ 20, 75 ], "prob": 20 },

    aka give me some charcoal items, but like each has 50 charges so
    spawn 50 charges worth times 20 to 75 charcoal, a few.

    change it so it's less, way less, still a fair amount 10 to 50 charges
    times 2 to 5, I like this cause it'll spawn a very randomized amount
    each time

    Co-authored-by: casswedson <[email protected]>

commit b0c9b48
Author: Anton Burmistrov <[email protected]>
Date:   Thu Dec 8 08:13:34 2022 +0400

    Added doors to toilets (CleverRaven#62614)

commit 4b14b02
Merge: d89155a 1894579
Author: MNG-cataclysm <[email protected]>
Date:   Sun Dec 4 12:02:38 2022 -0500

    Merge branch 'CleverRaven:master' into horde_master_jsonify

commit d89155a
Author: MNG-cataclysm <[email protected]>
Date:   Sun Dec 4 10:48:25 2022 -0500

    Update mission_start.cpp

commit 3fa674e
Author: anoobindisguise <[email protected]>
Date:   Sat Dec 3 23:27:48 2022 -0800

    spawn primed casings in gunsmith stores

commit 8a4d5f3
Author: MNG-cataclysm <[email protected]>
Date:   Sun Dec 4 00:27:49 2022 -0500

    Update data/json/npcs/missiondef.json

    Co-authored-by: Anton Burmistrov <[email protected]>

commit c53204f
Author: MNG-cataclysm <[email protected]>
Date:   Sat Dec 3 23:39:25 2022 -0500

    Do the C++ thing

commit e80b84a
Author: MNG-cataclysm <[email protected]>
Date:   Sat Dec 3 23:27:25 2022 -0500

    Add the stuff

commit 86f6561
Author: Alexey Kim <[email protected]>
Date:   Fri Dec 2 07:39:54 2022 +0200

    Use liters/ml for vehicle part "size" definitions

commit 1e665fd
Author: Alexey Kim <[email protected]>
Date:   Fri Dec 2 07:39:39 2022 +0200

    Remove "size" from non-CARGO part types

commit dd8473f
Author: Alexey Kim <[email protected]>
Date:   Fri Dec 2 07:39:09 2022 +0200

    Use bonus field for funnels instead of size field
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
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [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.
2 participants
@oosyrag @dseguin