[New Feature] Autoload Command Shortcut #1452

psi-cmd · 2024-12-14T08:57:38Z

For selected units, pair the transport with infantry/vehicle.

If vehicle loadable transports selected, it won't be loaded if there are vehicles that can only be paired with infantry within selection.
It will always try to load the unit type with least amount of units first, eg. 2 GI and 3 GGI, it will match 2 GI to transport first.
For transport with multiple seats, it will try to fill those seats "diversely".

psi-cmd · 2024-12-14T09:23:12Z

(Falsely include irrelevent file that belongs to another feature)

Aephiex · 2024-12-14T09:32:38Z

Is it possible we can have a default shortcut key for the autoload command?
This doesn't seem to support garrisonable buildings and bio reactors. However if we add such support to it, we have to tell apart grinders from bio reactors, and we have to distinguish InfantryAbsorb and UnitAbsorb.
This doesn't seem to support Ares features Passengers.Allowed=, Passengers.Disallowed=, Passengers.BySize=, and NoManualEnter= as well as it will still try to assign size 6 vehicles into a transport with size limit 3.
~~Terror drones may not be auto-loaded into Flak Tracks this way. Maybe treat smaller units like they are infantries?~~
~~It doesn't check if the passengers are mind controlled or are mind controlling something, in which case it is not allowed to enter a transport.~~

I solved 3, 4, and 5. See below for details.

Aephiex · 2024-12-14T10:14:39Z

When I select an amphibious transport on water and units on land at a same time and press the auto load button, the amphibious transport will move ashore all the way to the land unit and stop there. The land unit doesn't get into the transport. However, this is exactly the same behavior when I call a land unit to get into an amphibious transport on water, so this isn't really an issue.

The implementation is mindful. It directly gives enter order to selected units so everything will behave the same as if the player explicitly gave an enter order. It is very convenient to use, even I can now enjoy playing the Allies.

github-actions · 2024-12-14T12:07:07Z

Nightly build for this pull request:

compiled-dll-c8d039ffcdabb53855f441716596efe99a472078.zip
These artifacts will expire in 90 days and will not be available for download after that time.

This comment is automatic and is meant to allow guests to get latest nightly builds for this pull request without registering. It is updated on every successful build.

Aephiex · 2024-12-14T12:49:24Z

Hello, made Ares tag support for you, and more.

psi-cmd#1

Effects:

Transports with NoManualEnter=true will be viewed as if they didn't have passenger slots;
If a transport has Passengers.BySize=false then every potential passenger is viewed as size 1;
If a transport has Passengers.Allowed= and Passengers.Disallowed= defined then passengers unable to enter it will not try to get into it, as well as the auto assignment will never try to violent the SizeLimit=;
Vehicle types with size <= 2 and passenger <= 0 are viewed as standard passengers like infantry types, and infantry types with size >= 3 are viewed as larger passengers like tanks;
If a standard transport can't actually load anything due to its passenger filters, then just try to load it into larger transports;
Mind controlled units and units mind controlling something can't be passengers at all.

Maybe we have to detect if Ares is present before we take compatibility with Ares tags?

NetsuNegi · 2024-12-14T14:42:34Z

have you test in multiplayer game?

psi-cmd · 2024-12-14T18:44:38Z

Hello, made Ares tag support for you, and more.

psi-cmd#1

Effects:

Transports with NoManualEnter=true will be viewed as if they didn't have passenger slots;

If a transport has Passengers.BySize=false then every potential passenger is viewed as size 1;

If a transport has Passengers.Allowed= and Passengers.Disallowed= defined then passengers unable to enter it will not try to get into it, as well as the auto assignment will never try to violent the SizeLimit=;

Vehicle types with size <= 2 and passenger <= 0 are viewed as standard passengers like infantry types, and infantry types with size >= 3 are viewed as larger passengers like tanks;

If a standard transport can't actually load anything due to its passenger filters, then just try to load it into larger transports;

Mind controlled units and units mind controlling something can't be passengers at all.

Maybe we have to detect if Ares is present before we take compatibility with Ares tags?

Wow, thanks for your work. I am not famillar with other features on transport loading and you help with the corner cases.
And also thanks for a clear documentation that explain things into details. 👍

For ares tags, maybe we could have the "original" default value for them. For example, NoManualEnter=False, Passengers.BySize=True are the default behavior without any MOD.

Ares tags support and smarter unit size logic and more

psi-cmd · 2024-12-14T20:11:55Z

have you test in multiplayer game?

Not yet, trying to find someone for help.

src/Commands/AutoLoad.cpp

