Merge pull request #2145 from abaresk/remove-berryfix
Remove berry yield bug fix
This commit is contained in:
+3
-9
@@ -1204,15 +1204,9 @@ static u8 GetNumStagesWateredByBerryTreeId(u8 id)
|
|||||||
return BerryTreeGetNumStagesWatered(GetBerryTreeInfo(id));
|
return BerryTreeGetNumStagesWatered(GetBerryTreeInfo(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Berries can be watered at 4 stages of growth. This function is likely meant
|
// Berries can be watered at 4 stages of growth. The distribution is largely
|
||||||
// to divide the berry yield range equally into quartiles. If you watered the
|
// even but slightly prefers middle berry yields, since it uniformly draws from
|
||||||
// tree n times, your yield is a random number in the nth quartile.
|
// a subset of the total yield range.
|
||||||
//
|
|
||||||
// However, this function actually skews towards higher berry yields, because
|
|
||||||
// it rounds `extraYield` to the nearest whole number.
|
|
||||||
//
|
|
||||||
// See resulting yields: https://gist.github.com/hondew/2a099dbe54aa91414decdbfaa524327d,
|
|
||||||
// and bug fix: https://gist.github.com/hondew/0f0164e5b9dadfd72d24f30f2c049a0b.
|
|
||||||
static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water)
|
static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water)
|
||||||
{
|
{
|
||||||
u32 randMin;
|
u32 randMin;
|
||||||
|
|||||||
Reference in New Issue
Block a user