warp and promotion anim

Author: Coronia

docs/Fixed-or-Improved-Logics.md

@@ -785,13 +785,14 @@ TargetZoneScanType=same  ; target zone scan enumeration (same|any|inrange)
 
 - You can now specify Teleport/Chrono Locomotor settings per TechnoType to override default rules values. Unfilled values default to values in `[General]`.
 - Only applicable to Techno that have Teleport/Chrono Locomotor attached.
+- If more than one animation is listed in `WarpOut`, `WarpIn` or `WarpAway`, a random one is selected.
 
 In `rulesmd.ini`:
 ```ini
 [SOMETECHNO]            ; TechnoType
-WarpOut=                ; Anim (played when Techno warping out), default to [General] WarpOut
-WarpIn=                 ; Anim (played when Techno warping in), default to [General] WarpIn
-WarpAway=               ; Anim (played when Techno chronowarped by chronosphere), default to [General] WarpOut
+WarpOut=                ; list of Animation (played when Techno warping out), default to [General] WarpOut
+WarpIn=                 ; list of Animation (played when Techno warping in), default to [General] WarpIn
+WarpAway=               ; list of Animation (played when Techno chronowarped by chronosphere), default to [General] WarpOut
 ChronoTrigger=          ; boolean, if yes then delay varies by distance, if no it is a constant
 ChronoDistanceFactor=   ; integer, amount to divide the distance to destination by to get the warped out delay
 ChronoMinimumDelay=     ; integer, the minimum delay for teleporting, no matter how short the distance

docs/New-or-Enhanced-Logics.md

@@ -1545,15 +1545,15 @@ Promote.IncludeSpawns=false  ; boolean
 ### Promotion animation
 
 - You can now specify an animation on the unit or structure promotion.
-  - `Promote.VeteranAnimation` is used when unit or structure is promoted to veteran.
-  - `Promote.EliteAnimation` is used when unit or structure is promoted to elite.
+  - `Promote.VeteranAnimation` is used when unit or structure is promoted to veteran. If more than one animation is listed, a random one is selected.
+  - `Promote.EliteAnimation` is used when unit or structure is promoted to elite. If more than one animation is listed, a random one is selected.
   - If `Promote.EliteAnimation` is not defined, `Promote.VeteranAnimation` will play instead when unit or structure is promoted to elite.
 
 In `rulesmd.ini`:
 ```ini
 [AudioVisual]
-Promote.VeteranAnimation=         ; AnimationType
-Promote.EliteAnimation=           ; AnimationType
+Promote.VeteranAnimation=         ; list of Animation
+Promote.EliteAnimation=           ; list of Animation
 ```
 
 ### Raise alert when technos are taking damage

docs/locale/zh_CN/LC_MESSAGES/Fixed-or-Improved-Logics.po

@@ -3151,11 +3151,11 @@ msgstr "仅对使用超时空运动方式的科技类型有效。"
 #: ../../Fixed-or-Improved-Logics.md:790
 msgid ""
 "[SOMETECHNO]            ; TechnoType\n"
-"WarpOut=                ; Anim (played when Techno warping out), default "
+"WarpOut=                ; list of Animation (played when Techno warping out), default "
 "to [General] WarpOut\n"
-"WarpIn=                 ; Anim (played when Techno warping in), default "
+"WarpIn=                 ; list of Animation (played when Techno warping in), default "
 "to [General] WarpIn\n"
-"WarpAway=               ; Anim (played when Techno chronowarped by "
+"WarpAway=               ; list of Animation (played when Techno chronowarped by "
 "chronosphere), default to [General] WarpOut\n"
 "ChronoTrigger=          ; boolean, if yes then delay varies by distance, "
 "if no it is a constant\n"
@@ -3168,11 +3168,11 @@ msgid ""
 "ChronoDelay=            ; integer, delay after teleport for chronosphere\n"
 msgstr ""
 "[SOMETECHNO]            ; TechnoType\n"
-"WarpOut=                ; Anim (played when Techno warping out), default "
+"WarpOut=                ; list of Animation (played when Techno warping out), default "
 "to [General] WarpOut\n"
-"WarpIn=                 ; Anim (played when Techno warping in), default "
+"WarpIn=                 ; list of Animation (played when Techno warping in), default "
 "to [General] WarpIn\n"
-"WarpAway=               ; Anim (played when Techno chronowarped by "
+"WarpAway=               ; list of Animation (played when Techno chronowarped by "
 "chronosphere), default to [General] WarpOut\n"
 "ChronoTrigger=          ; boolean, if yes then delay varies by distance, "
 "if no it is a constant\n"

docs/locale/zh_CN/LC_MESSAGES/New-or-Enhanced-Logics.po

@@ -5848,14 +5848,14 @@ msgstr "现在你可以在单位或建筑升级时播放指定动画。"
 #: ../../New-or-Enhanced-Logics.md:1548
 msgid ""
 "`Promote.VeteranAnimation` is used when unit or structure is promoted to "
-"veteran."
-msgstr "`Promote.VeteranAnimation` 用于单位或建筑升级为老兵时。"
+"veteran. If more than one animation is listed, a random one is selected."
+msgstr "`Promote.VeteranAnimation` 用于单位或建筑升级为老兵时。如果列出了多个动画，则将随机选择一个。"
 
 #: ../../New-or-Enhanced-Logics.md:1549
 msgid ""
 "`Promote.EliteAnimation` is used when unit or structure is promoted to "
-"elite."
-msgstr "`Promote.EliteAnimation` 用于单位或建筑升级为精英时。"
+"elite. If more than one animation is listed, a random one is selected."
+msgstr "`Promote.EliteAnimation` 用于单位或建筑升级为精英时。如果列出了多个动画，则将随机选择一个。"
 
 #: ../../New-or-Enhanced-Logics.md:1550
 msgid ""
@@ -5866,12 +5866,12 @@ msgstr "如果未定义 `Promote.EliteAnimation` 则使用 `Promote.VeteranAnima
 #: ../../New-or-Enhanced-Logics.md:1553
 msgid ""
 "[AudioVisual]\n"