src/Ext/TechnoType/Body.cpp

src/Commands/AutoLoad.cpp

Co-authored-by: Kerbiter <[email protected]>

Aephiex · 2024-12-15T04:04:05Z

For ares tags, maybe we could have the "original" default value for them. For example, NoManualEnter=False, Passengers.BySize=True are the default behavior without any MOD.

Yes, I defaulted every vehicle to allow maual enter and to count passengers by size.

minor adjustments

Aephiex · 2024-12-20T11:48:37Z

@chaserli Hello, this pull request seems ready for review. Maybe take a look when you have time?

Metadorius

Looks good, lemme fix some of the style stuff quickly.

Metadorius · 2024-12-20T20:39:20Z

docs/User-Interface.md

+  - Larger passengers are loaded first, and transports with smaller size limits are used first.
+  - At a given unit size and size limit, passengers will be diversely distributed into transports if possible.
+  - Ares `Passengers.Allowed=` and `Passengers.Disallowed=` are taken into account.
+- It also supports Bio Reactors and Tank Bunkers. Select valid candidates and multiple said buildings while pressing Shift, then press the auto load hotkey, the units will be distributed among these buildings and will be ordered to enter them.


What about Soviet Battle Bunkers and other structures that you own and can select and can have garrisons?

Garrisonable structures are currently not supported. Neutral structures and owned troops can't be selected at a same time. Also can't read the user's intention when a bio reactor, a battle bunker, and a group of conscripts are selected at a same time. Maybe we need another shortcut key for that.

Also can't read the user's intention when a bio reactor, a battle bunker, and a group of conscripts are selected at a same time.

Everyone who can fit in bio reactor but not the garrison goes to bio reactor, everyone else is spread between bunkers and reactors. I think the situation when battle bunkers and reactors will be selected is rather rare so there's no need to do much thought about it

You are right. I will add such support later. However since neutral structures still can't be selected with owned troops at a same time, this will only ease the loading of battle bunkers, which is always owned by a player even when not garrisoned.

src/Commands/AutoLoad.cpp

CREDITS.md

Co-authored-by: Kerbiter <[email protected]>

chaserli

Redundant sanity checks such as misuse of abstract_cast and all kinds of sanity check on xxExt are not the most significant code style issues in the current code.

I have the impression that the entire selection-filtering is somehow repeated. I can think of 2 ways: either you just let the game tell which cursor to use and select the "load onto vehicle" cursors among them. Or just handle the network event directly.

If you don't fully understand how network events are handled, you can check the implementation of the virtual function you've chosen. Methods in EventClass.h in yrpp is also updated to handle them directly.

Metadorius · 2024-12-21T13:26:22Z

@chaserli it will be good to see the actual explanations of why do you think something is wrong (like the cast thing) and how and it should be done properly. Code reviews should be done so the author can learn and grow, saying "it is wrong" without explaining when you know the answer is not productive.

Garrisonable structure support & extract redundancy as inline function

TaranDahl · 2024-12-23T01:56:21Z

src/Commands/AutoLoad.cpp

