From 8d270812f8abd4b808e6c5d94efaacd3987331f7 Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Fri, 23 Oct 2026 01:57:55 +0200 Subject: [PATCH] feat: give every CustomCrops crop the same death chance Each crop now has a 12% chance to die per grow at fertility 78, the median province fertility under the 671 crops planted on Main. The per-update rate is solved from each crop's stage count and Cooking affection, so stage counts, drops and affection stay unchanged. Crops that regrow from stage 2 after harvest only roll death from stage 2 up (point-more-than 1), so each regrowth also carries 12%. Strawberry regrows from stage 0 and keeps the normal rule. Main ran hand-tuned rates (2.5-14.4% per update) that were never committed; this replaces both those and the flat 5% kept here. Co-Authored-By: Claude Opus 5.5 --- CustomCrops/contents/crops/apple.yml | 5 ++++- CustomCrops/contents/crops/banana.yml | 5 ++++- CustomCrops/contents/crops/basil.yml | 2 +- CustomCrops/contents/crops/blackpepper.yml | 2 +- CustomCrops/contents/crops/cactusfruit.yml | 5 ++++- CustomCrops/contents/crops/cherry.yml | 5 ++++- CustomCrops/contents/crops/cinnamon.yml | 2 +- CustomCrops/contents/crops/corn.yml | 2 +- CustomCrops/contents/crops/cucumber.yml | 2 +- CustomCrops/contents/crops/garlic.yml | 2 +- CustomCrops/contents/crops/grape.yml | 5 ++++- CustomCrops/contents/crops/lemon.yml | 5 ++++- CustomCrops/contents/crops/lettuce.yml | 2 +- CustomCrops/contents/crops/lime.yml | 5 ++++- CustomCrops/contents/crops/mustard.yml | 2 +- CustomCrops/contents/crops/nutmeg.yml | 2 +- CustomCrops/contents/crops/olive.yml | 5 ++++- CustomCrops/contents/crops/onion.yml | 2 +- CustomCrops/contents/crops/orange.yml | 5 ++++- CustomCrops/contents/crops/peach.yml | 5 ++++- CustomCrops/contents/crops/pineapple.yml | 2 +- CustomCrops/contents/crops/pistachio.yml | 5 ++++- CustomCrops/contents/crops/plum.yml | 5 ++++- CustomCrops/contents/crops/rhubarb.yml | 2 +- CustomCrops/contents/crops/rice.yml | 2 +- CustomCrops/contents/crops/spiceleaf.yml | 2 +- CustomCrops/contents/crops/strawberry.yml | 2 +- CustomCrops/contents/crops/tomato.yml | 2 +- CustomCrops/contents/crops/vanilla.yml | 2 +- CustomCrops/contents/crops/yeast.yml | 2 +- 30 files changed, 66 insertions(+), 30 deletions(-) diff --git a/CustomCrops/contents/crops/apple.yml b/CustomCrops/contents/crops/apple.yml index c77f0ad..3bdf913 100644 --- a/CustomCrops/contents/crops/apple.yml +++ b/CustomCrops/contents/crops/apple.yml @@ -114,10 +114,13 @@ apple: '&&': condition_1: type: random - value: 0.05 + value: 0.0361 condition_2: type: point-less-than value: 5 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/banana.yml b/CustomCrops/contents/crops/banana.yml index eddfaac..788fad8 100644 --- a/CustomCrops/contents/crops/banana.yml +++ b/CustomCrops/contents/crops/banana.yml @@ -104,10 +104,13 @@ banana: '&&': condition_1: type: random - value: 0.05 + value: 0.0564 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/basil.yml b/CustomCrops/contents/crops/basil.yml index 6d270af..3665a72 100644 --- a/CustomCrops/contents/crops/basil.yml +++ b/CustomCrops/contents/crops/basil.yml @@ -101,7 +101,7 @@ basil: '&&': condition_1: type: random - value: 0.05 + value: 0.037 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/blackpepper.yml b/CustomCrops/contents/crops/blackpepper.yml index 7b64895..c56149c 100644 --- a/CustomCrops/contents/crops/blackpepper.yml +++ b/CustomCrops/contents/crops/blackpepper.yml @@ -101,7 +101,7 @@ blackpepper: '&&': condition_1: type: random - value: 0.05 + value: 0.0353 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/cactusfruit.yml b/CustomCrops/contents/crops/cactusfruit.yml index 25faf2a..eeb8d6f 100644 --- a/CustomCrops/contents/crops/cactusfruit.yml +++ b/CustomCrops/contents/crops/cactusfruit.yml @@ -104,10 +104,13 @@ cactusfruit: '&&': condition_1: type: random - value: 0.05 + value: 0.0602 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/cherry.yml b/CustomCrops/contents/crops/cherry.yml index 93f7f79..0a2b576 100644 --- a/CustomCrops/contents/crops/cherry.yml +++ b/CustomCrops/contents/crops/cherry.yml @@ -104,10 +104,13 @@ cherry: '&&': condition_1: type: random - value: 0.05 + value: 0.0538 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/cinnamon.yml b/CustomCrops/contents/crops/cinnamon.yml index 8971c65..a99c4f2 100644 --- a/CustomCrops/contents/crops/cinnamon.yml +++ b/CustomCrops/contents/crops/cinnamon.yml @@ -103,7 +103,7 @@ cinnamon: '&&': condition_1: type: random - value: 0.05 + value: 0.0269 condition_2: type: point-less-than value: 4 diff --git a/CustomCrops/contents/crops/corn.yml b/CustomCrops/contents/crops/corn.yml index fe0d893..e63d645 100644 --- a/CustomCrops/contents/crops/corn.yml +++ b/CustomCrops/contents/crops/corn.yml @@ -101,7 +101,7 @@ corn: '&&': condition_1: type: random - value: 0.05 + value: 0.0345 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/cucumber.yml b/CustomCrops/contents/crops/cucumber.yml index d2caf5e..d2a1664 100644 --- a/CustomCrops/contents/crops/cucumber.yml +++ b/CustomCrops/contents/crops/cucumber.yml @@ -101,7 +101,7 @@ cucumber: '&&': condition_1: type: random - value: 0.05 + value: 0.0357 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/garlic.yml b/CustomCrops/contents/crops/garlic.yml index be6e07b..b9a1f56 100644 --- a/CustomCrops/contents/crops/garlic.yml +++ b/CustomCrops/contents/crops/garlic.yml @@ -101,7 +101,7 @@ garlic: '&&': condition_1: type: random - value: 0.05 + value: 0.0379 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/grape.yml b/CustomCrops/contents/crops/grape.yml index aae1405..e2ee994 100644 --- a/CustomCrops/contents/crops/grape.yml +++ b/CustomCrops/contents/crops/grape.yml @@ -106,10 +106,13 @@ grape: '&&': condition_1: type: random - value: 0.05 + value: 0.0366 condition_2: type: point-less-than value: 5 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/lemon.yml b/CustomCrops/contents/crops/lemon.yml index 0423f07..8a5a8ed 100644 --- a/CustomCrops/contents/crops/lemon.yml +++ b/CustomCrops/contents/crops/lemon.yml @@ -104,10 +104,13 @@ lemon: '&&': condition_1: type: random - value: 0.05 + value: 0.0544 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/lettuce.yml b/CustomCrops/contents/crops/lettuce.yml index 0cf0fcc..3136f1b 100644 --- a/CustomCrops/contents/crops/lettuce.yml +++ b/CustomCrops/contents/crops/lettuce.yml @@ -99,7 +99,7 @@ lettuce: '&&': condition_1: type: random - value: 0.05 + value: 0.0526 condition_2: type: point-less-than value: 2 diff --git a/CustomCrops/contents/crops/lime.yml b/CustomCrops/contents/crops/lime.yml index 36ceb93..5380d26 100644 --- a/CustomCrops/contents/crops/lime.yml +++ b/CustomCrops/contents/crops/lime.yml @@ -104,10 +104,13 @@ lime: '&&': condition_1: type: random - value: 0.05 + value: 0.0544 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/mustard.yml b/CustomCrops/contents/crops/mustard.yml index ccf353f..39358f1 100644 --- a/CustomCrops/contents/crops/mustard.yml +++ b/CustomCrops/contents/crops/mustard.yml @@ -103,7 +103,7 @@ mustard: '&&': condition_1: type: random - value: 0.05 + value: 0.0275 condition_2: type: point-less-than value: 4 diff --git a/CustomCrops/contents/crops/nutmeg.yml b/CustomCrops/contents/crops/nutmeg.yml index f343b19..0556523 100644 --- a/CustomCrops/contents/crops/nutmeg.yml +++ b/CustomCrops/contents/crops/nutmeg.yml @@ -103,7 +103,7 @@ nutmeg: '&&': condition_1: type: random - value: 0.05 + value: 0.0266 condition_2: type: point-less-than value: 4 diff --git a/CustomCrops/contents/crops/olive.yml b/CustomCrops/contents/crops/olive.yml index 8963000..f1f0735 100644 --- a/CustomCrops/contents/crops/olive.yml +++ b/CustomCrops/contents/crops/olive.yml @@ -104,10 +104,13 @@ olive: '&&': condition_1: type: random - value: 0.05 + value: 0.0577 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/onion.yml b/CustomCrops/contents/crops/onion.yml index bdd2d41..f33c4f3 100644 --- a/CustomCrops/contents/crops/onion.yml +++ b/CustomCrops/contents/crops/onion.yml @@ -99,7 +99,7 @@ onion: '&&': condition_1: type: random - value: 0.05 + value: 0.0571 condition_2: type: point-less-than value: 2 diff --git a/CustomCrops/contents/crops/orange.yml b/CustomCrops/contents/crops/orange.yml index c650512..893c978 100644 --- a/CustomCrops/contents/crops/orange.yml +++ b/CustomCrops/contents/crops/orange.yml @@ -104,10 +104,13 @@ orange: '&&': condition_1: type: random - value: 0.05 + value: 0.0544 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/peach.yml b/CustomCrops/contents/crops/peach.yml index cfaae61..784e5d7 100644 --- a/CustomCrops/contents/crops/peach.yml +++ b/CustomCrops/contents/crops/peach.yml @@ -104,10 +104,13 @@ peach: '&&': condition_1: type: random - value: 0.05 + value: 0.0538 condition_2: type: point-less-than value: 4 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/pineapple.yml b/CustomCrops/contents/crops/pineapple.yml index 12baf56..080d52a 100644 --- a/CustomCrops/contents/crops/pineapple.yml +++ b/CustomCrops/contents/crops/pineapple.yml @@ -101,7 +101,7 @@ pineapple: '&&': condition_1: type: random - value: 0.05 + value: 0.0375 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/pistachio.yml b/CustomCrops/contents/crops/pistachio.yml index c41be59..0f1cfd7 100644 --- a/CustomCrops/contents/crops/pistachio.yml +++ b/CustomCrops/contents/crops/pistachio.yml @@ -102,10 +102,13 @@ pistachio: '&&': condition_1: type: random - value: 0.05 + value: 0.1111 condition_2: type: point-less-than value: 3 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/plum.yml b/CustomCrops/contents/crops/plum.yml index eae7b76..64b0c33 100644 --- a/CustomCrops/contents/crops/plum.yml +++ b/CustomCrops/contents/crops/plum.yml @@ -106,10 +106,13 @@ plum: '&&': condition_1: type: random - value: 0.05 + value: 0.0361 condition_2: type: point-less-than value: 5 + condition_3: + type: point-more-than + value: 1 custom-bone-meal: default: item: BONE_MEAL diff --git a/CustomCrops/contents/crops/rhubarb.yml b/CustomCrops/contents/crops/rhubarb.yml index 3a04cd9..f1150f5 100644 --- a/CustomCrops/contents/crops/rhubarb.yml +++ b/CustomCrops/contents/crops/rhubarb.yml @@ -99,7 +99,7 @@ rhubarb: '&&': condition_1: type: random - value: 0.05 + value: 0.0551 condition_2: type: point-less-than value: 2 diff --git a/CustomCrops/contents/crops/rice.yml b/CustomCrops/contents/crops/rice.yml index 05f939d..e727faa 100644 --- a/CustomCrops/contents/crops/rice.yml +++ b/CustomCrops/contents/crops/rice.yml @@ -101,7 +101,7 @@ rice: '&&': condition_1: type: random - value: 0.05 + value: 0.034 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/spiceleaf.yml b/CustomCrops/contents/crops/spiceleaf.yml index abb332f..c59ef36 100644 --- a/CustomCrops/contents/crops/spiceleaf.yml +++ b/CustomCrops/contents/crops/spiceleaf.yml @@ -99,7 +99,7 @@ spiceleaf: '&&': condition_1: type: random - value: 0.05 + value: 0.0544 condition_2: type: point-less-than value: 2 diff --git a/CustomCrops/contents/crops/strawberry.yml b/CustomCrops/contents/crops/strawberry.yml index 41f20f4..df342ba 100644 --- a/CustomCrops/contents/crops/strawberry.yml +++ b/CustomCrops/contents/crops/strawberry.yml @@ -100,7 +100,7 @@ strawberry: '&&': condition_1: type: random - value: 0.05 + value: 0.0532 condition_2: type: point-less-than value: 2 diff --git a/CustomCrops/contents/crops/tomato.yml b/CustomCrops/contents/crops/tomato.yml index ba66f0f..eb4cd7d 100644 --- a/CustomCrops/contents/crops/tomato.yml +++ b/CustomCrops/contents/crops/tomato.yml @@ -95,7 +95,7 @@ tomato: '&&': condition_1: type: random - value: 0.05 + value: 0.0349 condition_2: type: point-less-than value: 3 diff --git a/CustomCrops/contents/crops/vanilla.yml b/CustomCrops/contents/crops/vanilla.yml index 8c684bb..e37cb61 100644 --- a/CustomCrops/contents/crops/vanilla.yml +++ b/CustomCrops/contents/crops/vanilla.yml @@ -103,7 +103,7 @@ vanilla: '&&': condition_1: type: random - value: 0.05 + value: 0.0262 condition_2: type: point-less-than value: 4 diff --git a/CustomCrops/contents/crops/yeast.yml b/CustomCrops/contents/crops/yeast.yml index a34508e..b340840 100644 --- a/CustomCrops/contents/crops/yeast.yml +++ b/CustomCrops/contents/crops/yeast.yml @@ -101,7 +101,7 @@ yeast: '&&': condition_1: type: random - value: 0.05 + value: 0.0393 condition_2: type: point-less-than value: 3