Skip to content

Added Odyssey hack logic check to CE turret #4527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SaltyKarl wants to merge 2 commits into
base: Development
Choose a base branch
from
Open

Added Odyssey hack logic check to CE turret #4527

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bd7c3d
add check for hackable&ishacked
SaltyKarl Mar 25, 2026
d923d86
whitespace
SaltyKarl Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -39,7 +39,7 @@ public class Building_TurretGunCE : Building_Turret
public CompCanBeDormant dormantComp;
public CompInitiatable initiatableComp;
public CompMannable mannableComp;

public CompHackable hackableComp;
public static Material ForcedTargetLineMat = MaterialPool.MatFrom(GenDraw.LineTexPath, ShaderDatabase.Transparent, new Color(1f, 0.5f, 0.5f));

// New fields
Expand All @@ -56,7 +56,10 @@ public class Building_TurretGunCE : Building_Turret

#region Properties
// Core properties
public virtual bool Active => (powerComp == null || powerComp.PowerOn) && (dormantComp == null || dormantComp.Awake) && (initiatableComp == null || initiatableComp.Initiated);
public virtual bool Active => (powerComp == null || powerComp.PowerOn) &&
(dormantComp == null || dormantComp.Awake) &&
(initiatableComp == null || initiatableComp.Initiated) &&
(hackableComp == null || !hackableComp.IsHacked);
public CompEquippable GunCompEq => Gun.TryGetComp<CompEquippable>();
public NonSnapTurretExtension NonSnapExtension => def.GetModExtension<NonSnapTurretExtension>();
public bool NonSnap => NonSnapExtension != null;
Expand Down Expand Up @@ -179,6 +182,7 @@ public override void SpawnSetup(Map map, bool respawningAfterLoad) //Add ma
initiatableComp = GetComp<CompInitiatable>();
powerComp = GetComp<CompPowerTrader>();
mannableComp = GetComp<CompMannable>();
hackableComp = GetComp<CompHackable>();

if (!everSpawned && (!Map.IsPlayerHome || Faction != Faction.OfPlayer))
{
Expand Down
Loading