-"Promote.VeteranAnimation=         ; AnimationType\n"
-"Promote.EliteAnimation=           ; AnimationType\n"
+"Promote.VeteranAnimation=         ; list of Animation\n"
+"Promote.EliteAnimation=           ; list of Animation\n"
 msgstr ""
 "[AudioVisual]\n"
-"Promote.VeteranAnimation=         ; AnimationType\n"
-"Promote.EliteAnimation=           ; AnimationType\n"
+"Promote.VeteranAnimation=         ; list of Animation\n"
+"Promote.EliteAnimation=           ; list of Animation\n"
 
 #: ../../New-or-Enhanced-Logics.md:1559
 msgid "Raise alert when technos are taking damage"

src/Ext/Rules/Body.h

@@ -155,8 +155,8 @@ class RulesExt
 		Valueable<Point2D> DrawInsignia_AdjustPos_Buildings;
 		Nullable<BuildingSelectBracketPosition> DrawInsignia_AdjustPos_BuildingsAnchor;
 		Valueable<Point2D> DrawInsignia_AdjustPos_Units;
-		Valueable<AnimTypeClass*> Promote_VeteranAnimation;
-		Valueable<AnimTypeClass*> Promote_EliteAnimation;
+		ValueableVector<AnimTypeClass*> Promote_VeteranAnimation;
+		ValueableVector<AnimTypeClass*> Promote_EliteAnimation;
 
 		Valueable<double> DamageOwnerMultiplier;
 		Valueable<double> DamageAlliesMultiplier;

src/Ext/Techno/Hooks.cpp

@@ -111,23 +111,15 @@ DEFINE_HOOK(0x6F9FA9, TechnoClass_AI_PromoteAnim, 0x6)
 
 	auto aresProcess = [pThis]() { return (pThis->GetTechnoType()->Turret) ? 0x6F9FB7 : 0x6FA054; };
 
-	if (!RulesExt::Global()->Promote_VeteranAnimation && !RulesExt::Global()->Promote_EliteAnimation)
+	if (!RulesExt::Global()->Promote_VeteranAnimation.size() && !RulesExt::Global()->Promote_EliteAnimation.size())
 		return aresProcess();
 
 	if (pThis->CurrentRanking != pThis->Veterancy.GetRemainingLevel() && pThis->CurrentRanking != Rank::Invalid && (pThis->Veterancy.GetRemainingLevel() != Rank::Rookie))
 	{
-		AnimClass* promAnim = nullptr;
-		if (pThis->Veterancy.GetRemainingLevel() == Rank::Veteran && RulesExt::Global()->Promote_VeteranAnimation)
-			promAnim = GameCreate<AnimClass>(RulesExt::Global()->Promote_VeteranAnimation, pThis->GetCenterCoords());
-		else if (RulesExt::Global()->Promote_EliteAnimation)
-			promAnim = GameCreate<AnimClass>(RulesExt::Global()->Promote_EliteAnimation, pThis->GetCenterCoords());
-
-		if (promAnim)
-		{
-			promAnim->SetOwnerObject(pThis);
-			AnimExt::SetAnimOwnerHouseKind(promAnim, pThis->Owner, nullptr, false, true);
-			AnimExt::ExtMap.Find(promAnim)->SetInvoker(pThis);
-		}
+		if (pThis->Veterancy.GetRemainingLevel() == Rank::Veteran && RulesExt::Global()->Promote_VeteranAnimation.size() > 0)
+			AnimExt::CreateRandomAnim(RulesExt::Global()->Promote_VeteranAnimation, pThis->GetCenterCoords(), pThis, pThis->Owner, true);
+		else if (RulesExt::Global()->Promote_EliteAnimation.size() > 0)
+			AnimExt::CreateRandomAnim(RulesExt::Global()->Promote_EliteAnimation, pThis->GetCenterCoords(), pThis, pThis->Owner, true);
 	}
 
 	return aresProcess();
