diff --git a/OpenRA.Game/Traits/Player/PlayerResources.cs b/OpenRA.Game/Traits/Player/PlayerResources.cs index 067cd3f39b..77fdbc4857 100644 --- a/OpenRA.Game/Traits/Player/PlayerResources.cs +++ b/OpenRA.Game/Traits/Player/PlayerResources.cs @@ -23,42 +23,6 @@ namespace OpenRA.Traits public object Create(ActorInitializer init) { return new PlayerResources(init.self, this); } } - public class DebugResourceCashInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugResourceCash(init.self); } - } - - public class DebugResourceCash : ISync - { - readonly PlayerResources pr; - public DebugResourceCash(Actor self) { pr = self.Trait(); } - [Sync] public int foo { get { return pr.Cash; } } - } - - public class DebugResourceOreInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugResourceOre(init.self); } - } - - public class DebugResourceOre : ISync - { - readonly PlayerResources pr; - public DebugResourceOre(Actor self) { pr = self.Trait(); } - [Sync] public int foo { get { return pr.Ore; } } - } - - public class DebugResourceOreCapacityInfo : ITraitInfo - { - public object Create(ActorInitializer init) { return new DebugResourceOreCapacity(init.self); } - } - - public class DebugResourceOreCapacity : ISync - { - readonly PlayerResources pr; - public DebugResourceOreCapacity(Actor self) { pr = self.Trait(); } - [Sync] public int foo { get { return pr.OreCapacity; } } - } - public class PlayerResources : ITick, ISync { readonly Player Owner; diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs index 3104c922a3..4cb41ce53c 100755 --- a/OpenRA.Mods.RA/Air/Aircraft.cs +++ b/OpenRA.Mods.RA/Air/Aircraft.cs @@ -19,53 +19,6 @@ using OpenRA.Traits; namespace OpenRA.Mods.RA.Air { - public class DebugAircraftFacingInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugAircraftFacing(init.self); } - } - - public class DebugAircraftFacing : ISync - { - readonly Aircraft a; - public DebugAircraftFacing(Actor self){ a = self.Trait(); } - [Sync] public int foo { get { return a.Facing; } } - } - - public class DebugAircraftSubPxXInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugAircraftSubPxX(init.self); } - } - - public class DebugAircraftSubPxX : ISync - { - readonly Aircraft a; - public DebugAircraftSubPxX(Actor self){ a = self.Trait(); } - [Sync] public int foo { get { return a.SubPxPosition.Y; } } - } - - public class DebugAircraftSubPxYInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugAircraftSubPxY(init.self); } - } - - public class DebugAircraftSubPxY : ISync - { - readonly Aircraft a; - public DebugAircraftSubPxY(Actor self){ a = self.Trait(); } - [Sync] public int foo { get { return a.SubPxPosition.Y; } } - } - - public class DebugAircraftAltitudeInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugAircraftAltitude(init.self); } - } - - public class DebugAircraftAltitude : ISync - { - readonly Aircraft a; - public DebugAircraftAltitude(Actor self){ a = self.Trait(); } - [Sync] public int foo { get { return a.Altitude; } } - } public class AircraftInfo : ITraitInfo, IFacingInfo, UsesInit, UsesInit, UsesInit { @@ -111,7 +64,7 @@ namespace OpenRA.Mods.RA.Air readonly AircraftInfo Info; - public Aircraft( ActorInitializer init , AircraftInfo info) + public Aircraft(ActorInitializer init , AircraftInfo info) { this.self = init.self; if( init.Contains() ) diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs index 0dbbfd5a47..d53f66fcc3 100644 --- a/OpenRA.Mods.RA/AutoTarget.cs +++ b/OpenRA.Mods.RA/AutoTarget.cs @@ -20,6 +20,7 @@ namespace OpenRA.Mods.RA { [Desc("It will try to hunt down the enemy if it is not set to defend.")] public readonly bool AllowMovement = true; + [Desc("Set to a value >1 to override weapons maximum range for this.")] public readonly int ScanRadius = -1; public readonly UnitStance InitialStance = UnitStance.AttackAnything; @@ -121,20 +122,22 @@ namespace OpenRA.Mods.RA var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range)); - if (self.Owner.HasFogVisibility()) { + if (self.Owner.HasFogVisibility()) + { return inRange .Where(a => a.AppearsHostileTo(self)) .Where(a => !a.HasTrait()) .Where(a => attack.HasAnyValidWeapons(Target.FromActor(a))) - .ClosestTo( self.CenterLocation ); + .ClosestTo(self.CenterLocation); } - else { + else + { return inRange .Where(a => a.AppearsHostileTo(self)) .Where(a => !a.HasTrait()) .Where(a => attack.HasAnyValidWeapons(Target.FromActor(a))) .Where(a => self.Owner.Shroud.IsTargetable(a)) - .ClosestTo( self.CenterLocation ); + .ClosestTo(self.CenterLocation); } } } @@ -142,28 +145,5 @@ namespace OpenRA.Mods.RA [Desc("Will not get automatically targeted by enemy (like walls)")] class AutoTargetIgnoreInfo : TraitInfo { } class AutoTargetIgnore { } - - public class DebugRetiliateAgainstAggressorInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugRetiliateAgainstAggressor(init.self); } - } - public class DebugRetiliateAgainstAggressor : ISync - { - readonly AutoTarget a; - public DebugRetiliateAgainstAggressor(Actor self){ a = self.Trait(); } - [Sync] public int Aggressor { get { return a.AggressorID; } } - } - - public class DebugNextAutoTargetScanTimeInfo : ITraitInfo, Requires - { - public object Create(ActorInitializer init) { return new DebugNextAutoTargetScanTime(init.self); } - } - - public class DebugNextAutoTargetScanTime : ISync - { - readonly AutoTarget a; - public DebugNextAutoTargetScanTime(Actor self){ a = self.Trait(); } - [Sync] public int NextAutoTargetScanTime { get { return a.nextScanTime; } } - } } diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 2a48c26f4e..32b0feb672 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -89,8 +89,6 @@ HELI: FallsToEarth: Explosion: HeliCrash AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: HeliExplode EmptyWeapon: HeliExplode @@ -139,8 +137,6 @@ ORCA: FallsToEarth: Explosion: HeliCrash AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: HeliExplode EmptyWeapon: HeliExplode diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 17aa688b0c..e7d4bdfc55 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -431,8 +431,6 @@ VICE: TargetTypes: Ground AutoTarget: ScanRadius: 4 - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: AttackMove: HiddenUnderFog: GainsExperience: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index be63c1339c..282a3b837f 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -104,8 +104,6 @@ Range: 5 AutoTarget: ScanRadius: 4 - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Mobile: Crushes: crate SharesCell: true @@ -150,8 +148,6 @@ Inherits: ^Infantry -Buildable: -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: -TakeCover: -RenderInfantryProne: AppearsOnRadar: diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index cf1e92a0f6..4721bd11ee 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -170,8 +170,6 @@ E6: Captures: CaptureTypes: building, husk -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true RenderInfantryProne: diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 24d65b3c06..1c32716775 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -26,8 +26,6 @@ BOAT: RenderGunboat: AutoTarget: AllowMovement: false - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: WithSmoke: LST: diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 5a58248adf..f35a0da25f 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -527,8 +527,6 @@ GUN: LocalOffset: -71,0,85 AttackTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: -AutoTargetIgnore: -RenderBuilding: -DeadBuildingState: @@ -571,8 +569,6 @@ SAM: AttackPopupTurreted: WithMuzzleFlash: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: -RenderBuilding: RenderRangeCircle: @@ -613,8 +609,6 @@ OBLI: AutoTarget: RenderBuilding: QuantizedFacings: 8 - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: -AutoTargetIgnore: -RenderBuilding: RenderRangeCircle: @@ -650,8 +644,6 @@ GTWR: RenderBuilding: QuantizedFacings: 8 AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: -AutoTargetIgnore: DetectCloaked: Range: 5 @@ -696,8 +688,6 @@ ATWR: AutoTarget: RenderBuilding: QuantizedFacings: 8 - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: -AutoTargetIgnore: RenderDetectionCircle: DetectCloaked: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 24d98912d8..a0bcb27c03 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -58,10 +58,8 @@ HARV: Resources: Tiberium, BlueTiberium PipCount: 7 Capacity: 20 - UnloadTicksPerBale: 12 # hardcoded default is 4 - # How far away from our linked proc (refinery) to find resources (in cells): + UnloadTicksPerBale: 12 SearchFromProcRadius: 24 - # How far away from last harvest order location to find more resources (in cells): SearchFromOrderRadius: 12 Mobile: Speed: 6 @@ -115,8 +113,6 @@ APC: WithMuzzleFlash: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Cargo: Types: Infantry MaxWeight: 5 @@ -156,8 +152,6 @@ ARTY: EmptyWeapon: UnitExplode AutoTarget: InitialStance: Defend - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: ARTY.Husk @@ -188,8 +182,6 @@ FTNK: AttackFrontal: RenderUnit: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: WithMuzzleFlash: Explodes: Weapon: FlametankExplode @@ -227,8 +219,6 @@ BGGY: WithMuzzleFlash: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: BGGY.Husk @@ -267,8 +257,6 @@ BIKE: AttackFrontal: RenderUnit: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: BIKE.Husk @@ -302,8 +290,6 @@ JEEP: WithMuzzleFlash: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: JEEP.Husk @@ -338,8 +324,6 @@ LTNK: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: LTNK.Husk Explodes: @@ -376,8 +360,6 @@ MTNK: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: MTNK.Husk Explodes: @@ -423,8 +405,6 @@ HTNK: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: SelfHealing: Ticks: 10 HealIfBelow: 50% @@ -467,8 +447,6 @@ MSAM: AttackFrontal: RenderUnitTurretedAim: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: LeavesHusk: HuskActor: MSAM.Husk @@ -504,8 +482,6 @@ MLRS: RenderUnitTurretedAim: AutoTarget: InitialStance: Defend - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -547,8 +523,6 @@ STNK: RenderUnit: AutoTarget: InitialStance: HoldFire - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: TargetableUnit: LeavesHusk: HuskActor: STNK.Husk diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index b6b3dba55b..bc0f544b16 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -191,8 +191,6 @@ SONICTANK: LocalOffset: 640,0,427 AttackFrontal: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index f11c1130df..04a1af59ad 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -125,8 +125,6 @@ TargetTypes: Ground RenderInfantry: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: AttackMove: Passenger: CargoType: Infantry @@ -160,10 +158,6 @@ GivesExperience: DrawLineToTarget: ActorLostNotification: - DebugAircraftFacing: - DebugAircraftSubPxX: - DebugAircraftSubPxY: - DebugAircraftAltitude: ProximityCaptor: Types:Plane GivesBounty: diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 420540a45b..0d312df94e 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -214,8 +214,6 @@ DEVAST: LocalOffset: 683,213,85, 683,-171,85 AttackFrontal: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeScale EmptyWeapon: UnitExplodeScale diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 47f853d217..84d004920a 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -49,8 +49,6 @@ ENGINEER: Captures: #TakeCover: -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true @@ -110,8 +108,6 @@ MEDIC: Passenger: PipType: Blue -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true RenderInfantry: @@ -137,8 +133,6 @@ MEDIC: # Speed: 4 # Passenger: # -AutoTarget: -# -DebugRetiliateAgainstAggressor: -# -DebugNextAutoTargetScanTime: # AttackMove: # JustMove: true # Transforms: diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 273bd6fba6..8874c0123d 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -235,8 +235,6 @@ DEVIATORTANK: AttackLoyalty: AutoTarget: InitialStance: Defend - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -277,7 +275,5 @@ SABOTEUR: C4Demolition: C4Delay: 45 -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 8584d93843..141dbb4ba7 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -138,8 +138,6 @@ HARVESTER.starport: LocalOffset: 256,0,128 AttackFrontal: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeTiny EmptyWeapon: UnitExplodeTiny @@ -180,8 +178,6 @@ QUAD: LocalOffset: 128,0,85#-4 AttackFrontal: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeTiny EmptyWeapon: UnitExplodeTiny @@ -229,8 +225,6 @@ QUAD.starport: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -285,8 +279,6 @@ SIEGETANK: EmptyWeapon: UnitExplodeScale AutoTarget: InitialStance: Defend - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Selectable: Bounds: 30,30 LeavesHusk: @@ -342,8 +334,6 @@ MISSILETANK: AttackFrontal: AutoTarget: InitialStance: Defend - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeScale EmptyWeapon: UnitExplodeScale diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 1d4af8da3e..91d208e8d4 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -97,8 +97,6 @@ TargetTypes: Ground, Disguise RenderInfantry: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: AttackMove: Passenger: CargoType: Infantry @@ -167,10 +165,6 @@ DrawLineToTarget: ActorLostNotification: Notification: AirUnitLost - DebugAircraftFacing: - DebugAircraftSubPxX: - DebugAircraftSubPxY: - DebugAircraftAltitude: ProximityCaptor: Types:Plane EjectOnDeath: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 269ab9642d..416dd638e1 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -171,8 +171,6 @@ E6: Captures: TakeCover: -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true -RenderInfantry: @@ -208,8 +206,6 @@ SPY: Infiltrates: InfiltrateTypes: Cash, SupportPower, Exploration -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true -RenderInfantry: @@ -287,8 +283,6 @@ MEDI: Cursor: heal TakeCover: -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true -RenderInfantry: @@ -326,8 +320,6 @@ MECH: Cursor: repair TakeCover: -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true -RenderInfantry: @@ -350,8 +342,6 @@ EINSTEIN: RevealsShroud: Range: 2 -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true ProximityCaptor: @@ -376,8 +366,6 @@ DELPHI: RevealsShroud: Range: 2 -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true ProximityCaptor: @@ -418,8 +406,6 @@ THF: InfiltrateTypes: Cash TakeCover: -AutoTarget: - -DebugRetiliateAgainstAggressor: - -DebugNextAutoTargetScanTime: AttackMove: JustMove: true diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 198d7ea72b..684f8b5eda 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -43,8 +43,6 @@ SS: RepairableNear: -DetectCloaked: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: InitialStance: HoldFire AttackMove: @@ -92,8 +90,6 @@ MSUB: RepairableNear: -DetectCloaked: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: InitialStance: HoldFire AttackMove: @@ -136,8 +132,6 @@ DD: Bounds: 38,38 RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Chronoshiftable: IronCurtainable: RepairableNear: @@ -193,8 +187,6 @@ CA: Bounds: 44,44 RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Chronoshiftable: IronCurtainable: RepairableNear: @@ -265,8 +257,6 @@ PT: Bounds: 32,32 RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Chronoshiftable: IronCurtainable: RepairableNear: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index b3d0394f3c..1d11b87df7 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -290,8 +290,6 @@ TSLA: AttackTesla: ReloadTime: 120 AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: IronCurtainable: -RenderBuilding: RenderRangeCircle: @@ -451,8 +449,6 @@ PBOX.E1: Image: PBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Vulcan LocalOffset: 469,0,0 @@ -476,8 +472,6 @@ PBOX.E3: Image: PBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Dragon LocalOffset: 469,0,0 @@ -491,8 +485,6 @@ PBOX.E4: Image: PBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Flamer LocalOffset: 469,0,0 @@ -506,8 +498,6 @@ PBOX.E7: Image: PBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Colt45 LocalOffset: 469,0,0 @@ -521,8 +511,6 @@ PBOX.SHOK: Image: PBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: PortaTesla LocalOffset: 469,0,0 @@ -536,8 +524,6 @@ PBOX.SNIPER: Image: PBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Sniper LocalOffset: 469,0,0 @@ -628,8 +614,6 @@ HBOX.E1: Image: HBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Vulcan LocalOffset: 469,0,0 @@ -653,8 +637,6 @@ HBOX.E3: Image: HBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Dragon LocalOffset: 469,0,0 @@ -668,8 +650,6 @@ HBOX.E4: Image: HBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Flamer LocalOffset: 469,0,0 @@ -683,8 +663,6 @@ HBOX.E7: Image: HBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Colt45 LocalOffset: 469,0,0 @@ -698,8 +676,6 @@ HBOX.SHOK: Image: HBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: PortaTesla LocalOffset: 469,0,0 @@ -713,8 +689,6 @@ HBOX.SNIPER: Image: HBOX RenderRangeCircle: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament: Weapon: Sniper LocalOffset: 469,0,0 @@ -750,8 +724,6 @@ GUN: Weapon: TurretGun AttackTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: IronCurtainable: -RenderBuilding: RenderRangeCircle: @@ -790,8 +762,6 @@ FTUR: RenderBuilding: QuantizedFacings: 8 AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: IronCurtainable: RenderRangeCircle: -AcceptsSupplies: @@ -830,8 +800,6 @@ SAM: AttackTurreted: WithMuzzleFlash: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: IronCurtainable: -RenderBuilding: RenderRangeCircle: diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index 57566ce5dc..7f992eff06 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -518,9 +518,6 @@ Player: PlayerColorPalette: BasePalette: player RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 - DebugResourceCash: - DebugResourceOre: - DebugResourceOreCapacity: GpsWatcher: Shroud: BaseAttackNotifier: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index ac6e918522..3e148d8fbd 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -24,8 +24,6 @@ V2RL: AttackFrontal: RenderUnitReload: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: SCUD EmptyWeapon: @@ -59,8 +57,6 @@ V2RL: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -98,8 +94,6 @@ V2RL: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -140,8 +134,6 @@ V2RL: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -187,8 +179,6 @@ V2RL: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -232,8 +222,6 @@ ARTY: Weapon: UnitExplode Chance: 75 AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: HARV: Inherits: ^Vehicle @@ -346,8 +334,6 @@ JEEP: WithMuzzleFlash: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Cargo: Types: Infantry MaxWeight: 1 @@ -381,8 +367,6 @@ APC: RenderUnit: WithMuzzleFlash: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Cargo: Types: Infantry MaxWeight: 5 @@ -654,8 +638,6 @@ TTNK: Selectable: Bounds: 28,28,0,0 AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: FTRK: Inherits: ^Vehicle @@ -687,8 +669,6 @@ FTRK: AttackTurreted: RenderUnitTurreted: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -753,8 +733,6 @@ CTNK: Range: 6 RenderUnit: AutoTarget: - DebugRetiliateAgainstAggressor: - DebugNextAutoTargetScanTime: Armament@PRIMARY: Weapon: ChronoTusk LocalOffset: 0,-171,0