+// If return value <= 0 then the building can't be a "transport".
+inline static const int GetBuildingPassengerBudget(BuildingClass* pBuilding)
+{
+	auto pBuildingType = abstract_cast<BuildingTypeClass*>(pBuilding->GetTechnoType());


You can directly use pBuilding->Type.

TaranDahl · 2024-12-23T02:06:20Z

src/Commands/AutoLoad.cpp

+	else if (pPassenger->WhatAmI() == AbstractType::Unit)
+	{
+		// Tank Bunker
+		return pPassenger->GetTechnoType()->Turret


Missed a lot of checks. See sub_70FB50.

如果你不想仔细检查每个可能的进入关系是否成立的话，可以试试使用MouseOverObject。它会返回一个Action，只要返回的Action是Enter那应该就是可以进入的。不过这个函数会进行很多很多判断，如果你要用的话最好实际测试一下会不会造成卡顿。
If you don't want to carefully check whether each possible entry relationship is established, you can try using MouseOverObject. It will return an Action. As long as the returned Action is Enter, it should be possible to enter. However, this function will make many, many checks. If you decide to use it, it is best to actually test whether it will cause lag.

Tried before you say, didn't work. Most objects don't yield Action::Enter when selected by the player, only Bio Reactors do. Meanwhile, if we simply invoke ObjectClickedAction, most objects can be entered when Action::Enter is given, even when the object is selected by the player, only Tank Bunkers can't be entered this way.

Missed a lot of checks. See sub_70FB50.

As far as I read from the assembly, it seems hovered units, parasited units, and those without a "turret changer" weapon, are never eligible to enter a Tank Bunker, right?
I don't know what is a turret changer. The rest can be added to the filter.

You can directly reference that function by using reinterpret_cast. The use cases can be found in the project.

Wow, didn't know that, thank you.

TaranDahl · 2024-12-23T02:12:59Z

src/Commands/AutoLoad.cpp

+	if (pTransport->WhatAmI() == AbstractType::Building)
+	{
+		auto pBuilding = abstract_cast<BuildingClass*>(pTransport);
+		auto pBuildingType = abstract_cast<BuildingTypeClass*>(pBuilding->GetTechnoType());


pBuilding->Type

Reselected after deselected

Aephiex · 2024-12-23T14:54:30Z

@chaserli Hello, redundancy have been migrated to inline functions, so it doesn't look as redundant as before. Maybe you can take a look again when you have time. Also I don't know what's wrong with the "misuse" of abstract_cast, maybe you will elaborate.

CrimRecya

It seems that you understand the abstract_cast. But I found some parts that can be omitted to avoid repeating check.

CrimRecya · 2024-12-24T07:58:34Z

src/Commands/AutoLoad.cpp

+		return pPassenger->GetTechnoType()->Turret
+			&& pPassenger->GetTechnoType()->Bunkerable
+			&& pPassenger->GetTechnoType()->SpeedType != SpeedType::Hover
+			&& !abstract_cast<FootClass*>(pPassenger)->ParasiteEatingMe


!static_cast<FootClass*>(pPassenger)->ParasiteEatingMe

CrimRecya · 2024-12-24T08:00:35Z

src/Commands/AutoLoad.cpp

+	}
+	else if (pTransport->WhatAmI() == AbstractType::Building)
+	{
+		auto pBuilding = abstract_cast<BuildingClass*>(pTransport);


else if (auto pBuilding = abstract_cast<BuildingClass*>(pTransport))

CrimRecya · 2024-12-24T08:00:50Z

src/Commands/AutoLoad.cpp

+			// the check of MCing is redundant here, see inline function "CanBeBuildingPassenger".
+			return pPassenger->WhatAmI() == AbstractType::Infantry
+				&& !pPassenger->IsMindControlled()
+				&& abstract_cast<InfantryTypeClass*>(pPassenger->GetTechnoType())->Occupier


static_cast<InfantryTypeClass*>(pPassenger->GetTechnoType())->Occupier

CrimRecya · 2024-12-24T08:03:59Z

src/Commands/AutoLoad.cpp

+{
+	if (pTransport->WhatAmI() == AbstractType::Unit)
+	{
+		auto pType = pTransport->GetTechnoType();


if (auto pUnit = abstract_cast<UnitClass*>(pTransport)) { auto pType = pUnit->Type; ... }

CrimRecya · 2024-12-24T08:05:54Z

src/Commands/AutoLoad.cpp

+{
+	if (pTransport->WhatAmI() == AbstractType::Building)
+	{
+		auto pBuilding = abstract_cast<BuildingClass*>(pTransport);


if (auto pBuilding = abstract_cast<BuildingClass*>(pTransport))

CrimRecya · 2024-12-24T08:12:01Z

src/Commands/AutoLoad.cpp

+		// Detect enterable buildings.
+		if (pTechno->WhatAmI() == AbstractType::Building)
+		{
+			auto pBuilding = abstract_cast<BuildingClass*>(pTechno);


if (auto pBuilding = abstract_cast<BuildingClass*>(pTechno))

CrimRecya · 2024-12-24T08:23:35Z

src/Commands/AutoLoad.cpp

+					{
+						// If by size then get the actual size of the potential passenger.
+						// Otherwise, every potential passenger counts as size 1.
+						passengerSize = static_cast<int>(abstract_cast<TechnoClass*>(pPassenger)->GetTechnoType()->Size);


If it is determined that pPassenger is a TechnoClass*, you can replace the redundant abstract_cast with reinterpret_cast

Aephiex · 2024-12-24T12:14:52Z

It seems that you understand the abstract_cast. But I found some parts that can be omitted to avoid repeating check.

Thank you for your detailed review. I appreciate.

psi-cmd added 3 commits December 14, 2024 01:44

max variety autoload and recursive autoload

0e604e4

Implement autoload hotkey

7bc526b

Implement Autoload Shortcut

831097e

psi-cmd force-pushed the autoload branch from a8160a5 to 831097e Compare December 14, 2024 09:20

Aephiex approved these changes Dec 14, 2024

View reviewed changes

ares tags support

ea03a24

Aephiex added 6 commits December 14, 2024 21:53

smarter passenger and vehicle distinction by size

1fba9d4

fix not working

7b5dfad

remove redundant check

142e751

comments

bde01c4

mind control support

caa7a13

mind control support part 2

8f3a38a

prevent CaptureManager null pointer

817147c

psi-cmd added 2 commits December 14, 2024 13:24

Merge pull request #1 from Aephiex/autoload

2e143f0

Ares tags support and smarter unit size logic and more

fix nullptr case not tested

91f51d2

merge with latest develop

d57a878

Metadorius reviewed Dec 14, 2024

View reviewed changes

src/Commands/AutoLoad.cpp Outdated Show resolved Hide resolved

Metadorius reviewed Dec 14, 2024

View reviewed changes

bracket style adjustment

873ff7c

Co-authored-by: Kerbiter <[email protected]>

Aephiex added 2 commits December 15, 2024 12:43

Fix transport remaining size calculation

c17d0b3

fix comments misleading

3a6163e

psi-cmd marked this pull request as ready for review December 18, 2024 01:53

Merge pull request #6 from Aephiex/patch-1

0f23cca

minor adjustments

Aephiex approved these changes Dec 18, 2024

View reviewed changes

Metadorius removed the Needs Rework The structure or methodology is "mise en question" label Dec 20, 2024

Metadorius approved these changes Dec 20, 2024

View reviewed changes

psi-cmd and others added 2 commits December 20, 2024 14:51

style fix

f121f60

Co-authored-by: Kerbiter <[email protected]>

Update CREDITS.md

dd403ec

chaserli requested changes Dec 21, 2024

View reviewed changes

Aephiex added 6 commits December 21, 2024 17:03

Update AutoLoad.cpp

36456fd

Update AutoLoad.cpp

8520a5f

Update Body.h

d94a680

Update Body.cpp

de34130

Update User-Interface.md

f3b2029

Update AutoLoad.cpp

5a25372

Aephiex and others added 4 commits December 22, 2024 01:17

Update AutoLoad.cpp

2f78fa0

Merge pull request #7 from Aephiex/patch-1

5b0dd74

Garrisonable structure support & extract redundancy as inline function

Update AutoLoad.cpp

6385f63

Update AutoLoad.cpp

da540d6

TaranDahl reviewed Dec 23, 2024

View reviewed changes

psi-cmd and others added 3 commits December 22, 2024 20:40

Merge pull request #8 from Aephiex/patch-1

df6ce6e

Reselected after deselected

fix tank bunker filter

0f6c255

pBuilding->Type

bba2745

CrimRecya reviewed Dec 24, 2024

View reviewed changes

Aephiex added 3 commits December 24, 2024 21:24

style and details

6aef490

typo

117add1

tank bunker check use YR function

2804cdc

[New Feature] Autoload Command Shortcut #1452

Are you sure you want to change the base?

[New Feature] Autoload Command Shortcut #1452

Conversation

psi-cmd commented Dec 14, 2024 • edited Loading

psi-cmd commented Dec 14, 2024

Aephiex commented Dec 14, 2024 • edited Loading

Aephiex commented Dec 14, 2024 • edited Loading

github-actions bot commented Dec 14, 2024 • edited Loading

Aephiex commented Dec 14, 2024 • edited Loading

NetsuNegi commented Dec 14, 2024

psi-cmd commented Dec 14, 2024 • edited Loading

psi-cmd commented Dec 14, 2024 • edited Loading

Aephiex commented Dec 15, 2024

Aephiex commented Dec 20, 2024

Metadorius left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chaserli left a comment

Choose a reason for hiding this comment

Metadorius commented Dec 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Aephiex Dec 23, 2024 • edited Loading

Choose a reason for hiding this comment

Aephiex Dec 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Aephiex commented Dec 23, 2024

CrimRecya left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Aephiex commented Dec 24, 2024

psi-cmd commented Dec 14, 2024 •

edited

Loading

Aephiex commented Dec 14, 2024 •

edited

Loading

Aephiex commented Dec 14, 2024 •

edited

Loading

github-actions bot commented Dec 14, 2024 •

edited

Loading

Aephiex commented Dec 14, 2024 •

edited

Loading

psi-cmd commented Dec 14, 2024 •

edited

Loading

psi-cmd commented Dec 14, 2024 •

edited

Loading

Metadorius commented Dec 21, 2024 •

edited

Loading

Aephiex Dec 23, 2024 •

edited

Loading

Aephiex Dec 23, 2024 •

edited

Loading