Skip to content

Commit

Permalink
remove producible with level, fix guardian drone crash, fix autodeplo…
Browse files Browse the repository at this point in the history
…yer crash, fix mini drone crash
  • Loading branch information
patrickwieth committed Jan 19, 2023
1 parent 771d30d commit e908c16
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 92 deletions.
1 change: 0 additions & 1 deletion mods/ca/rules/china/aircraft.yaml
@@ -1,7 +1,6 @@
CHMIG:
Inherits: ^PlaneTD
Inherits: ^PrioAntiHeavy
Inherits@AUTOTARGET2: ^PrioAntiHeavy
Inherits@EXPERIENCE: ^GainsExperience
Inherits@announce: ^AnnounceOnBuild
Inherits@rearm: ^AircraftWithAmmo
Expand Down
2 changes: 0 additions & 2 deletions mods/ca/rules/china/vehicles.yaml
Expand Up @@ -512,7 +512,6 @@ choverlord.Propaganda.Reflector:
choverlord.Nuke_Shells:
Inherits: choverlord
Inherits: ^PrioAntiLight
Inherits@AUTOTARGET2: ^PrioAntiLight
Buildable:
Prerequisites: chweap, techcenter, ~commander_tree.overlord.nuclear_shells, ~!filler.overlord2
Description: Heavy Chinese tank armed with nuclear shells.
Expand Down Expand Up @@ -568,7 +567,6 @@ choverlord.Nuke_Shells.Reflector:
choverlord.Plasma:
Inherits: choverlord
Inherits: ^PrioEnergyWeapon
Inherits@AUTOTARGET2: ^PrioEnergyWeapon
Buildable:
Prerequisites: techcenter, ~commander_tree.overlord.plasma, ~!filler.overlord2
Description: Heavy Chinese tank shooting ionized plasma.
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/rules/commander-tree.yaml
Expand Up @@ -1502,13 +1502,13 @@ hack.cameo_filler.sovietgeneral.1:
Inherits: ^default.cameo_filler
Buildable:
BuildPaletteOrder: 0
Prerequisites: prerequisite.has_points, radar, ~aircraft.soviet, ~filler.soviet_general
Prerequisites: prerequisite.has_points, radar, ~structures.soviet, ~filler.soviet_general

hack.cameo_filler.sovietgeneral.2:
Inherits: ^default.cameo_filler
Buildable:
BuildPaletteOrder: 0
Prerequisites: prerequisite.has_points, radar, ~aircraft.soviet, ~filler.soviet_general
Prerequisites: prerequisite.has_points, radar, ~structures.soviet, ~filler.soviet_general

#GDI
commander_tree.Railgunner:
Expand Down
14 changes: 5 additions & 9 deletions mods/ca/rules/defaults.yaml
Expand Up @@ -1263,12 +1263,6 @@
Targetable@MINIDRONE:
TargetTypes: MiniDroneAttachable
RequiresCondition: !mdrn-attached
ChangesHealth@MINIDRONE:
PercentageStep: 1
Delay: 25
StartIfBelow: 100
DamageCooldown: 75
RequiresCondition: mdrn-attached
ExternalCondition@MINIDRONE:
Condition: mdrn-attached
AttachableTo:
Expand Down Expand Up @@ -1932,6 +1926,7 @@
^RobotDriver:
Inherits@IDISABLE: ^DisabledByRadarLoss
Inherits@HACKABLE: ^Hackable
IgnoresDisguise:
WithDecoration@DISABLED:
Image: poweroff
Sequence: offline
Expand Down Expand Up @@ -4134,10 +4129,8 @@
UndeployTicks: 50

^AutoDeployIdler:
AutoTarget:
HoldFireCondition: stance-holdfire
AutoDeployer:
RequiresCondition: undeployed && !parachute && stance-holdfire
RequiresCondition: undeployed && !parachute
DeployChance: 100
DeployTrigger: BecomingIdle
DeployTicks: 5
Expand All @@ -4148,6 +4141,9 @@
RequiresCondition: !jammed && !disabled && !being-warped
ExternalCondition@JAMMED:
Condition: jammed
ProvidesPrerequisite@radar-active:
Prerequisite: radar-active
RequiresCondition: !jammed && !disabled && !being-warped

^AircraftWithAmmo:
Rearmable:
Expand Down
6 changes: 0 additions & 6 deletions mods/ca/rules/structures.yaml
Expand Up @@ -607,9 +607,6 @@ DOME:
ProvidesPrerequisite@gdirad:
Factions: gdi, zocom, talon, eagle
Prerequisite: radar.gdi
ProvidesPrerequisite@radar-active:
Prerequisite: radar-active
RequiresCondition: !jammed && !disabled && !being-warped
ProvidesPrerequisite@buildingname:
InfiltrateForSupportPower@tec:
Types: SabInfiltrate
Expand Down Expand Up @@ -3787,9 +3784,6 @@ HQ:
Factions: gdi, zocom, talon, eagle
Prerequisite: radar.gdi
ProvidesPrerequisite@buildingname:
ProvidesPrerequisite@radar-active:
Prerequisite: radar-active
RequiresCondition: !jammed && !disabled && !being-warped
InfiltrateForSupportPower@tec:
Types: SabInfiltrate
Proxy: rad.gdi.stolen
Expand Down

0 comments on commit e908c16

Please sign in to comment.