Skip to content

Allow docking/building of mercies on carriers and air staging. #7135

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
Nuggets75 wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Allow docking/building of mercies on carriers and air staging. #7135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
db9e092
Allow docking/building of mercies on carriers and air staging.
Nuggets75 Jun 5, 2026
24d31ba
Allow Mercy to be built by carriers
lL1l1 Jun 12, 2026
cedcd52
Document CANNOTUSEAIRSTAGING category
lL1l1 Jun 12, 2026
95ce623
Allow Mercy to patrol, dock, and enter transports
lL1l1 Jun 12, 2026
4f118af
Allow mercy to assist/guard
lL1l1 Jun 12, 2026
c413184
Allow mercy to refuel so it can leave air staging
lL1l1 Jun 12, 2026
7dfce09
Fix Mercy not attacking units in range
lL1l1 Jun 12, 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
1 change: 1 addition & 0 deletions engine/Core/Categories.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ categories = {
BUILTBYTIER3COMMANDER = categoryValue,
BUILTBYTIER3ENGINEER = categoryValue,
BUILTBYTIER3FACTORY = categoryValue,
--- Used by engine to disallow air units to right click into transports/air staging.
CANNOTUSEAIRSTAGING = categoryValue,
CANTRANSPORTCOMMANDER = categoryValue,
CAPTURE = categoryValue,
Expand Down
17 changes: 10 additions & 7 deletions units/DAA0206/DAA0206_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,14 @@ UnitBlueprint{
"AIR",
"BOMB",
"BOMBER",
"CANNOTUSEAIRSTAGING",
"MOBILE",
"PRODUCTDL",
"RECLAIMABLE",
"SELECTABLE",
"SHOWATTACKRETICLE",
"TECH2",
"TRANSPORTBUILTBYTIER2FACTORY",
"TRANSPORTBUILTBYTIER3FACTORY",
"BUILTBYTIER2FACTORY",
"BUILTBYTIER3FACTORY",
"VISIBLETORECON",
},
Defense = {
Expand Down Expand Up @@ -117,7 +116,11 @@ UnitBlueprint{
General = {
CommandCaps = {
RULEUCC_Attack = true,
RULEUCC_CallTransport = true,
RULEUCC_Dock = true,
RULEUCC_Guard = true,
RULEUCC_Move = true,
RULEUCC_Patrol = true,
RULEUCC_RetaliateToggle = true,
RULEUCC_Stop = true,
},
Expand All @@ -133,7 +136,7 @@ UnitBlueprint{
Physics = {
AttackElevation = 0.5,
Elevation = 12,
FuelRechargeRate = 0,
FuelRechargeRate = 5,
FuelUseTime = 400,
GroundCollisionOffset = -0.25,
MaxSpeed = 13,
Expand All @@ -159,6 +162,7 @@ UnitBlueprint{
Weapon = {
{
AboveWaterTargetsOnly = true,
AlwaysRecheckTarget = true,
Audio = {
Fire = Sound { Bank = 'UAAWeapon', Cue = 'UAA0304_Bomb_Quark', LodCutoff = 'Weapon_LodCutoff' },
},
Expand Down Expand Up @@ -202,7 +206,7 @@ UnitBlueprint{
RateOfFire = 10/1, --10/integer interval in ticks
SlavedToBody = true,
SlavedToBodyArcRange = 35,
TargetCheckInterval = 999999,
TargetCheckInterval = 1,
TargetPriorities = {
"TECH4",
"TECH3 STRUCTURE",
Expand All @@ -211,7 +215,6 @@ UnitBlueprint{
"(ALLUNITS - SPECIALLOWPRI)",
},
TargetRestrictDisallow = "UNTARGETABLE",
TrackingRadius = 0.5,
TurretBoneMuzzle = "DAA0206",
TurretBonePitch = "DAA0206",
TurretBoneYaw = "DAA0206",
Expand Down Expand Up @@ -239,4 +242,4 @@ UnitBlueprint{
WeaponCategory = "Death",
},
},
}
}