Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-26 01:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

jsts corporation

Browse Source
This commit is contained in:
Olivier Gagnon 2021-08-31 03:07:20 -04:00
parent 67be13c6d6
commit 1ae17677c0
18 changed files with 160 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/Corporation/Corporation.tsx
View File

@ -1,47 +1,26 @@
import { AllCorporationStates,
CorporationState } from "./CorporationState";
import { CorporationState } from "./CorporationState";
import {
CorporationUnlockUpgrade,
CorporationUnlockUpgrades } from "./data/CorporationUnlockUpgrades";
import { CorporationUpgrade, CorporationUpgrades } from "./data/CorporationUpgrades";
import { EmployeePositions } from "./EmployeePositions";
import { Industries,
IndustryStartingCosts,
IndustryResearchTrees } from "./IndustryData";
import { IndustryUpgrades } from "./IndustryUpgrades";
import { Material } from "./Material";
import { MaterialSizes } from "./MaterialSizes";
import { Product } from "./Product";
import { ResearchMap } from "./ResearchMap";
import { Warehouse } from "./Warehouse";
import { OfficeSpace } from "./OfficeSpace";
import { CorporationConstants } from "./data/Constants";
import { Industry } from "./Industry";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { showLiterature } from "../Literature/LiteratureHelpers";
import { LiteratureNames } from "../Literature/data/LiteratureNames";
import { CityName } from "../Locations/data/CityNames";
import { IPlayer } from "../PersonObjects/IPlayer";
import { numeralWrapper } from "../ui/numeralFormat";
import { Page, routing } from "../ui/navigationTracking";
import { calculateEffectWithFactors } from "../utils/calculateEffectWithFactors";
import { dialogBoxCreate } from "../../utils/DialogBox";
import { Reviver,
Generic_toJSON,
Generic_fromJSON } from "../../utils/JSONReviver";
import { appendLineBreaks } from "../../utils/uiHelpers/appendLineBreaks";
import { createElement } from "../../utils/uiHelpers/createElement";
import { createPopup } from "../../utils/uiHelpers/createPopup";
import { createPopupCloseButton } from "../../utils/uiHelpers/createPopupCloseButton";
import { formatNumber } from "../../utils/StringHelperFunctions";
import { getRandomInt } from "../../utils/helpers/getRandomInt";
import { isString } from "../../utils/helpers/isString";
import { KEY } from "../../utils/helpers/keyCodes";
import { removeElement } from "../../utils/uiHelpers/removeElement";
import { removeElementById } from "../../utils/uiHelpers/removeElementById";
// UI Related Imports
@ -52,16 +31,6 @@ import { CorporationRouting } from "./ui/Routing";
import Decimal from "decimal.js";
/* Constants */
export const INITIALSHARES = 1e9; //Total number of shares you have at your company
export const SHARESPERPRICEUPDATE = 1e6; //When selling large number of shares, price is dynamically updated for every batch of this amount
export const CyclesPerMarketCycle = 50;
export const CyclesPerIndustryStateCycle = CyclesPerMarketCycle / AllCorporationStates.length;
export const SecsPerMarketCycle = CyclesPerMarketCycle / 5;
export const DividendMaxPercentage = 50;
interface IParams {
name?: string;
}
@ -107,7 +76,7 @@ export class Corporation {
this.upgradeMultipliers = Array(numUpgrades).fill(1);
}
addFunds(amt: number) {
addFunds(amt: number): void {
if(!isFinite(amt)) {
console.error('Trying to add invalid amount of funds. Report to a developper.');
return;
@ -123,11 +92,11 @@ export class Corporation {
this.storedCycles += numCycles;
}
process(player: IPlayer) {
if (this.storedCycles >= CyclesPerIndustryStateCycle) {
process(player: IPlayer): void {
if (this.storedCycles >= CorporationConstants.CyclesPerIndustryStateCycle) {
const state = this.getState();
const marketCycles = 1;
const gameCycles = (marketCycles * CyclesPerIndustryStateCycle);
const gameCycles = (marketCycles * CorporationConstants.CyclesPerIndustryStateCycle);
this.storedCycles -= gameCycles;
this.divisions.forEach((ind) => {
@ -152,8 +121,8 @@ export class Corporation {
this.revenue = this.revenue.plus(ind.lastCycleRevenue);
this.expenses = this.expenses.plus(ind.lastCycleExpenses);
});
var profit = this.revenue.minus(this.expenses);
const cycleProfit = profit.times(marketCycles * SecsPerMarketCycle);
const profit = this.revenue.minus(this.expenses);
const cycleProfit = profit.times(marketCycles * CorporationConstants.SecsPerMarketCycle);
if (isNaN(this.funds) || this.funds === Infinity || this.funds === -Infinity) {
dialogBoxCreate("There was an error calculating your Corporations funds and they got reset to 0. " +
"This is a bug. Please report to game developer.<br><br>" +
@ -164,7 +133,7 @@ export class Corporation {
// Process dividends
if (this.dividendPercentage > 0 && cycleProfit > 0) {
// Validate input again, just to be safe
if (isNaN(this.dividendPercentage) || this.dividendPercentage < 0 || this.dividendPercentage > DividendMaxPercentage) {
if (isNaN(this.dividendPercentage) || this.dividendPercentage < 0 || this.dividendPercentage > CorporationConstants.DividendMaxPercentage) {
console.error(`Invalid Corporation dividend percentage: ${this.dividendPercentage}`);
} else {
const totalDividends = (this.dividendPercentage / 100) * cycleProfit;
@ -188,8 +157,8 @@ export class Corporation {
}
}
determineValuation() {
var val, profit = (this.revenue.minus(this.expenses)).toNumber();
determineValuation(): number {
let val, profit = (this.revenue.minus(this.expenses)).toNumber();
if (this.public) {
// Account for dividends
if (this.dividendPercentage > 0) {
@ -212,13 +181,13 @@ export class Corporation {
return val * BitNodeMultipliers.CorporationValuation;
}
getTargetSharePrice() {
getTargetSharePrice(): number {
// Note: totalShares - numShares is not the same as issuedShares because
// issuedShares does not account for private investors
return this.determineValuation() / (2 * (this.totalShares - this.numShares) + 1);
}
updateSharePrice() {
updateSharePrice(): void {
const targetPrice = this.getTargetSharePrice();
if (this.sharePrice <= targetPrice) {
this.sharePrice *= (1 + (Math.random() * 0.01));
@ -228,7 +197,7 @@ export class Corporation {
if (this.sharePrice <= 0.01) {this.sharePrice = 0.01;}
}
immediatelyUpdateSharePrice() {
immediatelyUpdateSharePrice(): void {
this.sharePrice = this.getTargetSharePrice();
}
@ -242,7 +211,7 @@ export class Corporation {
let sharesSold = 0;
let profit = 0;
const maxIterations = Math.ceil(numShares / SHARESPERPRICEUPDATE);
const maxIterations = Math.ceil(numShares / CorporationConstants.SHARESPERPRICEUPDATE);
if (isNaN(maxIterations) || maxIterations > 10e6) {
console.error(`Something went wrong or unexpected when calculating share sale. Maxiterations calculated to be ${maxIterations}`);
return [0, 0, 0];
@ -255,7 +224,7 @@ export class Corporation {
break;
} else {
profit += (sharePrice * sharesUntilUpdate);
sharesUntilUpdate = SHARESPERPRICEUPDATE;
sharesUntilUpdate = CorporationConstants.SHARESPERPRICEUPDATE;
sharesTracker -= sharesUntilUpdate;
sharesSold += sharesUntilUpdate;
@ -267,7 +236,7 @@ export class Corporation {
return [profit, sharePrice, sharesUntilUpdate];
}
convertCooldownToString(cd: number) {
convertCooldownToString(cd: number): string {
// The cooldown value is based on game cycles. Convert to a simple string
const seconds = cd / 5;
@ -306,11 +275,11 @@ export class Corporation {
//Levelable upgrades
upgrade(upgrade: CorporationUpgrade): void {
var upgN = upgrade[0], basePrice = upgrade[1], priceMult = upgrade[2],
const upgN = upgrade[0], basePrice = upgrade[1], priceMult = upgrade[2],
upgradeAmt = upgrade[3]; //Amount by which the upgrade multiplier gets increased (additive)
while (this.upgrades.length <= upgN) {this.upgrades.push(0);}
while (this.upgradeMultipliers.length <= upgN) {this.upgradeMultipliers.push(1);}
var totalCost = basePrice * Math.pow(priceMult, this.upgrades[upgN]);
const totalCost = basePrice * Math.pow(priceMult, this.upgrades[upgN]);
if (this.funds.lt(totalCost)) {
dialogBoxCreate("You don't have enough funds to purchase this!");
return;
@ -323,9 +292,9 @@ export class Corporation {
//If storage size is being updated, update values in Warehouse objects
if (upgN === 1) {
for (var i = 0; i < this.divisions.length; ++i) {
var industry = this.divisions[i];
for (var city in industry.warehouses) {
for (let i = 0; i < this.divisions.length; ++i) {
const industry = this.divisions[i];
for (const city in industry.warehouses) {
if (industry.warehouses.hasOwnProperty(city) && industry.warehouses[city] instanceof Warehouse) {
industry.warehouses[city].updateSize(this, industry);
}
@ -334,64 +303,64 @@ export class Corporation {
}
}
getProductionMultiplier() {
var mult = this.upgradeMultipliers[0];
getProductionMultiplier(): number {
const mult = this.upgradeMultipliers[0];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getStorageMultiplier() {
var mult = this.upgradeMultipliers[1];
getStorageMultiplier(): number {
const mult = this.upgradeMultipliers[1];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getDreamSenseGain() {
var gain = this.upgradeMultipliers[2] - 1;
getDreamSenseGain(): number {
const gain = this.upgradeMultipliers[2] - 1;
return gain <= 0 ? 0 : gain;
}
getAdvertisingMultiplier() {
var mult = this.upgradeMultipliers[3];
getAdvertisingMultiplier(): number {
const mult = this.upgradeMultipliers[3];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getEmployeeCreMultiplier() {
var mult = this.upgradeMultipliers[4];
getEmployeeCreMultiplier(): number {
const mult = this.upgradeMultipliers[4];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getEmployeeChaMultiplier() {
var mult = this.upgradeMultipliers[5];
getEmployeeChaMultiplier(): number {
const mult = this.upgradeMultipliers[5];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getEmployeeIntMultiplier() {
var mult = this.upgradeMultipliers[6];
getEmployeeIntMultiplier(): number {
const mult = this.upgradeMultipliers[6];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getEmployeeEffMultiplier() {
var mult = this.upgradeMultipliers[7];
getEmployeeEffMultiplier(): number {
const mult = this.upgradeMultipliers[7];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getSalesMultiplier() {
var mult = this.upgradeMultipliers[8];
getSalesMultiplier(): number {
const mult = this.upgradeMultipliers[8];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
getScientificResearchMultiplier() {
var mult = this.upgradeMultipliers[9];
getScientificResearchMultiplier(): number {
const mult = this.upgradeMultipliers[9];
if (isNaN(mult) || mult < 1) {return 1;} else {return mult;}
}
// Adds the Corporation Handbook (Starter Guide) to the player's home computer.
// This is a lit file that gives introductory info to the player
// This occurs when the player clicks the "Getting Started Guide" button on the overview panel
getStarterGuide(player: IPlayer) {
getStarterGuide(player: IPlayer): void {
// Check if player already has Corporation Handbook
let homeComp = player.getHomeComputer(),
hasHandbook = false,
handbookFn = LiteratureNames.CorporationManagementHandbook;
const homeComp = player.getHomeComputer();
let hasHandbook = false;
const handbookFn = LiteratureNames.CorporationManagementHandbook;
for (let i = 0; i < homeComp.messages.length; ++i) {
if (isString(homeComp.messages[i]) && homeComp.messages[i] === handbookFn) {
hasHandbook = true;
@ -401,10 +370,10 @@ export class Corporation {
if (!hasHandbook) { homeComp.messages.push(handbookFn); }
showLiterature(handbookFn);
return false;
return;
}
createUI(player: IPlayer) {
createUI(player: IPlayer): void {
companyManagementDiv = createElement("div", {
id:"cmpy-mgmt-container",
position:"fixed",
@ -419,7 +388,7 @@ export class Corporation {
this.rerender(player);
}
rerender(player: IPlayer) {
rerender(player: IPlayer): void {
if (companyManagementDiv == null || corpRouting == null) {
console.warn(`Corporation.rerender() called when companyManagementDiv, corpRouting, or eventHandler is null`);
return;
@ -433,7 +402,7 @@ export class Corporation {
/>, companyManagementDiv);
}
clearUI() {
clearUI(): void {
if (companyManagementDiv instanceof HTMLElement) {
ReactDOM.unmountComponentAtNode(companyManagementDiv);
removeElementById(companyManagementDiv.id);

178
src/Corporation/Industry.ts
View File

@ -120,7 +120,7 @@ export class Industry {
this.init();
}
init() {
init(): void {
//Set the unique properties of an industry (how much its affected by real estate/scientific research, etc.)
const startingCost = IndustryStartingCosts[this.type];
if(startingCost === undefined)
@ -323,8 +323,8 @@ export class Industry {
}
}
getProductDescriptionText() {
if (!this.makesProducts) {return;}
getProductDescriptionText(): string {
if (!this.makesProducts) return '';
switch (this.type) {
case Industries.Food:
return "create and manage restaurants";
@ -349,7 +349,7 @@ export class Industry {
}
}
getMaximumNumberProducts() {
getMaximumNumberProducts(): number {
if (!this.makesProducts) return 0;
// Calculate additional number of allowed Products from Research/Upgrades
@ -360,24 +360,24 @@ export class Industry {
return CorporationConstants.BaseMaxProducts + additional;
}
hasMaximumNumberProducts() {
hasMaximumNumberProducts(): boolean {
return (Object.keys(this.products).length >= this.getMaximumNumberProducts());
}
//Calculates the values that factor into the production and properties of
//materials/products (such as quality, etc.)
calculateProductionFactors() {
var multSum = 0;
for (var i = 0; i < CorporationConstants.Cities.length; ++i) {
var city = CorporationConstants.Cities[i];
var warehouse = this.warehouses[city];
calculateProductionFactors(): void {
let multSum = 0;
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
const city = CorporationConstants.Cities[i];
const warehouse = this.warehouses[city];
if (!(warehouse instanceof Warehouse)) {
continue;
}
var materials = warehouse.materials;
const materials = warehouse.materials;
var cityMult = Math.pow(0.002 * materials.RealEstate.qty+1, this.reFac) *
const cityMult = Math.pow(0.002 * materials.RealEstate.qty+1, this.reFac) *
Math.pow(0.002 * materials.Hardware.qty+1, this.hwFac) *
Math.pow(0.002 * materials.Robots.qty+1, this.robFac) *
Math.pow(0.002 * materials.AICores.qty+1, this.aiFac);
@ -390,9 +390,9 @@ export class Industry {
updateWarehouseSizeUsed(warehouse: Warehouse): void {
warehouse.updateMaterialSizeUsed();
for (var prodName in this.products) {
for (const prodName in this.products) {
if (this.products.hasOwnProperty(prodName)) {
var prod = this.products[prodName];
const prod = this.products[prodName];
warehouse.sizeUsed += (prod.data[warehouse.loc][0] * prod.siz);
if (prod.data[warehouse.loc][0] > 0) {
warehouse.breakdown += (prodName + ": " + formatNumber(prod.data[warehouse.loc][0] * prod.siz, 0) + "<br>");
@ -401,7 +401,7 @@ export class Industry {
}
}
process(marketCycles=1, state: string, company: any) {
process(marketCycles=1, state: string, company: any): void {
this.state = state;
//At the start of a cycle, store and reset revenue/expenses
@ -423,8 +423,8 @@ export class Industry {
if (this.lastCycleRevenue.gt(0)) {this.newInd = false;}
// Process offices (and the employees in them)
var employeeSalary = 0;
for (var officeLoc in this.offices) {
let employeeSalary = 0;
for (const officeLoc in this.offices) {
if (this.offices[officeLoc] instanceof OfficeSpace) {
employeeSalary += this.offices[officeLoc].process(marketCycles, {industry:this, corporation:company});
}
@ -432,7 +432,7 @@ export class Industry {
this.thisCycleExpenses = this.thisCycleExpenses.plus(employeeSalary);
// Process change in demand/competition of materials/products
this.processMaterialMarket(marketCycles);
this.processMaterialMarket();
this.processProductMarket(marketCycles);
// Process loss of popularity
@ -440,7 +440,7 @@ export class Industry {
this.popularity = Math.max(0, this.popularity);
// Process Dreamsense gains
var popularityGain = company.getDreamSenseGain(), awarenessGain = popularityGain * 4;
const popularityGain = company.getDreamSenseGain(), awarenessGain = popularityGain * 4;
if (popularityGain > 0) {
this.popularity += (popularityGain * marketCycles);
this.awareness += (awarenessGain * marketCycles);
@ -465,24 +465,24 @@ export class Industry {
}
// Process change in demand and competition for this industry's materials
processMaterialMarket(marketCycles=1) {
processMaterialMarket(): void {
//References to prodMats and reqMats
var reqMats = this.reqMats, prodMats = this.prodMats;
const reqMats = this.reqMats, prodMats = this.prodMats;
//Only 'process the market' for materials that this industry deals with
for (var i = 0; i < CorporationConstants.Cities.length; ++i) {
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
//If this industry has a warehouse in this city, process the market
//for every material this industry requires or produces
if (this.warehouses[CorporationConstants.Cities[i]] instanceof Warehouse) {
var wh = this.warehouses[CorporationConstants.Cities[i]];
for (var name in reqMats) {
const wh = this.warehouses[CorporationConstants.Cities[i]];
for (const name in reqMats) {
if (reqMats.hasOwnProperty(name)) {
wh.materials[name].processMarket();
}
}
//Produced materials are stored in an array
for (var foo = 0; foo < prodMats.length; ++foo) {
for (let foo = 0; foo < prodMats.length; ++foo) {
wh.materials[prodMats[foo]].processMarket();
}
@ -496,13 +496,13 @@ export class Industry {
}
// Process change in demand and competition for this industry's products
processProductMarket(marketCycles=1) {
processProductMarket(marketCycles=1): void {
// Demand gradually decreases, and competition gradually increases
for (const name in this.products) {
if (this.products.hasOwnProperty(name)) {
const product = this.products[name];
let change = getRandomInt(0, 3) * 0.0004;
if (change === 0) { continue; }
if (change === 0) continue;
if (this.type === Industries.Pharmaceutical || this.type === Industries.Software ||
this.type === Industries.Robotics) {
@ -519,20 +519,20 @@ export class Industry {
//Process production, purchase, and import/export of materials
processMaterials(marketCycles=1, company: any): [number, number] {
var revenue = 0, expenses = 0;
let revenue = 0, expenses = 0;
this.calculateProductionFactors();
//At the start of the export state, set the imports of everything to 0
if (this.state === "EXPORT") {
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
var city = CorporationConstants.Cities[i], office = this.offices[city];
const city = CorporationConstants.Cities[i];
if (!(this.warehouses[city] instanceof Warehouse)) {
continue;
}
var warehouse = this.warehouses[city];
for (var matName in warehouse.materials) {
const warehouse = this.warehouses[city];
for (const matName in warehouse.materials) {
if (warehouse.materials.hasOwnProperty(matName)) {
var mat = warehouse.materials[matName];
const mat = warehouse.materials[matName];
mat.imp = 0;
}
}
@ -540,20 +540,20 @@ export class Industry {
}
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
var city = CorporationConstants.Cities[i], office = this.offices[city];
const city = CorporationConstants.Cities[i], office = this.offices[city];
if (this.warehouses[city] instanceof Warehouse) {
var warehouse = this.warehouses[city];
const warehouse = this.warehouses[city];
switch(this.state) {
case "PURCHASE":
/* Process purchase of materials */
for (var matName in warehouse.materials) {
for (const matName in warehouse.materials) {
if (warehouse.materials.hasOwnProperty(matName)) {
(function(matName, ind) {
var mat = warehouse.materials[matName];
var buyAmt, maxAmt;
const mat = warehouse.materials[matName];
let buyAmt, maxAmt;
if (warehouse.smartSupplyEnabled && Object.keys(ind.reqMats).includes(matName)) {
//Smart supply tracker is stored as per second rate
mat.buy = ind.reqMats[matName] * warehouse.smartSupplyStore;
@ -583,10 +583,10 @@ export class Industry {
/* Process production of materials */
if (this.prodMats.length > 0) {
var mat = warehouse.materials[this.prodMats[0]];
const mat = warehouse.materials[this.prodMats[0]];
//Calculate the maximum production of this material based
//on the office's productivity
var maxProd = this.getOfficeProductivity(office)
const maxProd = this.getOfficeProductivity(office)
* this.prodMult // Multiplier from materials
* company.getProductionMultiplier()
* this.getProductionMultiplier(); // Multiplier from Research
@ -601,17 +601,17 @@ export class Industry {
prod *= (CorporationConstants.SecsPerMarketCycle * marketCycles); //Convert production from per second to per market cycle
// Calculate net change in warehouse storage making the produced materials will cost
var totalMatSize = 0;
let totalMatSize = 0;
for (let tmp = 0; tmp < this.prodMats.length; ++tmp) {
totalMatSize += (MaterialSizes[this.prodMats[tmp]]);
}
for (const reqMatName in this.reqMats) {
var normQty = this.reqMats[reqMatName];
const normQty = this.reqMats[reqMatName];
totalMatSize -= (MaterialSizes[reqMatName] * normQty);
}
// If not enough space in warehouse, limit the amount of produced materials
if (totalMatSize > 0) {
var maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / totalMatSize);
const maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / totalMatSize);
prod = Math.min(maxAmt, prod);
}
@ -621,10 +621,10 @@ export class Industry {
warehouse.smartSupplyStore += (prod / (CorporationConstants.SecsPerMarketCycle * marketCycles));
// Make sure we have enough resource to make our materials
var producableFrac = 1;
for (var reqMatName in this.reqMats) {
let producableFrac = 1;
for (const reqMatName in this.reqMats) {
if (this.reqMats.hasOwnProperty(reqMatName)) {
var req = this.reqMats[reqMatName] * prod;
const req = this.reqMats[reqMatName] * prod;
if (warehouse.materials[reqMatName].qty < req) {
producableFrac = Math.min(producableFrac, warehouse.materials[reqMatName].qty / req);
}
@ -635,7 +635,7 @@ export class Industry {
// Make our materials if they are producable
if (producableFrac > 0 && prod > 0) {
for (const reqMatName in this.reqMats) {
var reqMatQtyNeeded = (this.reqMats[reqMatName] * prod * producableFrac);
const reqMatQtyNeeded = (this.reqMats[reqMatName] * prod * producableFrac);
warehouse.materials[reqMatName].qty -= reqMatQtyNeeded;
warehouse.materials[reqMatName].prd = 0;
warehouse.materials[reqMatName].prd -= reqMatQtyNeeded / (CorporationConstants.SecsPerMarketCycle * marketCycles);
@ -672,9 +672,9 @@ export class Industry {
case "SALE":
/* Process sale of materials */
for (var matName in warehouse.materials) {
for (const matName in warehouse.materials) {
if (warehouse.materials.hasOwnProperty(matName)) {
var mat = warehouse.materials[matName];
const mat = warehouse.materials[matName];
if (mat.sCost < 0 || mat.sllman[0] === false) {
mat.sll = 0;
continue;
@ -687,7 +687,7 @@ export class Industry {
// Determine the cost that the material will be sold at
const markupLimit = mat.getMarkupLimit();
var sCost;
let sCost;
if (mat.marketTa2) {
const prod = mat.prd;
@ -746,17 +746,17 @@ export class Industry {
}
}
var maxSell = (mat.qlt + .001)
const maxSell = (mat.qlt + .001)
* marketFactor
* markup
* businessFactor
* company.getSalesMultiplier()
* advertisingFactor
* this.getSalesMultiplier();
var sellAmt;
let sellAmt;
if (isString(mat.sllman[1])) {
//Dynamically evaluated
var tmp = mat.sllman[1].replace(/MAX/g, maxSell);
let tmp = mat.sllman[1].replace(/MAX/g, maxSell);
tmp = tmp.replace(/PROD/g, mat.prd);
try {
sellAmt = eval(tmp);
@ -794,13 +794,13 @@ export class Industry {
break;
case "EXPORT":
for (var matName in warehouse.materials) {
for (const matName in warehouse.materials) {
if (warehouse.materials.hasOwnProperty(matName)) {
var mat = warehouse.materials[matName];
const mat = warehouse.materials[matName];
mat.totalExp = 0; //Reset export
for (var expI = 0; expI < mat.exp.length; ++expI) {
var exp = mat.exp[expI];
var amt = exp.amt.replace(/MAX/g, mat.qty / (CorporationConstants.SecsPerMarketCycle * marketCycles));
for (let expI = 0; expI < mat.exp.length; ++expI) {
const exp = mat.exp[expI];
let amt = exp.amt.replace(/MAX/g, mat.qty / (CorporationConstants.SecsPerMarketCycle * marketCycles));
try {
amt = eval(amt);
} catch(e) {
@ -822,10 +822,10 @@ export class Industry {
if (amt === 0) {
break; //None left
}
for (var foo = 0; foo < company.divisions.length; ++foo) {
for (let foo = 0; foo < company.divisions.length; ++foo) {
if (company.divisions[foo].name === exp.ind) {
var expIndustry = company.divisions[foo];
var expWarehouse = expIndustry.warehouses[exp.city];
const expIndustry = company.divisions[foo];
const expWarehouse = expIndustry.warehouses[exp.city];
if (!(expWarehouse instanceof Warehouse)) {
console.error(`Invalid export! ${expIndustry.name} ${exp.city}`);
break;
@ -837,7 +837,7 @@ export class Industry {
// affect revenue so just return 0's
return [0, 0];
} else {
var maxAmt = Math.floor((expWarehouse.size - expWarehouse.sizeUsed) / MaterialSizes[matName]);
const maxAmt = Math.floor((expWarehouse.size - expWarehouse.sizeUsed) / MaterialSizes[matName]);
amt = Math.min(maxAmt, amt);
}
expWarehouse.materials[matName].imp += (amt / (CorporationConstants.SecsPerMarketCycle * marketCycles));
@ -881,7 +881,8 @@ export class Industry {
//Process production & sale of this industry's FINISHED products (including all of their stats)
processProducts(marketCycles=1, corporation: any): [number, number] {
var revenue = 0, expenses = 0;
let revenue = 0;
const expenses = 0;
//Create products
if (this.state === "PRODUCTION") {
@ -913,9 +914,9 @@ export class Industry {
}
//Produce Products
for (var prodName in this.products) {
for (const prodName in this.products) {
if (this.products.hasOwnProperty(prodName)) {
var prod = this.products[prodName];
const prod = this.products[prodName];
if (prod instanceof Product && prod.fin) {
revenue += this.processProduct(marketCycles, prod, corporation);
}
@ -928,14 +929,14 @@ export class Industry {
processProduct(marketCycles=1, product: Product, corporation: any): number {
let totalProfit = 0;
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
let city = CorporationConstants.Cities[i], office = this.offices[city], warehouse = this.warehouses[city];
const city = CorporationConstants.Cities[i], office = this.offices[city], warehouse = this.warehouses[city];
if (warehouse instanceof Warehouse) {
switch(this.state) {
case "PRODUCTION": {
//Calculate the maximum production of this material based
//on the office's productivity
var maxProd = this.getOfficeProductivity(office, {forProduct:true})
const maxProd = this.getOfficeProductivity(office, {forProduct:true})
* corporation.getProductionMultiplier()
* this.prodMult // Multiplier from materials
* this.getProductionMultiplier() // Multiplier from research
@ -951,27 +952,27 @@ export class Industry {
prod *= (CorporationConstants.SecsPerMarketCycle * marketCycles);
//Calculate net change in warehouse storage making the Products will cost
var netStorageSize = product.siz;
for (var reqMatName in product.reqMats) {
let netStorageSize = product.siz;
for (const reqMatName in product.reqMats) {
if (product.reqMats.hasOwnProperty(reqMatName)) {
var normQty = product.reqMats[reqMatName];
const normQty = product.reqMats[reqMatName];
netStorageSize -= (MaterialSizes[reqMatName] * normQty);
}
}
//If there's not enough space in warehouse, limit the amount of Product
if (netStorageSize > 0) {
var maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / netStorageSize);
const maxAmt = Math.floor((warehouse.size - warehouse.sizeUsed) / netStorageSize);
prod = Math.min(maxAmt, prod);
}
warehouse.smartSupplyStore += (prod / (CorporationConstants.SecsPerMarketCycle * marketCycles));
//Make sure we have enough resources to make our Products
var producableFrac = 1;
for (var reqMatName in product.reqMats) {
let producableFrac = 1;
for (const reqMatName in product.reqMats) {
if (product.reqMats.hasOwnProperty(reqMatName)) {
var req = product.reqMats[reqMatName] * prod;
const req = product.reqMats[reqMatName] * prod;
if (warehouse.materials[reqMatName].qty < req) {
producableFrac = Math.min(producableFrac, warehouse.materials[reqMatName].qty / req);
}
@ -980,9 +981,9 @@ export class Industry {
//Make our Products if they are producable
if (producableFrac > 0 && prod > 0) {
for (var reqMatName in product.reqMats) {
for (const reqMatName in product.reqMats) {
if (product.reqMats.hasOwnProperty(reqMatName)) {
var reqMatQtyNeeded = (product.reqMats[reqMatName] * prod * producableFrac);
const reqMatQtyNeeded = (product.reqMats[reqMatName] * prod * producableFrac);
warehouse.materials[reqMatName].qty -= reqMatQtyNeeded;
warehouse.materials[reqMatName].prd -= reqMatQtyNeeded / (CorporationConstants.SecsPerMarketCycle * marketCycles);
}
@ -998,7 +999,7 @@ export class Industry {
case "SALE": {
//Process sale of Products
product.pCost = 0; //Estimated production cost
for (var reqMatName in product.reqMats) {
for (const reqMatName in product.reqMats) {
if (product.reqMats.hasOwnProperty(reqMatName)) {
product.pCost += (product.reqMats[reqMatName] * warehouse.materials[reqMatName].bCost);
}
@ -1014,7 +1015,7 @@ export class Industry {
// Calculate Sale Cost (sCost), which could be dynamically evaluated
const markupLimit = product.rat / product.mku;
var sCost;
let sCost;
if (product.marketTa2) {
const prod = product.data[city][1];
@ -1062,14 +1063,14 @@ export class Industry {
sCost = product.sCost;
}
var markup = 1;
let markup = 1;
if (sCost > product.pCost) {
if ((sCost - product.pCost) > markupLimit) {
markup = markupLimit / (sCost - product.pCost);
}
}
var maxSell = 0.5
const maxSell = 0.5
* Math.pow(product.rat, 0.65)
* marketFactor
* corporation.getSalesMultiplier()
@ -1077,10 +1078,10 @@ export class Industry {
* businessFactor
* advertisingFactor
* this.getSalesMultiplier();
var sellAmt;
let sellAmt;
if (product.sllman[city][0] && isString(product.sllman[city][1])) {
//Sell amount is dynamically evaluated
var tmp = product.sllman[city][1].replace(/MAX/g, maxSell);
let tmp = product.sllman[city][1].replace(/MAX/g, maxSell);
tmp = tmp.replace(/PROD/g, product.data[city][1]);
try {
tmp = eval(tmp);
@ -1124,7 +1125,7 @@ export class Industry {
}
discontinueProduct(product: Product): void {
for (var productName in this.products) {
for (const productName in this.products) {
if (this.products.hasOwnProperty(productName)) {
if (product === this.products[productName]) {
delete this.products[productName];
@ -1133,7 +1134,7 @@ export class Industry {
}
}
upgrade(upgrade: IndustryUpgrade, refs: {corporation: any, office: OfficeSpace}): void {
upgrade(upgrade: IndustryUpgrade, refs: {corporation: any; office: OfficeSpace}): void {
const corporation = refs.corporation;
const office = refs.office;
const upgN = upgrade[0];
@ -1141,21 +1142,24 @@ export class Industry {
++this.upgrades[upgN];
switch (upgN) {
case 0: //Coffee, 5% energy per employee
case 0: { //Coffee, 5% energy per employee
for (let i = 0; i < office.employees.length; ++i) {
office.employees[i].ene = Math.min(office.employees[i].ene * 1.05, office.maxEne);
}
break;
case 1: //AdVert.Inc,
}
case 1: { //AdVert.Inc,
const advMult = corporation.getAdvertisingMultiplier() * this.getAdvertisingMultiplier();
this.awareness += (3 * advMult);
this.popularity += (1 * advMult);
this.awareness *= (1.01 * advMult);
this.popularity *= ((1 + getRandomInt(1, 3) / 100) * advMult);
break;
default:
}
default: {
console.error(`Un-implemented function index: ${upgN}`);
break;
}
}
}
@ -1205,7 +1209,7 @@ export class Industry {
}
//Returns a multiplier based on a materials demand and competition that affects sales
getMarketFactor(mat: {dmd: number, cmp: number}): number {
getMarketFactor(mat: {dmd: number; cmp: number}): number {
return Math.max(0.1, mat.dmd * (100 - mat.cmp) / 100);
}

2
src/Corporation/IndustryData.tsx
View File

@ -2,8 +2,6 @@ import React from 'react';
import { ResearchTree } from "./ResearchTree";
import { getBaseResearchTreeCopy,
getProductIndustryResearchTreeCopy } from "./data/BaseResearchTree";
import { numeralWrapper } from "../ui/numeralFormat";
import { Money } from "../ui/React/Money";
interface IIndustryMap<T> {

12
src/Corporation/ui/ExportPopup.tsx
View File

@ -1,12 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
interface IProps {
mat: any;
@ -90,8 +84,7 @@ amount to 'MAX' to export all of the materials in this warehouse.
</p>
<select className="dropdown" onChange={onIndustryChange} defaultValue={industry}>
{
props.corp.divisions.map((division: any) =>
<option key={division.name} value={division.name}>{division.name}</option>)
props.corp.divisions.map((division: any) => <option key={division.name} value={division.name}>{division.name}</option>)
}
</select>
<select className="dropdown" onChange={onCityChange} defaultValue={city}>
@ -109,8 +102,7 @@ Below is a list of all current exports of this material from this warehouse.
Clicking on one of the exports below will REMOVE that export.
</p>
{
props.mat.exp.map((exp: any, index: number) =>
<div key={index} className="cmpy-mgmt-existing-export" onClick={() => removeExport(exp)}>
props.mat.exp.map((exp: any, index: number) => <div key={index} className="cmpy-mgmt-existing-export" onClick={() => removeExport(exp)}>
Industry: {exp.ind}<br />
City: {exp.city}<br />
Amount/s: {exp.amt}

9
src/Corporation/ui/FindInvestorsPopup.tsx
View File

@ -1,12 +1,5 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import React from 'react';
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { numeralWrapper } from "../../ui/numeralFormat";
import { CorporationConstants } from "../data/Constants";

7
src/Corporation/ui/GoPublicPopup.tsx
View File

@ -1,14 +1,7 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { numeralWrapper } from "../../ui/numeralFormat";
import { CorporationConstants } from "../data/Constants";
interface IProps {
corp: any;

2
src/Corporation/ui/IndustryOverview.tsx
View File

@ -79,7 +79,7 @@ export function IndustryOverview(props: IProps): React.ReactElement {
display: "inline-block",
}
function openMakeProductPopup() {
function openMakeProductPopup(): void {
const popupId = "cmpy-mgmt-create-product-popup";
createPopup(popupId, MakeProductPopup, {
popupText: createProductPopupText,

4
src/Corporation/ui/IndustryWarehouse.tsx
View File

@ -260,7 +260,7 @@ function MaterialComponent(props: IMaterialProps): React.ReactElement {
const purchaseButtonText = `Buy (${numeralWrapper.format(mat.buy, nfB)})`;
const purchaseButtonClass = tutorial ? "std-button flashing-button tooltip" : "std-button";
function openPurchaseMaterialPopup() {
function openPurchaseMaterialPopup(): void {
const popupId = "cmpy-mgmt-material-purchase-popup";
createPopup(popupId, PurchaseMaterialPopup, {
mat: mat,
@ -271,7 +271,7 @@ function MaterialComponent(props: IMaterialProps): React.ReactElement {
});
}
function openExportPopup() {
function openExportPopup(): void {
const popupId = "cmpy-mgmt-export-popup";
createPopup(popupId, ExportPopup, {
mat: mat,

1
src/Corporation/ui/IssueNewSharesPopup.tsx
View File

@ -1,5 +1,4 @@
import React, { useState } from 'react';
import { createElement } from "../../../utils/uiHelpers/createElement";
import { numeralWrapper } from "../../ui/numeralFormat";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { removePopup } from "../../ui/React/createPopup";

9
src/Corporation/ui/LimitProductProductionPopup.tsx
View File

@ -1,13 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
interface IProps {
product: any;
@ -25,7 +18,7 @@ export function LimitProductProductionPopup(props: IProps): React.ReactElement {
removePopup(props.popupId);
return;
}
var qty = limit;
const qty = limit;
if (isNaN(qty)) {
dialogBoxCreate("Invalid value entered");
return;

15
src/Corporation/ui/MakeProductPopup.tsx
View File

@ -1,12 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { Industries } from "../IndustryData";
import { Product } from "../Product";
@ -29,9 +23,9 @@ function productPlaceholder(tpe: string): string {
}
// Create a popup that lets the player create a product for their current industry
export function MakeProductPopup(props: IProps) {
const allCities = Object.keys(props.division.offices).
filter((cityName: string) => props.division.offices[cityName] !== 0);
export function MakeProductPopup(props: IProps): React.ReactElement {
const allCities = Object.keys(props.division.offices)
.filter((cityName: string) => props.division.offices[cityName] !== 0);
const [city, setCity] = useState(allCities.length > 0 ? allCities[0] : '');
const [name, setName] = useState('');
const [design, setDesign] = useState<number | null>(null);
@ -94,8 +88,7 @@ export function MakeProductPopup(props: IProps) {
<p dangerouslySetInnerHTML={{__html: props.popupText}} />
<select className="dropdown" style={{margin: "5px"}} onChange={onCityChange} defaultValue={city}>
{
allCities.map((cityName: string) =>
<option key={cityName} value={cityName}>{cityName}</option>)
allCities.map((cityName: string) => <option key={cityName} value={cityName}>{cityName}</option>)
}
</select>
<input onChange={onProductNameChange} className="text-input" style={{margin:"5px"}} placeholder={productPlaceholder(props.division.type)} />

8
src/Corporation/ui/MaterialMarketTaPopup.tsx
View File

@ -1,12 +1,4 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { numeralWrapper } from "../../ui/numeralFormat";
interface IMarketTA2Props {

13
src/Corporation/ui/NewIndustryPopup.tsx
View File

@ -1,12 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import {
Industries,
IndustryStartingCosts,
@ -22,9 +16,7 @@ interface IProps {
// This is created when the player clicks the "Expand into new Industry" header tab
export function NewIndustryPopup(props: IProps): React.ReactElement {
const allIndustries = Object.keys(Industries).sort();
const possibleIndustries = allIndustries.filter((industryType: string) =>
props.corp.divisions.find((division: any) =>
division.type === industryType) === undefined).sort();
const possibleIndustries = allIndustries.filter((industryType: string) => props.corp.divisions.find((division: any) => division.type === industryType) === undefined).sort();
const [industry, setIndustry] = useState(possibleIndustries.length > 0 ? possibleIndustries[0] : '');
const [name, setName] = useState('');
@ -74,8 +66,7 @@ export function NewIndustryPopup(props: IProps): React.ReactElement {
<p>Create a new division to expand into a new industry:</p>
<select className="dropdown" defaultValue={industry} onChange={onIndustryChange}>
{
possibleIndustries.map((industry: string) =>
<option key={industry} value={industry}>{industry}</option>)
possibleIndustries.map((industry: string) => <option key={industry} value={industry}>{industry}</option>)
}
</select>
<p>{IndustryDescriptions[industry]}</p>

8
src/Corporation/ui/ProductMarketTaPopup.tsx
View File

@ -1,12 +1,4 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { numeralWrapper } from "../../ui/numeralFormat";
interface IProps {

8
src/Corporation/ui/PurchaseMaterialPopup.tsx
View File

@ -1,12 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { MaterialSizes } from "../MaterialSizes";
import { numeralWrapper } from "../../ui/numeralFormat";
@ -85,7 +79,7 @@ function BulkPurchase(props: IProps): React.ReactElement {
(all at once).
</p>
<BulkPurchaseText warehouse={props.warehouse} mat={props.mat} amount={buyAmt} />
<input onChange={onChange} type="number" placeholder="Bulk Purchase amount" style={{margin: "5px"}} />
<input onChange={onChange} type="number" placeholder="Bulk Purchase amount" style={{margin: "5px"}} onKeyDown={onKeyDown} />
<button className="std-button">Confirm Bulk Purchase</button>
</>);
}

10
src/Corporation/ui/ResearchPopup.tsx
View File

@ -1,18 +1,10 @@
import React, { useState, useEffect } from 'react';
import { Warehouse } from "../Warehouse";
import React, { useEffect } from 'react';
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { MaterialSizes } from "../MaterialSizes";
import { numeralWrapper } from "../../ui/numeralFormat";
import { IndustryResearchTrees } from "../IndustryData";
import { CorporationConstants } from "../data/Constants";
import { ResearchMap } from "../ResearchMap";
import { ResearchTree } from "../ResearchTree";
import { Treant } from 'treant-js';
interface IProps {

6
src/Corporation/ui/SellMaterialPopup.tsx
View File

@ -1,12 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
function initialPrice(mat: any): string {
let val = mat.sCost ? mat.sCost : '';

16
src/Corporation/ui/SellProductPopup.tsx
View File

@ -1,12 +1,6 @@
import React, { useState } from 'react';
import { Warehouse } from "../Warehouse";
import { dialogBoxCreate } from "../../../utils/DialogBox";
import { createElement } from "../../../utils/uiHelpers/createElement";
import { removePopup } from "../../ui/React/createPopup";
import { createOptionElement } from "../../../utils/uiHelpers/createOptionElement";
import { clearSelector } from "../../../utils/uiHelpers/clearSelector";
import { getSelectText,
getSelectValue } from "../../../utils/uiHelpers/getSelectData";
import { Cities } from "../../Locations/Cities";
function initialPrice(product: any): string {
@ -40,9 +34,9 @@ export function SellProductPopup(props: IProps): React.ReactElement {
if (px.includes("MP")) {
//Dynamically evaluated quantity. First test to make sure its valid
//Sanitize input, then replace dynamic variables with arbitrary numbers
var price = px.replace(/\s+/g, '');
let price = px.replace(/\s+/g, '');
price = price.replace(/[^-()\d/*+.MP]/g, '');
var temp = price.replace(/MP/g, '1');
let temp = price.replace(/MP/g, '1');
try {
temp = eval(temp);
} catch(e) {
@ -55,7 +49,7 @@ export function SellProductPopup(props: IProps): React.ReactElement {
}
props.product.sCost = price; //Use sanitized price
} else {
var cost = parseFloat(px);
const cost = parseFloat(px);
if (isNaN(cost)) {
dialogBoxCreate("Invalid value for sell price field");
return;
@ -69,9 +63,9 @@ export function SellProductPopup(props: IProps): React.ReactElement {
// Parse quantity
if (iQty.includes("MAX") || iQty.includes("PROD")) {
//Dynamically evaluated quantity. First test to make sure its valid
var qty = iQty.replace(/\s+/g, '');
let qty = iQty.replace(/\s+/g, '');
qty = qty.replace(/[^-()\d/*+.MAXPROD]/g, '');
var temp = qty.replace(/MAX/g, '1');
let temp = qty.replace(/MAX/g, '1');
temp = temp.replace(/PROD/g, '1');
try {
temp = eval(temp);