Forwarded CommandRange Drawing incompatible mod check to prepare.

Source separated from Assemblies folder,Build target fix.
This commit is contained in:
MADxingjin 2025-04-13 18:31:09 +08:00
parent 36977d9928
commit e7c989431b
4 changed files with 446 additions and 430 deletions

View File

@ -21,21 +21,27 @@ namespace LTS_Implants
static class static class
Pawn_MechanitorTracker_CanCommandTo_Patch //increases the mechanitor's range by MechRemoteControlDistanceOffset Pawn_MechanitorTracker_CanCommandTo_Patch //increases the mechanitor's range by MechRemoteControlDistanceOffset
{ {
/// <summary>
/// default value of mechanitor command range.
/// </summary>
private static float defaultRange = 24.9f; private static float defaultRange = 24.9f;
[HarmonyPrepare] [HarmonyPrepare]
static bool Prepare() static bool Prepare()
{ {
//If CE,use CE value as default instead.unpatching is done in main patchBootstrap.
if (LTS_Implants.HarmonyPatches.IsCombatExtended) if (LTS_Implants.HarmonyPatches.IsCombatExtended)
{ {
defaultRange = 43.9f; defaultRange = 43.9f;
Verse.Log.Warning("[LTS-II-Forked]Pawn_MechanitorTracker.CanCommandTo Patch Recognized CE,default Range changed from 24.9 to 43.9"); Verse.Log.Warning(
"[LTS-II-Forked]Pawn_MechanitorTracker.CanCommandTo Patch Recognized CE,default Range changed from 24.9 to 43.9");
} }
return true; return true;
} }
/// <summary> /// <summary>
/// pushed always commandable check to front to reduct compute. /// pushed always commandable check to front to reduce compute overhead.
/// TODO perhaps need a custom patch order to make sure this logic always works. /// TODO:perhaps need a custom patch order to make sure this logic always works.
/// </summary> /// </summary>
/// <param name="target">target mech to command</param> /// <param name="target">target mech to command</param>
/// <param name="__instance">should be mechanitor, but not always the mechanitor for example like Dead man switch ctrl mechs </param> /// <param name="__instance">should be mechanitor, but not always the mechanitor for example like Dead man switch ctrl mechs </param>
@ -55,15 +61,27 @@ namespace LTS_Implants
SignalBoosterRange); //last line should mean that if something else makes it true, then it is(?) SignalBoosterRange); //last line should mean that if something else makes it true, then it is(?)
} }
} }
[HarmonyPatch(typeof(Pawn_MechanitorTracker))] [HarmonyPatch(typeof(Pawn_MechanitorTracker))]
[HarmonyPatch(nameof(Pawn_MechanitorTracker.DrawCommandRadius))] [HarmonyPatch(nameof(Pawn_MechanitorTracker.DrawCommandRadius))]
static class static class
Pawn_MechanitorTracker_DrawCommandRadius_Patch //increases the displayed mechanitor range by MechRemoteControlDistanceOffset Pawn_MechanitorTracker_DrawCommandRadius_Patch //increases the displayed mechanitor range by MechRemoteControlDistanceOffset
{ {
private static float defaultRange = 24.9f; private static float defaultRange = 24.9f;
[HarmonyPrepare] [HarmonyPrepare]
static bool Prepare() static bool Prepare()
{ {
//For conflict mods, disable the rendering patch entirely.
//TODO:make this a list.
if (ModsConfig.IsActive("swwu.MechanitorCommandRange") ||
ModsConfig.IsActive("Neronix17.TweaksGalore"))
{
Verse.Log.Message(
"[LTS-II-Forked/Biotech]Pawn_MechanitorTracker.DrawCommandRadius Patch Encountered Hard Incompatible mods,aborting patch");
return false;
}
if (LTS_Implants.HarmonyPatches.IsCombatExtended) if (LTS_Implants.HarmonyPatches.IsCombatExtended)
{ {
defaultRange = 43.9f; defaultRange = 43.9f;
@ -73,9 +91,11 @@ namespace LTS_Implants
return true; return true;
} }
/// <summary> /// <summary>
/// Skip original draw radius using a prefix. /// Skip original draw radius using a prefix.
/// TODO may need specify fixed patch order to make sure this works. /// TODO may need specify fixed patch order to make sure this works.
/// TODO:may need unpatch other conflict mods to make this work.
/// </summary> /// </summary>
/// <returns>return false to skip original draw.</returns> /// <returns>return false to skip original draw.</returns>
[HarmonyPrefix] [HarmonyPrefix]
@ -94,488 +114,485 @@ namespace LTS_Implants
if (__instance.Pawn.Spawned && __instance.AnySelectedDraftedMechs) if (__instance.Pawn.Spawned && __instance.AnySelectedDraftedMechs)
{ {
//GenDraw.DrawRadiusRing(___pawn.Position, 24.9f + (3f*___pawn.health?.hediffSet?.GetFirstHediffOfDef(HediffDef.Named("SignalBoosterImplant"))?.Severity ?? 0f), Color.white, (IntVec3 c) => __instance.CanCommandTo(c)); //GenDraw.DrawRadiusRing(___pawn.Position, 24.9f + (3f*___pawn.health?.hediffSet?.GetFirstHediffOfDef(HediffDef.Named("SignalBoosterImplant"))?.Severity ?? 0f), Color.white, (IntVec3 c) => __instance.CanCommandTo(c));
if (!ModsConfig.IsActive("swwu.MechanitorCommandRange") && IntVec3 position = __instance.Pawn.Position;
!ModsConfig.IsActive( float radius = defaultRange +
"Neronix17.TweaksGalore")) //for tweaks galore, it'd be better to try to find the setting specifically, with an inverted result and a null check true (__instance.Pawn?.GetStatValue(
{ StatDef.Named("MechRemoteControlDistanceOffset")) ?? 0f);
IntVec3 position = __instance.Pawn.Position; //Make our command circle yellow. And make sure this postfix implemented draw follows vanilla impl.
float radius = defaultRange + GenDraw.DrawRadiusRing(position, radius, Color.yellow,
(__instance.Pawn?.GetStatValue( (IntVec3 c) => __instance.CanCommandTo((LocalTargetInfo)c));
StatDef.Named("MechRemoteControlDistanceOffset")) ?? 0f);
//Make our command circle yellow. And make sure this postfix implemented draw follows vanilla impl.
GenDraw.DrawRadiusRing(position, radius, Color.yellow,
(IntVec3 c) => __instance.CanCommandTo((LocalTargetInfo)c));
}
} }
} }
} }
} }
}
#endregion #endregion
#region Resurrect #region Resurrect
public class CompProperties_MechanitorResurrectMech : CompProperties_AbilityEffect public class CompProperties_MechanitorResurrectMech : CompProperties_AbilityEffect
{
public CompProperties_MechanitorResurrectMech()
{ {
public CompProperties_MechanitorResurrectMech() this.compClass = typeof(CompAbilityEffect_MechanitorResurrectMech);
{
this.compClass = typeof(CompAbilityEffect_MechanitorResurrectMech);
}
public int maxCorpseAgeTicks = int.MaxValue;
public EffecterDef appliedEffecterDef;
public EffecterDef resolveEffecterDef;
//public EffecterDef centerEffecterDef;
} }
public class CompAbilityEffect_MechanitorResurrectMech : CompAbilityEffect public int maxCorpseAgeTicks = int.MaxValue;
public EffecterDef appliedEffecterDef;
public EffecterDef resolveEffecterDef;
//public EffecterDef centerEffecterDef;
}
public class CompAbilityEffect_MechanitorResurrectMech : CompAbilityEffect
{
public new CompProperties_MechanitorResurrectMech Props
{ {
public new CompProperties_MechanitorResurrectMech Props get { return (CompProperties_MechanitorResurrectMech)this.props; }
{
get { return (CompProperties_MechanitorResurrectMech)this.props; }
}
public override bool CanApplyOn(LocalTargetInfo target, LocalTargetInfo dest)
{
Corpse corpse;
bool bandwidthCheck = (target.Thing as Corpse).InnerPawn.GetStatValue(StatDef.Named("BandwidthCost")) <=
this.parent.pawn.mechanitor.TotalBandwidth -
this.parent.pawn.mechanitor.UsedBandwidth;
bool canApplyOnCheck = (base.CanApplyOn(target, dest) && target.HasThing &&
(corpse = target.Thing as Corpse) != null && this.CanResurrect(corpse) &&
bandwidthCheck);
//Log.Message("CanApplyOn check: " + canApplyOnCheck);
if ((target.Thing as Corpse).InnerPawn.Faction != this.parent.pawn.Faction)
{
Messages.Message("Can only resurrect allied mechs", (target.Thing as Pawn),
MessageTypeDefOf.NegativeEvent);
}
else if ((target.Thing as Corpse).timeOfDeath <=
Find.TickManager.TicksGame - this.Props.maxCorpseAgeTicks)
{
Messages.Message("Target has been dead too long", (target.Thing as Pawn),
MessageTypeDefOf.NegativeEvent);
}
else if (!bandwidthCheck)
{
Messages.Message("Insufficient bandwidth", (target.Thing as Pawn), MessageTypeDefOf.NegativeEvent);
}
return canApplyOnCheck;
}
private bool CanResurrect(Corpse corpse)
{
//return corpse.InnerPawn.RaceProps.IsMechanoid && corpse.InnerPawn.RaceProps.mechWeightClass < MechWeightClass.UltraHeavy && corpse.InnerPawn.Faction == this.parent.pawn.Faction && (corpse.InnerPawn.kindDef.abilities == null || !corpse.InnerPawn.kindDef.abilities.Contains(AbilityDefOf.ResurrectionMech)) && corpse.timeOfDeath >= Find.TickManager.TicksGame - this.Props.maxCorpseAgeTicks;
return corpse.InnerPawn.RaceProps.IsMechanoid && corpse.InnerPawn.Faction == this.parent.pawn.Faction &&
(corpse.InnerPawn.kindDef.abilities == null ||
!corpse.InnerPawn.kindDef.abilities.Contains(AbilityDefOf.ResurrectionMech)) &&
corpse.timeOfDeath >= Find.TickManager.TicksGame - this.Props.maxCorpseAgeTicks;
}
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{
//Log.Message("Apply called");
base.Apply(target, dest);
Corpse corpse = (Corpse)target.Thing;
if (!this.CanResurrect(corpse))
{
return;
}
Pawn innerPawn = corpse.InnerPawn;
ResurrectionUtility.TryResurrect(innerPawn, null);
if (this.Props.appliedEffecterDef != null)
{
Effecter effecter = this.Props.appliedEffecterDef.SpawnAttached(innerPawn, innerPawn.MapHeld, 1f);
effecter.Trigger(innerPawn, innerPawn, -1);
effecter.Cleanup();
this.parent.pawn.relations.AddDirectRelation(PawnRelationDefOf.Overseer,
innerPawn); //if resurrection successful, immediately takes control of resurrected mech.
}
innerPawn.stances.stagger.StaggerFor(60, 0.17f);
}
public override bool GizmoDisabled(out string reason)
{
reason = null;
return false;
}
public override IEnumerable<Mote> CustomWarmupMotes(LocalTargetInfo target)
{
foreach (LocalTargetInfo localTargetInfo in this.parent.GetAffectedTargets(target))
{
Thing thing = localTargetInfo.Thing;
yield return MoteMaker.MakeAttachedOverlay(thing, ThingDefOf.Mote_MechResurrectWarmupOnTarget,
Vector3.zero, 1f, -1f);
}
yield break;
}
public override void PostApplied(List<LocalTargetInfo> targets, Map map)
{
//Log.Message("PostApplied called");
Vector3 vector = Vector3.zero;
foreach (LocalTargetInfo localTargetInfo in targets)
{
vector += localTargetInfo.Cell.ToVector3Shifted();
}
vector /= (float)targets.Count<LocalTargetInfo>();
IntVec3 intVec = vector.ToIntVec3();
this.Props.resolveEffecterDef.Spawn(intVec, map, 1f).EffectTick(new TargetInfo(intVec, map, false),
new TargetInfo(intVec, map, false));
}
} }
#endregion public override bool CanApplyOn(LocalTargetInfo target, LocalTargetInfo dest)
#region Remote Dominate
public class CompProperties_MechanitorDominateMech : CompProperties_AbilityEffect
{ {
public CompProperties_MechanitorDominateMech() Corpse corpse;
bool bandwidthCheck = (target.Thing as Corpse).InnerPawn.GetStatValue(StatDef.Named("BandwidthCost")) <=
this.parent.pawn.mechanitor.TotalBandwidth -
this.parent.pawn.mechanitor.UsedBandwidth;
bool canApplyOnCheck = (base.CanApplyOn(target, dest) && target.HasThing &&
(corpse = target.Thing as Corpse) != null && this.CanResurrect(corpse) &&
bandwidthCheck);
//Log.Message("CanApplyOn check: " + canApplyOnCheck);
if ((target.Thing as Corpse).InnerPawn.Faction != this.parent.pawn.Faction)
{ {
this.compClass = typeof(CompAbilityEffect_MechanitorDominateMech); Messages.Message("Can only resurrect allied mechs", (target.Thing as Pawn),
MessageTypeDefOf.NegativeEvent);
} }
else if ((target.Thing as Corpse).timeOfDeath <=
Find.TickManager.TicksGame - this.Props.maxCorpseAgeTicks)
{
Messages.Message("Target has been dead too long", (target.Thing as Pawn),
MessageTypeDefOf.NegativeEvent);
}
else if (!bandwidthCheck)
{
Messages.Message("Insufficient bandwidth", (target.Thing as Pawn), MessageTypeDefOf.NegativeEvent);
}
return canApplyOnCheck;
} }
public class CompAbilityEffect_MechanitorDominateMech : CompAbilityEffect
private bool CanResurrect(Corpse corpse)
{ {
public new CompProperties_MechanitorDominateMech Props //return corpse.InnerPawn.RaceProps.IsMechanoid && corpse.InnerPawn.RaceProps.mechWeightClass < MechWeightClass.UltraHeavy && corpse.InnerPawn.Faction == this.parent.pawn.Faction && (corpse.InnerPawn.kindDef.abilities == null || !corpse.InnerPawn.kindDef.abilities.Contains(AbilityDefOf.ResurrectionMech)) && corpse.timeOfDeath >= Find.TickManager.TicksGame - this.Props.maxCorpseAgeTicks;
return corpse.InnerPawn.RaceProps.IsMechanoid && corpse.InnerPawn.Faction == this.parent.pawn.Faction &&
(corpse.InnerPawn.kindDef.abilities == null ||
!corpse.InnerPawn.kindDef.abilities.Contains(AbilityDefOf.ResurrectionMech)) &&
corpse.timeOfDeath >= Find.TickManager.TicksGame - this.Props.maxCorpseAgeTicks;
}
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{
//Log.Message("Apply called");
base.Apply(target, dest);
Corpse corpse = (Corpse)target.Thing;
if (!this.CanResurrect(corpse))
{ {
get { return (CompProperties_MechanitorDominateMech)this.props; } return;
} }
public override bool CanApplyOn(LocalTargetInfo target, LocalTargetInfo dest) Pawn innerPawn = corpse.InnerPawn;
ResurrectionUtility.TryResurrect(innerPawn, null);
if (this.Props.appliedEffecterDef != null)
{ {
Pawn pawn; Effecter effecter = this.Props.appliedEffecterDef.SpawnAttached(innerPawn, innerPawn.MapHeld, 1f);
effecter.Trigger(innerPawn, innerPawn, -1);
effecter.Cleanup();
this.parent.pawn.relations.AddDirectRelation(PawnRelationDefOf.Overseer,
innerPawn); //if resurrection successful, immediately takes control of resurrected mech.
}
bool bandwidthCheck = (target.Thing as Pawn).GetStatValue(StatDef.Named("BandwidthCost")) <= innerPawn.stances.stagger.StaggerFor(60, 0.17f);
this.parent.pawn.mechanitor.TotalBandwidth - }
this.parent.pawn.mechanitor.UsedBandwidth;
bool notTempMech = target.Thing.TryGetComp<CompMechPowerCell>() == null; public override bool GizmoDisabled(out string reason)
bool canApplyOnCheck = (base.CanApplyOn(target, dest) && target.HasThing && {
(pawn = target.Thing as Pawn) != null && bandwidthCheck && reason = null;
this.CanDominate(pawn) && notTempMech); return false;
}
public override IEnumerable<Mote> CustomWarmupMotes(LocalTargetInfo target)
{
foreach (LocalTargetInfo localTargetInfo in this.parent.GetAffectedTargets(target))
{
Thing thing = localTargetInfo.Thing;
yield return MoteMaker.MakeAttachedOverlay(thing, ThingDefOf.Mote_MechResurrectWarmupOnTarget,
Vector3.zero, 1f, -1f);
}
yield break;
}
public override void PostApplied(List<LocalTargetInfo> targets, Map map)
{
//Log.Message("PostApplied called");
Vector3 vector = Vector3.zero;
foreach (LocalTargetInfo localTargetInfo in targets)
{
vector += localTargetInfo.Cell.ToVector3Shifted();
}
vector /= (float)targets.Count<LocalTargetInfo>();
IntVec3 intVec = vector.ToIntVec3();
this.Props.resolveEffecterDef.Spawn(intVec, map, 1f).EffectTick(new TargetInfo(intVec, map, false),
new TargetInfo(intVec, map, false));
}
}
#endregion
#region Remote Dominate
public class CompProperties_MechanitorDominateMech : CompProperties_AbilityEffect
{
public CompProperties_MechanitorDominateMech()
{
this.compClass = typeof(CompAbilityEffect_MechanitorDominateMech);
}
}
public class CompAbilityEffect_MechanitorDominateMech : CompAbilityEffect
{
public new CompProperties_MechanitorDominateMech Props
{
get { return (CompProperties_MechanitorDominateMech)this.props; }
}
public override bool CanApplyOn(LocalTargetInfo target, LocalTargetInfo dest)
{
Pawn pawn;
bool bandwidthCheck = (target.Thing as Pawn).GetStatValue(StatDef.Named("BandwidthCost")) <=
this.parent.pawn.mechanitor.TotalBandwidth -
this.parent.pawn.mechanitor.UsedBandwidth;
bool notTempMech = target.Thing.TryGetComp<CompMechPowerCell>() == null;
bool canApplyOnCheck = (base.CanApplyOn(target, dest) && target.HasThing &&
(pawn = target.Thing as Pawn) != null && bandwidthCheck &&
this.CanDominate(pawn) && notTempMech);
if (!notTempMech) if (!notTempMech)
{ {
Messages.Message("Cannot target temporary mech", (target.Thing as Pawn), Messages.Message("Cannot target temporary mech", (target.Thing as Pawn),
MessageTypeDefOf.NegativeEvent); MessageTypeDefOf.NegativeEvent);
} }
else if ((target.Thing as Pawn).RaceProps.mechWeightClass >= MechWeightClass.UltraHeavy) else if ((target.Thing as Pawn).RaceProps.mechWeightClass >= MechWeightClass.UltraHeavy)
{ {
Messages.Message("Cannot target superheavy mech", (target.Thing as Pawn), Messages.Message("Cannot target superheavy mech", (target.Thing as Pawn),
MessageTypeDefOf.NegativeEvent); MessageTypeDefOf.NegativeEvent);
} }
else if (!bandwidthCheck) else if (!bandwidthCheck)
{ {
Messages.Message("Insufficient bandwidth", (target.Thing as Pawn), MessageTypeDefOf.NegativeEvent); Messages.Message("Insufficient bandwidth", (target.Thing as Pawn), MessageTypeDefOf.NegativeEvent);
} }
return canApplyOnCheck; return canApplyOnCheck;
}
private bool CanDominate(Pawn pawn)
{
return pawn.RaceProps.IsMechanoid && pawn.RaceProps.mechWeightClass < MechWeightClass.UltraHeavy &&
(pawn.kindDef.abilities == null ||
!pawn.kindDef.abilities.Contains(AbilityDefOf.ResurrectionMech));
}
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{
//Log.Message("Apply called");
base.Apply(target, dest);
Pawn pawn = (Pawn)target;
if (!this.CanDominate(pawn))
{
return;
} }
private bool CanDominate(Pawn pawn) pawn.SetFaction(this.parent.pawn.Faction); //convert pawn
{
return pawn.RaceProps.IsMechanoid && pawn.RaceProps.mechWeightClass < MechWeightClass.UltraHeavy &&
(pawn.kindDef.abilities == null ||
!pawn.kindDef.abilities.Contains(AbilityDefOf.ResurrectionMech));
}
this.parent.pawn.relations.AddDirectRelation(PawnRelationDefOf.Overseer, pawn);
pawn.stances.stagger.StaggerFor(60, 0.17f);
}
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest) public override bool GizmoDisabled(out string reason)
{ {
//Log.Message("Apply called"); reason = null;
base.Apply(target, dest); return false;
Pawn pawn = (Pawn)target; }
if (!this.CanDominate(pawn))
{
return;
}
//public override IEnumerable<Mote> CustomWarmupMotes(LocalTargetInfo target)
//{
// foreach (LocalTargetInfo localTargetInfo in this.parent.GetAffectedTargets(target))
// {
// Thing thing = localTargetInfo.Thing;
// yield return MoteMaker.MakeAttachedOverlay(thing, ThingDefOf.Mote_MechResurrectWarmupOnTarget, Vector3.zero, 1f, -1f);
// }
// IEnumerator<LocalTargetInfo> enumerator = null;
// yield break;
// yield break;
//}
pawn.SetFaction(this.parent.pawn.Faction); //convert pawn public override void PostApplied(List<LocalTargetInfo> targets, Map map)
{
this.parent.pawn.relations.AddDirectRelation(PawnRelationDefOf.Overseer, pawn); //Log.Message("PostApplied called");
pawn.stances.stagger.StaggerFor(60, 0.17f); //Vector3 vector = Vector3.zero;
} //foreach (LocalTargetInfo localTargetInfo in targets)
public override bool GizmoDisabled(out string reason)
{
reason = null;
return false;
}
//public override IEnumerable<Mote> CustomWarmupMotes(LocalTargetInfo target)
//{ //{
// foreach (LocalTargetInfo localTargetInfo in this.parent.GetAffectedTargets(target)) // vector += localTargetInfo.Cell.ToVector3Shifted();
// {
// Thing thing = localTargetInfo.Thing;
// yield return MoteMaker.MakeAttachedOverlay(thing, ThingDefOf.Mote_MechResurrectWarmupOnTarget, Vector3.zero, 1f, -1f);
// }
// IEnumerator<LocalTargetInfo> enumerator = null;
// yield break;
// yield break;
//} //}
//vector /= (float)targets.Count<LocalTargetInfo>();
public override void PostApplied(List<LocalTargetInfo> targets, Map map) //IntVec3 intVec = vector.ToIntVec3();
{ //this.Props.resolveEffecterDef.Spawn(intVec, map, 1f).EffectTick(new TargetInfo(intVec, map, false), new TargetInfo(intVec, map, false));
//Log.Message("PostApplied called");
//Vector3 vector = Vector3.zero;
//foreach (LocalTargetInfo localTargetInfo in targets)
//{
// vector += localTargetInfo.Cell.ToVector3Shifted();
//}
//vector /= (float)targets.Count<LocalTargetInfo>();
//IntVec3 intVec = vector.ToIntVec3();
//this.Props.resolveEffecterDef.Spawn(intVec, map, 1f).EffectTick(new TargetInfo(intVec, map, false), new TargetInfo(intVec, map, false));
}
} }
}
#endregion #endregion
#region Mech carrier #region Mech carrier
public class CompProperties_MechanitorMechCarrier : CompProperties_AbilityEffect public class CompProperties_MechanitorMechCarrier : CompProperties_AbilityEffect
{
public CompProperties_MechanitorMechCarrier()
{ {
public CompProperties_MechanitorMechCarrier() this.compClass = typeof(CompAbilityEffect_MechanitorMechCarrier);
{
this.compClass = typeof(CompAbilityEffect_MechanitorMechCarrier);
}
public PawnKindDef spawnPawnKind;
public int cooldownTicks = 900;
public int maxPawnsToSpawn = 2;
public EffecterDef spawnEffecter;
public EffecterDef spawnedMechEffecter;
public bool attachSpawnedEffecter;
public bool attachSpawnedMechEffecter;
} }
public class CompAbilityEffect_MechanitorMechCarrier : CompAbilityEffect public PawnKindDef spawnPawnKind;
public int cooldownTicks = 900;
public int maxPawnsToSpawn = 2;
public EffecterDef spawnEffecter;
public EffecterDef spawnedMechEffecter;
public bool attachSpawnedEffecter;
public bool attachSpawnedMechEffecter;
}
public class CompAbilityEffect_MechanitorMechCarrier : CompAbilityEffect
{
public new CompProperties_MechanitorMechCarrier Props
{ {
public new CompProperties_MechanitorMechCarrier Props get { return (CompProperties_MechanitorMechCarrier)this.props; }
{
get { return (CompProperties_MechanitorMechCarrier)this.props; }
}
public override void CompTick()
{
base.CompTick();
//if (Find.Selector.IsSelected(parent.pawn) && (int)Find.TickManager.CurTimeSpeed != 0 && Find.TickManager.TicksGame % (int)Find.TickManager.CurTimeSpeed == 0)//if the mechanitor is selected, and once erry 60/1 irl seconds
//{
// for (int i = 0; i < spawnedPawns.Count; i++)
// {
// if (!spawnedPawns[i].Dead)
// {
// GenDraw.DrawLineBetween(this.parent.pawn.TrueCenter(), spawnedPawns[i].TrueCenter());
// }
// }
//}
}
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{
base.Apply(target, dest);
TrySpawnPawns();
}
public int maxspawn()
{
//Log.Message("RemainingCharges: " + parent.RemainingCharges+1);
int max = parent.RemainingCharges +
1; //requires +1 to account for the charge that's automatically used upon ability activation, prior to this.
if (max > 2)
{
return 2;
}
else
{
return max;
}
}
public void TrySpawnPawns()
{
int maxCanSpawn = maxspawn();
//Log.Message("max spawns: "+ maxCanSpawn);
if (maxCanSpawn <= 0)
{
return;
}
PawnGenerationRequest pawnGenerationRequest = new PawnGenerationRequest(this.Props.spawnPawnKind,
this.parent.pawn.Faction, PawnGenerationContext.NonPlayer, -1, true, false, false, true, false, 1f,
false, true, false, true, true, false, false, false, false, 0f, 0f, null, 1f, null, null, null,
null, null, null, null, null, null, null, null, null, false, false, false, false, null, null, null,
null, null, 0f, DevelopmentalStage.Newborn, null, null, null, false, false, false, -1, 0, false);
Pawn pawn;
Lord lord = (((pawn = this.parent.pawn as Pawn) != null) ? pawn.GetLord() : null);
for (int i = 0; i < maxCanSpawn; i++)
{
Pawn pawn2 = PawnGenerator.GeneratePawn(pawnGenerationRequest);
GenSpawn.Spawn(pawn2, this.parent.pawn.Position, this.parent.pawn.Map, WipeMode.Vanish);
this.spawnedPawns.Add(pawn2);
if (lord != null)
{
lord.AddPawn(pawn2);
}
if (this.Props.spawnedMechEffecter != null)
{
Effecter effecter = new Effecter(this.Props.spawnedMechEffecter);
effecter.Trigger(
this.Props.attachSpawnedMechEffecter
? pawn2
: new TargetInfo(pawn2.Position, pawn2.Map, false), TargetInfo.Invalid, -1);
effecter.Cleanup();
}
}
this.cooldownTicksRemaining = this.Props.cooldownTicks;
if (this.Props.spawnEffecter != null)
{
Effecter effecter2 = new Effecter(this.Props.spawnEffecter);
effecter2.Trigger(
this.Props.attachSpawnedEffecter
? this.parent.pawn
: new TargetInfo(this.parent.pawn.Position, this.parent.pawn.Map, false),
TargetInfo.Invalid, -1);
effecter2.Cleanup();
}
if (maxCanSpawn == 2) //subtract an extra charge, as we're summoning 2
{
parent.RemainingCharges--;
}
}
public List<Pawn> GetSpawnedPawns()
{
return spawnedPawns;
}
private int cooldownTicksRemaining;
private List<Pawn> spawnedPawns = new List<Pawn>();
public SoundDef soundReload;
} }
public class HediffCompProperties_KillSpawnedPawns : HediffCompProperties public override void CompTick()
{ {
public AbilityDef abilityDef; base.CompTick();
//if (Find.Selector.IsSelected(parent.pawn) && (int)Find.TickManager.CurTimeSpeed != 0 && Find.TickManager.TicksGame % (int)Find.TickManager.CurTimeSpeed == 0)//if the mechanitor is selected, and once erry 60/1 irl seconds
public HediffCompProperties_KillSpawnedPawns() //{
{ // for (int i = 0; i < spawnedPawns.Count; i++)
compClass = typeof(HediffComp_KillSpawnedPawns); // {
} // if (!spawnedPawns[i].Dead)
// {
// GenDraw.DrawLineBetween(this.parent.pawn.TrueCenter(), spawnedPawns[i].TrueCenter());
// }
// }
//}
} }
public class HediffComp_KillSpawnedPawns : HediffComp public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{ {
public HediffCompProperties_KillSpawnedPawns Props => (HediffCompProperties_KillSpawnedPawns)props; base.Apply(target, dest);
TrySpawnPawns();
public override void Notify_PawnKilled()
{
foreach (Pawn i in base.Pawn.abilities.GetAbility(Props.abilityDef)
.CompOfType<CompAbilityEffect_MechanitorMechCarrier>().GetSpawnedPawns())
{
if (!i.Dead)
{
i.Kill(null, null);
}
}
}
} }
#endregion public int maxspawn()
#region Call a cluster
public class CompProperties_AbilityMechCluster : CompProperties_AbilityEffect
{ {
public CompProperties_AbilityMechCluster() //Log.Message("RemainingCharges: " + parent.RemainingCharges+1);
int max = parent.RemainingCharges +
1; //requires +1 to account for the charge that's automatically used upon ability activation, prior to this.
if (max > 2)
{ {
this.compClass = typeof(CompAbilityEffect_MechCluster); return 2;
}
else
{
return max;
} }
public float displayRadius;
} }
public class CompAbilityEffect_MechCluster : CompAbilityEffect public void TrySpawnPawns()
{ {
public new CompProperties_AbilityMechCluster Props int maxCanSpawn = maxspawn();
//Log.Message("max spawns: "+ maxCanSpawn);
if (maxCanSpawn <= 0)
{ {
get { return (CompProperties_AbilityMechCluster)this.props; } return;
} }
public bool ShouldHaveInspectString PawnGenerationRequest pawnGenerationRequest = new PawnGenerationRequest(this.Props.spawnPawnKind,
this.parent.pawn.Faction, PawnGenerationContext.NonPlayer, -1, true, false, false, true, false, 1f,
false, true, false, true, true, false, false, false, false, 0f, 0f, null, 1f, null, null, null,
null, null, null, null, null, null, null, null, null, false, false, false, false, null, null, null,
null, null, 0f, DevelopmentalStage.Newborn, null, null, null, false, false, false, -1, 0, false);
Pawn pawn;
Lord lord = (((pawn = this.parent.pawn as Pawn) != null) ? pawn.GetLord() : null);
for (int i = 0; i < maxCanSpawn; i++)
{ {
get { return ModsConfig.BiotechActive && this.parent.pawn.RaceProps.IsMechanoid; } Pawn pawn2 = PawnGenerator.GeneratePawn(pawnGenerationRequest);
} GenSpawn.Spawn(pawn2, this.parent.pawn.Position, this.parent.pawn.Map, WipeMode.Vanish);
this.spawnedPawns.Add(pawn2);
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest) if (lord != null)
{
base.Apply(target, dest);
if (Faction.OfMechanoids == null)
{ {
Messages.Message("MessageNoFactionForVerbMechCluster".Translate(), this.parent.pawn, lord.AddPawn(pawn2);
MessageTypeDefOf.RejectInput, null, false);
} }
else
if (this.Props.spawnedMechEffecter != null)
{ {
MechClusterUtility.SpawnCluster(target.Cell, this.parent.pawn.MapHeld, Effecter effecter = new Effecter(this.Props.spawnedMechEffecter);
MechClusterGenerator.GenerateClusterSketch(2500f, this.parent.pawn.MapHeld, true, true), true, effecter.Trigger(
false, null); this.Props.attachSpawnedMechEffecter
? pawn2
: new TargetInfo(pawn2.Position, pawn2.Map, false), TargetInfo.Invalid, -1);
effecter.Cleanup();
} }
} }
public override void PostApplied(List<LocalTargetInfo> targets, Map map) this.cooldownTicksRemaining = this.Props.cooldownTicks;
if (this.Props.spawnEffecter != null)
{ {
base.PostApplied(targets, map); Effecter effecter2 = new Effecter(this.Props.spawnEffecter);
if (this.parent.def.defName == effecter2.Trigger(
"MechhiveSatelliteUplink") //add field for cooldownFactorStat. Change this if statement to if it's not null. change the contents of getstatvalue on the next line to that field. this.Props.attachSpawnedEffecter
{ ? this.parent.pawn
this.parent.StartCooldown(Mathf.RoundToInt(this.parent.def.cooldownTicksRange.RandomInRange * : new TargetInfo(this.parent.pawn.Position, this.parent.pawn.Map, false),
this.parent.pawn?.GetStatValue(StatDef.Named("MechhiveSatelliteUplinkCooldownFactor")) ?? 1f)); TargetInfo.Invalid, -1);
} effecter2.Cleanup();
} }
public override void DrawEffectPreview(LocalTargetInfo target) if (maxCanSpawn == 2) //subtract an extra charge, as we're summoning 2
{ {
GenDraw.DrawRadiusRing(target.Cell, this.Props.displayRadius); parent.RemainingCharges--;
}
public override string CompInspectStringExtra()
{
if (!this.ShouldHaveInspectString)
{
return null;
}
if (this.parent.CanCast)
{
return "AbilityMechSmokepopCharged".Translate();
}
return "AbilityMechSmokepopRecharging".Translate(
this.parent.CooldownTicksRemaining.ToStringTicksToPeriod(true, false, true, true, false));
} }
} }
#endregion public List<Pawn> GetSpawnedPawns()
{
return spawnedPawns;
}
private int cooldownTicksRemaining;
private List<Pawn> spawnedPawns = new List<Pawn>();
public SoundDef soundReload;
}
public class HediffCompProperties_KillSpawnedPawns : HediffCompProperties
{
public AbilityDef abilityDef;
public HediffCompProperties_KillSpawnedPawns()
{
compClass = typeof(HediffComp_KillSpawnedPawns);
}
}
public class HediffComp_KillSpawnedPawns : HediffComp
{
public HediffCompProperties_KillSpawnedPawns Props => (HediffCompProperties_KillSpawnedPawns)props;
public override void Notify_PawnKilled()
{
foreach (Pawn i in base.Pawn.abilities.GetAbility(Props.abilityDef)
.CompOfType<CompAbilityEffect_MechanitorMechCarrier>().GetSpawnedPawns())
{
if (!i.Dead)
{
i.Kill(null, null);
}
}
}
}
#endregion
#region Call a cluster
public class CompProperties_AbilityMechCluster : CompProperties_AbilityEffect
{
public CompProperties_AbilityMechCluster()
{
this.compClass = typeof(CompAbilityEffect_MechCluster);
}
public float displayRadius;
}
public class CompAbilityEffect_MechCluster : CompAbilityEffect
{
public new CompProperties_AbilityMechCluster Props
{
get { return (CompProperties_AbilityMechCluster)this.props; }
}
public bool ShouldHaveInspectString
{
get { return ModsConfig.BiotechActive && this.parent.pawn.RaceProps.IsMechanoid; }
}
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{
base.Apply(target, dest);
if (Faction.OfMechanoids == null)
{
Messages.Message("MessageNoFactionForVerbMechCluster".Translate(), this.parent.pawn,
MessageTypeDefOf.RejectInput, null, false);
}
else
{
MechClusterUtility.SpawnCluster(target.Cell, this.parent.pawn.MapHeld,
MechClusterGenerator.GenerateClusterSketch(2500f, this.parent.pawn.MapHeld, true, true), true,
false, null);
}
}
public override void PostApplied(List<LocalTargetInfo> targets, Map map)
{
base.PostApplied(targets, map);
if (this.parent.def.defName ==
"MechhiveSatelliteUplink") //add field for cooldownFactorStat. Change this if statement to if it's not null. change the contents of getstatvalue on the next line to that field.
{
this.parent.StartCooldown(Mathf.RoundToInt(this.parent.def.cooldownTicksRange.RandomInRange *
this.parent.pawn?.GetStatValue(StatDef.Named("MechhiveSatelliteUplinkCooldownFactor")) ?? 1f));
}
}
public override void DrawEffectPreview(LocalTargetInfo target)
{
GenDraw.DrawRadiusRing(target.Cell, this.Props.displayRadius);
}
public override string CompInspectStringExtra()
{
if (!this.ShouldHaveInspectString)
{
return null;
}
if (this.parent.CanCast)
{
return "AbilityMechSmokepopCharged".Translate();
}
return "AbilityMechSmokepopRecharging".Translate(
this.parent.CooldownTicksRemaining.ToStringTicksToPeriod(true, false, true, true, false));
}
}
#endregion
} }

