feat(display): Implement player money per minute #1481

L3-M · 2025-08-21T19:30:23Z

This change implements player money per minute in Zero Hour.
Tracks earnings over the last 60 seconds. By default, it is enabled by "yes" and can be disabled by the value "no" in Options.ini.
By disabling it, it will fall back to original current money only.

For example with Mauller #1442

TODO

Replicate in Generals

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp

GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp

xezon · 2025-08-21T20:48:41Z

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

+				{
+					incomeStr.format(L"%d", cashPerMin);
+				}
+				buffer.format(TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:ControlBarMoneyDisplayIncome", L"%ls (%ls)", moneyStr.str(), incomeStr.str()));


What about the Money symbol?

The limitation here would be the ControlBarPro money texture. It has much less space compared to the original game's ControlBar, hence I removed it

Can you show image for it?

Yes.
1920x1080. Money symbol and ControlBarPro:

1920x1080. No money symbol and ControlBarPro:

1920x1080. Money symbol with Mauller font scaling and ControlBarPro:

1920x1080. Money symbol and original ControlBar:

You tested Control Bar Pro correctly in 16:9.

The Original Control Bar always needs to be tested in 4:3. That is because its elements are stretched wide in 16:9 and beyond.

Oof it seems to be broken on ControlBar too in 4:3, we can drop the brackets or not use the money symbol.

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h

GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp

xezon · 2025-08-21T20:55:00Z

GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp

+void Money::updateIncomeBucket()
+{
+	UnsignedInt frame = TheGameLogic->getFrame();
+	UnsignedInt lastSec = m_lastBucketFrame / LOGICFRAMES_PER_SECOND;


Can this value not be derived from m_currentBucket ?

I don't think so, m_lastBucketFrame records the exact frame of the last update

But do we care for this frame number? We only care for bucket position, no? I would expect that this logic can be simplified.

UnsignedInt lastSec = curSec - ((curSec + ARRAY_SIZE(m_incomeBuckets) - m_currentBucket) % ARRAY_SIZE(m_incomeBuckets));

Stubbjax · 2025-08-22T03:50:14Z

What pain points does this feature solve? Is it not something skilled players can already intuit? Are the benefits worth the added complexity / cost to readability?

ang1990 · 2025-08-22T04:13:01Z

Only game I know of that inlines the resource per min data point similar to this is Supreme Commander. But that game is a supply chain simulator compared to ZH.

Starcraft 2 has an income tab in replay mode only, so you can't see it while you're playing. income/min is useful if you're studying your replays and helps spectators understand the economy game, but I reckon not so much for the player himself.

Mauller · 2025-08-22T08:08:55Z

What pain points does this feature solve? Is it not something skilled players can already intuit? Are the benefits worth the added complexity / cost to readability?

A lot of people who watch Legis stream are often interested in his money, income, KD overlay and ask how to get it ingame.

helmutbuhler · 2025-08-22T18:18:05Z

I think this is a nice addition. I'd append the unit "/min" though to make it clearer what it means.

L3-M · 2025-08-22T22:30:04Z

I think this is a nice addition. I'd append the unit "/min" though to make it clearer what it means.

I don't think this is possible while remaining ControlBarPro addon compatibility as It has much less space in the money texture compared to the original game's ControlBar

helmutbuhler · 2025-08-23T15:27:50Z

I think this is a nice addition. I'd append the unit "/min" though to make it clearer what it means.

I don't think this is possible while remaining ControlBarPro addon compatibility as It has much less space in the money texture compared to the original game's ControlBar

Even if it overflows, it's fine. Someone will make an updated ControlBarPro addon soon that fixes the texture. And until then, you can still disable it.

xezon · 2025-08-24T10:56:05Z

GeneralsMD/Code/GameEngine/Include/Common/Money.h

 	{
+		for (UnsignedInt i = 0; i < 60; ++i)


How about we just call init() here if that sets everything to 0 already?

xezon · 2025-08-24T10:57:58Z

GeneralsMD/Code/GameEngine/Include/Common/Money.h

+		m_startingCash = 0;
+		m_currentBucket = 0;
+		m_lastBucketFrame = 0;
+		for (UnsignedInt i = 0; i < 60; ++i)


This can be simplified/optimized with std::fill

xezon · 2025-08-24T10:59:44Z

GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp

+	m_money = amount;
+	m_currentBucket = 0;
+	m_lastBucketFrame = 0;
+	for (UnsignedInt i = 0; i < ARRAY_SIZE(m_incomeBuckets); ++i)


This can be simplified/optimized with std::fill

xezon · 2025-08-24T11:02:12Z

GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp

+			diff = 60;
+		m_currentBucket = (m_currentBucket + diff) % ARRAY_SIZE(m_incomeBuckets);
+		for (UnsignedInt i = 0; i < diff; ++i)
+			m_incomeBuckets[m_currentBucket] = 0;


This looks wrong now.

Could probably also use std::fill here.

xezon · 2025-08-24T11:04:42Z

GeneralsMD/Code/GameEngine/Include/Common/Money.h

@@ -105,6 +120,10 @@ class Money : public Snapshot

 	UnsignedInt m_money;	///< amount of money
 	Int m_playerIndex;	///< what is my player index?
+	UnsignedInt m_startingCash;


What is this for? It appears to do nothing.

xezon · 2025-08-24T11:05:30Z

GeneralsMD/Code/GameEngine/Include/Common/Money.h

+		for (UnsignedInt i = 0; i < 60; ++i)
+		{
+			m_incomeBuckets[i] = 0;
+		}
 	}

 	void init()
 	{
 		m_money = 0;


It looks like init() is now synonymous to setStartingCash(0), so that can be simplified.

xezon · 2025-08-24T11:07:38Z

GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -462,6 +462,7 @@ void Player::init(const PlayerTemplate* pt)
 			{
 				m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE );
 			}
+			m_money.setStartingCash(m_money.countMoney());


This needs another look. First depositing money and then setting starting cash is not good.

It should be one call.

Better design setStartingCash in a way that prior calls to deposit and similar are not necessary.

xezon · 2025-08-24T11:11:35Z

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

+				UnicodeString moneyStr;
+				UnicodeString incomeStr;
+
+				if (currentMoney >= 100000)


This code portion can become prettier by breaking out the money values formatting:

UnicodeString moneyStr = formatMoneyValue(currentMoney); UnicodeString incomeStr = formatIncomeValue(cashPerMin);

Faithfinder · 2025-08-24T15:47:02Z

I'd leave the money display alone, and put this data into top-left corner together with other GenTool things. I'd be interested in seeing this data, but putting it next to current money might hinder comprehension speed

xezon · 2025-08-24T20:57:52Z

Perhaps it would be better suited for an Observer specific display.

Eikosa · 2025-08-25T00:46:21Z

Perhaps it would be better suited for an Observer specific display.

Frankly, it would be great fun to see this while playing singleplayer

L3-M · 2025-08-25T12:05:40Z

I'd leave the money display alone, and put this data into top-left corner together with other GenTool things. I'd be interested in seeing this data, but putting it next to current money might hinder comprehension speed

The money display is left alone. This feature is disabled by default now. I think it makes more sense this way.
Also I would not find myself looking at the top-left/right corner to see my current Money Per Minute, it looks better on the ControlBar GUI.

feat(display): Implement player money per minute

aa4a814

xezon reviewed Aug 21, 2025

View reviewed changes

xezon added Enhancement Is new feature or request GUI For graphical user interface Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour labels Aug 21, 2025

Implement suggestions

4c9114b

xezon reviewed Aug 24, 2025

View reviewed changes

Implement suggestions 2

8a09853

feat(display): Implement player money per minute #1481

Are you sure you want to change the base?

feat(display): Implement player money per minute #1481

Conversation

L3-M commented Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Stubbjax commented Aug 22, 2025

Uh oh!

ang1990 commented Aug 22, 2025

Uh oh!

Mauller commented Aug 22, 2025

Uh oh!

helmutbuhler commented Aug 22, 2025

Uh oh!

L3-M commented Aug 22, 2025

Uh oh!

helmutbuhler commented Aug 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Faithfinder commented Aug 24, 2025

Uh oh!

xezon commented Aug 24, 2025

Uh oh!

Eikosa commented Aug 25, 2025

Uh oh!

L3-M commented Aug 25, 2025

Uh oh!

Uh oh!

L3-M commented Aug 21, 2025 •

edited

Loading