Better interaction with allies [patch]

[wzdev-ci]

keyword_alliance_cursor_transport resolution_fixed type_patch (an actual patch, not a request for one) | by Zarel

---

The main point of this patch is to allow more interaction between allies

• You can now repair allied units.
• You can now repair allied structures.
• You can now upgrade allied structures.
• You can now rearm VTOLs on allied rearming pads.
• You can now repair your units at allied repair facilities.
• You can now guard allied units (trucks, sensors, and commanders) and structures.

Guarding allied units will cause your unit to follow them, and attack things that get in range. Guarding an allied commander actually works kinda similarly to assigning to them, although you don't get the experience bonus, and you don't count towards the 6+ unit limit.

Your trucks and repair turrets will not automatically repair damaged allied structures. However, your units will automatically be repaired by allied repair facilities (but only if your ally doesn't have any of their own units there), and your VTOLs will automatically use allied rearming-pads (but only if you don't have any of your own, and your allies' rearming-pads aren't being used).

You still can't directly control allied units or structures (it would be incredibly frustrating for your ally). You can't assign to allied sensors/commanders, or put your borgs in allied transports (just give your units to your ally, if it comes to that).

A few fixes/changes that came up while implementing this:

• You get a selection cursor when mousing over LasSat, to make it clearer that it's selectable.
• You get the OBSERVE cursor for attack-move, the EMBARK cursor for unload transport, etc.
• A few other minor cursor fixes. Cursors should now reflect what happens when you click on them significantly more of the time.
• Clicking on a transport with no cyborgs selected will select the transport, instead of doing nothing.
• You can attack (and actually damage) your own units/structures with Alt+click, now. Still doesn't work with LasSat, to prevent backstabbing allies by moving an expendable unit into their base. For the same reason, Alt+click only works on your own units, not on your allies'.
• Alt+click works on Mac OS X now.
• Repair turrets, and especially cyborg mechanics, now fidget a lot less, and will now a lot more reliably go directly to the unit you click on and start repairing.
• Alt+click with a cyborg transport selected will "Unload everything here"
• Attack-move (scout) changed from shift+click to alt+click

---

Issue migrated from trac:1084 at 2022-04-15 20:05:31 -0700

[wzdev-ci]

Zarel uploaded file betteralliances.patch (26.9 KiB)

better alliances patch

[wzdev-ci]

Zarel changed status from new to accepted

[wzdev-ci]

Zarel changed owner from ` toZarel`

[wzdev-ci]

Zarel commented

---

As usual, barring objections, I will be committing to trunk and 2.3-branch in around three days.

I expect there to be another beta of 2.3, in which I would like people to test in detail for unexpected cursor behavior.

[wzdev-ci]

Zarel edited the issue description

[wzdev-ci]

cybersphinx commented

---

Could you separate the fixes, and commit them now? I see no reason to a) wait with them, and b) include them in an alliance commit.

[wzdev-ci]

Zarel commented

---

The problem is that the fixes are all somewhat interconnected. The cursor stuff, in particular, come with the changes to behavior. No use changing "damaged ally unit" to "repair cursor" without actually implementing repair of ally units.

[wzdev-ci]

Zarel commented

---

Committed in [8433] Backported to 2.3 in [8432]

(I typoed the ticket name in the commit message.)

[wzdev-ci]

Zarel changed status from accepted to closed

[wzdev-ci]

Zarel set resolution to fixed