Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@ This page lists all the individual contributions to the project by their author.
- Weapon range finding in cylinder
- Allow jumpjet climbing ignore building height
- Fix an issue where the AI's regular targeting would also target garrisonable buildings
- Fix an issue that the move mission of the jumpjet does not end correctly
- **solar-III (凤九歌)**
- Target scanning delay customization (documentation)
- Skip target scanning function calling for unarmed technos (documentation)
Expand Down
1 change: 1 addition & 0 deletions docs/Fixed-or-Improved-Logics.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
- Vehicles overlapping `Wall=true` OverlayTypes no longer display sell cursor and cannot be sold.
- Fixed vehicles disguised as trees incorrectly displaying veterancy insignia when they shouldn't.
- Fixed the issue where the AI's regular targeting would also target garrisonable buildings.
- Fixed the issue that the move mission of the jumpjet does not end correctly.

## Fixes / interactions with other extensions

Expand Down
1 change: 1 addition & 0 deletions docs/Whats-New.md
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,7 @@ Vanilla fixes:
- Allowed observers to see a selected building's radial indicator (by Trsdy)
- Allow voxel projectiles to use `AnimPalette` and `FirersPalette` (by NetsuNegi)
- Fixed the issue where the AI's regular targeting would also target garrisonable buildings (by TaranDahl)
- Fixed the issue that the move mission of the jumpjet does not end correctly (by TaranDahl)

Phobos fixes:
- Fixed shields being able to take damage when the parent TechnoType was under effects of a `Temporal` Warhead (by Starkku)
Expand Down
16 changes: 16 additions & 0 deletions src/Misc/Hooks.BugFixes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2997,7 +2997,7 @@
GET(AbstractType, rtti, EAX);

if (CanBeSold(pTechno, rtti))
pTechno->Sell(-1);

Check warning on line 3000 in src/Misc/Hooks.BugFixes.cpp

View workflow job for this annotation

GitHub Actions / build

'argument': conversion from 'int' to 'DWORD', signed/unsigned mismatch [D:\a\Phobos\Phobos\Phobos.vcxproj]

return SkipGameCode;
}
Expand Down Expand Up @@ -3089,3 +3089,19 @@
R->AL(garrisonable && (isFullMap || pThis->MegaMissionIsAttackMove())); // Attack move is allowed because it can switch to Mission::Attack
return 0;
}

// Fix the issue that the movement mission of jumpjet does not end correctly.
DEFINE_HOOK(0x4D4203, FootClass_MissionMove_EndCheckFix1, 0x6)
{
GET(FootClass*, pThis, ESI);
R->EAX(pThis->Destination && (!locomotion_cast<JumpjetLocomotionClass*>(pThis->Locomotor) || pThis->DistanceFrom(pThis->Destination) > Unsorted::LeptonsPerCell));
return 0x4D4209;
}

// Replace IsMoving by IsMovingNow.
DEFINE_HOOK(0x4D4221, FootClass_MissionMove_EndCheckFix2, 0x6)
{
GET(FootClass*, pThis, ESI);
R->AL(pThis->Locomotor.GetInterfacePtr()->Is_Moving_Now());
return 0x4D422D;
}