Expand the tooltip for population cap

It was removed in dee2b73c7d since it wasn't noticed that it referred to
the number in the top panel. Adding the number should make this more
clear. The color is only applied to the number instead of the whole line
so that it's harder to mistake it with just some fancy formatting.

Fixes: #7851

.gitea/workflows/pre-commit.yml

@@ -3,22 +3,27 @@ name: pre-commit
 on:
   - push
   - pull_request
+env:
+  PRE_COMMIT_VERSION: 4.6.0
 jobs:
-  build:
+  pre-commit:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-python@v7
         with:
           python-version: "3.11"
-      - id: restore-pip-cache
-        uses: actions/cache/restore@v6
+      - uses: actions/cache@v6
         with:
-          key: pip-cache-v1-${{ github.workflow }}
+          key: pip-cache-v1-${{github.workflow}}-${{env.pythonLocation}}-${{env.PRE_COMMIT_VERSION}}
           path: ~/.cache/pip
-      - uses: pre-commit/action@v3.0.1
-      - uses: actions/cache/save@v6
-        if: steps.restore-pip-cache.outcome == 'success'
+      - run: python -m pip install pre-commit=="${{ env.PRE_COMMIT_VERSION }}"
+        shell: bash
+      - run: python -m pip freeze --local
+        shell: bash
+      - uses: actions/cache@v6
         with:
-          key: pip-cache-v1-${{ github.workflow }}
-          path: ~/.cache/pip
+          path: ~/.cache/pre-commit
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - run: pre-commit run --show-diff-on-failure --color=always --all-files
+        shell: bash

binaries/data/mods/public/gui/session/top_panel/CounterPopulation.js

@@ -25,13 +25,17 @@ class CounterPopulation
 		for (const resCode of g_ResourceData.GetCodes())
 			total += playerState.resourceGatherers[resCode];
 
-		this.stats.caption = coloredText(total, total ? this.DefaultTotalGatherersColor : this.DefaultTotalGatherersColorZero);
+		const colorizedTotal = coloredText(total,
+			total ? this.DefaultTotalGatherersColor : this.DefaultTotalGatherersColorZero);
+		this.stats.caption = colorizedTotal;
 
 		this.isTrainingBlocked = playerState.trainingBlocked;
 
 		this.panel.tooltip =
-			setStringTags(translate(this.PopulationTooltip), CounterManager.ResourceTitleTags) +
-			getAllyStatTooltip(this.getTooltipData.bind(this));
+			setStringTags(translate(this.PopulationTooltipTitle), CounterManager.ResourceTitleTags) +
+			"\n" + sprintf(this.PopulationTooltip, state) +
+			getAllyStatTooltip(this.getTooltipData.bind(this)) + "\n" +
+			sprintf(this.CurrentGatherersTooltip, { "currentGatherers": colorizedTotal });
 	}
 
 	getTooltipData(playerState, playername)
@@ -62,10 +66,20 @@ class CounterPopulation
 // Translation: Do not insert spaces around the slash symbol for this exact string. Keep only one space between popLimit and popMax.
 CounterPopulation.prototype.CounterCaption = markForTranslation("%(popCount)s/%(popLimit)s (%(popMax)s)");
 
-CounterPopulation.prototype.PopulationTooltip = markForTranslation("Population: current/limit (max)");
+CounterPopulation.prototype.PopulationTooltipTitle = markForTranslation("Population");
+CounterPopulation.prototype.PopulationTooltip =
+	translate("Current population: %(popCount)s\nPopulation limit: %(popLimit)s\nMaximum population: %(popMax)s");
 
 CounterPopulation.prototype.AllyPopulationTooltip = markForTranslation("%(popCount)s/%(popLimit)s (%(popMax)s)");
 
+/**
+ * Storing the translated and formatted gatherer string in the prototype.
+ * Including the number might seem redundant but is required since the collor
+ * isn't enough to associate it with the number in the top panel.
+ */
+CounterPopulation.prototype.CurrentGatherersTooltip =
+	setStringTags(translate("Current gatherers: %(currentGatherers)s"), { "font": "sans-14" });
+
 /**
  * Color to highlight the total number of gatherers at zero.
  */

binaries/data/mods/public/gui/session/top_panel/CounterResource.js

@@ -17,7 +17,9 @@ class CounterResource
 		this.count.caption = abbreviateLargeNumbers(Math.floor(playerState.resourceCounts[this.resCode]));
 
 		const gatherers = playerState.resourceGatherers[this.resCode];
-		this.stats.caption = coloredText(gatherers, gatherers ? this.DefaultResourceGatherersColor : this.DefaultResourceGatherersColorZero);
+		const colorizedGatherers = coloredText(gatherers,
+			gatherers ? this.DefaultResourceGatherersColor : this.DefaultResourceGatherersColorZero);
+		this.stats.caption = colorizedGatherers;
 
 
 		// TODO: Set the tooltip only if hovered?
@@ -28,7 +30,9 @@ class CounterResource
 		this.panel.tooltip =
 			setStringTags(resourceNameFirstWord(this.resCode), CounterManager.ResourceTitleTags) +
 			description +
-			getAllyStatTooltip(this.getTooltipData.bind(this));
+			getAllyStatTooltip(this.getTooltipData.bind(this)) + "\n" +
+			sprintf(CounterPopulation.prototype.CurrentGatherersTooltip,
+				{ "currentGatherers": colorizedGatherers });
 	}
 
 	getTooltipData(playerState, playername)

