Differential D4303 Diff 18802 binaries/data/mods/public/maps/random/rmgen-common/player.js

Changeset View

Standalone View

binaries/data/mods/public/maps/random/rmgen-common/player.js

Show First 20 Lines • Show All 837 Lines • ▼ Show 20 Lines if (bestShift)

let newPlayerIDs = []; let newPlayerIDs = [];

for (let i = 0; i < playerIDs.length; ++i) for (let i = 0; i < playerIDs.length; ++i)

newPlayerIDs.push(playerIDs[(i + bestShift) % playerIDs.length]); newPlayerIDs.push(playerIDs[(i + bestShift) % playerIDs.length]);

playerIDs = newPlayerIDs; playerIDs = newPlayerIDs;

} }

return [playerIDs, startLocations]; return [playerIDs, startLocations];

} }

/**

* Place on an arc on a circle, 1 arc per team. Each team member is on the same arc.

* @param {Array[int]} playerIDs

* @param {float} center

* @param {float} radius

* @param {float} mapAngle

* @param {float} teamGapRatio Ratio difference between team gap and players on the same team Should be 0 to 1.

* e.g. 0.8 means the ratio team gap:team player gap is 8:2. n.b. < 0.5 means enemies are closer

* than team members are to each other

lyvUnsubmitted

Not Done

Arrow function

Also this function already exists in rmgen2. Move it to rmgen and probably use that instead.

lyv: Arrow function Also this function already exists in rmgen2. Move it to rmgen and probably use…

function playerPlacementMultiArcs(playerIDs, center, radius, mapAngle, teamGapFrac) {

let playerTeams = playerIDs.map(getPlayerTeam);

FreagarachUnsubmitted

Not Done

* than team members are to each other

- function playerPlacementMultiArcs(radius, mapAngle, teamGapFrac) {

+ function playerPlacementMultiArcs(radius, mapAngle, teamGapFrac)

+ {

var playerIDs = sortAllPlayers();

let playerTeams = playerIDs.map(getPlayerTeam);

The linter will also have something to say about this function. (Mostly const.)

Freagarach: The linter will also have something to say about this function. (Mostly `const`.)

let uniqueTeams = new Set(playerTeams);

lyvUnsubmitted

Not Done

It might be cleaner to just insert into the set in a for loop rather than array map. The no team thing can also be made cleaner by counting -1s and incrementing the highest team ID at the end. Which is what the aforementioned getTeamsArray function does.

lyv: It might be cleaner to just insert into the set in a for loop rather than array map. The no…

let nTeams = uniqueTeams.size;

let nPlayers = playerIDs.length;

let teamIntMap = {};

let teamFreqPlayers = {};

let teamPlayersIntMap = {};

// Shuffle team order.

let teamShuffle = function(length) {

let i = 0;

lyvUnsubmitted

Not Done

Use shuffleArray

lyv: Use shuffleArray

let array = Array.from(Array(length), () => i++);

for(let i = array.length - 1; i > 0; i--){

const j = Math.round(Math.random() * (array.length-1))

const temp = array[i]

array[i] = array[j]

array[j] = temp

}

return array;

}(nTeams);

// Team to array (random) index map.

Array.from(uniqueTeams).map((val, i) => {teamIntMap[val] = teamShuffle[i];});

// Player frequency in teams.

playerTeams.map((v) => teamFreqPlayers[v] ? teamFreqPlayers[v] += 1 : teamFreqPlayers[v] = 1);

// Team player int map. This is useful when positioning players on a team.

Array.from(uniqueTeams).map((val) => {teamPlayersIntMap[val] = 0;});

// I don't know at this point. Trust my brain. It's smarter than my brain.

// Something-something add the previous team player combos.

// It's some kind of "cumulative frequency" of player teams idk.

for (let key in teamPlayersIntMap) {

lyvUnsubmitted

Not Done

Arrow function and possibly for of. A for range loop is usually much more clear.

lyv: Arrow function and possibly for of. A for range loop is usually much more clear.

if (teamPlayersIntMap.hasOwnProperty(key)) {

for (let key2 in teamPlayersIntMap) {

if (teamPlayersIntMap.hasOwnProperty(key)) {

if (teamIntMap[key2] > teamIntMap[key]) {

teamPlayersIntMap[key2] += teamFreqPlayers[key]-1;

}

const teamPlayerGapFrac = 1 - teamGapFrac;

const totalGapCount = teamGapFrac*nTeams + teamPlayerGapFrac*(nPlayers-nTeams);

const teamGapAngle = 2*Math.PI*teamGapFrac/totalGapCount;

const teamPlayerGapAngle = 2*Math.PI*teamPlayerGapFrac/totalGapCount;

function playerAngle(i) {

return mapAngle + teamGapAngle*teamIntMap[playerTeams[i]] + teamPlayerGapAngle*((teamPlayersIntMap[playerTeams[i]]++));

}

lyvUnsubmitted

Not Done

This is around 35 degrees or something I think. So pretty magic.

The problem with defining gaps in angles is that it's completely dependent with map size. The distance shouldn't scale with area linearly.

lyv: This is around 35 degrees or something I think. So pretty magic. The problem with defining…

return playerPlacementCustomAngle(

radius,

center,

playerAngle);

}