From 50ccd3cc01f1e98d411399fb45dc4617dca53ca8 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 15 Mar 2025 15:12:22 -0400
Subject: [PATCH] tweak variable name for cleaner merge.
---
src/events/intro/customizeSlaveTrade.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/events/intro/customizeSlaveTrade.js b/src/events/intro/customizeSlaveTrade.js
index 86bf50310e9..d989a707968 100644
--- a/src/events/intro/customizeSlaveTrade.js
+++ b/src/events/intro/customizeSlaveTrade.js
@@ -436,13 +436,13 @@ App.Intro.CustomSlaveTrade = function() {
*/
function populateFromCoordinates(lat, lon) {
V.nationalities = {};
- for (let gp of App.Data.World.gridPoints()) {
- const coords = App.Data.World.gridPointToCoordinate(gp);
+ for (const p of App.Data.World.gridPoints()) {
+ const coords = App.Data.World.gridPointToCoordinate(p);
const dist = distanceInKmBetweenEarthCoordinates(lat, lon, coords[0], coords[1]);
const pop1 = 1; // assume the clicked grid's population is 1. we could look it up, but it doesn't matter (it cancels out during normalization)
- const pop2 = App.Data.World.populationAt(gp);
+ const pop2 = App.Data.World.populationAt(p);
const gravity = (pop1 * pop2) / (dist * dist * frictionForDistance(dist));
- const nation = App.Data.World.nationAt(gp);
+ const nation = App.Data.World.nationAt(p);
addNationality(nation, Math.round(gravity));
}
refresh();
--
GitLab