diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index e435abb..1681aa7 100644 Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ diff --git a/1.6/1.6/Defs/Thing_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/Thing_Misc/Weapons/WULA_Weapon.xml index d65cf61..94314ad 100644 --- a/1.6/1.6/Defs/Thing_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/1.6/Defs/Thing_Misc/Weapons/WULA_Weapon.xml @@ -309,6 +309,7 @@ ARA_RW_Basic_Fist_Needle_Gun 40000 10 + @@ -509,6 +510,7 @@ ARA_RW_Basic_Acid_Bladder_Gun 80000 30 + diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompInteractiveProducer.cs b/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompInteractiveProducer.cs index f92d0be..1a21032 100644 --- a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompInteractiveProducer.cs +++ b/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompInteractiveProducer.cs @@ -112,12 +112,20 @@ namespace ArachnaeSwarm foreach (var process in Props.processes) { - yield return new FloatMenuOption("StartProduction".Translate(process.thingDef.label), () => + if (process.requiredResearch != null && !process.requiredResearch.IsFinished) { - this._selectedProcess = process; - Job job = JobMaker.MakeJob(DefDatabase.GetNamed("ARA_StartInteractiveProduction"), parent); - selPawn.jobs.TryTakeOrderedJob(job, JobTag.Misc); - }); + string disabledText = "StartProduction".Translate(process.thingDef.label) + " (" + "Requires".Translate() + ": " + process.requiredResearch.label + ")"; + yield return new FloatMenuOption(disabledText, null); + } + else + { + yield return new FloatMenuOption("StartProduction".Translate(process.thingDef.label), () => + { + this._selectedProcess = process; + Job job = JobMaker.MakeJob(DefDatabase.GetNamed("ARA_StartInteractiveProduction"), parent); + selPawn.jobs.TryTakeOrderedJob(job, JobTag.Misc); + }); + } } } diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/DataContracts.cs b/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/DataContracts.cs index 6d90d46..f85a990 100644 --- a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/DataContracts.cs +++ b/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/DataContracts.cs @@ -15,6 +15,7 @@ namespace ArachnaeSwarm public ThingDef thingDef; public int productionTicks; public float totalNutritionNeeded; + public ResearchProjectDef requiredResearch; } public class QualityThreshold