|
|
|
@ -100,8 +100,9 @@ var public const config float proximityCheckElevation; |
|
|
|
// else we need to track. |
|
|
|
// else we need to track. |
|
|
|
struct PipeRecord |
|
|
|
struct PipeRecord |
|
|
|
{ |
|
|
|
{ |
|
|
|
// Pipe that this record tracks |
|
|
|
// Pipe that this record tracks. |
|
|
|
var PipeBombProjectile pipe; |
|
|
|
// Reference to `PipeBombProjectile`. |
|
|
|
|
|
|
|
var NativeActorRef pipe; |
|
|
|
// Each pipe has a separate timer for their scheduled proximity checks, |
|
|
|
// Each pipe has a separate timer for their scheduled proximity checks, |
|
|
|
// so we need a separate variable to track when that time comes for |
|
|
|
// so we need a separate variable to track when that time comes for |
|
|
|
// each and every pipe |
|
|
|
// each and every pipe |
|
|
|
@ -111,7 +112,8 @@ struct PipeRecord |
|
|
|
var bool proximityCheckIntercepted; |
|
|
|
var bool proximityCheckIntercepted; |
|
|
|
// Reference to the `ExtendedZCollision` we created to catch |
|
|
|
// Reference to the `ExtendedZCollision` we created to catch |
|
|
|
// `TakeDamage()` event. |
|
|
|
// `TakeDamage()` event. |
|
|
|
var PipesSafetyCollision safetyCollision; |
|
|
|
// Reference to `PipesSafetyCollision`. |
|
|
|
|
|
|
|
var NativeActorRef safetyCollision; |
|
|
|
}; |
|
|
|
}; |
|
|
|
var private array<PipeRecord> pipeRecords; |
|
|
|
var private array<PipeRecord> pipeRecords; |
|
|
|
|
|
|
|
|
|
|
|
@ -121,12 +123,20 @@ var private array<PipeRecord> pipeRecords; |
|
|
|
// pipe bombs spawning). |
|
|
|
// pipe bombs spawning). |
|
|
|
var private bool pipesRelevancyFlag; |
|
|
|
var private bool pipesRelevancyFlag; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var private Timer cleanupTimer; |
|
|
|
|
|
|
|
|
|
|
|
protected function OnEnabled() |
|
|
|
protected function OnEnabled() |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
local LevelInfo level; |
|
|
|
local PipeBombProjectile nextPipe; |
|
|
|
local PipeBombProjectile nextPipe; |
|
|
|
pipesRelevancyFlag = class'PipeBombProjectile'.default.bAlwaysRelevant; |
|
|
|
pipesRelevancyFlag = class'PipeBombProjectile'.default.bAlwaysRelevant; |
|
|
|
class'PipeBombProjectile'.default.bGameRelevant = false; |
|
|
|
class'PipeBombProjectile'.default.bGameRelevant = false; |
|
|
|
|
|
|
|
// Set cleanup timer, there is little point to making |
|
|
|
|
|
|
|
// clean up interval configurable. |
|
|
|
|
|
|
|
cleanupTimer = _.time.StartTimer(5.0, true); |
|
|
|
|
|
|
|
cleanupTimer.OnElapsed(self).connect = CleanPipeRecords; |
|
|
|
// Fix pipes that are already lying about on the map |
|
|
|
// Fix pipes that are already lying about on the map |
|
|
|
|
|
|
|
level = _.unreal.GetLevel(); |
|
|
|
foreach level.DynamicActors(class'KFMod.PipeBombProjectile', nextPipe) { |
|
|
|
foreach level.DynamicActors(class'KFMod.PipeBombProjectile', nextPipe) { |
|
|
|
RegisterPipe(nextPipe); |
|
|
|
RegisterPipe(nextPipe); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -136,6 +146,7 @@ protected function OnDisabled() |
|
|
|
{ |
|
|
|
{ |
|
|
|
local int i; |
|
|
|
local int i; |
|
|
|
class'PipeBombProjectile'.default.bGameRelevant = pipesRelevancyFlag; |
|
|
|
class'PipeBombProjectile'.default.bGameRelevant = pipesRelevancyFlag; |
|
|
|
|
|
|
|
cleanupTimer.FreeSelf(); |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) { |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) { |
|
|
|
ReleasePipe(pipeRecords[i]); |
|
|
|
ReleasePipe(pipeRecords[i]); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -154,19 +165,18 @@ public final function RegisterPipe(PipeBombProjectile newPipe) |
|
|
|
// Check whether we have already added this pipe |
|
|
|
// Check whether we have already added this pipe |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (pipeRecords[i].pipe == newPipe) { |
|
|
|
if (pipeRecords[i].pipe.Get() == newPipe) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
newRecord.pipe = newPipe; |
|
|
|
newRecord.pipe = _.unreal.ActorRef(newPipe); |
|
|
|
// Setup `PipesSafetyCollision` for catching `TakeDamage()` events |
|
|
|
// Setup `PipesSafetyCollision` for catching `TakeDamage()` events |
|
|
|
// (only if we need to according to settings) |
|
|
|
// (only if we need to according to settings) |
|
|
|
if (NeedSafetyCollision()) |
|
|
|
if (NeedSafetyCollision()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
newRecord.safetyCollision = |
|
|
|
newRecord.safetyCollision = _.unreal.ActorRef( |
|
|
|
class'PipesSafetyCollision'.static.ProtectPipes(newPipe); |
|
|
|
class'PipesSafetyCollision'.static.ProtectPipes(newPipe)); |
|
|
|
} |
|
|
|
} |
|
|
|
newRecord.pipe = newPipe; |
|
|
|
|
|
|
|
pipeRecords[pipeRecords.length] = newRecord; |
|
|
|
pipeRecords[pipeRecords.length] = newRecord; |
|
|
|
// Intercept proximity checks (only if we need to according to settings) |
|
|
|
// Intercept proximity checks (only if we need to according to settings) |
|
|
|
if (NeedManagedProximityChecks()) |
|
|
|
if (NeedManagedProximityChecks()) |
|
|
|
@ -181,16 +191,26 @@ public final function RegisterPipe(PipeBombProjectile newPipe) |
|
|
|
// Rolls back our changes to the pipe in the given `PipeRecord`. |
|
|
|
// Rolls back our changes to the pipe in the given `PipeRecord`. |
|
|
|
public final function ReleasePipe(PipeRecord pipeRecord) |
|
|
|
public final function ReleasePipe(PipeRecord pipeRecord) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
local PipeBombProjectile pipe; |
|
|
|
|
|
|
|
local PipesSafetyCollision safetyCollision; |
|
|
|
if (pipeRecord.safetyCollision != none) |
|
|
|
if (pipeRecord.safetyCollision != none) |
|
|
|
{ |
|
|
|
{ |
|
|
|
pipeRecord.safetyCollision.TurnOff(); |
|
|
|
safetyCollision = |
|
|
|
|
|
|
|
PipesSafetyCollision(pipeRecord.safetyCollision.Get()); |
|
|
|
|
|
|
|
pipeRecord.safetyCollision.FreeSelf(); |
|
|
|
pipeRecord.safetyCollision = none; |
|
|
|
pipeRecord.safetyCollision = none; |
|
|
|
} |
|
|
|
} |
|
|
|
if (pipeRecord.proximityCheckIntercepted && pipeRecord.pipe != none) |
|
|
|
if (safetyCollision != none) { |
|
|
|
|
|
|
|
safetyCollision.TurnOff(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
pipe = PipeBombProjectile(pipeRecord.pipe.Get()); |
|
|
|
|
|
|
|
pipeRecord.pipe.FreeSelf(); |
|
|
|
|
|
|
|
pipeRecord.pipe = none; |
|
|
|
|
|
|
|
if (pipeRecord.proximityCheckIntercepted && pipe != none) |
|
|
|
{ |
|
|
|
{ |
|
|
|
pipeRecord.proximityCheckIntercepted = false; |
|
|
|
pipeRecord.proximityCheckIntercepted = false; |
|
|
|
if (IsPipeDoingProximityChecks(pipeRecord.pipe)) { |
|
|
|
if (IsPipeDoingProximityChecks(pipe)) { |
|
|
|
pipeRecord.pipe.SetTimer(pipeRecord.timerCountDown, true); |
|
|
|
pipe.SetTimer(pipeRecord.timerCountDown, true); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -215,12 +235,15 @@ private final function bool NeedManagedProximityChecks() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Removes dead records with pipe instances turned into `none` |
|
|
|
// Removes dead records with pipe instances turned into `none` |
|
|
|
private final function CleanPipeRecords() |
|
|
|
private final function CleanPipeRecords(Timer source) |
|
|
|
{ |
|
|
|
{ |
|
|
|
local int i; |
|
|
|
local int i; |
|
|
|
while (i < pipeRecords.length) |
|
|
|
while (i < pipeRecords.length) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (pipeRecords[i].pipe == none) { |
|
|
|
if (pipeRecords[i].pipe.Get() == none) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_.memory.Free(pipeRecords[i].pipe); |
|
|
|
|
|
|
|
_.memory.Free(pipeRecords[i].safetyCollision); |
|
|
|
pipeRecords.Remove(i, 1); |
|
|
|
pipeRecords.Remove(i, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
else { |
|
|
|
@ -236,13 +259,17 @@ private final function CleanPipeRecords() |
|
|
|
private final function InterceptProximityChecks() |
|
|
|
private final function InterceptProximityChecks() |
|
|
|
{ |
|
|
|
{ |
|
|
|
local int i; |
|
|
|
local int i; |
|
|
|
|
|
|
|
local PipeBombProjectile nextPipe; |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (pipeRecords[i].proximityCheckIntercepted) continue; |
|
|
|
if (pipeRecords[i].proximityCheckIntercepted) continue; |
|
|
|
if (pipeRecords[i].pipe == none) continue; |
|
|
|
nextPipe = PipeBombProjectile(pipeRecords[i].pipe.Get()); |
|
|
|
if (IsPipeDoingProximityChecks(pipeRecords[i].pipe)) |
|
|
|
if (nextPipe == none) continue; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (IsPipeDoingProximityChecks(nextPipe)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
pipeRecords[i].pipe.SetTimer(0, false); |
|
|
|
// Turn off pipe's own timer |
|
|
|
|
|
|
|
nextPipe.SetTimer(0, false); |
|
|
|
// We set `1.0` because that is the vanilla value; |
|
|
|
// We set `1.0` because that is the vanilla value; |
|
|
|
// Line 123 of "PipeBombProjectile.uc": `SetTimer(1.0,True);` |
|
|
|
// Line 123 of "PipeBombProjectile.uc": `SetTimer(1.0,True);` |
|
|
|
pipeRecords[i].timerCountDown = 1.0; |
|
|
|
pipeRecords[i].timerCountDown = 1.0; |
|
|
|
@ -269,17 +296,18 @@ private final function PerformProximityChecks(float delta) |
|
|
|
{ |
|
|
|
{ |
|
|
|
local int i; |
|
|
|
local int i; |
|
|
|
local Vector checkLocation; |
|
|
|
local Vector checkLocation; |
|
|
|
|
|
|
|
local PipeBombProjectile nextPipe; |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) |
|
|
|
for (i = 0; i < pipeRecords.length; i += 1) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (pipeRecords[i].pipe == none) continue; |
|
|
|
pipeRecords[i].timerCountDown -= delta; |
|
|
|
|
|
|
|
if (pipeRecords[i].timerCountDown > 0) continue; |
|
|
|
|
|
|
|
nextPipe = PipeBombProjectile(pipeRecords[i].pipe.Get()); |
|
|
|
|
|
|
|
if (nextPipe == none) continue; |
|
|
|
// `timerCountDown` does not makes sense for pipes that |
|
|
|
// `timerCountDown` does not makes sense for pipes that |
|
|
|
// are not doing proxiity checks |
|
|
|
// are not doing proxiity checks |
|
|
|
if (!IsPipeDoingProximityChecks(pipeRecords[i].pipe)) continue; |
|
|
|
if (!IsPipeDoingProximityChecks(nextPipe)) continue; |
|
|
|
|
|
|
|
|
|
|
|
pipeRecords[i].timerCountDown -= delta; |
|
|
|
checkLocation = nextPipe.location; |
|
|
|
if (pipeRecords[i].timerCountDown <= 0) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
checkLocation = pipeRecords[i].pipe.location; |
|
|
|
|
|
|
|
if (proximityCheckElevation > 0) { |
|
|
|
if (proximityCheckElevation > 0) { |
|
|
|
checkLocation.z += proximityCheckElevation; |
|
|
|
checkLocation.z += proximityCheckElevation; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -288,9 +316,7 @@ private final function PerformProximityChecks(float delta) |
|
|
|
DoPipeProximityCheck(pipeRecords[i], checkLocation); |
|
|
|
DoPipeProximityCheck(pipeRecords[i], checkLocation); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Assumes `pipeRecord.pipe != none` |
|
|
|
|
|
|
|
// Original code is somewhat messy and was reworked in this more manageble |
|
|
|
// Original code is somewhat messy and was reworked in this more manageble |
|
|
|
// form as core logic is simple - for every nearby `Pawn` we increase the |
|
|
|
// form as core logic is simple - for every nearby `Pawn` we increase the |
|
|
|
// percieved level for the pipe and when it reaches certain threshold |
|
|
|
// percieved level for the pipe and when it reaches certain threshold |
|
|
|
@ -319,11 +345,14 @@ private final function DoPipeProximityCheck( |
|
|
|
local Pawn checkPawn; |
|
|
|
local Pawn checkPawn; |
|
|
|
local float threatLevel; |
|
|
|
local float threatLevel; |
|
|
|
local PipeBombProjectile pipe; |
|
|
|
local PipeBombProjectile pipe; |
|
|
|
pipe = pipeRecord.pipe; |
|
|
|
pipe = PipeBombProjectile(pipeRecord.pipe.Get()); |
|
|
|
|
|
|
|
if (pipe == none) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
pipe.bAlwaysRelevant = false; |
|
|
|
pipe.bAlwaysRelevant = false; |
|
|
|
pipe.PlaySound(pipe.beepSound,, 0.5,, 50.0); |
|
|
|
pipe.PlaySound(pipe.beepSound,, 0.5,, 50.0); |
|
|
|
// Out rewritten logic, which should do exactly the same: |
|
|
|
// Out rewritten logic, which should do exactly the same: |
|
|
|
foreach VisibleCollidingActors( class'Pawn', checkPawn, |
|
|
|
foreach pipe.VisibleCollidingActors( class'Pawn', checkPawn, |
|
|
|
pipe.detectionRadius, checkLocation) |
|
|
|
pipe.detectionRadius, checkLocation) |
|
|
|
{ |
|
|
|
{ |
|
|
|
threatLevel += GetThreatLevel(pipe, checkPawn); |
|
|
|
threatLevel += GetThreatLevel(pipe, checkPawn); |
|
|
|
@ -402,7 +431,6 @@ private final function float GetThreatLevel( |
|
|
|
|
|
|
|
|
|
|
|
event Tick(float delta) |
|
|
|
event Tick(float delta) |
|
|
|
{ |
|
|
|
{ |
|
|
|
CleanPipeRecords(); |
|
|
|
|
|
|
|
if (NeedManagedProximityChecks()) |
|
|
|
if (NeedManagedProximityChecks()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
InterceptProximityChecks(); |
|
|
|
InterceptProximityChecks(); |
|
|
|
|
