Added Dohya
This commit is contained in:
@@ -24,6 +24,35 @@ public sealed class ItemProcessingRecipe : ScriptableObject
|
||||
(!string.IsNullOrEmpty(inputItem.ItemId) && item.ItemId == inputItem.ItemId);
|
||||
}
|
||||
|
||||
private void OnValidate() =>
|
||||
public bool TryValidateOutputPrefab(out string error)
|
||||
{
|
||||
error = string.Empty;
|
||||
if (outputItem == null || outputItem.WorldPrefab == null)
|
||||
return true;
|
||||
|
||||
NetworkItem prefabItem = outputItem.WorldPrefab.GetComponent<NetworkItem>();
|
||||
if (prefabItem == null)
|
||||
{
|
||||
error = $"Output prefab '{outputItem.WorldPrefab.name}' has no NetworkItem.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (prefabItem.Definition == outputItem)
|
||||
return true;
|
||||
|
||||
string actualOutput = prefabItem.Definition != null
|
||||
? prefabItem.Definition.name
|
||||
: "None";
|
||||
error = $"Output item '{outputItem.name}' points to prefab " +
|
||||
$"'{outputItem.WorldPrefab.name}', but that prefab uses definition " +
|
||||
$"'{actualOutput}'.";
|
||||
return false;
|
||||
}
|
||||
|
||||
private void OnValidate()
|
||||
{
|
||||
recipeId = recipeId?.Trim().ToLowerInvariant();
|
||||
if (!TryValidateOutputPrefab(out string error))
|
||||
Debug.LogError($"Invalid processing recipe '{name}': {error}", this);
|
||||
}
|
||||
}
|
||||
|
||||
+8
-3
@@ -202,12 +202,16 @@ public sealed class NetworkItemProcessingWorkstation : NetworkWorkstationControl
|
||||
outputObject.Spawn();
|
||||
|
||||
currentItem = outputObject.GetComponent<NetworkItem>();
|
||||
if (currentItem == null ||
|
||||
if (currentItem == null || currentItem.Definition != recipe.OutputItem ||
|
||||
!WorkstationItemControlUtility.TryGetControl(currentItem, out _))
|
||||
{
|
||||
string actualDefinition = currentItem != null && currentItem.Definition != null
|
||||
? currentItem.Definition.name
|
||||
: "None";
|
||||
Debug.LogError(
|
||||
$"{name} cannot produce '{recipe.OutputItem.DisplayName}': " +
|
||||
"the output prefab must contain NetworkItem and a supported " +
|
||||
"the output prefab must contain NetworkItem with the same " +
|
||||
$"definition (actual: '{actualDefinition}') and a supported " +
|
||||
"Carry or Drag interaction component.",
|
||||
this);
|
||||
outputObject.Despawn(true);
|
||||
@@ -292,6 +296,7 @@ public sealed class NetworkItemProcessingWorkstation : NetworkWorkstationControl
|
||||
|
||||
private static bool IsRecipeValid(ItemProcessingRecipe recipe) =>
|
||||
recipe != null && recipe.InputItem != null &&
|
||||
recipe.OutputItem != null && recipe.OutputItem.WorldPrefab != null;
|
||||
recipe.OutputItem != null && recipe.OutputItem.WorldPrefab != null &&
|
||||
recipe.TryValidateOutputPrefab(out _);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user