From bba2ccd83a438c87bba2385da9de324b93ef6ff1 Mon Sep 17 00:00:00 2001 From: Caldwell <115591472+Caldwell-74@users.noreply.github.com> Date: Tue, 12 Sep 2023 07:23:36 +0200 Subject: [PATCH] CORPORATION: add issueNewSharesCooldown and makesMaterial (#774) --- ...tburner.corpindustrydata.makesmaterials.md | 13 ++++++++ ...itburner.corpindustrydata.makesproducts.md | 13 ++++++++ markdown/bitburner.corpindustrydata.md | 4 ++- ...rner.corpindustrydata.producedmaterials.md | 2 ++ ....corporationinfo.issuenewsharescooldown.md | 13 ++++++++ markdown/bitburner.corporationinfo.md | 1 + markdown/bitburner.division.makesproducts.md | 2 +- markdown/bitburner.division.md | 2 +- src/Corporation/Division.ts | 4 +-- src/Corporation/data/IndustryData.ts | 30 +++++++++++++++++++ src/NetscriptFunctions/Corporation.ts | 1 + src/ScriptEditor/NetscriptDefinitions.d.ts | 9 +++++- 12 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 markdown/bitburner.corpindustrydata.makesmaterials.md create mode 100644 markdown/bitburner.corpindustrydata.makesproducts.md create mode 100644 markdown/bitburner.corporationinfo.issuenewsharescooldown.md diff --git a/markdown/bitburner.corpindustrydata.makesmaterials.md b/markdown/bitburner.corpindustrydata.makesmaterials.md new file mode 100644 index 000000000..f7633469b --- /dev/null +++ b/markdown/bitburner.corpindustrydata.makesmaterials.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [bitburner](./bitburner.md) > [CorpIndustryData](./bitburner.corpindustrydata.md) > [makesMaterials](./bitburner.corpindustrydata.makesmaterials.md) + +## CorpIndustryData.makesMaterials property + +Whether the industry of this division is capable of producing materials + +**Signature:** + +```typescript +makesMaterials: boolean; +``` diff --git a/markdown/bitburner.corpindustrydata.makesproducts.md b/markdown/bitburner.corpindustrydata.makesproducts.md new file mode 100644 index 000000000..bea9480e8 --- /dev/null +++ b/markdown/bitburner.corpindustrydata.makesproducts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [bitburner](./bitburner.md) > [CorpIndustryData](./bitburner.corpindustrydata.md) > [makesProducts](./bitburner.corpindustrydata.makesproducts.md) + +## CorpIndustryData.makesProducts property + +Whether the industry of this division is capable of developing and producing products + +**Signature:** + +```typescript +makesProducts: boolean; +``` diff --git a/markdown/bitburner.corpindustrydata.md b/markdown/bitburner.corpindustrydata.md index beb0774c2..e8fbe2beb 100644 --- a/markdown/bitburner.corpindustrydata.md +++ b/markdown/bitburner.corpindustrydata.md @@ -20,7 +20,9 @@ interface CorpIndustryData | [aiCoreFactor?](./bitburner.corpindustrydata.aicorefactor.md) | | number | _(Optional)_ AI Cores factor | | [description](./bitburner.corpindustrydata.description.md) | | string | | | [hardwareFactor?](./bitburner.corpindustrydata.hardwarefactor.md) | | number | _(Optional)_ Hardware factor | -| [producedMaterials?](./bitburner.corpindustrydata.producedmaterials.md) | | [CorpMaterialName](./bitburner.corpmaterialname.md)\[\] | _(Optional)_ | +| [makesMaterials](./bitburner.corpindustrydata.makesmaterials.md) | | boolean | Whether the industry of this division is capable of producing materials | +| [makesProducts](./bitburner.corpindustrydata.makesproducts.md) | | boolean | Whether the industry of this division is capable of developing and producing products | +| [producedMaterials?](./bitburner.corpindustrydata.producedmaterials.md) | | [CorpMaterialName](./bitburner.corpmaterialname.md)\[\] | _(Optional)_ Array of Materials produced | | [product?](./bitburner.corpindustrydata.product.md) | | [CorpProductData](./bitburner.corpproductdata.md) | _(Optional)_ | | [realEstateFactor?](./bitburner.corpindustrydata.realestatefactor.md) | | number | _(Optional)_ Real estate factor | | [recommendStarting](./bitburner.corpindustrydata.recommendstarting.md) | | boolean | | diff --git a/markdown/bitburner.corpindustrydata.producedmaterials.md b/markdown/bitburner.corpindustrydata.producedmaterials.md index e70f92650..b941da748 100644 --- a/markdown/bitburner.corpindustrydata.producedmaterials.md +++ b/markdown/bitburner.corpindustrydata.producedmaterials.md @@ -4,6 +4,8 @@ ## CorpIndustryData.producedMaterials property +Array of Materials produced + **Signature:** ```typescript diff --git a/markdown/bitburner.corporationinfo.issuenewsharescooldown.md b/markdown/bitburner.corporationinfo.issuenewsharescooldown.md new file mode 100644 index 000000000..6e09af2e6 --- /dev/null +++ b/markdown/bitburner.corporationinfo.issuenewsharescooldown.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [bitburner](./bitburner.md) > [CorporationInfo](./bitburner.corporationinfo.md) > [issueNewSharesCooldown](./bitburner.corporationinfo.issuenewsharescooldown.md) + +## CorporationInfo.issueNewSharesCooldown property + +Cooldown until new shares can be issued + +**Signature:** + +```typescript +issueNewSharesCooldown: number; +``` diff --git a/markdown/bitburner.corporationinfo.md b/markdown/bitburner.corporationinfo.md index 298282a8e..4e3f947fd 100644 --- a/markdown/bitburner.corporationinfo.md +++ b/markdown/bitburner.corporationinfo.md @@ -23,6 +23,7 @@ interface CorporationInfo | [expenses](./bitburner.corporationinfo.expenses.md) | | number | Expenses per second this cycle | | [funds](./bitburner.corporationinfo.funds.md) | | number | Funds available | | [issuedShares](./bitburner.corporationinfo.issuedshares.md) | | number | Amount of acquirable shares. | +| [issueNewSharesCooldown](./bitburner.corporationinfo.issuenewsharescooldown.md) | | number | Cooldown until new shares can be issued | | [name](./bitburner.corporationinfo.name.md) | | string | Name of the corporation | | [numShares](./bitburner.corporationinfo.numshares.md) | | number | Amount of share owned | | [public](./bitburner.corporationinfo.public.md) | | boolean | Indicating if the company is public | diff --git a/markdown/bitburner.division.makesproducts.md b/markdown/bitburner.division.makesproducts.md index de50f25be..19a600ff7 100644 --- a/markdown/bitburner.division.makesproducts.md +++ b/markdown/bitburner.division.makesproducts.md @@ -4,7 +4,7 @@ ## Division.makesProducts property -Whether the industry this division is in is capable of making products +Whether the industry of this division is capable of developing and producing products **Signature:** diff --git a/markdown/bitburner.division.md b/markdown/bitburner.division.md index bd935d726..daa36f803 100644 --- a/markdown/bitburner.division.md +++ b/markdown/bitburner.division.md @@ -20,7 +20,7 @@ interface Division | [cities](./bitburner.division.cities.md) | | [CityName](./bitburner.cityname.md)\[\] | Cities in which this division has expanded | | [lastCycleExpenses](./bitburner.division.lastcycleexpenses.md) | | number | Expenses last cycle | | [lastCycleRevenue](./bitburner.division.lastcyclerevenue.md) | | number | Revenue last cycle | -| [makesProducts](./bitburner.division.makesproducts.md) | | boolean | Whether the industry this division is in is capable of making products | +| [makesProducts](./bitburner.division.makesproducts.md) | | boolean | Whether the industry of this division is capable of developing and producing products | | [maxProducts](./bitburner.division.maxproducts.md) | | number | How many products this division can support | | [name](./bitburner.division.name.md) | | string | Name of the division | | [numAdVerts](./bitburner.division.numadverts.md) | | number | Number of times AdVert has been bought | diff --git a/src/Corporation/Division.ts b/src/Corporation/Division.ts index af934f279..0bc5d1e2c 100644 --- a/src/Corporation/Division.ts +++ b/src/Corporation/Division.ts @@ -33,7 +33,7 @@ export class Division { // Not included in save file. Just used for tracking whether research tree has been updated since game load. treeInitialized = false; - //An array of the name of materials being produced + /** An array of the name of materials being produced */ producedMaterials: CorpMaterialName[] = []; products = new JSONMap(); @@ -101,7 +101,7 @@ export class Division { // Loading data based on this division's industry type const data = IndustriesData[this.type]; this.startingCost = data.startingCost; - this.makesProducts = data.product ? true : false; + this.makesProducts = data.makesProducts; this.realEstateFactor = data.realEstateFactor ?? 0; this.researchFactor = data.scienceFactor ?? 0; this.hardwareFactor = data.hardwareFactor ?? 0; diff --git a/src/Corporation/data/IndustryData.ts b/src/Corporation/data/IndustryData.ts index c2b7e0ea5..715072f84 100644 --- a/src/Corporation/data/IndustryData.ts +++ b/src/Corporation/data/IndustryData.ts @@ -17,6 +17,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.04, requiredMaterials: { Water: 0.5, Chemicals: 0.2 }, producedMaterials: ["Plants", "Food"], + makesMaterials: true, + makesProducts: false, }, [IndustryType.Spring]: { startingCost: 10e9, @@ -30,6 +32,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.03, requiredMaterials: {}, producedMaterials: ["Water"], + makesMaterials: true, + makesProducts: false, }, [IndustryType.Refinery]: { startingCost: 50e9, @@ -43,6 +47,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.04, requiredMaterials: { Ore: 1 }, producedMaterials: ["Metal"], + makesMaterials: true, + makesProducts: false, }, [IndustryType.Chemical]: { startingCost: 70e9, @@ -56,6 +62,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.07, requiredMaterials: { Plants: 1, Water: 0.5 }, producedMaterials: ["Chemicals"], + makesMaterials: true, + makesProducts: false, }, [IndustryType.Computers]: { startingCost: 500e9, @@ -81,6 +89,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.17, requiredMaterials: { Metal: 2 }, producedMaterials: ["Hardware"], + makesMaterials: true, + makesProducts: true, }, [IndustryType.Fishing]: { startingCost: 80e9, @@ -94,6 +104,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.08, requiredMaterials: { Plants: 0.5 }, producedMaterials: ["Food"], + makesMaterials: true, + makesProducts: false, }, [IndustryType.Restaurant]: { startingCost: 10e9, @@ -116,6 +128,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.25, realEstateFactor: 0.05, requiredMaterials: { Food: 0.5, Water: 0.5 }, + makesMaterials: false, + makesProducts: true, }, [IndustryType.Healthcare]: { startingCost: 750e9, @@ -140,6 +154,8 @@ export const IndustriesData: Record = { robotFactor: 0.1, aiCoreFactor: 0.1, requiredMaterials: { Robots: 10, "AI Cores": 5, Drugs: 5, Food: 5 }, + makesMaterials: false, + makesProducts: true, }, [IndustryType.Mining]: { startingCost: 300e9, @@ -153,6 +169,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.06, requiredMaterials: { Hardware: 0.1 }, producedMaterials: ["Ore", "Minerals"], + makesMaterials: true, + makesProducts: false, }, [IndustryType.Pharmaceutical]: { startingCost: 200e9, @@ -178,6 +196,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.16, requiredMaterials: { Chemicals: 2, Water: 0.5 }, producedMaterials: ["Drugs"], + makesMaterials: true, + makesProducts: true, }, [IndustryType.RealEstate]: { startingCost: 600e9, @@ -202,6 +222,8 @@ export const IndustriesData: Record = { hardwareFactor: 0.05, requiredMaterials: { Metal: 5, Plants: 1, Water: 2, Hardware: 4 }, producedMaterials: ["Real Estate"], + makesMaterials: true, + makesProducts: true, }, [IndustryType.Robotics]: { startingCost: 1e12, @@ -227,6 +249,8 @@ export const IndustriesData: Record = { hardwareFactor: 0.19, requiredMaterials: { Hardware: 5, "AI Cores": 3 }, producedMaterials: ["Robots"], + makesMaterials: true, + makesProducts: true, }, [IndustryType.Software]: { startingCost: 25e9, @@ -252,6 +276,8 @@ export const IndustriesData: Record = { robotFactor: 0.05, requiredMaterials: { Hardware: 0.5 }, producedMaterials: ["AI Cores"], + makesMaterials: true, + makesProducts: true, }, [IndustryType.Tobacco]: { startingCost: 20e9, @@ -274,6 +300,8 @@ export const IndustriesData: Record = { aiCoreFactor: 0.15, advertisingFactor: 0.2, requiredMaterials: { Plants: 1 }, + makesMaterials: false, + makesProducts: true, }, [IndustryType.Water]: { startingCost: 150e9, @@ -286,6 +314,8 @@ export const IndustriesData: Record = { advertisingFactor: 0.08, requiredMaterials: { Hardware: 0.1 }, producedMaterials: ["Water"], + makesMaterials: true, + makesProducts: false, }, }; diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts index 0c1f58eb3..43f60dcf2 100644 --- a/src/NetscriptFunctions/Corporation.ts +++ b/src/NetscriptFunctions/Corporation.ts @@ -769,6 +769,7 @@ export function NetscriptCorporation(): InternalAPI { numShares: corporation.numShares, shareSaleCooldown: corporation.shareSaleCooldown, issuedShares: corporation.issuedShares, + issueNewSharesCooldown: corporation.issueNewSharesCooldown, sharePrice: corporation.sharePrice, dividendRate: corporation.dividendRate, dividendTax: corporation.dividendTax, diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index 633fe144e..35940f471 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -7490,7 +7490,12 @@ interface CorpIndustryData { aiCoreFactor?: number; /** Advertising factor (affects sales) */ advertisingFactor?: number; + /** Array of Materials produced */ producedMaterials?: CorpMaterialName[]; + /** Whether the industry of this division is capable of producing materials */ + makesMaterials: boolean; + /** Whether the industry of this division is capable of developing and producing products */ + makesProducts: boolean; } /** @@ -7516,6 +7521,8 @@ interface CorporationInfo { shareSaleCooldown: number; /** Amount of acquirable shares. */ issuedShares: number; + /** Cooldown until new shares can be issued */ + issueNewSharesCooldown: number; /** Price of the shares */ sharePrice: number; /** Fraction of profits issued as dividends */ @@ -7852,7 +7859,7 @@ interface Division { cities: CityName[]; /** Names of Products developed by this division */ products: string[]; - /** Whether the industry this division is in is capable of making products */ + /** Whether the industry of this division is capable of developing and producing products */ makesProducts: boolean; /** How many products this division can support */ maxProducts: number;