binaries/data/mods/public/gui/text/quotes.txt

@@ -208,3 +208,13 @@
 “This is a woman's resolve; as for men, they may live and be slaves.” \n— Boudicca, rallying against Roman occupation (Tacitus's Annals, Book 14, Chapter 35)
 “There are two things, knowledge and opinion; one makes its possessor know, the other to be ignorant.” \n— (Hippocratic treatise known as “The Law”, part of the Hippocratic Corpus)
 “Let them hate me, so long as they fear me.” \n— Caligula (Suetonius, The Twelve Caesars, Book 30)
+“There is no instance of a nation benefiting from prolonged warfare.” \n— Sun Tzu (“The Art of War”, Chapter 2)
+“To subdue the enemy without fighting is the acme of skill.” \n— Sun Tzu (“The Art of War”, Chapter 3)
+“One defends when his strength is inadequate; he attacks when it is abundant.” \n— Sun Tzu (“The Art of War”, Chapter 4)
+“When torrential water tosses boulders, it is because of its momentum. When the strike of a hawk breaks the body of its prey, it is because of timing.” \n— Sun Tzu (“The Art of War”, Chapter 5)
+“Treat your men as you would your own beloved sons. And they will follow you into the deepest valley.” \n— Sun Tzu (“The Art of War”, Chapter 10)
+“Woe to the defeated!” \n— Brennus disputing the weight of gold ransom while sacking Rome c. 387 BC  (Livy, “Ab Urbe Condita”, Book 5, Chapter 48)
+“\[Brutus] found the women fighting and perishing in company with the men with such bravery that they uttered no cry even in the midst of slaughter.” \n— Brutus in Lusitania during the battles with Viriathus (Appian of Alexandria, “The Spanish Wars”, 15)
+“What I desire for my own children, I desire for all men.” \n— Ashoka the Great (“The Kalinga Rock Edicts”)
+“If you Romans choose to lord it over the world, does it follow that the world is to accept slavery ?” \n— Caratacus pleading for pardon from Roman Emperor Claudius in Rome (Tacitus, “Annals”, 12.37)
+“And where am I to get so many soldiers ?” \n— Septimius Severus, frustrated with the challenge of controlling his own men and the harsh realities of frontier warfare against the northern tribes in Britannia. (Cassius Dio, “Roman History”, Vol IX, Book LXXVI, Section 11)

source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

@@ -273,8 +273,16 @@ private:
 
 		if (evt.GetWheelRotation())
 		{
-			float speed = 16.f * ScenarioEditor::GetSpeedModifier();
-			POST_MESSAGE(SmoothZoom, (eRenderView::GAME, evt.GetWheelRotation() * speed / evt.GetWheelDelta()));
+			if (evt.GetWheelAxis() == wxMOUSE_WHEEL_VERTICAL)
+			{
+				float speed = 16.f * ScenarioEditor::GetSpeedModifier();
+				POST_MESSAGE(SmoothZoom, (eRenderView::GAME, evt.GetWheelRotation() * speed / evt.GetWheelDelta()));
+			}
+			else
+			{
+				float speed = ScenarioEditor::GetSpeedModifier();
+				POST_MESSAGE(RotateY, (evt.GetWheelRotation() * speed / evt.GetWheelDelta()));
+			}
 		}
 		else
 		{

source/tools/atlas/GameInterface/GameLoop.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2026 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -41,7 +41,8 @@ struct GameLoopState
 	struct Input
 	{
 		float scrollSpeed[6]; // [fwd, bwd, left, right, cw-rotation, ccw-rotation]. 0.0f for disabled.
-		float zoomDelta;
+		float zoomDelta{0.f};
+		float rotateDelta{0.f};
 	} input;
 };
 

source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp

@@ -199,6 +199,14 @@ MESSAGEHANDLER(RotateAround)
 	}
 }
 
+MESSAGEHANDLER(RotateY)
+{
+	if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
+		return;
+
+	g_AtlasGameLoop->input.rotateDelta = msg->angle;
+}
+
 MESSAGEHANDLER(LookAt)
 {
 	// TODO: different camera depending on msg->view

source/tools/atlas/GameInterface/InputProcessor.cpp

@@ -117,6 +117,35 @@ bool InputProcessor::ProcessInput(GameLoopState* state)
 		moved = true;
 	}
 
+	if (state->input.rotateDelta != 0.f)
+	{
+		float angle{4 * state->realFrameLength};
+		if (input.rotateDelta > 0 )
+		{
+			if (angle > input.rotateDelta)
+			{
+				angle = input.rotateDelta;
+				input.rotateDelta = 0.f;
+			}
+			else
+				input.rotateDelta -= angle;
+		}
+		else
+		{
+			angle *= -1;
+			if (angle < input.rotateDelta)
+			{
+				angle = input.rotateDelta;
+				input.rotateDelta = 0.f;
+			}
+			else
+				input.rotateDelta -= angle;
+		}
+		Rotate(camera, angle);
+
+		moved = true;
+	}
+
 	if (moved)
 	{
 		camera.UpdateFrustum();

source/tools/atlas/GameInterface/Messages.h

@@ -456,6 +456,10 @@ MESSAGE(RotateAround,
 		((Position, pos))
 		);
 
+MESSAGE(RotateY,
+		((float, angle))
+		);
+
 MESSAGE(LookAt,
 		((int, view)) // eRenderView
 		((Position, pos))