Merge remote-tracking branch 'Phobos-developers/develop' into dev-docs

Author: DeathFishAtEase

CREDITS.md

@@ -414,7 +414,6 @@ This page lists all the individual contributions to the project by their author.
   - Fix an issue where miners affected by `Passengers/DeployFire` were unable to unload minerals
   - Fix an issue where mining vehicles could not move after leaving a tank bunker
   - Fixed the bug in AI scripts 56 and 57 that forced the launch of superweapons with index numbers 3 and 4
-  - Fix rare cases where paradropped techno killed by falling down
 - **NetsuNegi**:
   - Forbidding parallel AI queues by type
   - Jumpjet crash speed fix when crashing onto building
@@ -636,7 +635,6 @@ This page lists all the individual contributions to the project by their author.
   - AutoDeath upon ownership change
   - Maximum amount for power plant enhancer
   - Return warhead
-  - Fix rare cases where paradropped techno killed by falling down
 - **NaotoYuuki** - Vertical & meteor trajectory projectile prototypes
 - **handama** - AI script action to `16005 Jump Back To Previous Script`
 - **TaranDahl (航味麻酱)**:

docs/Fixed-or-Improved-Logics.md

@@ -305,7 +305,6 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Fixed the issue that the move mission of the jumpjet does not end correctly.
 - AI team garrison scripts now re-evaluate destination immediately instead of trying to garrison ungarrisonable building before changing target.
 - Fixed the bug that `DeploysInto` and `UndeploysInto` will make damaged techno lose 1 health.
-- Fixed rare cases where paradropped techno killed by falling down.
 - Fixed the issue that the Jumpjet must end its movement before starting the next mission.
 
 ## Fixes / interactions with other extensions

docs/Whats-New.md

@@ -606,7 +606,6 @@ Vanilla fixes:
 - Fixed the issue that the move mission of the jumpjet does not end correctly (by TaranDahl)
 - AI team garrison scripts now re-evaluate destination immediately instead of trying to garrison ungarrisonable building before changing target (by Starkku)
 - Fixed the bug that `DeploysInto` and `UndeploysInto` will make damaged techno lose 1 health (by CrimRecya)
-- Fixed rare cases where paradropped techno killed by falling down (by FlyStar & Ollerus)
 - Fixed the issue that the Jumpjet must end its movement before starting the next mission (by TaranDahl)
 
 Phobos fixes:

src/Ext/Techno/Hooks.cpp

@@ -876,25 +876,22 @@ DEFINE_HOOK(0x5F4032, ObjectClass_FallingDown_ToDead, 0x6)
 		if (!pCell->IsClearToMove(pType->SpeedType, true, true, -1, pType->MovementZone, pCell->GetLevel(), pCell->ContainsBridge()))
 			return 0;
 
-		int damage = 0;
+		const auto pTypeExt = TechnoTypeExt::ExtMap.Find(pType);
+		double ratio = 0.0;
 
-		if (!pTechno->HasParachute)
-		{
-			const auto pTypeExt = TechnoTypeExt::ExtMap.Find(pType);
-			double ratio = 0.0;
+		if (pCell->LandType == LandType::Water && !pTechno->OnBridge)
+			ratio = pTypeExt->FallingDownDamage_Water.Get(pTypeExt->FallingDownDamage.Get());
+		else
+			ratio = pTypeExt->FallingDownDamage.Get();
 
-			if (pCell->LandType == LandType::Water && !pTechno->OnBridge)
-				ratio = pTypeExt->FallingDownDamage_Water.Get(pTypeExt->FallingDownDamage.Get());
-			else
-				ratio = pTypeExt->FallingDownDamage.Get();
+		int damage = 0;
 
-			if (ratio < 0.0)
-				damage = static_cast<int>(pThis->Health * std::abs(ratio));
-			else if (ratio >= 0.0 && ratio <= 1.0)
-				damage = static_cast<int>(pType->Strength * ratio);
-			else
-				damage = static_cast<int>(ratio);
-		}
+		if (ratio < 0.0)
+			damage = static_cast<int>(pThis->Health * std::abs(ratio));
+		else if (ratio >= 0.0 && ratio <= 1.0)
+			damage = static_cast<int>(pType->Strength * ratio);
+		else
+			damage = static_cast<int>(ratio);
 
 		pThis->ReceiveDamage(&damage, 0, RulesClass::Instance->C4Warhead, nullptr, true, true, nullptr);