[ui] fix improvement display name in milestones tab

SoMall-dumpling · Aug 26, 2022 · cf3833f · cf3833f
1 parent f003348
commit cf3833f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/game/helpers/CampHelper.js b/src/game/helpers/CampHelper.js
@@ -436,6 +436,16 @@ define([
 			return ImprovementConstants.getMajorLevel(id, level);
 		},
 
+		getCurrentMaxBuiltImprovementLevel: function (improvementID) {
+			let result = 1;
+			let improvementName = improvementNames[improvementID];
+			for (var campNode = this.campNodes.head; campNode; campNode = campNode.next) {
+				let improvements = campNode.entity.get(SectorImprovementsComponent);
+				result = Math.max(result, improvements.getLevel(improvementName))
+			}
+			return result;
+		},
+
 		getCurrentMaxFollowersRecruited: function () {
 			let innMajorLevels = [];
 			for (var campNode = this.campNodes.head; campNode; campNode = campNode.next) {

diff --git a/src/game/systems/ui/UIOutMilestonesSystem.js b/src/game/systems/ui/UIOutMilestonesSystem.js
@@ -4,6 +4,7 @@ define([
 	'game/GlobalSignals',
 	'game/constants/UIConstants',
 	'game/constants/CampConstants',
+	'game/constants/ImprovementConstants',
 	'game/constants/OccurrenceConstants',
 	'game/constants/WorldConstants',
 	'game/nodes/sector/CampNode',
@@ -21,7 +22,7 @@ define([
 	'game/components/sector/events/RaidComponent',
 	'game/components/sector/OutgoingCaravansComponent'
 ], function (
-	Ash, GameGlobals, GlobalSignals, UIConstants, CampConstants, OccurrenceConstants, WorldConstants,
+	Ash, GameGlobals, GlobalSignals, UIConstants, CampConstants, ImprovementConstants, OccurrenceConstants, WorldConstants,
 	CampNode, PlayerPositionNode, PlayerStatsNode, TribeUpgradesNode,
 	PositionComponent, ResourcesComponent, ResourceAccumulationComponent, DeityComponent, LevelComponent, SectorImprovementsComponent, RecruitComponent, TraderComponent, RaidComponent, OutgoingCaravansComponent
 ) {
@@ -97,7 +98,9 @@ define([
 				}
 				if (reqs.tribe && reqs.tribe.improvements) {
 					for (let improvementID in reqs.tribe.improvements) {
-						requirementsDiv += this.getMilestoneReqsListEntry(improvementID, reqs.tribe.improvements[improvementID], GameGlobals.playerActionsHelper.getCurrentImprovementCountTotal(improvementID));
+						let improvementLevel = GameGlobals.campHelper.getCurrentMaxBuiltImprovementLevel(improvementID);
+						let getImprovementDisplayName = ImprovementConstants.getImprovementDisplayName(improvementID, improvementLevel);
+						requirementsDiv += this.getMilestoneReqsListEntry(getImprovementDisplayName, reqs.tribe.improvements[improvementID], GameGlobals.playerActionsHelper.getCurrentImprovementCountTotal(improvementID));
 					}
 				}
 				if (reqs.tribe && reqs.tribe.projects) {