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

Fixed merge conflicts with dev

Browse Source
This commit is contained in:
danielyxie
2018-11-15 19:45:03 -08:00
parent d6bdc9433a 93f241029a
commit 9b3ff6d2d3
29 changed files with 4879 additions and 4314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Company/data/CompanyPositionsMetadata.ts
+6 -6
View File
@@ -185,7 +185,7 @@ export const companyPositionMetadata: IConstructorParams[] = [
baseSalary: 410,
charismaEffectiveness: 20,
charismaExpGain: 0.1,
hackingEffectiveness: 0.80,
hackingEffectiveness: 80,
hackingExpGain: 0.5,
reqdCharisma: 76,
reqdHacking: 251,
@@ -419,7 +419,7 @@ export const companyPositionMetadata: IConstructorParams[] = [
},
{
name: posNames.AgentCompanyPositions[0], // Field Agent
nextPosition: posNames.AgentCompanyPositions[0], // Secret Agent
nextPosition: posNames.AgentCompanyPositions[1], // Secret Agent
baseSalary: 330,
hackingEffectiveness: 10,
strengthEffectiveness: 15,
@@ -443,8 +443,8 @@ export const companyPositionMetadata: IConstructorParams[] = [
repMultiplier: 1,
},
{
name: posNames.AgentCompanyPositions[0], // Secret Agent
nextPosition: posNames.AgentCompanyPositions[0], // Special Operative
name: posNames.AgentCompanyPositions[1], // Secret Agent
nextPosition: posNames.AgentCompanyPositions[2], // Special Operative
baseSalary: 990,
hackingEffectiveness: 15,
strengthEffectiveness: 15,
@@ -468,7 +468,7 @@ export const companyPositionMetadata: IConstructorParams[] = [
repMultiplier: 1.25,
},
{
name: posNames.AgentCompanyPositions[0], // Special Operative
name: posNames.AgentCompanyPositions[2], // Special Operative
nextPosition: null,
baseSalary: 2000,
hackingEffectiveness: 15,
@@ -558,7 +558,7 @@ export const companyPositionMetadata: IConstructorParams[] = [
repMultiplier: 1,
},
{
name: posNames.BusinessConsultantCompanyPositions[0], // Senior Business Consultant
name: posNames.BusinessConsultantCompanyPositions[1], // Senior Business Consultant
nextPosition: null,
baseSalary: 525,
hackingEffectiveness: 15,