From 5e3a0cdc9426c689a860ffc46fbe72f92e19bce2 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Thu, 29 Aug 2024 13:22:56 +0300 Subject: [PATCH] Cleanup unused condition warnings. --- mods/gen/rules/defaults.yaml | 5 +++++ mods/gen/rules/fakes.yaml | 1 + mods/gen/rules/misc.yaml | 1 + mods/gen/rules/structures.yaml | 9 +++++++++ mods/gen/rules/vehicles.yaml | 9 ++++++++- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/mods/gen/rules/defaults.yaml b/mods/gen/rules/defaults.yaml index 23a9458a..ec076733 100644 --- a/mods/gen/rules/defaults.yaml +++ b/mods/gen/rules/defaults.yaml @@ -1444,6 +1444,8 @@ Delay: 1 Condition: update_queue ShowSelectionBar: false + -GrantConditionOnFaction@Toxin: + -GrantConditionOnFaction@Demo: -ActorStatOverride@ZH_UNITS: ActorStatOverride@Stealth_ZH_UNITS: Upgrades: upgrade.camo_netting @@ -2289,11 +2291,13 @@ TargetTypes: GroundActor, Structure, NonGarrisonedStructure, C4, DetonateAttack, Disable, Defense MustBeDestroyed: RequiredForShortGame: false + -GrantConditionOnBotOwner@bot_owner: -GivesBuildableArea@AI: -AcceptsDeliveredCash: -Capturable: -CapturableProgressBar: -CapturableProgressBlink: + -CaptureManager: -DelayedWeaponAttachable@BOOBY_TRAP: -TriggersDelayedWeapon@BOOBY_TRAP: -Targetable@BOOBY_TRAP: @@ -2316,6 +2320,7 @@ -Capturable: -CapturableProgressBar: -CapturableProgressBlink: + -CaptureManager: -DelayedWeaponAttachable@BOOBY_TRAP: -TriggersDelayedWeapon@BOOBY_TRAP: -Targetable@BOOBY_TRAP: diff --git a/mods/gen/rules/fakes.yaml b/mods/gen/rules/fakes.yaml index 1b54e4f8..9915d358 100644 --- a/mods/gen/rules/fakes.yaml +++ b/mods/gen/rules/fakes.yaml @@ -726,6 +726,7 @@ fake.advanced_demo_trap: IntoActor: building.advanced_demo_trap Valued: Cost: 25 + -GrantConditionOnFaction@Toxin: ActorStatValues: Damage: 700 ActorStatOverride@Enemy: diff --git a/mods/gen/rules/misc.yaml b/mods/gen/rules/misc.yaml index f2169e8a..b9330dc8 100644 --- a/mods/gen/rules/misc.yaml +++ b/mods/gen/rules/misc.yaml @@ -243,6 +243,7 @@ crate.supply_drop: Delay: 13 RequiresCondition: !parachute -Crate: + -GrantConditionOnPrerequisite@ZH_UNITS: -ActorStatOverride@ZH_UNITS: crate.scrap: diff --git a/mods/gen/rules/structures.yaml b/mods/gen/rules/structures.yaml index a3908127..59aac77f 100644 --- a/mods/gen/rules/structures.yaml +++ b/mods/gen/rules/structures.yaml @@ -2330,6 +2330,7 @@ building.advanced_demo_trap: Name: actor-building-advanced-demo-trap.name SpawnActorOnDeath: Actor: building.advanced_demo_trap.explode + -GrantConditionOnFaction@Toxin: ActorStatValues: Damage: 700 -ActorStatOverride@Toxin: @@ -4255,6 +4256,7 @@ building.supply_drop_zone: PauseOnCondition: emp || hacked Exit: -CashTricklerMultiplier@SUPPLY_LINES: + -GrantConditionOnPrerequisite@SUPPLY_LINES: Voiced: VoiceSet: SupplyDropVoice ActorStatValues: @@ -4396,6 +4398,7 @@ building.speaker_tower: -Capturable: -CapturableProgressBar: -CapturableProgressBlink: + -CaptureManager: -DelayedWeaponAttachable@BOOBY_TRAP: -TriggersDelayedWeapon@BOOBY_TRAP: -Targetable@BOOBY_TRAP: @@ -4709,6 +4712,9 @@ building.scud_storm: GrantConditionOnFaction@ANTHRAX_BETA: Condition: anthrax_beta Factions: toxin + GrantConditionOnFaction@Toxin: + Condition: toxin + Factions: toxin GrantConditionOnFaction@Demo: Condition: demo Factions: demo @@ -4815,6 +4821,9 @@ building.scud_storm.boss: DisplayOrder: 65 ProductionBar: ProductionType: queue.boss_gen_scud_storm + -GrantConditionOnPrerequisite@MERGE_GENERALS: + -GrantConditionOnFaction@Stealth: + -GrantConditionOnFaction@Toxin: -ActorStatOverride@Toxin: -ActorStatOverride@Toxin_ZH_UNITS: -ActorStatOverride@Demo: diff --git a/mods/gen/rules/vehicles.yaml b/mods/gen/rules/vehicles.yaml index 5f12d4a8..19dd3c2d 100644 --- a/mods/gen/rules/vehicles.yaml +++ b/mods/gen/rules/vehicles.yaml @@ -1120,6 +1120,9 @@ vehicle.sentry_drone: Modifier: 84 Passenger: Weight: 1 + -CargoCondition: + SharedPassenger: + -CargoCondition: Crushable: WarnProbability: 0 CrushClasses: vehicle @@ -2285,7 +2288,7 @@ vehicle.assault_troop_crawler: Condition: ShouldUnload ValidDamageStates: Critical, Heavy IssueOrderToBot@AI: - RequiresCondition: loaded && ShouldUnload + RequiresCondition: bot_owner && loaded && ShouldUnload OrderName: Unload OrderChance: 100 OrderTrigger: Periodically @@ -4355,6 +4358,9 @@ vehicle.combat_cycle: Modifier: 75 Passenger: Weight: 1 + -CargoCondition: + SharedPassenger: + -CargoCondition: Crushable: WarnProbability: 0 CrushClasses: vehicle @@ -4994,6 +5000,7 @@ vehicle.tech_mcc: WithTextDecoration@SIDE: Text: TECH Color: 888888 + -GrantConditionOnPrerequisite@MERGE_GENERALS: # used by laser general in no base mode vehicle.mobile_reactor: