Skip to content

Fix CarryOverFreshness mangling other transition types #91

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

Open
TealSeer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix CarryOverFreshness mangling other transition types #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions Common/Collectible/Collectible.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ public virtual void OnCreatedByCrafting(ItemSlot[] allInputSlots, ItemSlot outpu
if (perishProps != null)
{
perishProps.TransitionedStack.Resolve(api.World, "oncrafted perished stack", Code);
CarryOverFreshness(api, allInputSlots, new ItemStack[] { outputSlot.Itemstack }, perishProps);
CarryOverFreshness(api, allInputSlots, new ItemStack[] { outputSlot.Itemstack }, tprops);
}

}
Expand Down Expand Up @@ -3134,12 +3134,12 @@ public virtual ItemStack OnTransitionNow(ItemSlot slot, TransitionableProperties
return newStack;
}

public static void CarryOverFreshness(ICoreAPI api, ItemSlot inputSlot, ItemStack outputStack, TransitionableProperties perishProps)
public static void CarryOverFreshness(ICoreAPI api, ItemSlot inputSlot, ItemStack outputStack, TransitionableProperties[] transitionProps)
{
CarryOverFreshness(api, new ItemSlot[] { inputSlot }, new ItemStack[] { outputStack }, perishProps);
CarryOverFreshness(api, new ItemSlot[] { inputSlot }, new ItemStack[] { outputStack }, transitionProps);
}

public static void CarryOverFreshness(ICoreAPI api, ItemSlot[] inputSlots, ItemStack[] outStacks, TransitionableProperties perishProps)
public static void CarryOverFreshness(ICoreAPI api, ItemSlot[] inputSlots, ItemStack[] outStacks, TransitionableProperties[] transitionProps)
{
float transitionedHoursRelative = 0;

Expand Down Expand Up @@ -3176,28 +3176,41 @@ public static void CarryOverFreshness(ICoreAPI api, ItemSlot[] inputSlots, ItemS
outStacks[i].Attributes["transitionstate"] = new TreeAttribute();
}

float transitionHours = perishProps.TransitionHours.nextFloat(1, api.World.Rand);
float freshHours = perishProps.FreshHours.nextFloat(1, api.World.Rand);

ITreeAttribute attr = (ITreeAttribute)outStacks[i].Attributes["transitionstate"];
attr.SetDouble("createdTotalHours", api.World.Calendar.TotalHours);
attr.SetDouble("lastUpdatedTotalHours", api.World.Calendar.TotalHours);

attr["freshHours"] = new FloatArrayAttribute(new float[] { freshHours });
attr["transitionHours"] = new FloatArrayAttribute(new float[] { transitionHours });

if (spoilageRel > 0)
{
// If already spoiled: Take away 40% spoilage and 2 hours
spoilageRel *= 0.6f;
attr["transitionedHours"] = new FloatArrayAttribute(new float[] { freshHours + Math.Max(0, transitionHours * spoilageRel - 2) });
float[] transitionFloats = new float[transitionProps.Length];
float[] transitionedFloats = new float[transitionProps.Length];
float[] freshFloats = new float[transitionProps.Length];

} else
for (int j = 0; j < transitionProps.Length; j++)
{
// If not yet spoiled: Weird formula :D
attr["transitionedHours"] = new FloatArrayAttribute(new float[] { Math.Max(0, transitionedHoursRelative * (0.8f + (2 + quantity) * spoilageRelMax) * (transitionHours + freshHours)) });
transitionFloats[j] = transitionProps[j].TransitionHours.nextFloat(1, api.World.Rand);
freshFloats[j] = transitionProps[j].FreshHours.nextFloat(1, api.World.Rand);
if (transitionProps[j].Type == EnumTransitionType.Perish)
{
if (spoilageRel > 0)
{
// If already spoiled: Take away 40% spoilage and 2 hours
spoilageRel *= 0.6f;
transitionedFloats[j] = freshFloats[j] + Math.Max(0, transitionFloats[j] * spoilageRel - 2);
}
else
{
// If not yet spoiled: Weird formula :D
transitionedFloats[j] = Math.Max(0, transitionedHoursRelative * (0.8f + (2 + quantity) * spoilageRelMax) * (transitionFloats[j] + freshFloats[j]));
}
}
else
{
transitionedFloats[j] = 0f;
}
}

attr["freshHours"] = new FloatArrayAttribute(freshFloats);
attr["transitionHours"] = new FloatArrayAttribute(transitionFloats);
attr["transitionedHours"] = new FloatArrayAttribute(transitionedFloats);

}
}
Expand Down