build a few fixes

This commit is contained in:
Olivier Gagnon 2021-09-11 02:32:15 -04:00
parent 99e82cd867
commit 609ba34804
7 changed files with 38 additions and 35 deletions

File diff suppressed because one or more lines are too long

@ -1,2 +1,2 @@
!function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],a=0,s=[];a<f.length;a++)i=f[a],Object.prototype.hasOwnProperty.call(u,i)&&u[i]&&s.push(u[i][0]),u[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(p&&p(t);s.length;)s.shift()();return r.push.apply(r,l||[]),o()}function o(){for(var n,t=0;t<r.length;t++){for(var o=r[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==u[c]&&(e=!1)}e&&(r.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},u={2:0},r=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var p=c;r.push([907,0]),o()}({907:function(n,t,o){"use strict";o.r(t);o(908),o(910),o(912),o(914),o(916),o(918),o(920),o(922),o(924),o(926),o(928),o(930),o(932),o(934),o(936),o(938),o(940),o(942),o(944),o(946),o(948),o(950),o(952),o(954),o(956),o(958),o(960),o(962),o(964),o(966),o(968),o(970),o(972)},910:function(n,t,o){},912:function(n,t,o){},914:function(n,t,o){},916:function(n,t,o){},918:function(n,t,o){},920:function(n,t,o){},922:function(n,t,o){},924:function(n,t,o){},926:function(n,t,o){},928:function(n,t,o){},930:function(n,t,o){},932:function(n,t,o){},934:function(n,t,o){},936:function(n,t,o){},938:function(n,t,o){},940:function(n,t,o){},942:function(n,t,o){},944:function(n,t,o){},946:function(n,t,o){},948:function(n,t,o){},950:function(n,t,o){},952:function(n,t,o){},954:function(n,t,o){},956:function(n,t,o){},958:function(n,t,o){},960:function(n,t,o){},962:function(n,t,o){},964:function(n,t,o){},966:function(n,t,o){},968:function(n,t,o){},970:function(n,t,o){},972:function(n,t,o){}}); !function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],a=0,s=[];a<f.length;a++)i=f[a],Object.prototype.hasOwnProperty.call(u,i)&&u[i]&&s.push(u[i][0]),u[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(p&&p(t);s.length;)s.shift()();return r.push.apply(r,l||[]),o()}function o(){for(var n,t=0;t<r.length;t++){for(var o=r[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==u[c]&&(e=!1)}e&&(r.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},u={2:0},r=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var p=c;r.push([908,0]),o()}({908:function(n,t,o){"use strict";o.r(t);o(909),o(911),o(913),o(915),o(917),o(919),o(921),o(923),o(925),o(927),o(929),o(931),o(933),o(935),o(937),o(939),o(941),o(943),o(945),o(947),o(949),o(951),o(953),o(955),o(957),o(959),o(961),o(963),o(965),o(967),o(969),o(971),o(973)},911:function(n,t,o){},913:function(n,t,o){},915:function(n,t,o){},917:function(n,t,o){},919:function(n,t,o){},921:function(n,t,o){},923:function(n,t,o){},925:function(n,t,o){},927:function(n,t,o){},929:function(n,t,o){},931:function(n,t,o){},933:function(n,t,o){},935:function(n,t,o){},937:function(n,t,o){},939:function(n,t,o){},941:function(n,t,o){},943:function(n,t,o){},945:function(n,t,o){},947:function(n,t,o){},949:function(n,t,o){},951:function(n,t,o){},953:function(n,t,o){},955:function(n,t,o){},957:function(n,t,o){},959:function(n,t,o){},961:function(n,t,o){},963:function(n,t,o){},965:function(n,t,o){},967:function(n,t,o){},969:function(n,t,o){},971:function(n,t,o){},973:function(n,t,o){}});
//# sourceMappingURL=engineStyle.bundle.js.map //# sourceMappingURL=engineStyle.bundle.js.map

15
dist/engineStyle.css vendored

@ -12,7 +12,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
vertical-align: top; } vertical-align: middle; }
:root { :root {
--my-font-color: #6f3; --my-font-color: #6f3;
@ -562,7 +562,7 @@ input[type="checkbox"] {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
vertical-align: top; } vertical-align: middle; }
:root { :root {
--my-font-color: #6f3; --my-font-color: #6f3;
@ -1998,7 +1998,7 @@ button {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
vertical-align: top; } vertical-align: middle; }
:root { :root {
--my-font-color: #6f3; --my-font-color: #6f3;
@ -2449,6 +2449,9 @@ input[type="checkbox"] {
/* Sit on top of the container */ /* Sit on top of the container */
color: var(--my-font-color); } color: var(--my-font-color); }
.popup-box-input-div {
margin: 2px; }
.popup-box-button, .popup-box-button,
.popup-box-button-inactive { .popup-box-button-inactive {
color: #aaa; color: #aaa;
@ -2591,10 +2594,6 @@ input[type="checkbox"] {
#infiltration-faction-select { #infiltration-faction-select {
background-color: #000; } background-color: #000; }
/* Generic Yes No Box */
#yes-no-text-input-box-input {
color: #fff; }
/* Game Options */ /* Game Options */
#game-options-container { #game-options-container {
transition: opacity 400ms ease-in; } transition: opacity 400ms ease-in; }
@ -2751,7 +2750,7 @@ input[type="checkbox"] {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
vertical-align: top; } vertical-align: middle; }
/* COLORS */ /* COLORS */
/* Attributes */ /* Attributes */

26
dist/vendor.bundle.js vendored

File diff suppressed because one or more lines are too long

@ -52,7 +52,6 @@ export function Overview(props: IProps): React.ReactElement {
} }
function openBribeFactionPopup(): void { function openBribeFactionPopup(): void {
console.log("hello click");
const popupId = "corp-bribe-popup"; const popupId = "corp-bribe-popup";
createPopup(popupId, BribeFactionPopup, { createPopup(popupId, BribeFactionPopup, {
player: props.player, player: props.player,
@ -274,7 +273,7 @@ export function Overview(props: IProps): React.ReactElement {
function Upgrades(): React.ReactElement { function Upgrades(): React.ReactElement {
// Don't show upgrades // Don't show upgrades
if (props.corp.divisions.length <= 0) { if (props.corp.divisions.length <= 0) {
return <></>; return <h1>Unlock upgrades after creating your first division</h1>;
} }
return ( return (

@ -160,13 +160,13 @@ export function PlayerObject() {
this.has4SDataTixApi = false; this.has4SDataTixApi = false;
//Gang //Gang
this.gang = 0; this.gang = null;
//Corporation //Corporation
this.corporation = 0; this.corporation = null;
//Bladeburner //Bladeburner
this.bladeburner = 0; this.bladeburner = null;
this.bladeburner_max_stamina_mult = 1; this.bladeburner_max_stamina_mult = 1;
this.bladeburner_stamina_gain_mult = 1; this.bladeburner_stamina_gain_mult = 1;
this.bladeburner_analysis_mult = 1; //Field Analysis Only this.bladeburner_analysis_mult = 1; //Field Analysis Only

@ -48,7 +48,7 @@ export function SidebarRoot(props: IProps): React.ReactElement {
} }
function clickStats() { function clickStats() {
props.engine.loadTerminalContent(); props.engine.loadCharacterContent();
if (flashStats) iTutorialNextStep(); if (flashStats) iTutorialNextStep();
} }
@ -93,8 +93,13 @@ export function SidebarRoot(props: IProps): React.ReactElement {
const canOpenSleeves = props.player.sleeves.length > 0; const canOpenSleeves = props.player.sleeves.length > 0;
const canCorporation = props.player.corporation != null; // TODO(hydroflame): these should not as any but right now the def is that it
const canGang = props.player.gang != null; // can only be defined;
const canCorporation = !!(props.player.corporation as any);
const canGang = !!(props.player.gang as any);
const canJob = props.player.companyName !== "";
const canStockMarket = props.player.hasWseAccount;
const canBladeburner = !!(props.player.bladeburner as any);
return ( return (
<ul id="mainmenu" className="mainmenu noscrollbar noselect"> <ul id="mainmenu" className="mainmenu noscrollbar noselect">
@ -208,17 +213,17 @@ export function SidebarRoot(props: IProps): React.ReactElement {
<li className="mainmenu-accordion-panel"> <li className="mainmenu-accordion-panel">
<button onClick={() => props.engine.loadTravelContent()}>Travel</button> <button onClick={() => props.engine.loadTravelContent()}>Travel</button>
</li> </li>
{props.player.companyName !== "" && ( {canJob && (
<li className="mainmenu-accordion-panel"> <li className="mainmenu-accordion-panel">
<button onClick={() => props.engine.loadJobContent()}>Job</button> <button onClick={() => props.engine.loadJobContent()}>Job</button>
</li> </li>
)} )}
{props.player.hasWseAccount && ( {canStockMarket && (
<li className="mainmenu-accordion-panel"> <li className="mainmenu-accordion-panel">
<button onClick={() => props.engine.loadStockMarketContent()}>Stock Market</button> <button onClick={() => props.engine.loadStockMarketContent()}>Stock Market</button>
</li> </li>
)} )}
{props.player.bladeburner && ( {canBladeburner && (
<li className="mainmenu-accordion-panel"> <li className="mainmenu-accordion-panel">
<button onClick={() => props.engine.loadBladeburnerContent()}>Bladeburner</button> <button onClick={() => props.engine.loadBladeburnerContent()}>Bladeburner</button>
</li> </li>