[Vanilla Enhancement] Vehicle disguise to vehicle #1803
+299
−30
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NetsuNegi
added
❓New feature
Needs testing
⚙️T1
|
Nightly build for this pull request:
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. |
Metadorius
reviewed
Aug 11, 2025
CrimRecya
reviewed
Sep 2, 2025
| @@ -504,6 +523,234 @@ DEFINE_HOOK(0x74691D, UnitClass_UpdateDisguise_EMP, 0x6) | |||
| return 0x746931; | |||
| } | |||
|
|
|||
| DEFINE_HOOK(0x7466DC, UnitClass_DisguiseAs_DisguiseAsVehicle, 0x6) | |||
There was a problem hiding this comment.
DEFINE_HOOK(0x7466D8, UnitClass_DisguiseAs_DisguiseAsVehicle, 0xA) may be better?
Comment on lines
+571
to
+629
| DEFINE_HOOK(0x73C655, UnitClass_DrawSHP_TechnoType, 0x6) | ||
| { | ||
| enum { ApplyDisguiseType = 0x73C65B }; | ||
|
|
||
| GET(UnitClass*, pThis, EBP); | ||
|
|
||
| if (pThis->IsDisguised() && !pThis->IsClearlyVisibleTo(HouseClass::CurrentPlayer)) | ||
| { | ||
| const auto pTargetType = pThis->GetDisguise(true); | ||
|
|
||
| if (pTargetType && pTargetType->WhatAmI() == UnitTypeClass::AbsID) | ||
| { | ||
| R->ECX(pTargetType); | ||
| return ApplyDisguiseType; | ||
| } | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| DEFINE_HOOK(0x73C69D, UnitClass_DrawSHP_TechnoType2, 0x6) | ||
| { | ||
| enum { ApplyDisguiseType = 0x73C6A3 }; | ||
|
|
||
| GET(UnitClass*, pThis, EBP); | ||
|
|
||
| if (pThis->IsDisguised() && !pThis->IsClearlyVisibleTo(HouseClass::CurrentPlayer)) | ||
| { | ||
| const auto pTargetType = pThis->GetDisguise(true); | ||
|
|
||
| if (pTargetType && pTargetType->WhatAmI() == UnitTypeClass::AbsID) | ||
| { | ||
| R->ECX(pThis->GetDisguise(true)); | ||
| return ApplyDisguiseType; | ||
| } | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| DEFINE_HOOK(0x73C702, UnitClass_DrawSHP_TechnoType3, 0x6) | ||
| { | ||
| enum { ApplyDisguiseType = 0x73C708 }; | ||
|
|
||
| GET(UnitClass*, pThis, EBP); | ||
|
|
||
| if (pThis->IsDisguised() && !pThis->IsClearlyVisibleTo(HouseClass::CurrentPlayer)) | ||
| { | ||
| const auto pTargetType = pThis->GetDisguise(true); | ||
|
|
||
| if (pTargetType && pTargetType->WhatAmI() == UnitTypeClass::AbsID) | ||
| { | ||
| R->ECX(pThis->GetDisguise(true)); | ||
| return ApplyDisguiseType; | ||
| } | ||
| } | ||
|
|
||
| return 0; | ||
| } |
There was a problem hiding this comment.
These look the same, I think they should be able to be encapsulated into a function ObjectTypeClass* GetUnitDisguiseAs(UnitClass* pThis)?
| return 0; | ||
| } | ||
|
|
||
| DEFINE_HOOK(0x73C725, UnitClass_DrawSHP_HasTurret, 0x5) |
There was a problem hiding this comment.
I think it's 0x6 instead of 0x5.
Comment on lines
+683
to
+696
| if (pType != pThis->Type) | ||
| { | ||
| if (pType->TurretCount > 0 && !pType->IsGattling) | ||
| return 0x73B8EC; | ||
| else | ||
| return 0x73B92F; | ||
| } | ||
| else | ||
| { | ||
| if (!pType->HasMultipleTurrets() || pType->IsGattling) | ||
| return 0x73B92F; | ||
| else | ||
| return 0x73B8FC; | ||
| } |
There was a problem hiding this comment.
I think this can make it clearer
if (!pType->HasMultipleTurrets() || pType->IsGattling)
return 0x73B92F;
return pType != pThis->Type ? 0x73B8EC : 0x73B8FC;
Comment on lines
+704
to
+724
| if (pType != pThis->Type) | ||
| { | ||
| if (pType->TurretCount > 0 && !pType->IsGattling) | ||
| { | ||
| if (pThis->CurrentTurretNumber < 0) | ||
| R->Stack<int>(0x1C, 0); | ||
|
|
||
| return 0x73BC35; | ||
| } | ||
| else | ||
| { | ||
| return 0x73BD79; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| if (!pType->HasMultipleTurrets() || pType->IsGattling) | ||
| return 0x73BD79; | ||
| else | ||
| return 0x73BC49; | ||
| } |
There was a problem hiding this comment.
Here, it can also return 0x73BD79; first if (!pType->HasMultipleTurrets() || pType->IsGattling)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
rulesmd.ini: