From 84a8b6d6b09b79bbb4cfe1ec43f009bedef8bfe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Mon, 12 Apr 2021 13:19:22 +0200
Subject: [PATCH 1/7] Rookie scale started

---
 src/common/types.ts                        |  1 +
 src/ui/views/Settings.tsx                  |  8 +++
 src/worker/core/draft/getRookieSalaries.ts | 76 +++-------------------
 3 files changed, 19 insertions(+), 66 deletions(-)

diff --git a/src/common/types.ts b/src/common/types.ts
index d9716599cb..81339c316d 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -415,6 +415,7 @@ export type GameAttributesLeague = {
 	numTeams: number;
 	playerMoodTraits: boolean;
 	pointsFormula: string;
+	rookieScale: number[][];
 	spectator: boolean;
 	otl: boolean;
 	otherTeamsWantToHire: boolean;
diff --git a/src/ui/views/Settings.tsx b/src/ui/views/Settings.tsx
index 11d8f2e2fb..753c064ff7 100644
--- a/src/ui/views/Settings.tsx
+++ b/src/ui/views/Settings.tsx
@@ -86,6 +86,7 @@ type Key =
 	| "challengeThanosMode"
 	| "realPlayerDeterminism"
 	| "repeatSeason"
+	| "rookieScale"
 	| "ties"
 	| "otl"
 	| "spectator"
@@ -721,6 +722,13 @@ export const options: {
 		godModeRequired: "always",
 		type: "bool",
 	},
+	{
+		category: "Contracts",
+		key: "rookieScale",
+		name: "Rookie scale",
+		godModeRequired: "existingLeagueOnly",
+		type: "bool",
+	},
 	{
 		category: "Contracts",
 		key: "playerMoodTraits",
diff --git a/src/worker/core/draft/getRookieSalaries.ts b/src/worker/core/draft/getRookieSalaries.ts
index a1ecab1349..23555e0159 100644
--- a/src/worker/core/draft/getRookieSalaries.ts
+++ b/src/worker/core/draft/getRookieSalaries.ts
@@ -33,76 +33,16 @@ const getRookieSalaries = (): number[] => {
 	}
 
 	// Default for first round
-	const firstRoundRookieSalaries = [
-		5000,
-		4500,
-		4000,
-		3500,
-		3000,
-		2750,
-		2500,
-		2250,
-		2000,
-		1900,
-		1800,
-		1700,
-		1600,
-		1500,
-		1400,
-		1300,
-		1200,
-		1100,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-		1000,
-	];
+	const firstRoundRookieSalaries = g.get("rookieScale")[0];
 
 	// Default for all subsequent rounds
-	const otherRoundRookieSalaries = [
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-		500,
-	];
+	const otherRoundRookieSalaries = g.get("rookieScale")[1];
 
 	while (g.get("numActiveTeams") > firstRoundRookieSalaries.length) {
 		//add first round contracts on to end of first round
-		firstRoundRookieSalaries.push(1000);
+		firstRoundRookieSalaries.push(
+			firstRoundRookieSalaries[firstRoundRookieSalaries.length - 1],
+		);
 	}
 
 	while (g.get("numActiveTeams") < firstRoundRookieSalaries.length) {
@@ -115,7 +55,11 @@ const getRookieSalaries = (): number[] => {
 		otherRoundRookieSalaries.length
 	) {
 		// Add min contracts on to end
-		otherRoundRookieSalaries.push(500);
+		otherRoundRookieSalaries.push(
+			otherRoundRookieSalaries[
+				otherRoundRookieSalaries[otherRoundRookieSalaries.length - 1]
+			],
+		);
 	}
 
 	while (

From 46f53060ccccf2d4397bf623bcb96719c214e880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Thu, 15 Apr 2021 10:26:53 +0200
Subject: [PATCH 2/7] RookieScale applied

---
 src/common/constants.ts                       |  2 +-
 src/common/types.ts                           |  5 +-
 src/ui/views/Settings/SettingsForm.tsx        | 71 ++++++++++++++--
 src/ui/views/Settings/settings.tsx            | 80 +++++++++++++++++-
 src/ui/views/Settings/types.ts                |  7 +-
 src/worker/core/draft/getRookieSalaries.ts    | 34 +++-----
 src/worker/core/draft/selectPlayer.ts         |  4 +-
 .../core/league/createGameAttributes.ts       | 68 +++++++++++++++
 src/worker/db/connectLeague.ts                | 84 +++++++++++++++++++
 src/worker/views/settings.ts                  |  4 +
 10 files changed, 325 insertions(+), 34 deletions(-)

diff --git a/src/common/constants.ts b/src/common/constants.ts
index 2dd545ed08..57ba4d9e86 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -21,7 +21,7 @@ const DIFFICULTY = {
 	Insane: 1,
 };
 
-const MAX_SUPPORTED_LEAGUE_VERSION = 43;
+const MAX_SUPPORTED_LEAGUE_VERSION = 44;
 
 const NO_LOTTERY_DRAFT_TYPES: DraftType[] = [
 	"freeAgents",
diff --git a/src/common/types.ts b/src/common/types.ts
index 34340cf9ff..fc27a6ccb6 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -357,6 +357,7 @@ export type GameAttributesLeague = {
 	aiTradesFactor: number;
 	allStarGame: number | null;
 	autoDeleteOldBoxScores: boolean;
+	automaticRookieScale: boolean;
 	brotherRate: number;
 	budget: boolean;
 	challengeNoDraftPicks: boolean;
@@ -415,7 +416,9 @@ export type GameAttributesLeague = {
 	numTeams: number;
 	playerMoodTraits: boolean;
 	pointsFormula: string;
-	rookieScale: number[][];
+	rookieScale: boolean;
+	rookieScaleMaxContract: number;
+	rookieScales: number[][];
 	spectator: boolean;
 	otl: boolean;
 	otherTeamsWantToHire: boolean;
diff --git a/src/ui/views/Settings/SettingsForm.tsx b/src/ui/views/Settings/SettingsForm.tsx
index 5b16504a84..5f955ecbf9 100644
--- a/src/ui/views/Settings/SettingsForm.tsx
+++ b/src/ui/views/Settings/SettingsForm.tsx
@@ -904,6 +904,56 @@ const encodeDecodeFunctions = {
 			return parsed;
 		},
 	},
+	rookieScale: {
+		stringify: (value:number[][]) =>{
+			var val =  "{" + String(value[0]) + "};{"+  String(value[1]) + "}"
+			console.log(value)
+			console.log(val)
+			return val
+		},
+		parse: (value: string) => {
+			console.log(value)
+			var values = value.split(";")
+			if(values.length != 2 || !value.match("\{.*\}\s*;\s*\{.*\}")){
+				throw new Error("Must have two array with brackets separated by a ;. i.e. {1000,800};{1000;750}");
+			}
+			
+			var val0 = values[0]	
+			var val1 = values[1]
+			
+			var scale0 = (val0.match(/\{(.*?)\}/) || ["",""])[1].split(",").map((x,i) => {
+				if(i==0 && x==""){
+					throw new Error("First round scale must have at least one number")
+				}
+				var num = Number(x);
+				if (Number.isNaN(num)){
+					throw new Error(x + " is not a number. Rookie scales must be composed of numbers")
+				}else{
+					return num;
+				}
+			});
+			var scale1 = (val1.match(/\{(.*?)\}/) || ["",""])[1].split(",").map((x,i) => {
+				if(i==0 && x==""){
+					throw new Error("Second round scale must have at least one number")
+				}
+				var num = Number(x);
+				if (Number.isNaN(num)){
+					throw new Error(x + " is not a number. Rookie scales must be composed of numbers")
+				}else{
+					return num;
+				}
+			});
+
+			if(scale0.length<1){
+				throw new Error("Rookie scale of first round must have at least one value")				
+			}
+			if(scale1.length<1){
+				throw new Error("Rookie scale of second round must have at least one value")				
+			}
+								
+			return [scale0,scale1];
+		}
+	},
 	string: {},
 	jsonString: {
 		stringify: (value: any) => JSON.stringify(value),
@@ -1038,7 +1088,7 @@ const Input = ({
 	id: string;
 	maxWidth?: true;
 	name: string;
-	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => void;
+	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => void;
 	type: FieldType;
 	value: string;
 	values?: Values;
@@ -1077,6 +1127,11 @@ const Input = ({
 				<label className="custom-control-label" htmlFor={id}></label>
 			</div>
 		);
+	} else if (type === "rookieScale"){
+		inputElement = (
+			<textarea rows={3} value={value} onChange={onChange} style={{width: "90%"}} disabled={disabled}/>
+		);
+
 	} else if (type === "rangePercent") {
 		inputElement = (
 			<div className="d-flex" style={inputStyle}>
@@ -1095,7 +1150,8 @@ const Input = ({
 				</div>
 			</div>
 		);
-	} else if (values) {
+
+		} else if (values) {
 		if (type === "floatValuesOrCustom") {
 			const parsed = JSON.parse(value);
 			const selectValue =
@@ -1203,17 +1259,17 @@ const Option = ({
 	godModeRequired?: "always" | "existingLeagueOnly";
 	newLeague?: boolean;
 	maxWidth?: true;
-	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => void;
+	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => void;
 	type: FieldType;
 	value: string;
 	values?: Values;
 	customForm?: ReactNode;
 }) => {
 	const [showDescriptionLong, setShowDescriptionLong] = useState(false);
-
+	
 	return (
 		<>
-			<div className="d-flex align-items-center" style={{ minHeight: 33 }}>
+			<div className="d-flex align-items-center" style={type!="rookieScale" ? { minHeight: 33  } : { minHeight: 33  ,flexDirection:"column"}}>
 				<div className="mr-auto text-nowrap">
 					<label
 						className="mb-0"
@@ -1413,11 +1469,14 @@ const SettingsForm = ({
 	};
 
 	const handleChange = (name: Key, type: FieldType) => (
-		event: ChangeEvent<HTMLInputElement | HTMLSelectElement>,
+		event: ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>,
 	) => {
 		let value: string;
 		if (type === "bool") {
 			value = String((event.target as any).checked);
+		}else if (type === "rookieScale") {
+			value = event.target.value;
+			console.log(state)
 		} else if (type === "floatValuesOrCustom") {
 			if (event.target.value === "custom") {
 				value = JSON.stringify([true, JSON.parse(state[name])[1]]);
diff --git a/src/ui/views/Settings/settings.tsx b/src/ui/views/Settings/settings.tsx
index 17cd43c0ab..8b56b782a6 100644
--- a/src/ui/views/Settings/settings.tsx
+++ b/src/ui/views/Settings/settings.tsx
@@ -335,7 +335,7 @@ export const settings: {
 		),
 		type: "string",
 		values: [
-			{ key: "nba2019", value: "NBA 2019" },
+			{ key: "nba2019", value: "NBA 2019" },  
 			{ key: "nba1994", value: "NBA 1994" },
 			{ key: "nba1990", value: "NBA 1990" },
 			{ key: "nhl2017", value: "NHL 2017" },
@@ -502,6 +502,84 @@ export const settings: {
 			}
 		},
 	},
+	{
+		category: "Contracts",
+		key: "rookieScale",
+		name: "Rookie Scale",
+		godModeRequired: "always",
+		type: "bool",
+		description: (
+			<p>
+				If enabled the rookies have to be signed to a fixed salary, determined by the Rookie Scales setting
+			</p>
+		)
+	},
+	{
+		category: "Contracts",
+		key: "automaticRookieScale",
+		name: "Automatic Rookie Scale",
+		godModeRequired: "always",
+		type: "bool",
+		description: (
+			<p>
+				If enabled the rookie scale is fixed for the max and mins contracts
+			</p>
+		)
+	},
+	{
+		category: "Contracts",
+		key: "rookieScaleMaxContract",
+		name: "Rookie Scale Max Contract ratio",
+		godModeRequired: "always",
+		type: "float",
+		descriptionLong: (
+			<p>
+				if Automatic Rookie Scale is enabled this determines the maximum contract of the rookie scale as a fraction of the max contract.
+			</p>
+		)
+	},
+	{
+		category: "Contracts",
+		maxWidth: true,
+		key: "rookieScales",
+		name: "Rookie Scales",
+		godModeRequired: "always",
+		type: "rookieScale",
+		descriptionLong: (
+			<>
+				<p>
+					If the Hard Cap is enabled these values establish the rookie salary for each position in the draft. 
+					</p>
+					<p>
+					The first scale belongs to the first round (ordered by position), the second to the second and following rounds. It does not matter if you put less 
+					values than the number of teams, the scale will be filled with the last value, as long as you have one value.
+
+					<a
+						href="https://en.wikipedia.org/wiki/NBA_salary_cap#Rookie_scale_salary"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						Rookie scale salary
+					</a>
+					</p>
+				
+			</>
+		),
+		validator: (value, output) => {
+			console.log(value)
+			if(value[0])
+			if(value.length<2){
+				if (value < 1) {
+					throw new Error("Rookie scale must have two ");
+				} else if(value[0].length<1){
+					throw new Error("Rookie scale of first round must have at least one value")
+				} else if(value[1].length<1){
+					throw new Error("Rookie scale of second round must have at least one value")
+				}
+			}
+
+		},
+	},
 	{
 		category: "Finances",
 		key: "hardCap",
diff --git a/src/ui/views/Settings/types.ts b/src/ui/views/Settings/types.ts
index ce2ad9ee6c..0fb195fae4 100644
--- a/src/ui/views/Settings/types.ts
+++ b/src/ui/views/Settings/types.ts
@@ -35,6 +35,10 @@ export type Key =
 	| "foulsUntilBonus"
 	| "threePointers"
 	| "pace"
+	| "automaticRookieScale"
+	| "rookieScaleMaxContract"
+	| "rookieScale"
+	| "rookieScales"
 	| "threePointTendencyFactor"
 	| "threePointAccuracyFactor"
 	| "twoPointAccuracyFactor"
@@ -100,7 +104,8 @@ export type FieldType =
 	| "jsonString"
 	| "string"
 	| "rangePercent"
-	| "floatValuesOrCustom";
+	| "floatValuesOrCustom"
+	| "rookieScale";
 
 export type Decoration = "currency" | "percent";
 
diff --git a/src/worker/core/draft/getRookieSalaries.ts b/src/worker/core/draft/getRookieSalaries.ts
index 0cef5e0bbe..43c1bdfc68 100644
--- a/src/worker/core/draft/getRookieSalaries.ts
+++ b/src/worker/core/draft/getRookieSalaries.ts
@@ -12,7 +12,8 @@ import { g, helpers } from "../../util";
 const getRookieSalaries = (): number[] => {
 	const numActiveTeams = g.get("numActiveTeams");
 	const numDraftRounds = g.get("numDraftRounds");
-
+	const autoRookieScale = g.get("automaticRookieScale");
+	const rookieScaleMaxContract = g.get("rookieScaleMaxContract");
 	if (numActiveTeams === 0 || numDraftRounds === 0) {
 		return [];
 	}
@@ -38,16 +39,14 @@ const getRookieSalaries = (): number[] => {
 	}
 
 	// Default for first round
-	const firstRoundRookieSalaries = g.get("rookieScale")[0];
+	const firstRoundRookieSalaries = g.get("rookieScales")[0]
 
 	// Default for all subsequent rounds
-	const otherRoundRookieSalaries = g.get("rookieScale")[1];
-
+	const otherRoundRookieSalaries = g.get("rookieScales")[1]
+ 
 	while (numActiveTeams > firstRoundRookieSalaries.length) {
 		//add first round contracts on to end of first round
-		firstRoundRookieSalaries.push(
-			firstRoundRookieSalaries[firstRoundRookieSalaries.length - 1],
-		);
+		firstRoundRookieSalaries.push(firstRoundRookieSalaries[firstRoundRookieSalaries.length-1]);
 	}
 
 	while (numActiveTeams < firstRoundRookieSalaries.length) {
@@ -60,11 +59,7 @@ const getRookieSalaries = (): number[] => {
 		otherRoundRookieSalaries.length
 	) {
 		// Add min contracts on to end
-		otherRoundRookieSalaries.push(
-			otherRoundRookieSalaries[
-				otherRoundRookieSalaries[otherRoundRookieSalaries.length - 1]
-			],
-		);
+		otherRoundRookieSalaries.push(otherRoundRookieSalaries[otherRoundRookieSalaries.length-1]);
 	}
 
 	while (
@@ -78,17 +73,11 @@ const getRookieSalaries = (): number[] => {
 	const rookieSalaries = firstRoundRookieSalaries.concat(
 		otherRoundRookieSalaries,
 	);
-
-	if (minContract !== 500 || maxContract !== 20000) {
+	
+	const maxContractScale = rookieSalaries[0]
+	if (minContract !== 500 || maxContract !== 20000  && autoRookieScale) {
 		for (let i = 0; i < rookieSalaries.length; i++) {
-			// Subtract min
-			rookieSalaries[i] -= 500;
-
-			// Scale so max will be 1/4 the max contract
-			rookieSalaries[i] *= (0.25 * maxContract - minContract) / 4500;
-
-			// Add min back
-			rookieSalaries[i] += minContract;
+			rookieSalaries[i] = (rookieSalaries[i]/maxContractScale)*(rookieScaleMaxContract * maxContract - minContract) + minContract;
 			rookieSalaries[i] = helpers.roundContract(rookieSalaries[i]);
 
 			rookieSalaries[i] = helpers.bound(
@@ -98,6 +87,7 @@ const getRookieSalaries = (): number[] => {
 			);
 		}
 	}
+	console.log(rookieSalaries)
 
 	return rookieSalaries;
 };
diff --git a/src/worker/core/draft/selectPlayer.ts b/src/worker/core/draft/selectPlayer.ts
index 2efcf4b6d7..57a7592d7e 100644
--- a/src/worker/core/draft/selectPlayer.ts
+++ b/src/worker/core/draft/selectPlayer.ts
@@ -69,7 +69,7 @@ const selectPlayer = async (dp: DraftPick, pid: number) => {
 
 	// Contract
 	if (!fantasyOrExpansionDraft) {
-		if (g.get("hardCap")) {
+		if (g.get("rookieScale") === false) {
 			// Make it an expiring contract, so player immediately becomes a free agent
 			player.setContract(
 				p,
@@ -81,7 +81,7 @@ const selectPlayer = async (dp: DraftPick, pid: number) => {
 			);
 		} else {
 			const rookieSalaries = getRookieSalaries();
-			const i = dp.pick - 1 + g.get("numActiveTeams") * (dp.round - 1);
+			const i = dp.pick - 1 + g.get("numActiveTeams") * (dp.round - 1);	
 
 			let years = g.get("rookieContractLengths")[dp.round - 1];
 			if (years === undefined) {
diff --git a/src/worker/core/league/createGameAttributes.ts b/src/worker/core/league/createGameAttributes.ts
index 79fdf4ce70..7cb44b3170 100644
--- a/src/worker/core/league/createGameAttributes.ts
+++ b/src/worker/core/league/createGameAttributes.ts
@@ -44,6 +44,74 @@ const createGameAttributes = ({
 			name: t.name,
 			region: t.region,
 		})),
+		rookieScales:[[
+			9100,
+			8190,
+			7280,
+			6370,
+			5460,
+			5000,
+			4540,
+			4090,
+			3630,
+			3450,
+			3270,
+			3090,
+			2900,
+			2720,
+			2540,
+			2360,
+			2180,
+			1990,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810],
+			[
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900
+		  ]
+
+		],
+		rookieScale: true,
+		automaticRookieScale: true,
+		rookieScaleMaxContract: 0.25,
 		gracePeriodEnd: startingSeason + 2, // Can't get fired for the first two seasons
 		numTeams: teamInfos.length,
 		numActiveTeams: teamInfos.filter(t => !t.disabled).length,
diff --git a/src/worker/db/connectLeague.ts b/src/worker/db/connectLeague.ts
index 8797267893..d0462b2a32 100644
--- a/src/worker/db/connectLeague.ts
+++ b/src/worker/db/connectLeague.ts
@@ -1005,6 +1005,90 @@ const migrate = ({
 				};
 			};
 		}
+		if (oldVersion <= 43) {
+			const tx = unwrap(transaction);
+			const rookieScales = [[
+				9100,
+				8190,
+				7280,
+				6370,
+				5460,
+				5000,
+				4540,
+				4090,
+				3630,
+				3450,
+				3270,
+				3090,
+				2900,
+				2720,
+				2540,
+				2360,
+				2180,
+				1990,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810],
+				[
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900
+			  ]
+	
+			];
+			tx.objectStore("gameAttributes").put({
+				key: "rookieScales",
+				value: rookieScales,
+			});
+			tx.objectStore("gameAttributes").put({
+				key: "rookieScale",
+				value: true,
+			});
+			tx.objectStore("gameAttributes").put({
+				key: "automaticRookieScale",
+				value: true,
+			});
+			tx.objectStore("gameAttributes").put({
+				key: "rookieScaleMaxContract",
+				value: 0.25,
+			});
+		}
 	}
 
 	// New ones here!
diff --git a/src/worker/views/settings.ts b/src/worker/views/settings.ts
index bccd17ca11..cf7ac5d938 100644
--- a/src/worker/views/settings.ts
+++ b/src/worker/views/settings.ts
@@ -144,6 +144,10 @@ const updateSettings = async (inputs: unknown, updateEvents: UpdateEvents) => {
 			stealFactor: g.get("stealFactor"),
 			turnoverFactor: g.get("turnoverFactor"),
 			orbFactor: g.get("orbFactor"),
+			automaticRookieScale:g.get("automaticRookieScale"),
+			rookieScale: g.get("rookieScale"),
+			rookieScaleMaxContract: g.get("rookieScaleMaxContract"),
+			rookieScales: g.get("rookieScales"),
 			challengeNoDraftPicks: g.get("challengeNoDraftPicks"),
 			challengeNoFreeAgents: g.get("challengeNoFreeAgents"),
 			challengeNoTrades: g.get("challengeNoTrades"),

From 3977ee5829fadb4173e5f47b57a43faef15d37c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Thu, 15 Apr 2021 10:28:49 +0200
Subject: [PATCH 3/7] Revert "RookieScale applied"

This reverts commit 46f53060ccccf2d4397bf623bcb96719c214e880.
---
 src/common/constants.ts                       |  2 +-
 src/common/types.ts                           |  5 +-
 src/ui/views/Settings/SettingsForm.tsx        | 71 ++--------------
 src/ui/views/Settings/settings.tsx            | 80 +-----------------
 src/ui/views/Settings/types.ts                |  7 +-
 src/worker/core/draft/getRookieSalaries.ts    | 34 +++++---
 src/worker/core/draft/selectPlayer.ts         |  4 +-
 .../core/league/createGameAttributes.ts       | 68 ---------------
 src/worker/db/connectLeague.ts                | 84 -------------------
 src/worker/views/settings.ts                  |  4 -
 10 files changed, 34 insertions(+), 325 deletions(-)

diff --git a/src/common/constants.ts b/src/common/constants.ts
index 57ba4d9e86..2dd545ed08 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -21,7 +21,7 @@ const DIFFICULTY = {
 	Insane: 1,
 };
 
-const MAX_SUPPORTED_LEAGUE_VERSION = 44;
+const MAX_SUPPORTED_LEAGUE_VERSION = 43;
 
 const NO_LOTTERY_DRAFT_TYPES: DraftType[] = [
 	"freeAgents",
diff --git a/src/common/types.ts b/src/common/types.ts
index fc27a6ccb6..34340cf9ff 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -357,7 +357,6 @@ export type GameAttributesLeague = {
 	aiTradesFactor: number;
 	allStarGame: number | null;
 	autoDeleteOldBoxScores: boolean;
-	automaticRookieScale: boolean;
 	brotherRate: number;
 	budget: boolean;
 	challengeNoDraftPicks: boolean;
@@ -416,9 +415,7 @@ export type GameAttributesLeague = {
 	numTeams: number;
 	playerMoodTraits: boolean;
 	pointsFormula: string;
-	rookieScale: boolean;
-	rookieScaleMaxContract: number;
-	rookieScales: number[][];
+	rookieScale: number[][];
 	spectator: boolean;
 	otl: boolean;
 	otherTeamsWantToHire: boolean;
diff --git a/src/ui/views/Settings/SettingsForm.tsx b/src/ui/views/Settings/SettingsForm.tsx
index 5f955ecbf9..5b16504a84 100644
--- a/src/ui/views/Settings/SettingsForm.tsx
+++ b/src/ui/views/Settings/SettingsForm.tsx
@@ -904,56 +904,6 @@ const encodeDecodeFunctions = {
 			return parsed;
 		},
 	},
-	rookieScale: {
-		stringify: (value:number[][]) =>{
-			var val =  "{" + String(value[0]) + "};{"+  String(value[1]) + "}"
-			console.log(value)
-			console.log(val)
-			return val
-		},
-		parse: (value: string) => {
-			console.log(value)
-			var values = value.split(";")
-			if(values.length != 2 || !value.match("\{.*\}\s*;\s*\{.*\}")){
-				throw new Error("Must have two array with brackets separated by a ;. i.e. {1000,800};{1000;750}");
-			}
-			
-			var val0 = values[0]	
-			var val1 = values[1]
-			
-			var scale0 = (val0.match(/\{(.*?)\}/) || ["",""])[1].split(",").map((x,i) => {
-				if(i==0 && x==""){
-					throw new Error("First round scale must have at least one number")
-				}
-				var num = Number(x);
-				if (Number.isNaN(num)){
-					throw new Error(x + " is not a number. Rookie scales must be composed of numbers")
-				}else{
-					return num;
-				}
-			});
-			var scale1 = (val1.match(/\{(.*?)\}/) || ["",""])[1].split(",").map((x,i) => {
-				if(i==0 && x==""){
-					throw new Error("Second round scale must have at least one number")
-				}
-				var num = Number(x);
-				if (Number.isNaN(num)){
-					throw new Error(x + " is not a number. Rookie scales must be composed of numbers")
-				}else{
-					return num;
-				}
-			});
-
-			if(scale0.length<1){
-				throw new Error("Rookie scale of first round must have at least one value")				
-			}
-			if(scale1.length<1){
-				throw new Error("Rookie scale of second round must have at least one value")				
-			}
-								
-			return [scale0,scale1];
-		}
-	},
 	string: {},
 	jsonString: {
 		stringify: (value: any) => JSON.stringify(value),
@@ -1088,7 +1038,7 @@ const Input = ({
 	id: string;
 	maxWidth?: true;
 	name: string;
-	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => void;
+	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => void;
 	type: FieldType;
 	value: string;
 	values?: Values;
@@ -1127,11 +1077,6 @@ const Input = ({
 				<label className="custom-control-label" htmlFor={id}></label>
 			</div>
 		);
-	} else if (type === "rookieScale"){
-		inputElement = (
-			<textarea rows={3} value={value} onChange={onChange} style={{width: "90%"}} disabled={disabled}/>
-		);
-
 	} else if (type === "rangePercent") {
 		inputElement = (
 			<div className="d-flex" style={inputStyle}>
@@ -1150,8 +1095,7 @@ const Input = ({
 				</div>
 			</div>
 		);
-
-		} else if (values) {
+	} else if (values) {
 		if (type === "floatValuesOrCustom") {
 			const parsed = JSON.parse(value);
 			const selectValue =
@@ -1259,17 +1203,17 @@ const Option = ({
 	godModeRequired?: "always" | "existingLeagueOnly";
 	newLeague?: boolean;
 	maxWidth?: true;
-	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => void;
+	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => void;
 	type: FieldType;
 	value: string;
 	values?: Values;
 	customForm?: ReactNode;
 }) => {
 	const [showDescriptionLong, setShowDescriptionLong] = useState(false);
-	
+
 	return (
 		<>
-			<div className="d-flex align-items-center" style={type!="rookieScale" ? { minHeight: 33  } : { minHeight: 33  ,flexDirection:"column"}}>
+			<div className="d-flex align-items-center" style={{ minHeight: 33 }}>
 				<div className="mr-auto text-nowrap">
 					<label
 						className="mb-0"
@@ -1469,14 +1413,11 @@ const SettingsForm = ({
 	};
 
 	const handleChange = (name: Key, type: FieldType) => (
-		event: ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>,
+		event: ChangeEvent<HTMLInputElement | HTMLSelectElement>,
 	) => {
 		let value: string;
 		if (type === "bool") {
 			value = String((event.target as any).checked);
-		}else if (type === "rookieScale") {
-			value = event.target.value;
-			console.log(state)
 		} else if (type === "floatValuesOrCustom") {
 			if (event.target.value === "custom") {
 				value = JSON.stringify([true, JSON.parse(state[name])[1]]);
diff --git a/src/ui/views/Settings/settings.tsx b/src/ui/views/Settings/settings.tsx
index 8b56b782a6..17cd43c0ab 100644
--- a/src/ui/views/Settings/settings.tsx
+++ b/src/ui/views/Settings/settings.tsx
@@ -335,7 +335,7 @@ export const settings: {
 		),
 		type: "string",
 		values: [
-			{ key: "nba2019", value: "NBA 2019" },  
+			{ key: "nba2019", value: "NBA 2019" },
 			{ key: "nba1994", value: "NBA 1994" },
 			{ key: "nba1990", value: "NBA 1990" },
 			{ key: "nhl2017", value: "NHL 2017" },
@@ -502,84 +502,6 @@ export const settings: {
 			}
 		},
 	},
-	{
-		category: "Contracts",
-		key: "rookieScale",
-		name: "Rookie Scale",
-		godModeRequired: "always",
-		type: "bool",
-		description: (
-			<p>
-				If enabled the rookies have to be signed to a fixed salary, determined by the Rookie Scales setting
-			</p>
-		)
-	},
-	{
-		category: "Contracts",
-		key: "automaticRookieScale",
-		name: "Automatic Rookie Scale",
-		godModeRequired: "always",
-		type: "bool",
-		description: (
-			<p>
-				If enabled the rookie scale is fixed for the max and mins contracts
-			</p>
-		)
-	},
-	{
-		category: "Contracts",
-		key: "rookieScaleMaxContract",
-		name: "Rookie Scale Max Contract ratio",
-		godModeRequired: "always",
-		type: "float",
-		descriptionLong: (
-			<p>
-				if Automatic Rookie Scale is enabled this determines the maximum contract of the rookie scale as a fraction of the max contract.
-			</p>
-		)
-	},
-	{
-		category: "Contracts",
-		maxWidth: true,
-		key: "rookieScales",
-		name: "Rookie Scales",
-		godModeRequired: "always",
-		type: "rookieScale",
-		descriptionLong: (
-			<>
-				<p>
-					If the Hard Cap is enabled these values establish the rookie salary for each position in the draft. 
-					</p>
-					<p>
-					The first scale belongs to the first round (ordered by position), the second to the second and following rounds. It does not matter if you put less 
-					values than the number of teams, the scale will be filled with the last value, as long as you have one value.
-
-					<a
-						href="https://en.wikipedia.org/wiki/NBA_salary_cap#Rookie_scale_salary"
-						target="_blank"
-						rel="noopener noreferrer"
-					>
-						Rookie scale salary
-					</a>
-					</p>
-				
-			</>
-		),
-		validator: (value, output) => {
-			console.log(value)
-			if(value[0])
-			if(value.length<2){
-				if (value < 1) {
-					throw new Error("Rookie scale must have two ");
-				} else if(value[0].length<1){
-					throw new Error("Rookie scale of first round must have at least one value")
-				} else if(value[1].length<1){
-					throw new Error("Rookie scale of second round must have at least one value")
-				}
-			}
-
-		},
-	},
 	{
 		category: "Finances",
 		key: "hardCap",
diff --git a/src/ui/views/Settings/types.ts b/src/ui/views/Settings/types.ts
index 0fb195fae4..ce2ad9ee6c 100644
--- a/src/ui/views/Settings/types.ts
+++ b/src/ui/views/Settings/types.ts
@@ -35,10 +35,6 @@ export type Key =
 	| "foulsUntilBonus"
 	| "threePointers"
 	| "pace"
-	| "automaticRookieScale"
-	| "rookieScaleMaxContract"
-	| "rookieScale"
-	| "rookieScales"
 	| "threePointTendencyFactor"
 	| "threePointAccuracyFactor"
 	| "twoPointAccuracyFactor"
@@ -104,8 +100,7 @@ export type FieldType =
 	| "jsonString"
 	| "string"
 	| "rangePercent"
-	| "floatValuesOrCustom"
-	| "rookieScale";
+	| "floatValuesOrCustom";
 
 export type Decoration = "currency" | "percent";
 
diff --git a/src/worker/core/draft/getRookieSalaries.ts b/src/worker/core/draft/getRookieSalaries.ts
index 43c1bdfc68..0cef5e0bbe 100644
--- a/src/worker/core/draft/getRookieSalaries.ts
+++ b/src/worker/core/draft/getRookieSalaries.ts
@@ -12,8 +12,7 @@ import { g, helpers } from "../../util";
 const getRookieSalaries = (): number[] => {
 	const numActiveTeams = g.get("numActiveTeams");
 	const numDraftRounds = g.get("numDraftRounds");
-	const autoRookieScale = g.get("automaticRookieScale");
-	const rookieScaleMaxContract = g.get("rookieScaleMaxContract");
+
 	if (numActiveTeams === 0 || numDraftRounds === 0) {
 		return [];
 	}
@@ -39,14 +38,16 @@ const getRookieSalaries = (): number[] => {
 	}
 
 	// Default for first round
-	const firstRoundRookieSalaries = g.get("rookieScales")[0]
+	const firstRoundRookieSalaries = g.get("rookieScale")[0];
 
 	// Default for all subsequent rounds
-	const otherRoundRookieSalaries = g.get("rookieScales")[1]
- 
+	const otherRoundRookieSalaries = g.get("rookieScale")[1];
+
 	while (numActiveTeams > firstRoundRookieSalaries.length) {
 		//add first round contracts on to end of first round
-		firstRoundRookieSalaries.push(firstRoundRookieSalaries[firstRoundRookieSalaries.length-1]);
+		firstRoundRookieSalaries.push(
+			firstRoundRookieSalaries[firstRoundRookieSalaries.length - 1],
+		);
 	}
 
 	while (numActiveTeams < firstRoundRookieSalaries.length) {
@@ -59,7 +60,11 @@ const getRookieSalaries = (): number[] => {
 		otherRoundRookieSalaries.length
 	) {
 		// Add min contracts on to end
-		otherRoundRookieSalaries.push(otherRoundRookieSalaries[otherRoundRookieSalaries.length-1]);
+		otherRoundRookieSalaries.push(
+			otherRoundRookieSalaries[
+				otherRoundRookieSalaries[otherRoundRookieSalaries.length - 1]
+			],
+		);
 	}
 
 	while (
@@ -73,11 +78,17 @@ const getRookieSalaries = (): number[] => {
 	const rookieSalaries = firstRoundRookieSalaries.concat(
 		otherRoundRookieSalaries,
 	);
-	
-	const maxContractScale = rookieSalaries[0]
-	if (minContract !== 500 || maxContract !== 20000  && autoRookieScale) {
+
+	if (minContract !== 500 || maxContract !== 20000) {
 		for (let i = 0; i < rookieSalaries.length; i++) {
-			rookieSalaries[i] = (rookieSalaries[i]/maxContractScale)*(rookieScaleMaxContract * maxContract - minContract) + minContract;
+			// Subtract min
+			rookieSalaries[i] -= 500;
+
+			// Scale so max will be 1/4 the max contract
+			rookieSalaries[i] *= (0.25 * maxContract - minContract) / 4500;
+
+			// Add min back
+			rookieSalaries[i] += minContract;
 			rookieSalaries[i] = helpers.roundContract(rookieSalaries[i]);
 
 			rookieSalaries[i] = helpers.bound(
@@ -87,7 +98,6 @@ const getRookieSalaries = (): number[] => {
 			);
 		}
 	}
-	console.log(rookieSalaries)
 
 	return rookieSalaries;
 };
diff --git a/src/worker/core/draft/selectPlayer.ts b/src/worker/core/draft/selectPlayer.ts
index 57a7592d7e..2efcf4b6d7 100644
--- a/src/worker/core/draft/selectPlayer.ts
+++ b/src/worker/core/draft/selectPlayer.ts
@@ -69,7 +69,7 @@ const selectPlayer = async (dp: DraftPick, pid: number) => {
 
 	// Contract
 	if (!fantasyOrExpansionDraft) {
-		if (g.get("rookieScale") === false) {
+		if (g.get("hardCap")) {
 			// Make it an expiring contract, so player immediately becomes a free agent
 			player.setContract(
 				p,
@@ -81,7 +81,7 @@ const selectPlayer = async (dp: DraftPick, pid: number) => {
 			);
 		} else {
 			const rookieSalaries = getRookieSalaries();
-			const i = dp.pick - 1 + g.get("numActiveTeams") * (dp.round - 1);	
+			const i = dp.pick - 1 + g.get("numActiveTeams") * (dp.round - 1);
 
 			let years = g.get("rookieContractLengths")[dp.round - 1];
 			if (years === undefined) {
diff --git a/src/worker/core/league/createGameAttributes.ts b/src/worker/core/league/createGameAttributes.ts
index 7cb44b3170..79fdf4ce70 100644
--- a/src/worker/core/league/createGameAttributes.ts
+++ b/src/worker/core/league/createGameAttributes.ts
@@ -44,74 +44,6 @@ const createGameAttributes = ({
 			name: t.name,
 			region: t.region,
 		})),
-		rookieScales:[[
-			9100,
-			8190,
-			7280,
-			6370,
-			5460,
-			5000,
-			4540,
-			4090,
-			3630,
-			3450,
-			3270,
-			3090,
-			2900,
-			2720,
-			2540,
-			2360,
-			2180,
-			1990,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810,
-			1810],
-			[
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900,
-			900
-		  ]
-
-		],
-		rookieScale: true,
-		automaticRookieScale: true,
-		rookieScaleMaxContract: 0.25,
 		gracePeriodEnd: startingSeason + 2, // Can't get fired for the first two seasons
 		numTeams: teamInfos.length,
 		numActiveTeams: teamInfos.filter(t => !t.disabled).length,
diff --git a/src/worker/db/connectLeague.ts b/src/worker/db/connectLeague.ts
index d0462b2a32..8797267893 100644
--- a/src/worker/db/connectLeague.ts
+++ b/src/worker/db/connectLeague.ts
@@ -1005,90 +1005,6 @@ const migrate = ({
 				};
 			};
 		}
-		if (oldVersion <= 43) {
-			const tx = unwrap(transaction);
-			const rookieScales = [[
-				9100,
-				8190,
-				7280,
-				6370,
-				5460,
-				5000,
-				4540,
-				4090,
-				3630,
-				3450,
-				3270,
-				3090,
-				2900,
-				2720,
-				2540,
-				2360,
-				2180,
-				1990,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810],
-				[
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900
-			  ]
-	
-			];
-			tx.objectStore("gameAttributes").put({
-				key: "rookieScales",
-				value: rookieScales,
-			});
-			tx.objectStore("gameAttributes").put({
-				key: "rookieScale",
-				value: true,
-			});
-			tx.objectStore("gameAttributes").put({
-				key: "automaticRookieScale",
-				value: true,
-			});
-			tx.objectStore("gameAttributes").put({
-				key: "rookieScaleMaxContract",
-				value: 0.25,
-			});
-		}
 	}
 
 	// New ones here!
diff --git a/src/worker/views/settings.ts b/src/worker/views/settings.ts
index cf7ac5d938..bccd17ca11 100644
--- a/src/worker/views/settings.ts
+++ b/src/worker/views/settings.ts
@@ -144,10 +144,6 @@ const updateSettings = async (inputs: unknown, updateEvents: UpdateEvents) => {
 			stealFactor: g.get("stealFactor"),
 			turnoverFactor: g.get("turnoverFactor"),
 			orbFactor: g.get("orbFactor"),
-			automaticRookieScale:g.get("automaticRookieScale"),
-			rookieScale: g.get("rookieScale"),
-			rookieScaleMaxContract: g.get("rookieScaleMaxContract"),
-			rookieScales: g.get("rookieScales"),
 			challengeNoDraftPicks: g.get("challengeNoDraftPicks"),
 			challengeNoFreeAgents: g.get("challengeNoFreeAgents"),
 			challengeNoTrades: g.get("challengeNoTrades"),

From 72cac4715756361481ba33bc8213ed1af3a79422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Thu, 15 Apr 2021 10:34:22 +0200
Subject: [PATCH 4/7] Rookie scale changes applied

Made the changes on my master so I have to workaround to give it its own branch.
---
 src/common/constants.ts                       |  2 +-
 src/common/types.ts                           |  5 +-
 src/ui/views/Settings/SettingsForm.tsx        | 99 ++++++++++++++++++-
 src/ui/views/Settings/settings.tsx            | 82 +++++++++++++++
 src/ui/views/Settings/types.ts                |  7 +-
 src/worker/core/draft/getRookieSalaries.ts    | 26 +++--
 src/worker/core/draft/selectPlayer.ts         |  2 +-
 .../core/league/createGameAttributes.ts       | 69 +++++++++++++
 src/worker/db/connectLeague.ts                | 85 ++++++++++++++++
 src/worker/views/settings.ts                  |  4 +
 10 files changed, 358 insertions(+), 23 deletions(-)

diff --git a/src/common/constants.ts b/src/common/constants.ts
index 2dd545ed08..57ba4d9e86 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -21,7 +21,7 @@ const DIFFICULTY = {
 	Insane: 1,
 };
 
-const MAX_SUPPORTED_LEAGUE_VERSION = 43;
+const MAX_SUPPORTED_LEAGUE_VERSION = 44;
 
 const NO_LOTTERY_DRAFT_TYPES: DraftType[] = [
 	"freeAgents",
diff --git a/src/common/types.ts b/src/common/types.ts
index 34340cf9ff..fc27a6ccb6 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -357,6 +357,7 @@ export type GameAttributesLeague = {
 	aiTradesFactor: number;
 	allStarGame: number | null;
 	autoDeleteOldBoxScores: boolean;
+	automaticRookieScale: boolean;
 	brotherRate: number;
 	budget: boolean;
 	challengeNoDraftPicks: boolean;
@@ -415,7 +416,9 @@ export type GameAttributesLeague = {
 	numTeams: number;
 	playerMoodTraits: boolean;
 	pointsFormula: string;
-	rookieScale: number[][];
+	rookieScale: boolean;
+	rookieScaleMaxContract: number;
+	rookieScales: number[][];
 	spectator: boolean;
 	otl: boolean;
 	otherTeamsWantToHire: boolean;
diff --git a/src/ui/views/Settings/SettingsForm.tsx b/src/ui/views/Settings/SettingsForm.tsx
index 5b16504a84..e339749029 100644
--- a/src/ui/views/Settings/SettingsForm.tsx
+++ b/src/ui/views/Settings/SettingsForm.tsx
@@ -904,6 +904,68 @@ const encodeDecodeFunctions = {
 			return parsed;
 		},
 	},
+	rookieScale: {
+		stringify: (value: number[][]) => {
+			var val = "{" + String(value[0]) + "};{" + String(value[1]) + "}";
+
+			return val;
+		},
+		parse: (value: string) => {
+			var values = value.split(";");
+			if (values.length != 2 || !value.match("{.*}s*;s*{.*}")) {
+				throw new Error(
+					"Must have two array with brackets separated by a ;. i.e. {1000,800};{1000;750}",
+				);
+			}
+
+			var val0 = values[0];
+			var val1 = values[1];
+
+			var scale0 = (val0.match(/\{(.*?)\}/) || ["", ""])[1]
+				.split(",")
+				.map((x, i) => {
+					if (i == 0 && x == "") {
+						throw new Error("First round scale must have at least one number");
+					}
+					var num = Number(x);
+					if (Number.isNaN(num)) {
+						throw new Error(
+							x + " is not a number. Rookie scales must be composed of numbers",
+						);
+					} else {
+						return num;
+					}
+				});
+			var scale1 = (val1.match(/\{(.*?)\}/) || ["", ""])[1]
+				.split(",")
+				.map((x, i) => {
+					if (i == 0 && x == "") {
+						throw new Error("Second round scale must have at least one number");
+					}
+					var num = Number(x);
+					if (Number.isNaN(num)) {
+						throw new Error(
+							x + " is not a number. Rookie scales must be composed of numbers",
+						);
+					} else {
+						return num;
+					}
+				});
+
+			if (scale0.length < 1) {
+				throw new Error(
+					"Rookie scale of first round must have at least one value",
+				);
+			}
+			if (scale1.length < 1) {
+				throw new Error(
+					"Rookie scale of second round must have at least one value",
+				);
+			}
+
+			return [scale0, scale1];
+		},
+	},
 	string: {},
 	jsonString: {
 		stringify: (value: any) => JSON.stringify(value),
@@ -1038,7 +1100,11 @@ const Input = ({
 	id: string;
 	maxWidth?: true;
 	name: string;
-	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => void;
+	onChange: (
+		event: ChangeEvent<
+			HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement
+		>,
+	) => void;
 	type: FieldType;
 	value: string;
 	values?: Values;
@@ -1077,6 +1143,16 @@ const Input = ({
 				<label className="custom-control-label" htmlFor={id}></label>
 			</div>
 		);
+	} else if (type === "rookieScale") {
+		inputElement = (
+			<textarea
+				rows={3}
+				value={value}
+				onChange={onChange}
+				style={{ width: "90%" }}
+				disabled={disabled}
+			/>
+		);
 	} else if (type === "rangePercent") {
 		inputElement = (
 			<div className="d-flex" style={inputStyle}>
@@ -1203,7 +1279,11 @@ const Option = ({
 	godModeRequired?: "always" | "existingLeagueOnly";
 	newLeague?: boolean;
 	maxWidth?: true;
-	onChange: (event: ChangeEvent<HTMLInputElement | HTMLSelectElement>) => void;
+	onChange: (
+		event: ChangeEvent<
+			HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement
+		>,
+	) => void;
 	type: FieldType;
 	value: string;
 	values?: Values;
@@ -1213,7 +1293,14 @@ const Option = ({
 
 	return (
 		<>
-			<div className="d-flex align-items-center" style={{ minHeight: 33 }}>
+			<div
+				className="d-flex align-items-center"
+				style={
+					type != "rookieScale"
+						? { minHeight: 33 }
+						: { minHeight: 33, flexDirection: "column" }
+				}
+			>
 				<div className="mr-auto text-nowrap">
 					<label
 						className="mb-0"
@@ -1413,11 +1500,15 @@ const SettingsForm = ({
 	};
 
 	const handleChange = (name: Key, type: FieldType) => (
-		event: ChangeEvent<HTMLInputElement | HTMLSelectElement>,
+		event: ChangeEvent<
+			HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement
+		>,
 	) => {
 		let value: string;
 		if (type === "bool") {
 			value = String((event.target as any).checked);
+		} else if (type === "rookieScale") {
+			value = event.target.value;
 		} else if (type === "floatValuesOrCustom") {
 			if (event.target.value === "custom") {
 				value = JSON.stringify([true, JSON.parse(state[name])[1]]);
diff --git a/src/ui/views/Settings/settings.tsx b/src/ui/views/Settings/settings.tsx
index 17cd43c0ab..442a42c5ac 100644
--- a/src/ui/views/Settings/settings.tsx
+++ b/src/ui/views/Settings/settings.tsx
@@ -502,6 +502,88 @@ export const settings: {
 			}
 		},
 	},
+	{
+		category: "Contracts",
+		key: "rookieScale",
+		name: "Rookie Scale",
+		godModeRequired: "always",
+		type: "bool",
+		description: (
+			<p>
+				If enabled the rookies have to be signed to a fixed salary, determined
+				by the Rookie Scales setting
+			</p>
+		),
+	},
+	{
+		category: "Contracts",
+		key: "automaticRookieScale",
+		name: "Automatic Rookie Scale",
+		godModeRequired: "always",
+		type: "bool",
+		description: (
+			<p>If enabled the rookie scale is fixed for the max and mins contracts</p>
+		),
+	},
+	{
+		category: "Contracts",
+		key: "rookieScaleMaxContract",
+		name: "Rookie Scale Max Contract ratio",
+		godModeRequired: "always",
+		type: "float",
+		descriptionLong: (
+			<p>
+				if Automatic Rookie Scale is enabled this determines the maximum
+				contract of the rookie scale as a fraction of the max contract.
+			</p>
+		),
+	},
+	{
+		category: "Contracts",
+		maxWidth: true,
+		key: "rookieScales",
+		name: "Rookie Scales",
+		godModeRequired: "always",
+		type: "rookieScale",
+		descriptionLong: (
+			<>
+				<p>
+					If the Hard Cap is enabled these values establish the rookie salary
+					for each position in the draft.
+				</p>
+				<p>
+					The first scale belongs to the first round (ordered by position), the
+					second to the second and following rounds. It does not matter if you
+					put less values than the number of teams, the scale will be filled
+					with the last value, as long as you have one value.
+					<a
+						href="https://en.wikipedia.org/wiki/NBA_salary_cap#Rookie_scale_salary"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						Rookie scale salary
+					</a>
+				</p>
+			</>
+		),
+		validator: (value, output) => {
+			console.log(value);
+			if (value[0])
+				if (value.length < 2) {
+					if (value < 1) {
+						throw new Error("Rookie scale must have two ");
+					} else if (value[0].length < 1) {
+						throw new Error(
+							"Rookie scale of first round must have at least one value",
+						);
+					} else if (value[1].length < 1) {
+						throw new Error(
+							"Rookie scale of second round must have at least one value",
+						);
+					}
+				}
+		},
+	},
 	{
 		category: "Finances",
 		key: "hardCap",
diff --git a/src/ui/views/Settings/types.ts b/src/ui/views/Settings/types.ts
index ce2ad9ee6c..0fb195fae4 100644
--- a/src/ui/views/Settings/types.ts
+++ b/src/ui/views/Settings/types.ts
@@ -35,6 +35,10 @@ export type Key =
 	| "foulsUntilBonus"
 	| "threePointers"
 	| "pace"
+	| "automaticRookieScale"
+	| "rookieScaleMaxContract"
+	| "rookieScale"
+	| "rookieScales"
 	| "threePointTendencyFactor"
 	| "threePointAccuracyFactor"
 	| "twoPointAccuracyFactor"
@@ -100,7 +104,8 @@ export type FieldType =
 	| "jsonString"
 	| "string"
 	| "rangePercent"
-	| "floatValuesOrCustom";
+	| "floatValuesOrCustom"
+	| "rookieScale";
 
 export type Decoration = "currency" | "percent";
 
diff --git a/src/worker/core/draft/getRookieSalaries.ts b/src/worker/core/draft/getRookieSalaries.ts
index 0cef5e0bbe..5d25559c69 100644
--- a/src/worker/core/draft/getRookieSalaries.ts
+++ b/src/worker/core/draft/getRookieSalaries.ts
@@ -12,7 +12,8 @@ import { g, helpers } from "../../util";
 const getRookieSalaries = (): number[] => {
 	const numActiveTeams = g.get("numActiveTeams");
 	const numDraftRounds = g.get("numDraftRounds");
-
+	const autoRookieScale = g.get("automaticRookieScale");
+	const rookieScaleMaxContract = g.get("rookieScaleMaxContract");
 	if (numActiveTeams === 0 || numDraftRounds === 0) {
 		return [];
 	}
@@ -38,10 +39,10 @@ const getRookieSalaries = (): number[] => {
 	}
 
 	// Default for first round
-	const firstRoundRookieSalaries = g.get("rookieScale")[0];
+	const firstRoundRookieSalaries = g.get("rookieScales")[0];
 
 	// Default for all subsequent rounds
-	const otherRoundRookieSalaries = g.get("rookieScale")[1];
+	const otherRoundRookieSalaries = g.get("rookieScales")[1];
 
 	while (numActiveTeams > firstRoundRookieSalaries.length) {
 		//add first round contracts on to end of first round
@@ -61,9 +62,7 @@ const getRookieSalaries = (): number[] => {
 	) {
 		// Add min contracts on to end
 		otherRoundRookieSalaries.push(
-			otherRoundRookieSalaries[
-				otherRoundRookieSalaries[otherRoundRookieSalaries.length - 1]
-			],
+			otherRoundRookieSalaries[otherRoundRookieSalaries.length - 1],
 		);
 	}
 
@@ -79,16 +78,13 @@ const getRookieSalaries = (): number[] => {
 		otherRoundRookieSalaries,
 	);
 
-	if (minContract !== 500 || maxContract !== 20000) {
+	const maxContractScale = rookieSalaries[0];
+	if (minContract !== 500 || (maxContract !== 20000 && autoRookieScale)) {
 		for (let i = 0; i < rookieSalaries.length; i++) {
-			// Subtract min
-			rookieSalaries[i] -= 500;
-
-			// Scale so max will be 1/4 the max contract
-			rookieSalaries[i] *= (0.25 * maxContract - minContract) / 4500;
-
-			// Add min back
-			rookieSalaries[i] += minContract;
+			rookieSalaries[i] =
+				(rookieSalaries[i] / maxContractScale) *
+					(rookieScaleMaxContract * maxContract - minContract) +
+				minContract;
 			rookieSalaries[i] = helpers.roundContract(rookieSalaries[i]);
 
 			rookieSalaries[i] = helpers.bound(
diff --git a/src/worker/core/draft/selectPlayer.ts b/src/worker/core/draft/selectPlayer.ts
index 2efcf4b6d7..5f64b718b6 100644
--- a/src/worker/core/draft/selectPlayer.ts
+++ b/src/worker/core/draft/selectPlayer.ts
@@ -69,7 +69,7 @@ const selectPlayer = async (dp: DraftPick, pid: number) => {
 
 	// Contract
 	if (!fantasyOrExpansionDraft) {
-		if (g.get("hardCap")) {
+		if (g.get("rookieScale") === false) {
 			// Make it an expiring contract, so player immediately becomes a free agent
 			player.setContract(
 				p,
diff --git a/src/worker/core/league/createGameAttributes.ts b/src/worker/core/league/createGameAttributes.ts
index 79fdf4ce70..7ebe8eb7b9 100644
--- a/src/worker/core/league/createGameAttributes.ts
+++ b/src/worker/core/league/createGameAttributes.ts
@@ -44,6 +44,75 @@ const createGameAttributes = ({
 			name: t.name,
 			region: t.region,
 		})),
+		rookieScales: [
+			[
+				9100,
+				8190,
+				7280,
+				6370,
+				5460,
+				5000,
+				4540,
+				4090,
+				3630,
+				3450,
+				3270,
+				3090,
+				2900,
+				2720,
+				2540,
+				2360,
+				2180,
+				1990,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+				1810,
+			],
+			[
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+				900,
+			],
+		],
+		rookieScale: true,
+		automaticRookieScale: true,
+		rookieScaleMaxContract: 0.25,
 		gracePeriodEnd: startingSeason + 2, // Can't get fired for the first two seasons
 		numTeams: teamInfos.length,
 		numActiveTeams: teamInfos.filter(t => !t.disabled).length,
diff --git a/src/worker/db/connectLeague.ts b/src/worker/db/connectLeague.ts
index 8797267893..bb6a488064 100644
--- a/src/worker/db/connectLeague.ts
+++ b/src/worker/db/connectLeague.ts
@@ -1005,6 +1005,91 @@ const migrate = ({
 				};
 			};
 		}
+		if (oldVersion <= 43) {
+			const tx = unwrap(transaction);
+			const rookieScales = [
+				[
+					9100,
+					8190,
+					7280,
+					6370,
+					5460,
+					5000,
+					4540,
+					4090,
+					3630,
+					3450,
+					3270,
+					3090,
+					2900,
+					2720,
+					2540,
+					2360,
+					2180,
+					1990,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+					1810,
+				],
+				[
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+					900,
+				],
+			];
+			tx.objectStore("gameAttributes").put({
+				key: "rookieScales",
+				value: rookieScales,
+			});
+			tx.objectStore("gameAttributes").put({
+				key: "rookieScale",
+				value: true,
+			});
+			tx.objectStore("gameAttributes").put({
+				key: "automaticRookieScale",
+				value: true,
+			});
+			tx.objectStore("gameAttributes").put({
+				key: "rookieScaleMaxContract",
+				value: 0.25,
+			});
+		}
 	}
 
 	// New ones here!
diff --git a/src/worker/views/settings.ts b/src/worker/views/settings.ts
index bccd17ca11..344852e240 100644
--- a/src/worker/views/settings.ts
+++ b/src/worker/views/settings.ts
@@ -144,6 +144,10 @@ const updateSettings = async (inputs: unknown, updateEvents: UpdateEvents) => {
 			stealFactor: g.get("stealFactor"),
 			turnoverFactor: g.get("turnoverFactor"),
 			orbFactor: g.get("orbFactor"),
+			automaticRookieScale: g.get("automaticRookieScale"),
+			rookieScale: g.get("rookieScale"),
+			rookieScaleMaxContract: g.get("rookieScaleMaxContract"),
+			rookieScales: g.get("rookieScales"),
 			challengeNoDraftPicks: g.get("challengeNoDraftPicks"),
 			challengeNoFreeAgents: g.get("challengeNoFreeAgents"),
 			challengeNoTrades: g.get("challengeNoTrades"),

From e740e88ca23fd3eedb1c86e9a9e27aba68b2a750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Fri, 16 Apr 2021 10:29:11 +0200
Subject: [PATCH 5/7] Some errors fixed and error messages changed

---
 src/ui/views/Settings/settings.tsx         |  9 ++++++---
 src/worker/core/draft/getRookieSalaries.ts | 12 +++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/ui/views/Settings/settings.tsx b/src/ui/views/Settings/settings.tsx
index 442a42c5ac..4e105f0fc0 100644
--- a/src/ui/views/Settings/settings.tsx
+++ b/src/ui/views/Settings/settings.tsx
@@ -522,7 +522,10 @@ export const settings: {
 		godModeRequired: "always",
 		type: "bool",
 		description: (
-			<p>If enabled the rookie scale is fixed for the max and mins contracts</p>
+			<p>
+				If enabled the rookie scale is fixed for the max and mins contracts,
+				earning the top pick a fixed percentage of the max contract.
+			</p>
 		),
 	},
 	{
@@ -533,8 +536,8 @@ export const settings: {
 		type: "float",
 		descriptionLong: (
 			<p>
-				if Automatic Rookie Scale is enabled this determines the maximum
-				contract of the rookie scale as a fraction of the max contract.
+				If Automatic Rookie Scale is enabled this determines the maximum
+				contract of the rookie scale as a percentage of the max contract.
 			</p>
 		),
 	},
diff --git a/src/worker/core/draft/getRookieSalaries.ts b/src/worker/core/draft/getRookieSalaries.ts
index 5d25559c69..d688349128 100644
--- a/src/worker/core/draft/getRookieSalaries.ts
+++ b/src/worker/core/draft/getRookieSalaries.ts
@@ -79,12 +79,14 @@ const getRookieSalaries = (): number[] => {
 	);
 
 	const maxContractScale = rookieSalaries[0];
-	if (minContract !== 500 || (maxContract !== 20000 && autoRookieScale)) {
+	if (minContract !== 500 || maxContract !== 20000) {
 		for (let i = 0; i < rookieSalaries.length; i++) {
-			rookieSalaries[i] =
-				(rookieSalaries[i] / maxContractScale) *
-					(rookieScaleMaxContract * maxContract - minContract) +
-				minContract;
+			if (autoRookieScale) {
+				rookieSalaries[i] =
+					(rookieSalaries[i] / maxContractScale) *
+						(rookieScaleMaxContract * maxContract - minContract) +
+					minContract;
+			}
 			rookieSalaries[i] = helpers.roundContract(rookieSalaries[i]);
 
 			rookieSalaries[i] = helpers.bound(

From 1a53316d6f995f4cfd688991cd70301f76f4802e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Fri, 16 Apr 2021 11:15:36 +0200
Subject: [PATCH 6/7] Default values changed for football

---
 src/ui/views/Settings/SettingsForm.tsx        |  2 +-
 .../core/league/createGameAttributes.ts       | 73 +------------------
 src/worker/util/defaultGameAttributes.ts      | 70 ++++++++++++++++++
 3 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/src/ui/views/Settings/SettingsForm.tsx b/src/ui/views/Settings/SettingsForm.tsx
index e339749029..093a8207c7 100644
--- a/src/ui/views/Settings/SettingsForm.tsx
+++ b/src/ui/views/Settings/SettingsForm.tsx
@@ -914,7 +914,7 @@ const encodeDecodeFunctions = {
 			var values = value.split(";");
 			if (values.length != 2 || !value.match("{.*}s*;s*{.*}")) {
 				throw new Error(
-					"Must have two array with brackets separated by a ;. i.e. {1000,800};{1000;750}",
+					"Must have two array with brackets separated by a ;. i.e. {1000,800};{1000,750}",
 				);
 			}
 
diff --git a/src/worker/core/league/createGameAttributes.ts b/src/worker/core/league/createGameAttributes.ts
index 7ebe8eb7b9..2a2a71dc1e 100644
--- a/src/worker/core/league/createGameAttributes.ts
+++ b/src/worker/core/league/createGameAttributes.ts
@@ -44,75 +44,10 @@ const createGameAttributes = ({
 			name: t.name,
 			region: t.region,
 		})),
-		rookieScales: [
-			[
-				9100,
-				8190,
-				7280,
-				6370,
-				5460,
-				5000,
-				4540,
-				4090,
-				3630,
-				3450,
-				3270,
-				3090,
-				2900,
-				2720,
-				2540,
-				2360,
-				2180,
-				1990,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-				1810,
-			],
-			[
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-				900,
-			],
-		],
-		rookieScale: true,
-		automaticRookieScale: true,
-		rookieScaleMaxContract: 0.25,
+		rookieScales: defaultGameAttributes.rookieScales,
+		rookieScale: defaultGameAttributes.rookieScale,
+		automaticRookieScale: defaultGameAttributes.automaticRookieScale,
+		rookieScaleMaxContract: defaultGameAttributes.rookieScaleMaxContract,
 		gracePeriodEnd: startingSeason + 2, // Can't get fired for the first two seasons
 		numTeams: teamInfos.length,
 		numActiveTeams: teamInfos.filter(t => !t.disabled).length,
diff --git a/src/worker/util/defaultGameAttributes.ts b/src/worker/util/defaultGameAttributes.ts
index fe1e7f526d..2e1e7ed558 100644
--- a/src/worker/util/defaultGameAttributes.ts
+++ b/src/worker/util/defaultGameAttributes.ts
@@ -53,6 +53,75 @@ const defaultGameAttributes: GameAttributesLeagueWithHistory = {
 	sonRate: 0.02,
 	brotherRate: 0.02,
 	forceRetireAge: 0,
+	rookieScale: true,
+	rookieScaleMaxContract: 0.25,
+	automaticRookieScale: true,
+	rookieScales: [
+		[
+			9100,
+			8190,
+			7280,
+			6370,
+			5460,
+			5000,
+			4540,
+			4090,
+			3630,
+			3450,
+			3270,
+			3090,
+			2900,
+			2720,
+			2540,
+			2360,
+			2180,
+			1990,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+			1810,
+		],
+		[
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+			900,
+		],
+	],
 
 	easyDifficultyInPast: false,
 	hardCap: false,
@@ -152,6 +221,7 @@ export const footballOverrides: Partial<GameAttributesLeagueWithHistory> =
 				numPlayoffByes: wrap(2),
 				stopOnInjuryGames: 1,
 				hardCap: true,
+				rookieScale: false,
 				ties: wrap(true),
 				draftType: "noLottery",
 				numDraftRounds: 7,

From b44915f4447e5902132173403e6097927e2c2069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Mor=C3=A1n?= <luis.teiichi@gmail.com>
Date: Mon, 19 Apr 2021 19:02:07 +0200
Subject: [PATCH 7/7] Football draft signings are optional

---
 src/common/types.ts                           |  1 +
 src/ui/views/NegotiationList.tsx              | 21 ++++++++++--
 src/worker/core/draft/selectPlayer.ts         |  2 +-
 .../core/phase/newPhaseResignPlayers.ts       | 25 ++++++++++++---
 src/worker/db/getCopies/playersPlus.ts        |  8 +++++
 src/worker/views/negotiation.ts               | 32 +++++++++++++++++--
 src/worker/views/negotiationList.ts           | 13 ++++++++
 7 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/src/common/types.ts b/src/common/types.ts
index fc27a6ccb6..0dc30f59a1 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -1010,6 +1010,7 @@ export type PlayersPlusOptions = {
 	numGamesRemaining?: number;
 	statType?: PlayerStatType;
 	mergeStats?: boolean;
+	draft?: boolean;
 };
 
 export type Race = "asian" | "black" | "brown" | "white";
diff --git a/src/ui/views/NegotiationList.tsx b/src/ui/views/NegotiationList.tsx
index 16de8320ae..d8b4bc768a 100644
--- a/src/ui/views/NegotiationList.tsx
+++ b/src/ui/views/NegotiationList.tsx
@@ -23,6 +23,10 @@ const NegotiationList = ({
 	stats,
 	sumContracts,
 	userPlayers,
+	rookieScale,
+	season,
+	numActiveTeams,
+	yearsRookieContracts,
 }: View<"negotiationList">) => {
 	const title = hardCap ? "Rookies and Expiring Contracts" : "Re-sign Players";
 
@@ -45,8 +49,8 @@ const NegotiationList = ({
 		"Exp",
 		"Negotiate",
 	);
-
 	const rows = players.map(p => {
+		const isRookie = rookieScale != undefined && p.draft.year === season;
 		return {
 			key: p.pid,
 			data: [
@@ -74,8 +78,19 @@ const NegotiationList = ({
 					maxWidth: true,
 					p,
 				}),
-				helpers.formatCurrency(p.mood.user.contractAmount / 1000, "M"),
-				p.contract.exp,
+				isRookie && rookieScale != undefined
+					? helpers.formatCurrency(
+							rookieScale[
+								p.draft.pick - 1 + numActiveTeams * (p.draft.round - 1)
+							] / 1000,
+							"M",
+					  )
+					: helpers.formatCurrency(p.mood.user.contractAmount / 1000, "M"),
+				isRookie && rookieScale != undefined
+					? yearsRookieContracts[
+							Math.min(yearsRookieContracts.length - 1, p.draft.round - 1)
+					  ] + season
+					: p.contract.exp,
 				{
 					value: (
 						// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20544
diff --git a/src/worker/core/draft/selectPlayer.ts b/src/worker/core/draft/selectPlayer.ts
index 5f64b718b6..8c2d2489d4 100644
--- a/src/worker/core/draft/selectPlayer.ts
+++ b/src/worker/core/draft/selectPlayer.ts
@@ -69,7 +69,7 @@ const selectPlayer = async (dp: DraftPick, pid: number) => {
 
 	// Contract
 	if (!fantasyOrExpansionDraft) {
-		if (g.get("rookieScale") === false) {
+		if (g.get("rookieScale") === false || process.env.SPORT === "football") {
 			// Make it an expiring contract, so player immediately becomes a free agent
 			player.setContract(
 				p,
diff --git a/src/worker/core/phase/newPhaseResignPlayers.ts b/src/worker/core/phase/newPhaseResignPlayers.ts
index fe7c68c592..efa1dca6dc 100644
--- a/src/worker/core/phase/newPhaseResignPlayers.ts
+++ b/src/worker/core/phase/newPhaseResignPlayers.ts
@@ -11,6 +11,7 @@ import {
 import { idb } from "../../db";
 import { g, helpers, local, logEvent } from "../../util";
 import type { Conditions, PhaseReturn } from "../../../common/types";
+import getRookieSalaries from "../draft/getRookieSalaries";
 
 const newPhaseResignPlayers = async (
 	conditions: Conditions,
@@ -188,12 +189,26 @@ const newPhaseResignPlayers = async (
 				if (draftPick) {
 					// Hockey already has rookie salaries set correctly in normalizeContractDemands
 					if (isSport("football")) {
-						contract.amount /= 2;
-
-						if (contract.amount < g.get("minContract")) {
-							contract.amount = g.get("minContract");
+						if (g.get("rookieScale")) {
+							const dp = p.draft;
+							const i = dp.pick - 1 + g.get("numActiveTeams") * (dp.round - 1);
+
+							let years = g.get("rookieContractLengths")[
+								Math.min(
+									g.get("rookieContractLengths").length - 1,
+									dp.round - 1,
+								)
+							];
+							contract.amount = getRookieSalaries()[i];
+							contract.exp = g.get("season") + years;
 						} else {
-							contract.amount = helpers.roundContract(contract.amount);
+							contract.amount /= 2;
+
+							if (contract.amount < g.get("minContract")) {
+								contract.amount = g.get("minContract");
+							} else {
+								contract.amount = helpers.roundContract(contract.amount);
+							}
 						}
 					}
 
diff --git a/src/worker/db/getCopies/playersPlus.ts b/src/worker/db/getCopies/playersPlus.ts
index 2346f8f368..635b7e2b07 100644
--- a/src/worker/db/getCopies/playersPlus.ts
+++ b/src/worker/db/getCopies/playersPlus.ts
@@ -29,6 +29,7 @@ type PlayersPlusOptionsRequired = {
 	numGamesRemaining: number;
 	statType: PlayerStatType;
 	mergeStats: boolean;
+	draft: boolean;
 };
 
 const processAttrs = (
@@ -667,6 +668,7 @@ const processPlayer = (p: Player, options: PlayersPlusOptionsRequired) => {
 		showNoStats,
 		showRetired,
 		showRookies,
+		draft,
 	} = options;
 
 	const output: any = {};
@@ -712,6 +714,10 @@ const processPlayer = (p: Player, options: PlayersPlusOptionsRequired) => {
 		processAttrs(output, p, options);
 	}
 
+	if (draft) {
+		output.draft = p.draft;
+	}
+
 	return output;
 };
 
@@ -763,6 +769,7 @@ const getCopies = async (
 		numGamesRemaining = 0,
 		statType = "perGame",
 		mergeStats = false,
+		draft = false,
 	}: PlayersPlusOptions,
 ): Promise<PlayerFiltered[]> => {
 	const options: PlayersPlusOptionsRequired = {
@@ -781,6 +788,7 @@ const getCopies = async (
 		numGamesRemaining,
 		statType,
 		mergeStats,
+		draft,
 	};
 
 	return players
diff --git a/src/worker/views/negotiation.ts b/src/worker/views/negotiation.ts
index 60a1fd7d7d..e3785b67ca 100644
--- a/src/worker/views/negotiation.ts
+++ b/src/worker/views/negotiation.ts
@@ -8,6 +8,7 @@ import type {
 	UpdateEvents,
 } from "../../common/types";
 import range from "lodash-es/range";
+import getRookieSalaries from "../core/draft/getRookieSalaries";
 
 const generateContractOptions = (contract: PlayerContract, ovr: number) => {
 	let growthFactor = 0.15;
@@ -133,14 +134,41 @@ const updateNegotiation = async (
 		}
 
 		p.mood = await player.moodInfos(p2);
-
-		const contractOptions = generateContractOptions(
+		let isRookie = undefined;
+		if (process.env.SPORT === "football") {
+			isRookie =
+				g.get("rookieScale") === true &&
+				p2.stats.length === 0 &&
+				p2.draft.year === g.get("season") &&
+				g.get("phase") === 7;
+		}
+		let contractOptions = generateContractOptions(
 			{
 				amount: p.mood.user.contractAmount / 1000,
 				exp: p.contract.exp,
 			},
 			p.ratings.ovr,
 		);
+		if (isRookie === true) {
+			const dp = p2.draft;
+			const rookieSalaries = getRookieSalaries();
+			const i = dp.pick - 1 + g.get("numActiveTeams") * (dp.round - 1);
+
+			let years = g.get("rookieContractLengths")[dp.round - 1];
+			if (years === undefined) {
+				years = g.get("rookieContractLengths")[
+					g.get("rookieContractLengths").length - 1
+				];
+			}
+			contractOptions = [
+				{
+					exp: g.get("season") + years,
+					years: years,
+					amount: rookieSalaries[i] / 1000,
+					smallestAmount: true,
+				},
+			];
+		}
 		if (
 			contractOptions.length === 0 &&
 			g.get("phase") === PHASE.RESIGN_PLAYERS
diff --git a/src/worker/views/negotiationList.ts b/src/worker/views/negotiationList.ts
index 05d453afdc..2876eb8cc7 100644
--- a/src/worker/views/negotiationList.ts
+++ b/src/worker/views/negotiationList.ts
@@ -1,5 +1,6 @@
 import { bySport, PLAYER } from "../../common";
 import { player, team } from "../core";
+import getRookieSalaries from "../core/draft/getRookieSalaries";
 import { idb } from "../db";
 import { g } from "../util";
 
@@ -50,6 +51,7 @@ const updateNegotiationList = async () => {
 		tid: userTid,
 		showNoStats: true,
 		fuzz: true,
+		draft: true,
 	});
 
 	let sumContracts = 0;
@@ -70,6 +72,13 @@ const updateNegotiationList = async () => {
 		showNoStats: true,
 		showRookies: true,
 	});
+	const rookieScale =
+		g.get("rookieScale") && process.env.SPORT === "football"
+			? getRookieSalaries()
+			: undefined;
+	const season = g.get("season");
+	const numActiveTeams = g.get("numActiveTeams");
+	const yearsRookieContracts = g.get("rookieContractLengths");
 
 	return {
 		capSpace,
@@ -83,6 +92,10 @@ const updateNegotiationList = async () => {
 		stats,
 		sumContracts,
 		userPlayers,
+		rookieScale,
+		season,
+		numActiveTeams,
+		yearsRookieContracts,
 	};
 };