[Highly Customized] Optimize aircrafts actions #1366

CrimRecya · 2024-08-25T07:19:17Z

Now, when a stop command (S) is issued to an aircraft, the aircraft will immediately return to the airport. When a guard command (G) is issued, the aircraft will search for targets around the current location and return immediately when target is not found, target is destroyed or ammos are depleted (Note that if the target is destroyed but ammos are not depleted yet, it will also return because the aircraft's command is one-time). When a attack move command (Ctrl+Shift) is issued, the aircraft will move towards the destination and search for nearby targets on the route for attack. Once ammos are depleted or the destination is reached, it will return (Note that if the automatically selected target is destroyed but ammos are not depleted yet during the process, the aircraft will continue to go to the destination).

In rulesmd.ini:

[General]
ExpandAircraftMission=     ; boolean

Coronia · 2024-08-25T07:39:01Z

suggest to make these guard behaviors compatible with GuardRange instead of always tying to weapon ranges, just like infantry and units did

CrimRecya · 2024-08-25T08:29:03Z

suggest to make these guard behaviors compatible with GuardRange instead of always tying to weapon ranges, just like infantry and units did

Only the attack move action will use the weapon's range to reduce the range that search the valid target.

github-actions · 2024-09-16T10:23:24Z

Nightly build for this pull request:

compiled-dll-34e8b9e09f4ce7387f1738cf3681f3c7b102300d.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.

src/Ext/Aircraft/Hooks.cpp

CrimRecya · 2024-09-16T15:02:13Z

TechnoClass
unknown_bool_418 -> bool IsTether
unknown_bool_419 -> bool IsAlternativeTether

FootClass
unknown_5A0 -> AbstractClass* Follow
unknown_int_5C4 -> Mission MegaMission
unknown_5C8 -> AbstractClass* MegaDestination
unknown_5CC -> AbstractClass* MegaTarget
unknown_bool_5D1 -> bool HaveAttackMoveTarget

TechnoClass_vtbl
bool TargetAndEstimateDamage(DWORD dwUnk, DWORD dwUnk2) -> bool TargetAndEstimateDamage(CoordStruct* pSelectCrd, TargetFlags targetFlags)
CellClass* SelectAutoTarget(TargetFlags TargetFlags, int CurrentThreat, bool OnlyTargetHouseEnemy) -> AbstractClass* SelectAutoTarget(TargetFlags targetFlags, CoordStruct* pSelectCrd, bool onlyTargetHouseEnemy)

vt_entry_3B4 -> bool InAuxiliarySearchRange(AbstractClass* pTarget)
vt_entry_3E8 -> int GetSecondaryWeaponIndex()
vt_entry_47C -> void SetFollowTarget(AbstractClass* pFollow)
vt_entry_4A4 -> Mission RespondMegaEventMission(EventClass* pRespondTo)
vt_entry_4A8 -> void ClearMegaMissionData()
vt_entry_4AC -> bool HaveMegaMission()
vt_entry_4B0 -> bool HaveAttackMoveTarget()
vt_entry_4B4 -> Mission GetMegaMission()
vt_entry_4B8 -> CoordStruct* GetAttackMoveCoords(CoordStruct* pBuffer)
vt_entry_4C4 -> bool MegaMissionIsAttackMove()
vt_entry_4C8 -> bool ContinueMegaMission()
vt_entry_4CC -> void UpdateAttackMove()
vt_entry_4D0 -> bool RefreshMegaMission()

CrimRecya · 2024-12-26T05:26:33Z

I modified the above content and merged the branch #1449.
But I don't know how to pull request for YRpp. Should I create a branch in YRpp or just the same from Phobos?

Metadorius · 2024-12-26T10:59:35Z

I modified the above content and merged the branch #1449.
But I don't know how to pull request for YRpp. Should I create a branch in YRpp or just the same from Phobos?

To do that you have to create a branch in YRpp, then you can push it and submit a pull request to YRpp repository.

When you cloned Phobos recursively - you also cloned YRpp as a submodule. Basically submodules are just nested repositories. You can open it like any other repository, so the changes can be synchronized to Phobos and you don't need to rename stuff by hand.

What I suggest to do is: in Visual Studio (regular or Code) rename fields and functions using Rename... feature ([F2] by default), then you will have two "levels" of changes displayed in your Git client:

for Phobos repository - changes in the Phobos code (as regular changes) and changes to YRpp (as one submodule change)
for YRpp repository - changes to the field names and function names in YRpp as regular changes.

At this point you have to create a branch in YRpp repository (create a fork of it if you didn't yet), commit and push the changes and submit it as a pull request. After pushing it you have two options in Phobos repository:

wait until it's accepted, checkout YRpp at the newest commit, then commit and push - this will save you having to commit and push multiple times, but you won't be able to get a nightly build for people to test;
don't wait for YRpp changes to be merged, commit and push right after you pushed the YRpp changes to your YRpp branch - you will have an up-to-date build on Phobos pull request this way. Note that you must do it only after you committed to and pushed your YRpp branch, otherwise the build system won't know what are the changes as they are not exposed to the world, only available to you locally.

After the YRpp pull request gets accepted you will need to switch to the latest commit that was merged (you do that in the submodule), verify that it compiles like normal, and then commit and push it to your Phobos branch that you made for the pull request.

src/Ext/Aircraft/Hooks.cpp

Metadorius

It all looks good to me except one thing. I also took the liberty of helping you out with documentation. Please review the changes and the question and let's get this merged.

Metadorius · 2024-12-27T22:55:50Z

It seems I am not able to push to this branch. Could you please enable "Allow edits by maintainers" on your pull requests so we can submit improvements without creating additional pull requests? I will push my doc/spelling improvements then.

CrimRecya · 2024-12-28T02:14:27Z

It seems I am not able to push to this branch. Could you please enable "Allow edits by maintainers" on your pull requests so we can submit improvements without creating additional pull requests? I will push my doc/spelling improvements then.

It seems that Allow edits and access to secrets by maintainers is always on. I turned it off and then on again. You can try again.

Metadorius · 2024-12-28T15:02:00Z

I think there's some configuration that prevents me from directly pushing. I have submitted a PR: CrimRecya#2

Doc and spelling/style improvements

CrimRecya · 2024-12-28T15:08:08Z

I think there's some configuration that prevents me from directly pushing. I have submitted a PR: CrimRecya#2

Thank you for your correction. I have merged it.

stale

chaserli · 2024-12-29T12:50:55Z

Excuse me for being unable to test when it was a PR, but it seems an aircraft still has some trouble proceeding to the next planning waypoint. For example it will try to contact the airport first. Is this intended?

CrimRecya · 2024-12-29T12:59:51Z

Excuse me for being unable to test when it was a PR, but it seems an aircraft still has some trouble proceeding to the next planning waypoint. For example it will try to contact the airport first. Is this intended?

No, judging from the mission of the aircraft, there will be 1-2 frames trying to contact the airport before entering the next planning waypoint, but this should not prevent it from continuing to the next waypoint. Is this the problem caused by the aircraft ammunition upper limit is greater than (not equal to) 2 and its ammo is not 0 but less than (not equal to) half of the upper limit?

chaserli · 2024-12-29T13:09:43Z

I don't have much clue either. I once tried avoiding it via flyloco methods such as 4CFA70, but it no longer works with your code here.

chaserli · 2024-12-29T13:25:42Z

src/Ext/Aircraft/Hooks.cpp

+	if (distance > std::max((pType->SlowdownDistance >> 1), (2048 / pType->ROT)))
+		return (R->Origin() == 0x4168C7 ? ContinueMoving1 : ContinueMoving2);
+
+	pThis->EnterIdleMode(false, true);


For example an easy but nasty way to "avoid" this is to add remaining waypoints check before enteridlemode. But it's probably not correct.

Normally bool __thiscall EnterIdleMode(TechnoClass *this, bool construction, bool nextPlanningPath) should have handled the next waypoint, but I don't understand why it didn't take effect. I'll check it carefully.

CrimRecya · 2024-12-29T13:30:17Z

I don't have much clue either. I once tried avoiding it via flyloco methods such as 4CFA70, but it no longer works with your code here.

At present, the return purpose of one or two frames is not a big problem, at least they will continue to the next waypoint. One more thing, ww hard coded that the aircraft cannot move directly to the water surface, which is also a problem. But anyway, I will try to solve these two problems and submit a new fix later.

CrimRecya · 2024-12-30T07:56:46Z

I don't have much clue either. I once tried avoiding it via flyloco methods such as 4CFA70, but it no longer works with your code here.

At present, the return purpose of one or two frames is not a big problem, at least they will continue to the next waypoint. One more thing, ww hard coded that the aircraft cannot move directly to the water surface, which is also a problem. But anyway, I will try to solve these two problems and submit a new fix later.

I fixed these two problems in #1484. Please check them in your own time.

1. Fix aircrafts planning waypoint problem - At the end of each task, all units with planning waypoints will generate an mega event to the next planning waypoint and respond after 1 frame. This is really no problem for most units, but for aircrafts, they will always return to the airport after each task. So they will try to return to the airport in the frame before it respond to event. There will be looked like a "shaking", if the `Speed` and `ROT` of the aircraft are fast. To solve this problem, I check the waypoints of aircrafts and let them wait before returning. 2. Fix a vanilla issue - Now aircrafts can fly towards the water surface normally. --------- Co-authored-by: Kerbiter <crabiter@vivaldi.net>

CrimRecya added 2 commits August 25, 2024 15:14

Core

218fa3b

Docs

a2d91cb

Fix a mistake

6157437

CrimRecya added 5 commits August 25, 2024 17:28

Optimize and remove some useless hook

d855e1d

Remove useless check

05c8cc5

Fit with aircraft waypoint

a59956b

Merge branch 'develop' into develop-aircraft

5d8f4d9

Merge branch 'develop' into develop-aircraft

6481cc1

Metadorius requested changes Sep 16, 2024

View reviewed changes

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

ZivDero previously requested changes Sep 16, 2024

View reviewed changes

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

Metadorius assigned ZivDero and Metadorius Sep 16, 2024

CrimRecya added 12 commits September 16, 2024 23:03

Add notes

77847a6

Rename variable

ce00c49

Fix a mistake

e35eac3

Merge branch 'develop' into develop-aircraft

d28d175

Update CREDITS.md

8943f30

Merge branch 'develop' into develop-aircraft

96c5482

Update

3f27ca2

Adapt to Kratos aircraft area guard

2b5dd08

Correct select target

4e1d14c

Merge branch 'develop' into develop-aircraft

a9635b5

Small change

283f0a9

Fix

245b52d

Starkku force-pushed the develop branch from 31f2f2a to 804eadb Compare October 31, 2024 12:48

Merge branch 'develop' into develop-aircraft

9c07122

CrimRecya added 2 commits December 26, 2024 13:08

Delete duplicated hooks

5a7fb09

Merge branch 'develop' into develop-aircraft

9b188f5

CrimRecya changed the title ~~Optimize aircrafts actions~~ [Highly Customized] Optimize aircrafts actions Dec 26, 2024

CrimRecya added 2 commits December 27, 2024 16:37

Merge branch 'develop' into develop-aircraft

7670926

Update YRpp

83376da

Metadorius reviewed Dec 27, 2024

View reviewed changes

src/Ext/Aircraft/Hooks.cpp Outdated Show resolved Hide resolved

Metadorius approved these changes Dec 27, 2024

View reviewed changes

Metadorius requested a review from ZivDero December 27, 2024 22:41

CrimRecya and others added 4 commits December 28, 2024 12:18

Update YRpp and codes comments

d7f98de

Change an implementation

5f508b8

Change a check function

673927b

Doc and spelling/style improvements

becf4a6

Merge pull request #2 from Metadorius/feature/aircraft-fixes

6d91e3a

Doc and spelling/style improvements

Metadorius approved these changes Dec 28, 2024

View reviewed changes

Metadorius merged commit 7090604 into Phobos-developers:develop Dec 28, 2024
6 checks passed

chaserli reviewed Dec 29, 2024

View reviewed changes

CrimRecya deleted the develop-aircraft branch January 17, 2025 10:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Highly Customized] Optimize aircrafts actions #1366

[Highly Customized] Optimize aircrafts actions #1366

CrimRecya commented Aug 25, 2024 •

edited

Loading

Coronia commented Aug 25, 2024

CrimRecya commented Aug 25, 2024

github-actions bot commented Sep 16, 2024 •

edited

Loading

CrimRecya commented Sep 16, 2024

CrimRecya commented Dec 26, 2024

Metadorius commented Dec 26, 2024 •

edited

Loading

Metadorius left a comment

Metadorius commented Dec 27, 2024 •

edited

Loading

CrimRecya commented Dec 28, 2024

Metadorius commented Dec 28, 2024

CrimRecya commented Dec 28, 2024

chaserli commented Dec 29, 2024

CrimRecya commented Dec 29, 2024 •

edited

Loading

chaserli commented Dec 29, 2024

chaserli Dec 29, 2024 •

edited

Loading

CrimRecya Dec 29, 2024 •

edited

Loading

CrimRecya commented Dec 29, 2024

CrimRecya commented Dec 30, 2024

[Highly Customized] Optimize aircrafts actions #1366

[Highly Customized] Optimize aircrafts actions #1366

Conversation

CrimRecya commented Aug 25, 2024 • edited Loading

Coronia commented Aug 25, 2024

CrimRecya commented Aug 25, 2024

github-actions bot commented Sep 16, 2024 • edited Loading

CrimRecya commented Sep 16, 2024

CrimRecya commented Dec 26, 2024

Metadorius commented Dec 26, 2024 • edited Loading

Metadorius left a comment

Choose a reason for hiding this comment

Metadorius commented Dec 27, 2024 • edited Loading

CrimRecya commented Dec 28, 2024

Metadorius commented Dec 28, 2024

CrimRecya commented Dec 28, 2024

chaserli commented Dec 29, 2024

CrimRecya commented Dec 29, 2024 • edited Loading

chaserli commented Dec 29, 2024

chaserli Dec 29, 2024 • edited Loading

Choose a reason for hiding this comment

CrimRecya Dec 29, 2024 • edited Loading

Choose a reason for hiding this comment

CrimRecya commented Dec 29, 2024

CrimRecya commented Dec 30, 2024

CrimRecya commented Aug 25, 2024 •

edited

Loading

github-actions bot commented Sep 16, 2024 •

edited

Loading

Metadorius commented Dec 26, 2024 •

edited

Loading

Metadorius commented Dec 27, 2024 •

edited

Loading

CrimRecya commented Dec 29, 2024 •

edited

Loading

chaserli Dec 29, 2024 •

edited

Loading

CrimRecya Dec 29, 2024 •

edited

Loading