View File

@ -10,11 +10,11 @@
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\</OutputPath> <OutputPath>..\1.5\Assemblies\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<DocumentationFile>..\Implants.xml</DocumentationFile> <DocumentationFile>..\1.5\Assemblies\Implants.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

View File

@ -264,6 +264,8 @@ namespace LTS_Implants
} }
} }
#region Mech Carrier
//public class CompProperties_MechanitorMechCarrier : CompProperties_AbilityEffect //public class CompProperties_MechanitorMechCarrier : CompProperties_AbilityEffect
//{ //{
// public CompProperties_MechanitorMechCarrier() // public CompProperties_MechanitorMechCarrier()
@ -448,9 +450,6 @@ namespace LTS_Implants
// } // }
// } // }
// public override bool GizmoDisabled(out string reason) // public override bool GizmoDisabled(out string reason)
// { // {
// //Log.Warning(ingredientCountRemaining + " out of "+ Props.costPerPawn + " steel."); // //Log.Warning(ingredientCountRemaining + " out of "+ Props.costPerPawn + " steel.");
@ -463,14 +462,6 @@ namespace LTS_Implants
// return base.GizmoDisabled(out reason); // return base.GizmoDisabled(out reason);
// } // }
// public int remainingCharges // public int remainingCharges
// { // {
// get // get
@ -589,6 +580,10 @@ namespace LTS_Implants
// // } // // }
// //} // //}
//} //}
#endregion
#region Psychic Shield
//public class LTS_ShieldHediff : Hediff_Implant //public class LTS_ShieldHediff : Hediff_Implant
//{ //{
@ -663,7 +658,7 @@ namespace LTS_Implants
// } // }
//} //}
#endregion
public class LTS_HediffCompProperties_Mote : HediffCompProperties public class LTS_HediffCompProperties_Mote : HediffCompProperties
{ {
//public AbilityDef abilityDef; //public AbilityDef abilityDef;

View File

@ -9,20 +9,24 @@ namespace LTS_Implants
public static class HarmonyPatches public static class HarmonyPatches
{ {
public static bool IsCombatExtended = false; public static bool IsCombatExtended = false;
public static bool IsSarg = false;
static HarmonyPatches() static HarmonyPatches()
{ {
Verse.Log.Message("[LTS-II-Forked]Unpatching CE patches to reduce overlap");
Harmony harmony = new Harmony("rimworld.LTS.implants"); Harmony harmony = new Harmony("rimworld.LTS.implants");
Harmony.DEBUG = false; Harmony.DEBUG = false;
//Check if we are in a CE enabled env //Check if we are in a CE enabled env
if(ModLister.GetModWithIdentifier("ceteam.combatextended")!=null) if (ModLister.GetModWithIdentifier("ceteam.combatextended") != null)
{
IsCombatExtended = true; IsCombatExtended = true;
Verse.Log.Message("[LTS-II-Forked]Found CombatExtended,Will unpatch some harmony patches to reduce overlap");
}
//TODO Detect Sarg`s mod and unpatch accordingly.
if (ModLister.BiotechInstalled) if (ModLister.BiotechInstalled)
{ {
Verse.Log.Message("[LTS-II-Forked]Biotech found, harmony patch running"); Verse.Log.Message("[LTS-II-Forked]Biotech found, harmony patch running");
if (IsCombatExtended) if (IsCombatExtended)
{ {
Verse.Log.Message("[LTS-II-Forked]Unpatching CE patches to reduce overlap"); Verse.Log.Message("[LTS-II-Forked]Unpatching CE Biotech Mechanitor Command Range patches to reduce overlap,CE range is used instead vanilla range");
var mechanitorCanCommand = typeof(Pawn_MechanitorTracker).GetMethod("CanCommandTo"); var mechanitorCanCommand = typeof(Pawn_MechanitorTracker).GetMethod("CanCommandTo");
harmony.Unpatch(mechanitorCanCommand,HarmonyPatchType.All,"CombatExtended.HarmonyCE"); harmony.Unpatch(mechanitorCanCommand,HarmonyPatchType.All,"CombatExtended.HarmonyCE");
var mechanitorDrawCommandRange = typeof(Pawn_MechanitorTracker).GetMethod("DrawCommandRadius"); var mechanitorDrawCommandRange = typeof(Pawn_MechanitorTracker).GetMethod("DrawCommandRadius");