felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-05-02 13:57:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs with refactored Company/job code. Added 'expr' Terminal command

Browse Source
This commit is contained in:
danielyxie
2018-11-17 16:23:48 -08:00
parent 9b3ff6d2d3
commit b242ca2f42
13 changed files with 679 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Company/Companies.ts
+18
View File
@@ -16,9 +16,27 @@ function addCompany(params: IConstructorParams) {
// Used to initialize new Company objects for the Companies map
// Called when creating new game or after a prestige/reset
export function initCompanies() {
// Save Old Company data for 'favor'
const oldCompanies = Companies;
// Re-construct all Companies
Companies = {};
companiesMetadata.forEach((e) => {
addCompany(e);
});
// Reset data
for (const companyName in Companies) {
const company = Companies[companyName];
const oldCompany = oldCompanies[companyName];
if (!(oldCompany instanceof Company)) {
// New game, so no OldCompanies data
company.favor = 0;
} else {
company.favor = oldCompanies[companyName].favor;
if (isNaN(company.favor)) { company.favor = 0; }
}
}
}
// Used to load Companies map from a save
src/Company/data/CompaniesMetadata.ts
+20 -21
View File
@@ -1,7 +1,6 @@
import { IConstructorParams } from "../Company";
import { Locations } from "../../Locations";
import * as posNames from "./CompanyPositionNames";
import { SafeObjectAssign } from "../../../utils/SafeObjectAssign";
import { IMap } from "../../types";
// Create Objects containing Company Positions by category
@@ -306,7 +305,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.VolhavenOmniaCybersystems,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
CEOOnly,
OperationsManagerOnly,
AllTechnologyPositions,
@@ -319,7 +318,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.ChongqingSolarisSpaceSystems,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
CEOOnly,
OperationsManagerOnly,
AllTechnologyPositions,
@@ -332,7 +331,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12DeltaOne,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
CEOOnly,
OperationsManagerOnly,
AllTechnologyPositions,
@@ -345,7 +344,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.NewTokyoGlobalPharmaceuticals,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions,
AllBusinessPositions,
AllSoftwareConsultantPositions,
@@ -358,7 +357,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.IshimaNovaMedical,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions,
AllBusinessPositions,
AllSoftwareConsultantPositions,
@@ -371,7 +370,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12CIA,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
SoftwarePositionsUpToHeadOfEngineering,
AllNetworkEngineerPositions,
AllITPositions,
@@ -385,7 +384,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12NSA,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
SoftwarePositionsUpToHeadOfEngineering,
AllNetworkEngineerPositions,
AllITPositions,
@@ -399,7 +398,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.AevumWatchdogSecurity,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
SoftwarePositionsUpToHeadOfEngineering,
AllNetworkEngineerPositions,
AllITPositions,
@@ -414,7 +413,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.VolhavenLexoCorp,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions,
AllSoftwareConsultantPositions,
AllBusinessPositions,
@@ -427,7 +426,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.AevumRhoConstruction,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
SoftwarePositionsUpToLeadDeveloper,
BusinessPositionsUpToOperationsManager
),
@@ -438,7 +437,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12AlphaEnterprises,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
SoftwarePositionsUpToLeadDeveloper,
BusinessPositionsUpToOperationsManager,
AllSoftwareConsultantPositions
@@ -450,7 +449,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.AevumPolice,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllSecurityPositions,
SoftwarePositionsUpToLeadDeveloper
),
@@ -461,7 +460,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.VolhavenSysCoreSecurities,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions
),
expMultiplier: 1.3,
@@ -471,7 +470,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.VolhavenCompuTek,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions
),
expMultiplier: 1.2,
@@ -481,7 +480,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.AevumNetLinkTechnologies,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions
),
expMultiplier: 1.2,
@@ -491,7 +490,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12CarmichaelSecurity,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllTechnologyPositions,
AllAgentPositions,
AllSecurityPositions
@@ -503,7 +502,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12FoodNStuff,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
EmployeeOnly, PartTimeEmployeeOnly
),
expMultiplier: 1,
@@ -513,7 +512,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.Sector12JoesGuns,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
EmployeeOnly, PartTimeEmployeeOnly
),
expMultiplier: 1,
@@ -523,7 +522,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.IshimaOmegaSoftware,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
AllSoftwarePositions,
AllSoftwareConsultantPositions,
AllITPositions
@@ -535,7 +534,7 @@ export const companiesMetadata: IConstructorParams[] = [
{
name: Locations.NewTokyoNoodleBar,
info: "",
companyPositions: SafeObjectAssign(
companyPositions: Object.assign({},
WaiterOnly, PartTimeWaiterOnly
),
expMultiplier: 1,