@@ -738,4 +730,4 @@ DEFINE_HOOK(0x4B3DF0, LocomotionClass_Process_DamagedSpeedMultiplier, 0x6)// Dri
 	__asm fmul multiplier;
 
 	return R->Origin() + 0x6;
-}
+}

src/Ext/TechnoType/Body.h

@@ -94,9 +94,9 @@ class TechnoTypeExt
 		NullableIdx<VocClass> VoiceCreated;
 		NullableIdx<VocClass> VoicePickup; // Used by carryalls instead of VoiceMove if set.
 
-		Nullable<AnimTypeClass*> WarpOut;
-		Nullable<AnimTypeClass*> WarpIn;
-		Nullable<AnimTypeClass*> WarpAway;
+		ValueableVector<AnimTypeClass*> WarpOut;
+		ValueableVector<AnimTypeClass*> WarpIn;
+		ValueableVector<AnimTypeClass*> WarpAway;
 		Nullable<bool> ChronoTrigger;
 		Nullable<int> ChronoDistanceFactor;
 		Nullable<int> ChronoMinimumDelay;

src/Ext/TechnoType/Hooks.Teleport.cpp

@@ -19,7 +19,11 @@ DEFINE_HOOK(0x7193F6, TeleportLocomotionClass_ILocomotion_Process_WarpoutAnim, 0
 {
 	GET_LOCO(ESI);
 
-	if (auto pWarpOut = pExt->WarpOut.Get(RulesClass::Instance->WarpOut))
+	if (pExt->WarpOut.size() > 0)
+	{
+		AnimExt::CreateRandomAnim(pExt->WarpOut, pLinked->Location, nullptr, pLinked->Owner);
+	}
+	else if (auto const pWarpOut = RulesClass::Instance->WarpOut)
 	{
 		auto const pAnim = GameCreate<AnimClass>(pWarpOut, pLinked->Location);
 		AnimExt::SetAnimOwnerHouseKind(pAnim, pLinked->Owner, nullptr, false, true);
@@ -74,7 +78,11 @@ DEFINE_HOOK(0x719742, TeleportLocomotionClass_ILocomotion_Process_WarpInAnim, 0x
 {
 	GET_LOCO(ESI);
 
-	if (auto pWarpIn = pExt->WarpIn.Get(RulesClass::Instance->WarpIn))
+	if (pExt->WarpIn.size() > 0)
+	{
+		AnimExt::CreateRandomAnim(pExt->WarpIn, pLinked->Location, nullptr, pLinked->Owner);
+	}
+	else if (auto const pWarpIn = RulesClass::Instance->WarpIn)
 	{
 		auto const pAnim = GameCreate<AnimClass>(pWarpIn, pLinked->Location);
 		AnimExt::SetAnimOwnerHouseKind(pAnim, pLinked->Owner, nullptr, false, true);
@@ -96,7 +104,11 @@ DEFINE_HOOK(0x719827, TeleportLocomotionClass_ILocomotion_Process_WarpAway, 0x5)
 {
 	GET_LOCO(ESI);
 
-	if (auto pWarpAway = pExt->WarpAway.Get(RulesClass::Instance->WarpOut))
+	if (pExt->WarpAway.size() > 0)
+	{
+		AnimExt::CreateRandomAnim(pExt->WarpAway, pLinked->Location, nullptr, pLinked->Owner);
+	}
+	else if (auto const pWarpAway = RulesClass::Instance->WarpOut)
 	{
 		auto const pAnim = GameCreate<AnimClass>(pWarpAway, pLinked->Location);
 		AnimExt::SetAnimOwnerHouseKind(pAnim, pLinked->Owner, nullptr, false, true);