Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-21 05:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev

Browse Source
This commit is contained in:
danielyxie 2019-04-30 02:27:58 -07:00
commit 8726946d4a
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Corporation/Corporation.jsx
View File

@ -1463,7 +1463,6 @@ function Employee(params={}) {
this.hap = params.happiness ? params.happiness : getRandomInt(50, 100); this.hap = params.happiness ? params.happiness : getRandomInt(50, 100);
this.ene = params.energy ? params.energy : getRandomInt(50, 100); this.ene = params.energy ? params.energy : getRandomInt(50, 100);
this.age = params.age ? params.age : getRandomInt(20, 50);
this.int = params.intelligence ? params.intelligence : getRandomInt(10, 50); this.int = params.intelligence ? params.intelligence : getRandomInt(10, 50);
this.cha = params.charisma ? params.charisma : getRandomInt(10, 50); this.cha = params.charisma ? params.charisma : getRandomInt(10, 50);
this.exp = params.experience ? params.experience : getRandomInt(10, 50); this.exp = params.experience ? params.experience : getRandomInt(10, 50);
@ -1482,13 +1481,7 @@ function Employee(params={}) {
Employee.prototype.process = function(marketCycles=1, office) { Employee.prototype.process = function(marketCycles=1, office) {
var gain = 0.003 * marketCycles, var gain = 0.003 * marketCycles,
det = gain * Math.random(); det = gain * Math.random();
this.age += gain;
this.exp += gain; this.exp += gain;
if (this.age > 150) {
this.int -= det;
this.eff -= det;
this.cha -= det;
}
// Employee salaries slowly go up over time // Employee salaries slowly go up over time
this.cyclesUntilRaise -= marketCycles; this.cyclesUntilRaise -= marketCycles;
@ -1577,7 +1570,6 @@ Employee.prototype.createUI = function(panel, corporation, industry) {
innerHTML:"Morale: " + formatNumber(this.mor, 3) + "<br>" + innerHTML:"Morale: " + formatNumber(this.mor, 3) + "<br>" +
"Happiness: " + formatNumber(this.hap, 3) + "<br>" + "Happiness: " + formatNumber(this.hap, 3) + "<br>" +
"Energy: " + formatNumber(this.ene, 3) + "<br>" + "Energy: " + formatNumber(this.ene, 3) + "<br>" +
"Age: " + formatNumber(this.age, 3) + "<br>" +
"Intelligence: " + formatNumber(effInt, 3) + "<br>" + "Intelligence: " + formatNumber(effInt, 3) + "<br>" +
"Charisma: " + formatNumber(effCha, 3) + "<br>" + "Charisma: " + formatNumber(effCha, 3) + "<br>" +
"Experience: " + formatNumber(this.exp, 3) + "<br>" + "Experience: " + formatNumber(this.exp, 3) + "<br>" +

2
src/Corporation/ui/IndustryOffice.jsx
View File

@ -495,8 +495,6 @@ export class IndustryOffice extends BaseReactComponent {
<br /> <br />
Energy: {numeralWrapper.format(this.state.employee.ene, nf)} Energy: {numeralWrapper.format(this.state.employee.ene, nf)}
<br /> <br />
Age: {numeralWrapper.format(this.state.employee.age, nf)}
<br />
Intelligence: {numeralWrapper.format(effInt, nf)} Intelligence: {numeralWrapper.format(effInt, nf)}
<br /> <br />
Charisma: {numeralWrapper.format(effCha, nf)} Charisma: {numeralWrapper.format(effCha, nf)}