Skip to content

Commit

Permalink
Tweaks
Browse files Browse the repository at this point in the history 
Fixed turret threading issue, tweaks to loadout AI, will now
equip/unequip weapons
  • Loading branch information
NoImageAvailable committed May 4, 2016
1 parent dae227e commit 2edaf83
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 27 deletions.
Binary file modified Assemblies/CombatRealism.dll
View file
Binary file not shown.
2 changes: 0 additions & 2 deletions Defs/ThingDefs/Apparel_Carrying.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
<ReloadSpeed>0.1</ReloadSpeed>
</equippedStatOffsets>
<costList>
<Components>1</Components>
<Cloth>60</Cloth>
</costList>
<apparel>
Expand Down Expand Up @@ -122,7 +121,6 @@
<CarryBulk>30</CarryBulk>
</equippedStatOffsets>
<costList>
<Components>1</Components>
<Cloth>60</Cloth>
</costList>
<apparel>
Expand Down
5 changes: 5 additions & 0 deletions Source/CombatRealism/Combat_Realism/Comps/CompTurretInit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ public CompProperties_TurretInit Props
public override void Initialize(CompProperties props)
{
base.Initialize(props);
LongEventHandler.ExecuteWhenFinished(InitTurret);
}

private void InitTurret()
{
Building_TurretGunCR turret = parent as Building_TurretGunCR;
if (turret != null && turret.gun == null)
{
Expand Down
60 changes: 35 additions & 25 deletions Source/CombatRealism/Combat_Realism/Jobs/JobGiver_UpdateLoadout.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ private enum ItemPriority : byte

public override float GetPriority(Pawn pawn)
{
if (CheckForExcessItems(pawn))
{
return 9.2f;
}
ItemPriority priority;
Thing unused;
int i;
LoadoutSlot slot = GetPrioritySlot(pawn, out priority, out unused, out i);
if (slot == null)
{
if (CheckForExcessItems(pawn)) return 3f;
return 0f;
}
if (priority == ItemPriority.Low) return 3f;
Expand All @@ -53,22 +56,17 @@ private LoadoutSlot GetPrioritySlot(Pawn pawn, out ItemPriority priority, out Th
{
foreach(LoadoutSlot curSlot in loadout.Slots)
{
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: checking slot " + curSlot.ToString());
ItemPriority curPriority = ItemPriority.None;
Thing curThing = null;
int numCarried = inventory.container.NumContained(curSlot.Def);

// Add currently equipped gun
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: checking gun");
if (pawn.equipment != null && pawn.equipment.Primary != null)
{
if (pawn.equipment.Primary.def == curSlot.Def) numCarried++;
}

Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: calculating priority");
if (numCarried < curSlot.Count)
{
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: checking for proximity");
curThing = GenClosest.ClosestThingReachable(
pawn.Position,
ThingRequest.ForDef(curSlot.Def),
Expand All @@ -79,7 +77,6 @@ private LoadoutSlot GetPrioritySlot(Pawn pawn, out ItemPriority priority, out Th
if (curThing != null) curPriority = ItemPriority.Proximity;
else
{
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: checking for availability");
curThing = GenClosest.ClosestThingReachable(
pawn.Position,
ThingRequest.ForDef(curSlot.Def),
Expand All @@ -89,23 +86,19 @@ private LoadoutSlot GetPrioritySlot(Pawn pawn, out ItemPriority priority, out Th
x => !x.IsForbidden(pawn) && pawn.CanReserve(x));
if (curThing != null)
{
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: checking for meal");
if (!curSlot.Def.IsNutritionSource && numCarried / curSlot.Count <= 0.5f) curPriority = ItemPriority.LowStock;
else curPriority = ItemPriority.Low;
}
}
}
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: checking for update");
if (curPriority > priority && curThing != null && inventory.CanFitInInventory(curThing, out count))
{
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: updating current slot");
priority = curPriority;
slot = curSlot;
closestThing = curThing;
}
if (priority >= ItemPriority.LowStock)
{
Log.Message("JobGiver_UpdateLoadout :: GetPrioritySlot :: breaking");
break;
}
}
Expand All @@ -117,6 +110,7 @@ private LoadoutSlot GetPrioritySlot(Pawn pawn, out ItemPriority priority, out Th

private bool CheckForExcessItems(Pawn pawn)
{
if (pawn.CurJob != null && pawn.CurJob.def == JobDefOf.Tame) return false;
CompInventory inventory = pawn.TryGetComp<CompInventory>();
Loadout loadout = pawn.GetLoadout();
if (inventory == null || inventory.container == null || loadout == null || loadout.Slots.NullOrEmpty()) return false;
Expand All @@ -138,17 +132,7 @@ protected override Job TryGiveTerminalJob(Pawn pawn)
Loadout loadout = pawn.GetLoadout();
if (loadout != null)
{
// Find missing items
ItemPriority priority;
Thing closestThing;
int count;
LoadoutSlot prioritySlot = GetPrioritySlot(pawn, out priority, out closestThing, out count);
if (closestThing != null)
{
int numContained = inventory.container.NumContained(prioritySlot.Def);
return new Job(JobDefOf.TakeInventory, closestThing) { maxNumToCarry = Mathf.Min(closestThing.stackCount, prioritySlot.Count - numContained, count) };
}

// Find and drop excess items
foreach (LoadoutSlot slot in loadout.Slots)
{
int numContained = inventory.container.NumContained(slot.Def);
Expand Down Expand Up @@ -178,11 +162,18 @@ protected override Job TryGiveTerminalJob(Pawn pawn)
}
}
}
else if (pawn.equipment != null && pawn.equipment.Primary != null && pawn.equipment.Primary.def == slot.Def)
{
ThingWithComps droppedEq;
if(pawn.equipment.TryDropEquipment(pawn.equipment.Primary, out droppedEq, pawn.Position, false))
{
return HaulAIUtility.HaulToStorageJob(pawn, droppedEq);
}
}
}
}
Thing thingToRemove = inventory.container.FirstOrDefault(t =>
(t.def.ingestible == null || t.def.ingestible.preferability > FoodPreferability.Raw)
&& !loadout.Slots.Any(s => s.Def == t.def));
// Find excess items that are not part of our loadout
Thing thingToRemove = inventory.container.FirstOrDefault(t => !loadout.Slots.Any(s => s.Def == t.def));
if (thingToRemove != null)
{
Thing droppedThing;
Expand All @@ -195,6 +186,25 @@ protected override Job TryGiveTerminalJob(Pawn pawn)
Log.Error(pawn.ToString() + " tried dropping " + thingToRemove.ToString() + " from inventory but resulting thing is null");
}
}

// Find missing items
ItemPriority priority;
Thing closestThing;
int count;
LoadoutSlot prioritySlot = GetPrioritySlot(pawn, out priority, out closestThing, out count);
if (closestThing != null)
{
// Equip gun if unarmed or current gun is not in loadout
if (closestThing.TryGetComp<CompEquippable>() != null
&& (pawn.health != null && pawn.health.capacities.CapableOf(PawnCapacityDefOf.Manipulation))
&& (pawn.equipment == null || pawn.equipment.Primary == null || !loadout.Slots.Any(s => s.Def == pawn.equipment.Primary.def)))
{
return new Job(JobDefOf.Equip, closestThing);
}
// Take items into inventory if needed
int numContained = inventory.container.NumContained(prioritySlot.Def);
return new Job(JobDefOf.TakeInventory, closestThing) { maxNumToCarry = Mathf.Min(closestThing.stackCount, prioritySlot.Count - numContained, count) };
}
}
return null;
}
Expand Down

0 comments on commit 2edaf83

Please sign in to comment.