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 @@ -514,6 +514,7 @@ This page lists all the individual contributions to the project by their author.
- Fix the bug that unit will play crashing voice & sound when dropped by warhead with `IsLocomotor=yes`
- Add toggle of whether shield use ArmorMultiplier or not
- Fix an Ares bug that led to erroneous interactions where the parasite would frequently reset to the victim's position under specific circumstances and that was highly prone to crashes
- Fix the bug that if paradropping technos with `Crashable=yes` has been destroyed in air, they will falling down on ground but not dead
- **Apollo** - Translucent SHP drawing patches
- **ststl**:
- Customizable `ShowTimer` priority of superweapons
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 @@ -310,6 +310,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
- Voxel drawing code now skips sections that are invisible (have all zeros in the transform matrix main diagonal, meaning that the scale is 0% on all axes), thus increasing drawing performance for some voxels.
- Fixed the bug that unit will play crashing voice & sound when dropped by warhead with `IsLocomotor=yes`.
- Fixed an issue that retaliation will make the unit keep switching among multiple targets with the same amount of threat.
- Fixed the bug that if paradropping technos with `Crashable=yes` has been destroyed in air, they will falling down on ground but not dead.

## 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 @@ -620,6 +620,7 @@ Vanilla fixes:
- Fixed an issue where parachute units would die upon landing if bridges were destroyed during their descent (by FlyStar)
- Voxel drawing code now skips sections that are invisible (have all zeros in the transform matrix main diagonal, meaning that the scale is 0% on all axes), thus increasing drawing performance for some voxels (by Kerbiter & ZivDero)
- Fixed the bug that unit will play crashing voice & sound when dropped by warhead with `IsLocomotor=yes` (by NetsuNegi)
- Fixed the bug that if paradropping technos with `Crashable=yes` has been destroyed in air, they will falling down on ground but not dead (by NetsuNegi)

Phobos fixes:
- Fixed the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it (by NetsuNegi)
Expand Down
6 changes: 6 additions & 0 deletions docs/locale/zh_CN/LC_MESSAGES/CREDITS.po
Original file line number Diff line number Diff line change
Expand Up @@ -1676,6 +1676,12 @@ msgid ""
"circumstances and that was highly prone to crashes"
msgstr "修复了一个极易崩溃且导致寄生者特定条件下会被高频重设至受害者位置这一错误交互的 Ares Bug"

msgid ""
"Fix the bug that if paradropping technos with `Crashable=yes` has "
"been destroyed in air, they will falling down on ground but not dead"
msgstr ""
"修复了当 `Crashable=yes` 的科技类型在空降时被于半空中摧毁,它会落地但不会死亡的 Bug"

msgid "**Apollo** - Translucent SHP drawing patches"
msgstr "**Apollo** - 半透明 SHP 绘制补丁"

Expand Down
5 changes: 5 additions & 0 deletions docs/locale/zh_CN/LC_MESSAGES/Fixed-or-Improved-Logics.po
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,11 @@ msgid ""
"multiple targets with the same amount of threat."
msgstr "修复了反击行为会让单位在多个相同威胁值的目标间不断切换的问题。"

msgid ""
"Fixed the bug that if paradropping technos with `Crashable=yes` has "
"been destroyed in air, they will falling down on ground but not dead."
msgstr "修复了当 `Crashable=yes` 的科技类型在空降时被于半空中摧毁,它会落地但不会死亡的 Bug。"

msgid "Fixes / interactions with other extensions"
msgstr "修复或与其他扩展的交互"

Expand Down
5 changes: 5 additions & 0 deletions docs/locale/zh_CN/LC_MESSAGES/Whats-New.po
Original file line number Diff line number Diff line change
Expand Up @@ -2107,6 +2107,11 @@ msgid ""
"warhead with `IsLocomotor=yes` (by NetsuNegi)"
msgstr "修复了载具被 `IsLocomotor=yes` 的弹头丢下时会播放坠毁语音和音效的 Bug(by NetsuNegi)"

msgid ""
"Fixed the bug that if paradropping technos with `Crashable=yes` has "
"been destroyed in air, they will falling down on ground but not dead (by NetsuNegi)"
msgstr "修复了当 `Crashable=yes` 的科技类型在空降时被于半空中摧毁,它会落地但不会死亡的 Bug(by NetsuNegi)"

msgid "Phobos fixes:"
msgstr "Phobos 过往版本问题修复:"

Expand Down
13 changes: 13 additions & 0 deletions src/Misc/Hooks.BugFixes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2874,6 +2874,19 @@ DEFINE_HOOK(0x4DB874, FootClass_SetLocation_Extra, 0xA)
return SkipGameCode;
}

DEFINE_HOOK(0x4DEC7F, FootClass_Crash_FallingDownFix, 0x7)
{
GET(FootClass*, pThis, ESI);

if (pThis->IsFallingDown && !pThis->IsABomb && pThis->Locomotor)
{
if (const auto pJumpjet = locomotion_cast<JumpjetLocomotionClass*>(pThis->Locomotor))
pJumpjet->State = JumpjetLocomotionClass::State::Crashing;
}

return 0;
}

#pragma region ClearTargetOnOwnerChanged

DEFINE_HOOK(0x70D4A0, AbstractClass_ClearTargetToMe_ClearManagerTarget, 0x5)
Expand Down
Loading