Merge branch 'develop' into fryone/owner_changer

Author: Fryone

docs/Fixed-or-Improved-Logics.md

@@ -130,6 +130,8 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Objects with `Palette` set now have their color tint adjusted accordingly by superweapons, map retint actions etc. if they belong to a house using any color scheme instead of only those from the first half of `[Colors]` list.
 - Animations using `AltPalette` are now remapped to their owner's color scheme instead of first listed color scheme and no longer draw over shroud. Color scheme from `[AudioVisual]` -> `AnimRemapDefaultColorScheme` is used if anim has no owner, which defaults to first listed color scheme from `[Colors]` still.
   - They can also have map lighting apply on them if `AltPalette.ApplyLighting` is set to true.
+- Fixed `DeployToFire` not considering building placement rules for `DeploysInto` buildings and as a result not working properly with `WaterBound` buildings.
+- Fixed `DeployToFire` not recalculating firer's position on land if it cannot currently deploy.
 
 ## Fixes / interactions with other extensions
 

docs/New-or-Enhanced-Logics.md

@@ -449,6 +449,10 @@ Strength=0                             ; integer
 Armor=                                 ; ArmorType
 ```
 
+```{note}
+Currently interceptor weapons with projectiles that do not have `Inviso=true` will be unable to intercept projectiles if the firer of the interceptor weapon dies before the interceptor weapon projectile reaches its target. This may change in future.
+```
+
 ### Projectile trajectories
 
 - Projectiles can now have customizable trajectories.

docs/Whats-New.md

@@ -263,7 +263,7 @@ You can use the migration utility (can be found on [Phobos supplementaries repo]
 
 ### Version TBD (develop branch nightly builds)
 
-<details>
+<details open>
   <summary>Click to show</summary>
 
 New:
@@ -367,6 +367,8 @@ Vanilla fixes:
 - Suppressed the BuildingCaptured EVA events when capturing a building considered as a vehicle (by Trsdy)
 - Objects with `Palette` set now have their color tint adjusted accordingly by superweapons, map retint actions etc. if they belong to a house using any color scheme instead of only those from the first half of `[Colors]` list (by Starkku)
 - Animations using `AltPalette` are now remapped to their owner's color scheme instead of first listed color scheme and no longer draw over shroud (by Starkku)
+- Fixed `DeployToFire` not considering building placement rules for `DeploysInto` buildings and as a result not working properly with `WaterBound` buildings (by Starkku)
+- Fixed `DeployToFire` not recalculating firer's position on land if it cannot currently deploy (by Starkku)
 
 Phobos fixes:
 - Fixed a few errors of calling for superweapon launch by `LaunchSW` or building infiltration (by Trsdy)
@@ -383,6 +385,7 @@ Phobos fixes:
 - Fixed an issue with `Gunner=true` vehicles not correctly using the first passenger's mode with multiple passengers inside (by Starkku)
 - Used `MindControl.Anim` for buildings deployed from mind-controlled vehicles (by Trsdy)
 - Optimized extension class implementation, should improve performance all around (by Otamaa & Starkku)
+- Fixed `Interceptor` not resetting target if the intercepted projectile changes type to non-interceptable one afterwards (by Starkku)
 
 Fixes / interactions with other extensions:
 - Fixed an issue introduced by Ares that caused `Grinding=true` building `ActiveAnim` to be incorrectly restored while `SpecialAnim` was playing and the building was sold, erased or destroyed (by Starkku)
@@ -392,6 +395,7 @@ Fixes / interactions with other extensions:
 
 <details>
   <summary>Click to show</summary>
+
 New:
 - Additional sync logging in case of desync errors occuring (by Starkku)
 

src/Ext/Anim/Hooks.cpp

@@ -264,32 +264,13 @@ DEFINE_HOOK(0x4232E2, AnimClass_DrawIt_AltPalette, 0x6)
 	return SkipGameCode;
 }
 
-namespace ConvertTemp
-{
-	int shadeCount = -1;
-}
-
 // Set ShadeCount to 53 to initialize the palette fully shaded - this is required to make it not draw over shroud for some reason.
 DEFINE_HOOK(0x68C4C4, GenerateColorSpread_ShadeCountSet, 0x5)
 {
 	GET(int, shadeCount, EDX);
 
-	ConvertTemp::shadeCount = shadeCount;
-	R->EDX(53);
-
-	return 0;
-}
-
-// Restore original ShadeCount.
-DEFINE_HOOK(0x68C4E7, GenerateColorSpread_ShadeCountUnset, 0x5)
-{
-	GET(LightConvertClass*, pConvert, EAX);
-
-	if (pConvert && ConvertTemp::shadeCount != -1)
-	{
-		pConvert->ShadeCount = ConvertTemp::shadeCount;
-		ConvertTemp::shadeCount = -1;
-	}
+	if (shadeCount == 1)
+		R->EDX(53);
 
 	return 0;
 }

src/Ext/Bullet/Body.cpp

@@ -14,7 +14,7 @@ void BulletExt::ExtData::InterceptBullet(TechnoClass* pSource, WeaponTypeClass*
 		return;
 
 	auto const pThis = this->OwnerObject();
-	auto const pTypeExt = this->TypeExtData;
+	auto pTypeExt = this->TypeExtData;
 	bool canAffect = false;
 	bool isIntercepted = false;
 
@@ -60,7 +60,8 @@ void BulletExt::ExtData::InterceptBullet(TechnoClass* pSource, WeaponTypeClass*
 			{
 				pThis->Speed = pWeaponOverride->Speed;
 				pThis->Type = pWeaponOverride->Projectile;
-				this->TypeExtData = BulletTypeExt::ExtMap.Find(pThis->Type);
+				pTypeExt = BulletTypeExt::ExtMap.Find(pThis->Type);
+				this->TypeExtData = pTypeExt;
 
 				if (this->LaserTrails.size())
 				{
@@ -69,6 +70,10 @@ void BulletExt::ExtData::InterceptBullet(TechnoClass* pSource, WeaponTypeClass*
 					if (!pThis->Type->Inviso)
 						this->InitializeLaserTrails();
 				}
+
+				// Lose target if the current bullet is no longer interceptable.
+				if (!pTypeExt->Interceptable || (pTypeExt->Armor.isset() && GeneralUtils::GetWarheadVersusArmor(pWeapon->Warhead, pTypeExt->Armor.Get()) == 0.0))
+					pSource->SetTarget(nullptr);
 			}
 		}
 

src/Ext/Techno/Body.cpp

@@ -577,6 +577,42 @@ void TechnoExt::GetValuesForDisplay(TechnoClass* pThis, DisplayInfoType infoType
 	}
 }
 
+// Checks if vehicle can deploy into a building at its current location. If unit has no DeploysInto set returns noDeploysIntoDefaultValue (def = false) instead.
+bool TechnoExt::CanDeployIntoBuilding(UnitClass* pThis, bool noDeploysIntoDefaultValue)
+{
+	if (!pThis)
+		return false;
+
+	auto const pDeployType = pThis->Type->DeploysInto;
+
+	if (!pDeployType)
+		return noDeploysIntoDefaultValue;
+
+	bool canDeploy = true;
+	auto mapCoords = CellClass::Coord2Cell(pThis->GetCoords());
+
+	if (pDeployType->GetFoundationWidth() > 2 || pDeployType->GetFoundationHeight(false) > 2)
+		mapCoords += CellStruct { -1, -1 };
+
+	pThis->Mark(MarkType::Up);
+
+	if (!pThis->Locomotor)
+		Game::RaiseError(E_POINTER);
+
+	pThis->Locomotor->Mark_All_Occupation_Bits(MarkType::Up);
+
+	if (!pDeployType->CanCreateHere(mapCoords, pThis->Owner))
+		canDeploy = false;
+
+	if (!pThis->Locomotor)
+		Game::RaiseError(E_POINTER);
+
+	pThis->Locomotor->Mark_All_Occupation_Bits(MarkType::Down);
+	pThis->Mark(MarkType::Down);
+
+	return canDeploy;
+}
+
 // =============================
 // load / save
 

src/Ext/Techno/Body.h

@@ -136,6 +136,7 @@ class TechnoExt
 	static bool AllowedTargetByZone(TechnoClass* pThis, TechnoClass* pTarget, TargetZoneScanType zoneScanType, WeaponTypeClass* pWeapon = nullptr, bool useZone = false, int zone = -1);
 	static void UpdateAttachedAnimLayers(TechnoClass* pThis);
 	static bool ConvertToType(FootClass* pThis, TechnoTypeClass* toType);
+	static bool CanDeployIntoBuilding(UnitClass* pThis, bool noDeploysIntoDefaultValue = false);
 
 	// WeaponHelpers.cpp
 	static int PickWeaponIndex(TechnoClass* pThis, TechnoClass* pTargetTechno, AbstractClass* pTarget, int weaponIndexOne, int weaponIndexTwo, bool allowFallback = true, bool allowAAFallback = true);

src/Misc/Hooks.BugFixes.cpp

@@ -723,3 +723,27 @@ DEFINE_HOOK(0x4834E5, CellClass_IsClearToMove_BridgeEdges, 0x5)
 
 	return 0;
 }
+
+// Fix DeployToFire not working properly for WaterBound DeploysInto buildings and not recalculating position on land if can't deploy.
+DEFINE_HOOK(0x4D580B, FootClass_ApproachTarget_DeployToFire, 0x6)
+{
+	enum { SkipGameCode = 0x4D583F };
+
+	GET(UnitClass*, pThis, EBX);
+
+	R->EAX(TechnoExt::CanDeployIntoBuilding(pThis, true));
+
+	return SkipGameCode;
+}
+
+DEFINE_HOOK(0x741050, UnitClass_CanFire_DeployToFire, 0x6)
+{
+	enum { SkipGameCode = 0x741086, MustDeploy = 0x7410A8 };
+
+	GET(UnitClass*, pThis, ESI);
+
+	if (pThis->Type->DeployToFire && pThis->CanDeployNow() && !TechnoExt::CanDeployIntoBuilding(pThis, true))
+		return MustDeploy;
+
+	return SkipGameCode;
+}