New Infotypes and new display method

CREDITS.md

@@ -390,6 +390,7 @@ This page lists all the individual contributions to the project by their author.
   - Enhanced Bombard trajectory
   - No turret unit turn to the target
   - Damage multiplier for different houses
+  - Several new Infotypes, no display in specific status and a new single frame display method
 - **Ollerus**
   - Build limit group enhancement
   - Customizable rocker amplitude

docs/User-Interface.md

@@ -37,15 +37,16 @@ IngameScore.LoseTheme= ; Soundtrack theme ID
 - You can now configure various types of numerical counters to be displayed over Techno to represent its attributes, such as health points or shield points and can be turned on or off via a [new hotkey](#toggle-digital-display).
   - `Anchor.Horizontal` and `Anchor.Vertical` set the anchor point from which the display is drawn (depending on `Align`) relative to unit's center/selection box. For buildings, `Anchor.Building` is used instead.
     - `Offset` and `Offset.ShieldDelta` (the latter applied when a shield is active) can be used to further modify the position.
-  - By default, values are displayed in `current/maximum` format (i.e. 20/40). `HideMaxValue=yes` will make the counter show only the current value (i.e. 20). `Percentage=yes` changes the format to `percent%` (i.e. 50%).
-  - `CanSee` and `CanSee.Observer` can limit visibility to specific players.
+  - By default, values are displayed in `current/maximum` format (i.e. 20/40). `HideMaxValue=true` will make the counter show only the current value (i.e. 20), the default value is whether the techno is infantry or not. `Percentage=true` changes the format to `percent%` (i.e. 50%). `ValueAsTimer` controls whether the value will be displayed in the form of a timer (i.e. 5:00, 25:00 or 1:00:00).
+  - `VisibleToHouses` and `VisibleToHouses.Observer` can limit visibility to specific players.
+    - `VisibleInSpecialState` controls whether this display type will show when the owner is in ironcurtain or is attacked by a temporal weapon.
   - The digits can be either a custom shape (.shp) or text drawn using the game font. This depends on whether `Shape` is set.
     - `Text.Color`, `Text.Color.ConditionYellow` and `Text.Color.ConditionRed` allow customization of the font color. `Text.Background=yes` will additionally draw a black rectangle background.
-    - When using shapes, a custom palette can be specified with `Palette`. `Shape.Spacing` controls pixel buffer between characters.
-    - Frames 0-9 will be used as digits when the owner's health bar is green, 10-19 when yellow, 20-29 when red. For `/` and `%` characters, frame numbers are 30-31, 32-33, 34-35, respectively.
+    - When using shapes, a custom palette can be specified with `Palette`. `Shape.Spacing` controls pixel buffer between characters. If `Shape.PercentageFrame` set to true, it will only draw one frame that corresponds to total frames by percentage.
+    - Frames 0-9 will be used as digits when the owner's health bar is green, 10-19 when yellow, 20-29 when red. For `/` and `%` (or `:` if set `ValueAsTimer` to true) characters, frame numbers are 30-31, 32-33, 34-35, respectively.
   - Default `Offset.ShieldDelta` for `InfoType=Shield` is `0,-10`, `0,0` for others.
   - Default `Shape.Spacing` for buildings is `4,-2`, `4,0` for others.
-  - `ValueScaleDivisor` can be used to adjust scale of displayed values. Both the current & maximum value will be divided by the integer number given, if higher than 1.
+  - `ValueScaleDivisor` can be used to adjust scale of displayed values. Both the current & maximum value will be divided by the integer number given, if higher than 1. Default to 1 (or 15 when set `ValueAsTimer` to true).
 
 In `rulesmd.ini`:
 ```ini
@@ -60,7 +61,7 @@ Aircraft.DefaultDigitalDisplayTypes=    ; List of DigitalDisplayTypes
 
 [SOMEDIGITALDISPLAYTYPE]                ; DigitalDisplayType
 ; Generic
-InfoType=Health                         ; Displayed value enumeration (health|shield|ammo|mindcontrol|spawns|passengers|tiberium|experience|occupants|gattlingstage)
+InfoType=Health                         ; Displayed value enumeration (health|shield|ammo|mindcontrol|spawns|passengers|tiberium|experience|occupants|gattlingstage|ROF|Reload|SpawnTimer|GattlingTimer|ProduceCash|PassengerKill|AutoDeath|SuperWeapon|IronCurtain|TemporalLife)
 Offset=0,0                              ; integers - horizontal, vertical
 Offset.ShieldDelta=                     ; integers - horizontal, vertical
 Align=right                             ; Text alignment enumeration (left|right|center/centre)
@@ -71,7 +72,9 @@ Percentage=false                        ; boolean
 HideMaxValue=false                      ; boolean
 VisibleToHouses=owner                   ; Affected house enumeration (none|owner/self|allies/ally|team|enemies/enemy|all)
 VisibleToHouses.Observer=true           ; boolean
-ValueScaleDivisor=1                     ; integer
+VisibleInSpecialState=true              ; boolean
+ValueScaleDivisor=                      ; integer
+ValueAsTimer=false                      ; boolean
 ; Text
 Text.Color=0,255,0                      ; integers - Red, Green, Blue
 Text.Color.ConditionYellow=255,255,0    ; integers - Red, Green, Blue
@@ -81,6 +84,7 @@ Text.Background=false                   ; boolean
 Shape=                                  ; filename with .shp extension, if not present, game-drawn text will be used instead
 Palette=palette.pal                     ; filename with .pal extension
 Shape.Spacing=                          ; integers - horizontal, vertical spacing between digits
+Shape.PercentageFrame=false             ; boolean
 
 [SOMETECHNO]                            ; TechnoType
 DigitalDisplay.Disable=false            ; boolean

docs/Whats-New.md

@@ -327,6 +327,7 @@ New:
 - No turret unit turn to the target (by CrimRecya & TaranDahl)
 - Damage multiplier for different houses (by CrimRecya)
 - Customizable duration for electric bolts (by Starkku)
+- Several new Infotypes, no display in specific status and a new single frame display method (by CrimRecya)
 
 Vanilla fixes:
 - Prevent the units with locomotors that cause problems from entering the tank bunker (by TaranDahl)

src/Ext/Techno/Body.Internal.cpp

@@ -144,6 +144,18 @@ CoordStruct TechnoExt::GetSimpleFLH(InfantryClass* pThis, int weaponIndex, bool&
 	return FLH;
 }
 
+void TechnoExt::ExtData::InitializeDisplayInfo()
+{
+	const auto pThis = this->OwnerObject();
+	const auto pPrimary = pThis->GetWeapon(0)->WeaponType;
+	pThis->RearmTimer.Start(0);
+
+	if (pPrimary && pThis->GetTechnoType()->LandTargeting != LandTargetingType::Land_Not_OK)
+		pThis->RearmTimer.TimeLeft = pPrimary->ROF;
+	else if (const auto pSecondary = pThis->GetWeapon(1)->WeaponType)
+		pThis->RearmTimer.TimeLeft = pSecondary->ROF;
+}
+
 void TechnoExt::ExtData::InitializeAttachEffects()
 {
 	if (auto pTypeExt = this->TypeExtData)

src/Ext/Techno/Body.Visuals.cpp

@@ -2,7 +2,10 @@
 
 #include <TacticalClass.h>
 #include <SpawnManagerClass.h>
-
+#include <FactoryClass.h>
+#include <SuperClass.h>
+#include <Ext/SWType/Body.h>
+#include <Ext/House/Body.h>
 #include <Utilities/EnumFunctions.h>
 
 void TechnoExt::DrawSelfHealPips(TechnoClass* pThis, Point2D* pLocation, RectangleStruct* pBounds)
@@ -331,18 +334,23 @@ void TechnoExt::ProcessDigitalDisplays(TechnoClass* pThis)
 		if (!HouseClass::IsCurrentPlayerObserver() && !EnumFunctions::CanTargetHouse(pDisplayType->VisibleToHouses, pThis->Owner, HouseClass::CurrentPlayer))
 			continue;
 
+		if (!pDisplayType->VisibleInSpecialState && (pThis->TemporalTargetingMe || pThis->IsIronCurtained()))
+			continue;
+
 		int value = -1;
-		int maxValue = -1;
+		int maxValue = 0;
 
 		GetValuesForDisplay(pThis, pDisplayType->InfoType, value, maxValue);
 
-		if (value == -1 || maxValue == -1)
+		if (value <= -1 || maxValue <= 0)
 			continue;
 
-		if (pDisplayType->ValueScaleDivisor > 1)
+		const auto divisor = pDisplayType->ValueScaleDivisor.Get(pDisplayType->ValueAsTimer ? 15 : 1);
+
+		if (divisor > 1)
 		{
-			value = Math::max(value / pDisplayType->ValueScaleDivisor, value != 0 ? 1 : 0);
-			maxValue = Math::max(maxValue / pDisplayType->ValueScaleDivisor, maxValue != 0 ? 1 : 0);
+			value = Math::max(value / divisor, value ? 1 : 0);
+			maxValue = Math::max(maxValue / divisor, 1);
 		}
 
 		const bool isBuilding = pThis->WhatAmI() == AbstractType::Building;
@@ -375,54 +383,51 @@ void TechnoExt::GetValuesForDisplay(TechnoClass* pThis, DisplayInfoType infoType
 	}
 	case DisplayInfoType::Shield:
 	{
-		if (pExt->Shield == nullptr || pExt->Shield->IsBrokenAndNonRespawning())
+		const auto pShield = pExt->Shield.get();
+
+		if (!pShield || pShield->IsBrokenAndNonRespawning())
 			return;
 
-		value = pExt->Shield->GetHP();
-		maxValue = pExt->Shield->GetType()->Strength.Get();
+		value = pShield->GetHP();
+		maxValue = pShield->GetType()->Strength.Get();
 		break;
 	}
 	case DisplayInfoType::Ammo:
 	{
-		if (pType->Ammo <= 0)
-			return;
-
 		value = pThis->Ammo;
 		maxValue = pType->Ammo;
 		break;
 	}
 	case DisplayInfoType::MindControl:
 	{
-		if (pThis->CaptureManager == nullptr)
+		const auto pCaptureManager = pThis->CaptureManager;
+
+		if (!pCaptureManager)
 			return;
 
-		value = pThis->CaptureManager->ControlNodes.Count;
-		maxValue = pThis->CaptureManager->MaxControlNodes;
+		value = pCaptureManager->ControlNodes.Count;
+		maxValue = pCaptureManager->MaxControlNodes;
 		break;
 	}
 	case DisplayInfoType::Spawns:
 	{
-		if (pThis->SpawnManager == nullptr || pType->Spawns == nullptr || pType->SpawnsNumber <= 0)
+		const auto pSpawnManager = pThis->SpawnManager;
+
+		if (!pSpawnManager || !pType->Spawns)
 			return;
 
-		value = pThis->SpawnManager->CountAliveSpawns();
+		value = pSpawnManager->CountAliveSpawns();
 		maxValue = pType->SpawnsNumber;
 		break;
 	}
 	case DisplayInfoType::Passengers:
 	{
-		if (pType->Passengers <= 0)
-			return;
-
 		value = pThis->Passengers.NumPassengers;
 		maxValue = pType->Passengers;
 		break;
 	}
 	case DisplayInfoType::Tiberium:
 	{
-		if (pType->Storage <= 0)
-			return;
-
 		value = static_cast<int>(pThis->Tiberium.GetTotalAmount());
 		maxValue = pType->Storage;
 		break;
@@ -438,13 +443,12 @@ void TechnoExt::GetValuesForDisplay(TechnoClass* pThis, DisplayInfoType infoType
 		if (pThis->WhatAmI() != AbstractType::Building)
 			return;
 
-		const auto pBuildingType = abstract_cast<BuildingTypeClass*>(pType);
-		const auto pBuilding = abstract_cast<BuildingClass*>(pThis);
+		const auto pBuildingType = static_cast<BuildingTypeClass*>(pType);
 
 		if (!pBuildingType->CanBeOccupied)
 			return;
 
-		value = pBuilding->Occupants.Count;
+		value = static_cast<BuildingClass*>(pThis)->Occupants.Count;
 		maxValue = pBuildingType->MaxNumberOccupants;
 		break;
 	}
@@ -453,10 +457,169 @@ void TechnoExt::GetValuesForDisplay(TechnoClass* pThis, DisplayInfoType infoType
 		if (!pType->IsGattling)
 			return;
 
-		value = pThis->CurrentGattlingStage;
+		value = pThis->GattlingValue ? pThis->CurrentGattlingStage + 1 : 0;
 		maxValue = pType->WeaponStages;
 		break;
 	}
+	case DisplayInfoType::ROF:
+	{
+		if (!pThis->IsArmed())
+			return;
+
+		const auto& timer = pThis->RearmTimer;
+		value = timer.GetTimeLeft();
+		maxValue = timer.TimeLeft;
+		break;
+	}
+	case DisplayInfoType::Reload:
+	{
+		if (pType->Ammo <= 0)
+			return;
+
+		value = (pThis->Ammo >= pType->Ammo) ? 0 : pThis->ReloadTimer.GetTimeLeft();
+		maxValue = (pThis->Ammo || pType->EmptyReload <= 0) ? pType->Reload : pType->EmptyReload;
+		break;
+	}
+	case DisplayInfoType::SpawnTimer:
+	{
+		const auto pSpawnManager = pThis->SpawnManager;
+
+		if (!pSpawnManager || !pType->Spawns || pType->SpawnsNumber <= 0)
+			return;
+
+		value = 0;
+
+		for (int i = 0; i < pType->SpawnsNumber; i++)
+		{
+			const auto pSpawnNode = pSpawnManager->SpawnedNodes[i];
+
+			if (pSpawnNode->Status != SpawnNodeStatus::Dead)
+				continue;
+
+			const auto thisValue = pSpawnNode->SpawnTimer.GetTimeLeft();
+
+			if (thisValue < value || !value)
+				value = thisValue;
+		}
+
+		maxValue = pSpawnManager->RegenRate;
+		break;
+	}
+	case DisplayInfoType::GattlingTimer:
+	{
+		if (!pType->IsGattling)
+			return;
+
+		const auto thisStage = pThis->CurrentGattlingStage;
+		const auto& stage = pThis->Veterancy.IsElite() ? pType->EliteStage : pType->WeaponStage;
+
+		value = pThis->GattlingValue;
+		maxValue = stage[thisStage];
+
+		if (thisStage > 0)
+		{
+			value -= stage[thisStage - 1];
+			maxValue -= stage[thisStage - 1];
+		}
+
+		break;
+	}
+	case DisplayInfoType::ProduceCash:
+	{
+		if (pThis->WhatAmI() != AbstractType::Building || static_cast<BuildingTypeClass*>(pType)->ProduceCashAmount <= 0)
+			return;
+
+		const auto& timer = static_cast<BuildingClass*>(pThis)->CashProductionTimer;
+		value = timer.GetTimeLeft();
+		maxValue = timer.TimeLeft;
+		break;
+	}
+	case DisplayInfoType::PassengerKill:
+	{
+		if (!pExt->TypeExtData->PassengerDeletionType)
+			return;
+
+		const auto& timer = pExt->PassengerDeletionTimer;
+		value = timer.GetTimeLeft();
+		maxValue = timer.TimeLeft;
+		break;
+	}
+	case DisplayInfoType::AutoDeath:
+	{
+		const auto pTypeExt = pExt->TypeExtData;
+
+		if (!pTypeExt->AutoDeath_Behavior.isset())
+			return;
+
+		if (pTypeExt->AutoDeath_AfterDelay > 0)
+		{
+			const auto& timer = pExt->AutoDeathTimer;
+			value = timer.GetTimeLeft();
+			maxValue = timer.TimeLeft;
+		}
+		else if (pTypeExt->AutoDeath_OnAmmoDepletion)
+		{
+			value = pThis->Ammo;
+			maxValue = pType->Ammo;
+		}
+
+		break;
+	}
+	case DisplayInfoType::SuperWeapon:
+	{
+		if (pThis->WhatAmI() != AbstractType::Building)
+			return;
+
+		const auto pHouse = pThis->Owner;
+		const auto pBuildingType = static_cast<BuildingTypeClass*>(pType);
+
+		if (pBuildingType->SuperWeapon != -1)
+		{
+			const auto& timer = pHouse->Supers.GetItem(pBuildingType->SuperWeapon)->RechargeTimer;
+			value = timer.GetTimeLeft();
+			maxValue = timer.TimeLeft;
+		}
+		else if (pBuildingType->SuperWeapon2 != -1)
+		{
+			const auto& timer = pHouse->Supers.GetItem(pBuildingType->SuperWeapon2)->RechargeTimer;
+			value = timer.GetTimeLeft();
+			maxValue = timer.TimeLeft;
+		}
+		else
+		{
+			const auto& superWeapons = BuildingTypeExt::ExtMap.Find(pBuildingType)->SuperWeapons;
+
+			if (superWeapons.size() > 0)
+			{
+				const auto& timer = pHouse->Supers.GetItem(superWeapons[0])->RechargeTimer;
+				value = timer.GetTimeLeft();
+				maxValue = timer.TimeLeft;
+			}
+		}
+
+		break;
+	}
+	case DisplayInfoType::IronCurtain:
+	{
+		if (!pThis->IsIronCurtained())
+			return;
+
+		const auto& timer = pThis->IronCurtainTimer;
+		value = timer.GetTimeLeft();
+		maxValue = timer.TimeLeft;
+		break;
+	}
+	case DisplayInfoType::TemporalLife:
+	{
+		const auto pTemporal = pThis->TemporalTargetingMe;
+
+		if (!pTemporal)
+			return;
+
+		value = pTemporal->WarpRemaining;
+		maxValue = pType->Strength * 10;
+		break;
+	}
 	default:
 	{
 		value = pThis->Health;

src/Ext/Techno/Body.h

@@ -119,6 +119,7 @@ class TechnoExt
 		void UpdateSelfOwnedAttachEffects();
 		bool HasAttachedEffects(std::vector<AttachEffectTypeClass*> attachEffectTypes, bool requireAll, bool ignoreSameSource, TechnoClass* pInvoker, AbstractClass* pSource, std::vector<int> const* minCounts, std::vector<int> const* maxCounts) const;
 		int GetAttachedEffectCumulativeCount(AttachEffectTypeClass* pAttachEffectType, bool ignoreSameSource = false, TechnoClass* pInvoker = nullptr, AbstractClass* pSource = nullptr) const;
+		void InitializeDisplayInfo();
 
 		virtual ~ExtData() override;
 		virtual void InvalidatePointer(void* ptr, bool bRemoved) override { }

src/Ext/Techno/Hooks.cpp

@@ -141,6 +141,7 @@ DEFINE_HOOK(0x6F42F7, TechnoClass_Init, 0x2)
 	pExt->CurrentShieldType = pExt->TypeExtData->ShieldType;
 	pExt->InitializeLaserTrails();
 	pExt->InitializeAttachEffects();
+	pExt->InitializeDisplayInfo();
 
 	if (pExt->TypeExtData->Harvester_Counted)
 		HouseExt::ExtMap.Find(pThis->Owner)->OwnedCountedHarvesters.push_back(pThis);