mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-12-21 05:35:45 +01:00
Fix bug with recent Corporation UI rewrite. Improve some styling with Corporation UI and the status text messages
This commit is contained in:
parent
5230837dad
commit
8eecb1539c
@ -60,7 +60,6 @@
|
|||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
overflow: visible;
|
overflow: visible;
|
||||||
padding: 2px;
|
|
||||||
top: 10px;
|
top: 10px;
|
||||||
width: 45%;
|
width: 45%;
|
||||||
}
|
}
|
||||||
@ -69,18 +68,21 @@
|
|||||||
border: 1px solid #fff;
|
border: 1px solid #fff;
|
||||||
color: var(--my-font-color);
|
color: var(--my-font-color);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
padding: 3px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cmpy-mgmt-employee-panel {
|
.cmpy-mgmt-employee-panel {
|
||||||
border: 1px solid #fff;
|
border: 1px solid #fff;
|
||||||
display: block;
|
display: block;
|
||||||
|
padding: 3px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cmpy-mgmt-warehouse-panel {
|
.cmpy-mgmt-warehouse-panel {
|
||||||
border: 1px solid #fff;
|
border: 1px solid #fff;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
padding: 3px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,7 +203,6 @@ a:visited {
|
|||||||
|
|
||||||
.status-text {
|
.status-text {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 15%;
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
-webkit-animation: status-text 3s 1;
|
-webkit-animation: status-text 3s 1;
|
||||||
@ -215,10 +214,12 @@ a:visited {
|
|||||||
|
|
||||||
#status-text {
|
#status-text {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
font-size: $defaultFontSize * 1.25;
|
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
display: none;
|
||||||
|
font-size: $defaultFontSize * 1.25;
|
||||||
margin-right: 14px;
|
margin-right: 14px;
|
||||||
|
opacity: 0;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
@ -751,16 +751,20 @@ Industry.prototype.processMaterials = function(marketCycles=1, company) {
|
|||||||
}
|
}
|
||||||
var mat = warehouse.materials[matName];
|
var mat = warehouse.materials[matName];
|
||||||
|
|
||||||
|
// Calculate sale cost
|
||||||
|
const markupLimit = mat.getMarkupLimit();
|
||||||
var sCost;
|
var sCost;
|
||||||
if (isString(mat.sCost)) {
|
if (mat.marketTa1) {
|
||||||
|
sCost = mat.bCost + markupLimit;
|
||||||
|
} else if (isString(mat.sCost)) {
|
||||||
sCost = mat.sCost.replace(/MP/g, mat.bCost);
|
sCost = mat.sCost.replace(/MP/g, mat.bCost);
|
||||||
sCost = eval(sCost);
|
sCost = eval(sCost);
|
||||||
} else {
|
} else {
|
||||||
sCost = mat.sCost;
|
sCost = mat.sCost;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Calculate how much of the material sells (per second)
|
// Calculate how much of the material sells (per second)
|
||||||
let markup = 1, markupLimit = mat.getMarkupLimit();
|
let markup = 1;
|
||||||
if (sCost > mat.bCost) {
|
if (sCost > mat.bCost) {
|
||||||
//Penalty if difference between sCost and bCost is greater than markup limit
|
//Penalty if difference between sCost and bCost is greater than markup limit
|
||||||
if ((sCost - mat.bCost) > markupLimit) {
|
if ((sCost - mat.bCost) > markupLimit) {
|
||||||
@ -1111,7 +1115,6 @@ Industry.prototype.discontinueProduct = function(product, parentRefs) {
|
|||||||
if (this.products.hasOwnProperty(productName)) {
|
if (this.products.hasOwnProperty(productName)) {
|
||||||
if (product === this.products[productName]) {
|
if (product === this.products[productName]) {
|
||||||
delete this.products[productName];
|
delete this.products[productName];
|
||||||
company.updateUIContent();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1534,31 +1537,6 @@ Employee.prototype.createUI = function(panel, corporation, industry) {
|
|||||||
panel.appendChild(selector);
|
panel.appendChild(selector);
|
||||||
}
|
}
|
||||||
|
|
||||||
Employee.prototype.updateUI = function(panel, corporation, industry) {
|
|
||||||
var effCre = this.cre * corporation.getEmployeeCreMultiplier() * industry.getEmployeeCreMultiplier(),
|
|
||||||
effCha = this.cha * corporation.getEmployeeChaMultiplier() * industry.getEmployeeChaMultiplier(),
|
|
||||||
effInt = this.int * corporation.getEmployeeIntMultiplier() * industry.getEmployeeIntMultiplier(),
|
|
||||||
effEff = this.eff * corporation.getEmployeeEffMultiplier() * industry.getEmployeeEffMultiplier();
|
|
||||||
if (panel == null) {
|
|
||||||
console.log("ERROR: Employee.updateUI() called with null panel");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var text = document.getElementById("cmpy-mgmt-employee-" + this.name + "-panel-text");
|
|
||||||
if (text == null) {
|
|
||||||
return this.createUI(panel);
|
|
||||||
}
|
|
||||||
text.innerHTML = "Morale: " + formatNumber(this.mor, 3) + "<br>" +
|
|
||||||
"Happiness: " + formatNumber(this.hap, 3) + "<br>" +
|
|
||||||
"Energy: " + formatNumber(this.ene, 3) + "<br>" +
|
|
||||||
"Age: " + formatNumber(this.age, 3) + "<br>" +
|
|
||||||
"Intelligence: " + formatNumber(effInt, 3) + "<br>" +
|
|
||||||
"Charisma: " + formatNumber(effCha, 3) + "<br>" +
|
|
||||||
"Experience: " + formatNumber(this.exp, 3) + "<br>" +
|
|
||||||
"Creativity: " + formatNumber(effCre, 3) + "<br>" +
|
|
||||||
"Efficiency: " + formatNumber(effEff, 3) + "<br>" +
|
|
||||||
"Salary: " + numeralWrapper.format(this.sal, "$0.000a") + "/ s<br>";
|
|
||||||
}
|
|
||||||
|
|
||||||
Employee.prototype.toJSON = function() {
|
Employee.prototype.toJSON = function() {
|
||||||
return Generic_toJSON("Employee", this);
|
return Generic_toJSON("Employee", this);
|
||||||
}
|
}
|
||||||
@ -1606,6 +1584,10 @@ function OfficeSpace(params={}) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OfficeSpace.prototype.atCapacity = function() {
|
||||||
|
return (this.employees.length) >= this.size;
|
||||||
|
}
|
||||||
|
|
||||||
OfficeSpace.prototype.process = function(marketCycles=1, parentRefs) {
|
OfficeSpace.prototype.process = function(marketCycles=1, parentRefs) {
|
||||||
var corporation = parentRefs.corporation, industry = parentRefs.industry;
|
var corporation = parentRefs.corporation, industry = parentRefs.industry;
|
||||||
|
|
||||||
@ -1685,6 +1667,7 @@ OfficeSpace.prototype.calculateEmployeeProductivity = function(marketCycles=1, p
|
|||||||
//Takes care of UI as well
|
//Takes care of UI as well
|
||||||
OfficeSpace.prototype.findEmployees = function(parentRefs) {
|
OfficeSpace.prototype.findEmployees = function(parentRefs) {
|
||||||
var company = parentRefs.corporation, division = parentRefs.industry;
|
var company = parentRefs.corporation, division = parentRefs.industry;
|
||||||
|
if (this.atCapacity()) { return; }
|
||||||
if (document.getElementById("cmpy-mgmt-hire-employee-popup") != null) {return;}
|
if (document.getElementById("cmpy-mgmt-hire-employee-popup") != null) {return;}
|
||||||
|
|
||||||
//Generate three random employees (meh, decent, amazing)
|
//Generate three random employees (meh, decent, amazing)
|
||||||
@ -1782,7 +1765,7 @@ OfficeSpace.prototype.hireEmployee = function(employee, parentRefs) {
|
|||||||
}
|
}
|
||||||
employee.name = name;
|
employee.name = name;
|
||||||
this.employees.push(employee);
|
this.employees.push(employee);
|
||||||
company.displayDivisionContent(division, currentCityUi);
|
company.rerender();
|
||||||
return yesNoTxtInpBoxClose();
|
return yesNoTxtInpBoxClose();
|
||||||
});
|
});
|
||||||
noBtn.addEventListener("click", ()=>{
|
noBtn.addEventListener("click", ()=>{
|
||||||
@ -1793,6 +1776,7 @@ OfficeSpace.prototype.hireEmployee = function(employee, parentRefs) {
|
|||||||
|
|
||||||
OfficeSpace.prototype.hireRandomEmployee = function(parentRefs) {
|
OfficeSpace.prototype.hireRandomEmployee = function(parentRefs) {
|
||||||
var company = parentRefs.corporation, division = parentRefs.industry;
|
var company = parentRefs.corporation, division = parentRefs.industry;
|
||||||
|
if (this.atCapacity()) { return; }
|
||||||
if (document.getElementById("cmpy-mgmt-hire-employee-popup") != null) {return;}
|
if (document.getElementById("cmpy-mgmt-hire-employee-popup") != null) {return;}
|
||||||
|
|
||||||
//Generate three random employees (meh, decent, amazing)
|
//Generate three random employees (meh, decent, amazing)
|
||||||
@ -1822,7 +1806,6 @@ OfficeSpace.prototype.hireRandomEmployee = function(parentRefs) {
|
|||||||
}
|
}
|
||||||
emp.name = name;
|
emp.name = name;
|
||||||
this.employees.push(emp);
|
this.employees.push(emp);
|
||||||
company.displayDivisionContent(division, currentCityUi);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Finds the first unassigned employee and assigns its to the specified job
|
//Finds the first unassigned employee and assigns its to the specified job
|
||||||
@ -2021,7 +2004,7 @@ Corporation.prototype.getInvestment = function() {
|
|||||||
++this.fundingRound;
|
++this.fundingRound;
|
||||||
this.funds = this.funds.plus(funding);
|
this.funds = this.funds.plus(funding);
|
||||||
this.numShares -= investShares;
|
this.numShares -= investShares;
|
||||||
this.displayCorporationOverviewContent();
|
this.rerender();
|
||||||
return yesNoBoxClose();
|
return yesNoBoxClose();
|
||||||
});
|
});
|
||||||
noBtn.addEventListener("click", ()=>{
|
noBtn.addEventListener("click", ()=>{
|
||||||
@ -2074,7 +2057,7 @@ Corporation.prototype.goPublic = function() {
|
|||||||
this.issuedShares = numShares;
|
this.issuedShares = numShares;
|
||||||
this.numShares -= numShares;
|
this.numShares -= numShares;
|
||||||
this.funds = this.funds.plus(numShares * initialSharePrice);
|
this.funds = this.funds.plus(numShares * initialSharePrice);
|
||||||
this.displayCorporationOverviewContent();
|
this.rerender();
|
||||||
removeElementById(goPublicPopupId);
|
removeElementById(goPublicPopupId);
|
||||||
dialogBoxCreate(`You took your ${this.name} public and earned ` +
|
dialogBoxCreate(`You took your ${this.name} public and earned ` +
|
||||||
`${numeralWrapper.formatMoney(numShares * initialSharePrice)} in your IPO`);
|
`${numeralWrapper.formatMoney(numShares * initialSharePrice)} in your IPO`);
|
||||||
@ -2213,8 +2196,6 @@ Corporation.prototype.upgrade = function(upgrade) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.updateCorporationOverviewContent();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Corporation.prototype.getProductionMultiplier = function() {
|
Corporation.prototype.getProductionMultiplier = function() {
|
||||||
|
@ -26,7 +26,7 @@ export class Warehouse {
|
|||||||
breakdown: string = "";
|
breakdown: string = "";
|
||||||
|
|
||||||
// Warehouse's level, which affects its maximum size
|
// Warehouse's level, which affects its maximum size
|
||||||
level: number = 0;
|
level: number = 1;
|
||||||
|
|
||||||
// City that this Warehouse is in
|
// City that this Warehouse is in
|
||||||
loc: string;
|
loc: string;
|
||||||
|
@ -89,7 +89,8 @@ export const researchMetadata: IConstructorParams[] = [
|
|||||||
desc: "Develop advanced AI software that uses technical analysis to " +
|
desc: "Develop advanced AI software that uses technical analysis to " +
|
||||||
"help you understand and exploit the market. This research " +
|
"help you understand and exploit the market. This research " +
|
||||||
"allows you to know what price to sell your Materials/Products " +
|
"allows you to know what price to sell your Materials/Products " +
|
||||||
"at in order to avoid losing sales due to having too high of a mark-up.",
|
"at in order to avoid losing sales due to having too high of a mark-up. " +
|
||||||
|
"It also lets you automatically use that sale price.",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Market-TA.II",
|
name: "Market-TA.II",
|
||||||
|
@ -32,6 +32,8 @@ export class CityTabs extends BaseReactComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
const division = this.routing().currentDivision;
|
||||||
|
|
||||||
const tabs = [];
|
const tabs = [];
|
||||||
|
|
||||||
// Tabs for each city
|
// Tabs for each city
|
||||||
@ -44,7 +46,7 @@ export class CityTabs extends BaseReactComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Tab to "Expand into new City"
|
// Tab to "Expand into new City"
|
||||||
const newCityOnClick = this.eventHandler().createNewCityPopup.bind(this.eventHandler());
|
const newCityOnClick = this.eventHandler().createNewCityPopup.bind(this.eventHandler(), division);
|
||||||
tabs.push(this.renderTab({
|
tabs.push(this.renderTab({
|
||||||
current: false,
|
current: false,
|
||||||
key: "Expand into new City",
|
key: "Expand into new City",
|
||||||
|
@ -239,6 +239,7 @@ export class CorporationEventHandler {
|
|||||||
clickListener:()=>{
|
clickListener:()=>{
|
||||||
industry.discontinueProduct(product, parentRefs);
|
industry.discontinueProduct(product, parentRefs);
|
||||||
removeElementById(popupId);
|
removeElementById(popupId);
|
||||||
|
this.corp.rerender();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -669,6 +670,28 @@ export class CorporationEventHandler {
|
|||||||
". This means that if you set the sale price higher than this, " +
|
". This means that if you set the sale price higher than this, " +
|
||||||
"you will begin to experience a loss in number of sales",
|
"you will begin to experience a loss in number of sales",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Enable using Market-TA1 for automatically setting sale price
|
||||||
|
const useTa1AutoSaleId = "cmpy-mgmt-marketa1-checkbox";
|
||||||
|
const useTa1AutoSaleDiv = createElement("div", { display: "block" });
|
||||||
|
const useTa1AutoSaleLabel = createElement("label", {
|
||||||
|
color: "white",
|
||||||
|
for: useTa1AutoSaleId,
|
||||||
|
innerText: "Use Market-TA.I for Auto-Sale Price",
|
||||||
|
tooltip: "If this is enabled, then this Material will automatically " +
|
||||||
|
"be sold at the price identified by Market-TA.I (i.e. the price shown above)"
|
||||||
|
})
|
||||||
|
const useTa1AutoSaleCheckbox = createElement("input", {
|
||||||
|
id: useTa1AutoSaleId,
|
||||||
|
type: "checkbox",
|
||||||
|
value: mat.marketTa1,
|
||||||
|
changeListener: (e) => {
|
||||||
|
mat.marketTa1 = e.target.value;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
useTa1AutoSaleDiv.appendChild(useTa1AutoSaleCheckbox);
|
||||||
|
useTa1AutoSaleDiv.appendChild(useTa1AutoSaleCheckbox);
|
||||||
|
|
||||||
const closeBtn = createPopupCloseButton(popupId, {
|
const closeBtn = createPopupCloseButton(popupId, {
|
||||||
class: "std-button",
|
class: "std-button",
|
||||||
display: "block",
|
display: "block",
|
||||||
@ -713,7 +736,7 @@ export class CorporationEventHandler {
|
|||||||
createPopup(popupId, [ta1, ta2Text, ta2Input, closeBtn]);
|
createPopup(popupId, [ta1, ta2Text, ta2Input, closeBtn]);
|
||||||
} else {
|
} else {
|
||||||
// Market-TA.I only
|
// Market-TA.I only
|
||||||
createPopup(popupId, [ta1, closeBtn]);
|
createPopup(popupId, [ta1, useTa1AutoSaleDiv, closeBtn]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -726,7 +749,6 @@ export class CorporationEventHandler {
|
|||||||
});
|
});
|
||||||
const citySelector = createElement("select", { class: "dropdown", margin:"5px" });
|
const citySelector = createElement("select", { class: "dropdown", margin:"5px" });
|
||||||
for (const cityName in division.offices) {
|
for (const cityName in division.offices) {
|
||||||
if (division.offices.hasOwnProperty(cityName)) {
|
|
||||||
if (!(division.offices[cityName] instanceof OfficeSpace)) {
|
if (!(division.offices[cityName] instanceof OfficeSpace)) {
|
||||||
citySelector.add(createElement("option", {
|
citySelector.add(createElement("option", {
|
||||||
text: cityName,
|
text: cityName,
|
||||||
@ -734,13 +756,11 @@ export class CorporationEventHandler {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const confirmBtn = createElement("a", {
|
const confirmBtn = createElement("a", {
|
||||||
class:"std-button",
|
class:"std-button",
|
||||||
display:"inline-block",
|
display:"inline-block",
|
||||||
innerText: "Confirm",
|
innerText: "Confirm",
|
||||||
margin:"3px",
|
|
||||||
clickListener: () => {
|
clickListener: () => {
|
||||||
let city = citySelector.options[citySelector.selectedIndex].value;
|
let city = citySelector.options[citySelector.selectedIndex].value;
|
||||||
if (this.corp.funds.lt(OfficeInitialCost)) {
|
if (this.corp.funds.lt(OfficeInitialCost)) {
|
||||||
|
@ -117,7 +117,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
|
|
||||||
// Helper functions for (re-)assigning employees to different positions
|
// Helper functions for (re-)assigning employees to different positions
|
||||||
const assignEmployee = (to) => {
|
const assignEmployee = (to) => {
|
||||||
if (this.state.numUnassigned >= 0) {
|
if (this.state.numUnassigned <= 0) {
|
||||||
console.warn("Cannot assign employee. No unassigned employees available");
|
console.warn("Cannot assign employee. No unassigned employees available");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -310,7 +310,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
||||||
{EmployeePositions.Operations}
|
{EmployeePositions.Operations} ({this.state.numOperations})
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Manages supply chain operations. Improves production.
|
Manages supply chain operations. Improves production.
|
||||||
</span>
|
</span>
|
||||||
@ -320,7 +320,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
<br />
|
<br />
|
||||||
|
|
||||||
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
||||||
{EmployeePositions.Engineer}
|
{EmployeePositions.Engineer} ({this.state.numEngineers})
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Develops and maintains products and production systems. Improves production.
|
Develops and maintains products and production systems. Improves production.
|
||||||
</span>
|
</span>
|
||||||
@ -330,7 +330,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
<br />
|
<br />
|
||||||
|
|
||||||
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
||||||
{EmployeePositions.Business}
|
{EmployeePositions.Business} ({this.state.numBusiness})
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Handles sales and finances. Improves sales.
|
Handles sales and finances. Improves sales.
|
||||||
</span>
|
</span>
|
||||||
@ -340,7 +340,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
<br />
|
<br />
|
||||||
|
|
||||||
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
||||||
{EmployeePositions.Management}
|
{EmployeePositions.Management} ({this.state.numManagement})
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Leads and oversees employees and office operations. Improves production.
|
Leads and oversees employees and office operations. Improves production.
|
||||||
</span>
|
</span>
|
||||||
@ -350,7 +350,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
<br />
|
<br />
|
||||||
|
|
||||||
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
||||||
{EmployeePositions.RandD}
|
{EmployeePositions.RandD} ({this.state.numResearch})
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Research new innovative ways to improve the company. Generates Scientific Research
|
Research new innovative ways to improve the company. Generates Scientific Research
|
||||||
</span>
|
</span>
|
||||||
@ -360,7 +360,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
<br />
|
<br />
|
||||||
|
|
||||||
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
<h2 className={"tooltip"} style={positionHeaderStyle}>
|
||||||
{EmployeePositions.Training}
|
{EmployeePositions.Training} ({this.state.numTraining})
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Set employee to training, which will increase some of their stats. Employees in training do not affect any company operations.
|
Set employee to training, which will increase some of their stats. Employees in training do not affect any company operations.
|
||||||
</span>
|
</span>
|
||||||
@ -402,13 +402,6 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const employeeSelectorStyle = {
|
|
||||||
backgroundColor: "black",
|
|
||||||
color: "white",
|
|
||||||
margin: "4px",
|
|
||||||
padding: "4px",
|
|
||||||
}
|
|
||||||
|
|
||||||
// Employee Positions Selector
|
// Employee Positions Selector
|
||||||
const employeePositions = [];
|
const employeePositions = [];
|
||||||
const positionNames = Object.values(EmployeePositions);
|
const positionNames = Object.values(EmployeePositions);
|
||||||
@ -475,7 +468,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<select style={employeeSelectorStyle} onChange={employeeSelectorOnChange}>
|
<select onChange={employeeSelectorOnChange}>
|
||||||
{employees}
|
{employees}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -492,16 +485,30 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Hire Employee button
|
// Hire Employee button
|
||||||
let hireEmployeeButtonClass = "std-button tooltip";
|
let hireEmployeeButtonClass = "tooltip";
|
||||||
|
if (office.atCapacity()) {
|
||||||
|
hireEmployeeButtonClass += " a-link-button-inactive";
|
||||||
|
} else {
|
||||||
|
hireEmployeeButtonClass += " std-button";
|
||||||
if (office.employees.length === 0) {
|
if (office.employees.length === 0) {
|
||||||
hireEmployeeButtonClass += " flashing-button";
|
hireEmployeeButtonClass += " flashing-button";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const hireEmployeeButtonOnClick = () => {
|
const hireEmployeeButtonOnClick = () => {
|
||||||
office.findEmployees({ corporation: corp, industry: division });
|
office.findEmployees({ corporation: corp, industry: division });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Autohire employee button
|
// Autohire employee button
|
||||||
|
let autohireEmployeeButtonClass = "tooltip";
|
||||||
|
if (office.atCapacity()) {
|
||||||
|
autohireEmployeeButtonClass += " a-link-button-inactive";
|
||||||
|
} else {
|
||||||
|
autohireEmployeeButtonClass += " std-button";
|
||||||
|
}
|
||||||
const autohireEmployeeButtonOnClick = () => {
|
const autohireEmployeeButtonOnClick = () => {
|
||||||
|
if (office.atCapacity()) { return; }
|
||||||
office.hireRandomEmployee({ corporation: corp, industry: division });
|
office.hireRandomEmployee({ corporation: corp, industry: division });
|
||||||
this.corp().rerender();
|
this.corp().rerender();
|
||||||
}
|
}
|
||||||
@ -514,7 +521,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={"cmpy-mgmt-employee-panel"}>
|
<div className={"cmpy-mgmt-employee-panel"}>
|
||||||
<h1>Office Space</h1>
|
<h1 style={{ margin: "4px 0px 5px 0px" }}>Office Space</h1>
|
||||||
<p>Size: {office.employees.length} / {office.size} employees</p>
|
<p>Size: {office.employees.length} / {office.size} employees</p>
|
||||||
<button className={hireEmployeeButtonClass} onClick={hireEmployeeButtonOnClick} style={buttonStyle}>
|
<button className={hireEmployeeButtonClass} onClick={hireEmployeeButtonOnClick} style={buttonStyle}>
|
||||||
Hire Employee
|
Hire Employee
|
||||||
@ -526,7 +533,7 @@ export class IndustryOffice extends BaseReactComponent {
|
|||||||
</span>
|
</span>
|
||||||
}
|
}
|
||||||
</button>
|
</button>
|
||||||
<button className={"std-button tooltip"} onClick={autohireEmployeeButtonOnClick} style={buttonStyle}>
|
<button className={autohireEmployeeButtonClass} onClick={autohireEmployeeButtonOnClick} style={buttonStyle}>
|
||||||
Autohire Employee
|
Autohire Employee
|
||||||
<span className={"tooltiptext"}>
|
<span className={"tooltiptext"}>
|
||||||
Automatically hires an employee and gives him/her a random name
|
Automatically hires an employee and gives him/her a random name
|
||||||
|
@ -163,10 +163,9 @@ export class IndustryOverview extends BaseReactComponent {
|
|||||||
products that you produce.
|
products that you produce.
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
<button className={"help-tip"} onClick={division.createResearchBox}>
|
<button className={"help-tip"} onClick={division.createResearchBox.bind(division)}>
|
||||||
Research
|
Research
|
||||||
</button>
|
</button>
|
||||||
<div className={"help-tip"} onClick={division.createResearchBox.bind(division)}>?</div>
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -157,6 +157,7 @@ function MaterialComponent(props) {
|
|||||||
const warehouse = props.warehouse;
|
const warehouse = props.warehouse;
|
||||||
const mat = props.mat;
|
const mat = props.mat;
|
||||||
const eventHandler = props.eventHandler;
|
const eventHandler = props.eventHandler;
|
||||||
|
const markupLimit = mat.getMarkupLimit();
|
||||||
|
|
||||||
// Numeraljs formatter
|
// Numeraljs formatter
|
||||||
const nf = "0.000";
|
const nf = "0.000";
|
||||||
@ -192,11 +193,13 @@ function MaterialComponent(props) {
|
|||||||
sellButtonText = (mat.sllman[1] === -1 ? "Sell (" + numeralWrapper.format(mat.sll, nf) + "/MAX)" :
|
sellButtonText = (mat.sllman[1] === -1 ? "Sell (" + numeralWrapper.format(mat.sll, nf) + "/MAX)" :
|
||||||
"Sell (" + numeralWrapper.format(mat.sll, nf) + "/" + numeralWrapper.format(mat.sllman[1], nf) + ")");
|
"Sell (" + numeralWrapper.format(mat.sll, nf) + "/" + numeralWrapper.format(mat.sllman[1], nf) + ")");
|
||||||
if (mat.sCost) {
|
if (mat.sCost) {
|
||||||
if (isString(mat.sCost)) {
|
if (mat.marketTa1) {
|
||||||
|
sellButtonText += " @ " + numeralWrapper.formatMoney(mat.bCost + markupLimit);
|
||||||
|
} else if (isString(mat.sCost)) {
|
||||||
var sCost = mat.sCost.replace(/MP/g, mat.bCost);
|
var sCost = mat.sCost.replace(/MP/g, mat.bCost);
|
||||||
sellButtonText += " @ $" + numeralWrapper.format(eval(sCost), "0.00");
|
sellButtonText += " @ " + numeralWrapper.formatMoney(eval(sCost));
|
||||||
} else {
|
} else {
|
||||||
sellButtonText += " @ $" + numeralWrapper.format(mat.sCost, "0.00");
|
sellButtonText += " @ " + numeralWrapper.formatMoney(mat.sCost);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -303,7 +306,7 @@ export class IndustryWarehouse extends BaseReactComponent {
|
|||||||
++warehouse.level;
|
++warehouse.level;
|
||||||
warehouse.updateSize(corp, division);
|
warehouse.updateSize(corp, division);
|
||||||
corp.funds = corp.funds.minus(sizeUpgradeCost);
|
corp.funds = corp.funds.minus(sizeUpgradeCost);
|
||||||
warehouse.createUI(parentRefs);
|
corp.rerender();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -444,12 +447,13 @@ export class IndustryWarehouse extends BaseReactComponent {
|
|||||||
{
|
{
|
||||||
corp.unlockUpgrades[1] &&
|
corp.unlockUpgrades[1] &&
|
||||||
<div>
|
<div>
|
||||||
<label style={{color: "white"}} for={smartSupplyCheckboxId}>
|
<label style={{color: "white"}} htmlFor={smartSupplyCheckboxId}>
|
||||||
Enable Smart Supply
|
Enable Smart Supply
|
||||||
</label>
|
</label>
|
||||||
<input type={"checkbox"}
|
<input type={"checkbox"}
|
||||||
id={smartSupplyCheckboxId}
|
id={smartSupplyCheckboxId}
|
||||||
onChange={smartSupplyOnChange}
|
onChange={smartSupplyOnChange}
|
||||||
|
style={{margin: "3px"}}
|
||||||
value={warehouse.smartSupplyEnabled}
|
value={warehouse.smartSupplyEnabled}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -17,11 +17,12 @@ export class LevelableUpgrade extends BaseReactComponent {
|
|||||||
const text = `${data[4]} - ${numeralWrapper.formatMoney(cost)}`
|
const text = `${data[4]} - ${numeralWrapper.formatMoney(cost)}`
|
||||||
const tooltip = data[5];
|
const tooltip = data[5];
|
||||||
const onClick = () => {
|
const onClick = () => {
|
||||||
if (this.corp().funds.lt(cost)) {
|
const corp = this.corp();
|
||||||
|
if (corp.funds.lt(cost)) {
|
||||||
dialogBoxCreate("Insufficient funds");
|
dialogBoxCreate("Insufficient funds");
|
||||||
} else {
|
} else {
|
||||||
this.corp().upgrade(data);
|
corp.upgrade(data);
|
||||||
//this.corp().displayCorporationOverviewContent();
|
corp.rerender();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,6 +9,8 @@ import { Industry } from "./Industry";
|
|||||||
import { Overview } from "./Overview";
|
import { Overview } from "./Overview";
|
||||||
import { overviewPage } from "./Routing";
|
import { overviewPage } from "./Routing";
|
||||||
|
|
||||||
|
import { OfficeSpace } from "../Corporation";
|
||||||
|
|
||||||
import { Cities } from "../../Locations/Cities";
|
import { Cities } from "../../Locations/Cities";
|
||||||
|
|
||||||
export class MainPanel extends BaseReactComponent {
|
export class MainPanel extends BaseReactComponent {
|
||||||
@ -59,11 +61,13 @@ export class MainPanel extends BaseReactComponent {
|
|||||||
// City tabs
|
// City tabs
|
||||||
const onClicks = {};
|
const onClicks = {};
|
||||||
for (const cityName in division.offices) {
|
for (const cityName in division.offices) {
|
||||||
|
if (division.offices[cityName] instanceof OfficeSpace) {
|
||||||
onClicks[cityName] = () => {
|
onClicks[cityName] = () => {
|
||||||
this.state.city = cityName;
|
this.state.city = cityName;
|
||||||
this.corp().rerender();
|
this.corp().rerender();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
const cityTabs = (
|
const cityTabs = (
|
||||||
<CityTabs
|
<CityTabs
|
||||||
{...this.props}
|
{...this.props}
|
||||||
|
@ -11,11 +11,12 @@ export class UnlockUpgrade extends BaseReactComponent {
|
|||||||
const text = `${data[2]} - ${numeralWrapper.formatMoney(data[1])}`;
|
const text = `${data[2]} - ${numeralWrapper.formatMoney(data[1])}`;
|
||||||
const tooltip = data[3];
|
const tooltip = data[3];
|
||||||
const onClick = () => {
|
const onClick = () => {
|
||||||
if (this.corp().funds.lt(data[1])) {
|
const corp = this.corp();
|
||||||
|
if (corp.funds.lt(data[1])) {
|
||||||
dialogBoxCreate("Insufficient funds");
|
dialogBoxCreate("Insufficient funds");
|
||||||
} else {
|
} else {
|
||||||
this.corp().unlock(data);
|
corp.unlock(data);
|
||||||
//this.corp().displayCorporationOverviewContent();
|
corp.rerender();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -494,6 +494,29 @@ export function createDevMenu() {
|
|||||||
innerText: "Add cycles to Gang mechanic",
|
innerText: "Add cycles to Gang mechanic",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Corporation
|
||||||
|
const corpHeader = createElement("h2", { innerText: "Corporation" });
|
||||||
|
|
||||||
|
const corpStoredCyclesInput = createElement("input", {
|
||||||
|
class: "text-input",
|
||||||
|
margin: "5px",
|
||||||
|
placeholder: "# Cycles to Add",
|
||||||
|
type: "number",
|
||||||
|
});
|
||||||
|
|
||||||
|
const corpStoredCyclesButton = createElement("button", {
|
||||||
|
class: "std-button",
|
||||||
|
clickListener: () => {
|
||||||
|
try {
|
||||||
|
const cycles = parseInt(bladeburnerStoredCyclesInput.value);
|
||||||
|
Player.corporation.storeCycles(cycles);
|
||||||
|
} catch(e) {
|
||||||
|
exceptionAlert(`Failed to add cycles to Bladeburner in dev menu: ${e}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
innerText: "Add Cycles to Corporation mechanic",
|
||||||
|
});
|
||||||
|
|
||||||
// Coding Contracts
|
// Coding Contracts
|
||||||
const contractsHeader = createElement("h2", {innerText: "Coding Contracts"});
|
const contractsHeader = createElement("h2", {innerText: "Coding Contracts"});
|
||||||
|
|
||||||
@ -686,6 +709,10 @@ export function createDevMenu() {
|
|||||||
devMenuContainer.appendChild(gangStoredCyclesInput);
|
devMenuContainer.appendChild(gangStoredCyclesInput);
|
||||||
devMenuContainer.appendChild(gangAddStoredCycles);
|
devMenuContainer.appendChild(gangAddStoredCycles);
|
||||||
devMenuContainer.appendChild(createElement("br"));
|
devMenuContainer.appendChild(createElement("br"));
|
||||||
|
devMenuContainer.appendChild(corpHeader);
|
||||||
|
devMenuContainer.appendChild(corpStoredCyclesInput);
|
||||||
|
devMenuContainer.appendChild(corpStoredCyclesButton);
|
||||||
|
devMenuContainer.appendChild(createElement("br"));
|
||||||
devMenuContainer.appendChild(contractsHeader);
|
devMenuContainer.appendChild(contractsHeader);
|
||||||
devMenuContainer.appendChild(generateRandomContractBtn);
|
devMenuContainer.appendChild(generateRandomContractBtn);
|
||||||
devMenuContainer.appendChild(generateRandomContractOnHomeBtn);
|
devMenuContainer.appendChild(generateRandomContractOnHomeBtn);
|
||||||
|
@ -219,6 +219,7 @@ CodeMirror.defineMode("netscript", function(config, parserConfig) {
|
|||||||
"setActionAutolevel": atom,
|
"setActionAutolevel": atom,
|
||||||
"setActionLevel": atom,
|
"setActionLevel": atom,
|
||||||
"getRank": atom,
|
"getRank": atom,
|
||||||
|
"getBlackOpRank": atom,
|
||||||
"getSkillPoints": atom,
|
"getSkillPoints": atom,
|
||||||
"getSkillLevel": atom,
|
"getSkillLevel": atom,
|
||||||
"getSkillUpgradeCost": atom,
|
"getSkillUpgradeCost": atom,
|
||||||
|
@ -17,11 +17,13 @@ export function createStatusText(text: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const statusElement: HTMLElement = getElementById("status-text");
|
const statusElement: HTMLElement = getElementById("status-text");
|
||||||
|
statusElement.style.display = "block";
|
||||||
statusElement.classList.add("status-text");
|
statusElement.classList.add("status-text");
|
||||||
statusElement.innerText = text;
|
statusElement.innerText = text;
|
||||||
const handler: Action = () => {
|
const handler: Action = () => {
|
||||||
statusElement.classList.remove("status-text");
|
|
||||||
statusElement.innerText = "";
|
statusElement.innerText = "";
|
||||||
|
statusElement.style.display = "none";
|
||||||
|
statusElement.classList.remove("status-text");
|
||||||
};
|
};
|
||||||
|
|
||||||
x = setTimeoutRef(handler, threeSeconds);
|
x = setTimeoutRef(handler, threeSeconds);
|
||||||
|
Loading…
Reference in New Issue
Block a user