Persisting effects in complete item
This commit is contained in:
@@ -101,7 +101,7 @@ public enum ForgeManager implements Runnable {
|
||||
|
||||
public static int submit(WorkOrder workOrder) {
|
||||
|
||||
int validation_result = ForgeManager.validate(workOrder);
|
||||
int validation_result = ItemManager.validate(workOrder);
|
||||
|
||||
if (validation_result != 0)
|
||||
return validation_result;
|
||||
@@ -154,30 +154,6 @@ public enum ForgeManager implements Runnable {
|
||||
return validation_result;
|
||||
}
|
||||
|
||||
public static int validate(WorkOrder workOrder) {
|
||||
|
||||
int validation_result = 0;
|
||||
|
||||
ItemTemplate template = ItemTemplate.templates.get(workOrder.templateID);
|
||||
|
||||
if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
|
||||
return 30; //30: That person cannot carry that item
|
||||
|
||||
if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
|
||||
return 59; //59: This hireling does not have this formula
|
||||
|
||||
if (!Warehouse.calcCostOverrun(workOrder).isEmpty())
|
||||
return 10; //18: You can't really afford that
|
||||
|
||||
// Forge must be protected in order to access warehouse.
|
||||
|
||||
if (calcProductionCost(workOrder).size() > 1)
|
||||
if (!workOrder.vendor.building.protectionState.equals(mbEnums.ProtectionState.PROTECTED))
|
||||
return 193; //193: Production denied: This building must be protected to gain access to warehouse
|
||||
|
||||
return validation_result;
|
||||
}
|
||||
|
||||
public static long calcRollingDuration(WorkOrder workOrder) {
|
||||
|
||||
float rollingDuration;
|
||||
@@ -284,7 +260,7 @@ public enum ForgeManager implements Runnable {
|
||||
return forgedItem;
|
||||
}
|
||||
|
||||
private static void applyItemEffects(Item forgedItem) {
|
||||
public static void applyItemEffects(Item forgedItem) {
|
||||
|
||||
if (forgedItem.prefixToken != 0) {
|
||||
EffectsBase prefix = PowersManager.getEffectByToken(forgedItem.prefixToken);
|
||||
|
||||
Reference in New Issue
Block a user