From c973663dc2b4e92dd48b8311b7c48062acf10d10 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Sun, 17 Mar 2019 18:20:31 -0700 Subject: [PATCH] Fixed empty td Element issue with new React Character overview. Updated changelog --- src/Constants.ts | 3 + .../ui/CorporationUIEventHandler.js | 10 ++- src/ui/React/CharacterOverview.jsx | 80 +++++++++---------- 3 files changed, 49 insertions(+), 44 deletions(-) diff --git a/src/Constants.ts b/src/Constants.ts index 1d48c94a2..be3018275 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -289,6 +289,8 @@ export let CONSTANTS: IMap = { ** Increased the cost multiplier for upgrading office size (the cost will increase faster) ** The stats of your employees now has a slightly larger effect on production & sales ** Added several new Research upgrades + ** Market-TA research now allows you to automatically set sale price at optimal values + ** Market-TA research now works for Products (not just Materials) ** Reduced the amount of Scientific Research needed to unlock the Hi-Tech R&D Laboratory from 10k to 5k ** Energy Material requirement of the Software industry reduced from 1 to 0.5 ** It is now slightly easier to increase the Software industry's production multiplier @@ -299,6 +301,7 @@ export let CONSTANTS: IMap = { ** Training employees is now 3x more effective ** Bug Fix: An industry's products are now properly separated between different cities + * Added a Netscript API for Duplicate Sleeves (by hydroflame) * Rebalanced BitNode-3 to make it slightly harder * Bug Fix: Bladeburner's Hyperbolic Regeneration Chamber should no longer instantly refill all stamina * Bug Fix: The cost of purchasing Augmentations for Duplicate Sleeves no longer scales with how many Augs you've purchased for yourself diff --git a/src/Corporation/ui/CorporationUIEventHandler.js b/src/Corporation/ui/CorporationUIEventHandler.js index a43d78819..713ad825f 100644 --- a/src/Corporation/ui/CorporationUIEventHandler.js +++ b/src/Corporation/ui/CorporationUIEventHandler.js @@ -542,7 +542,9 @@ export class CorporationEventHandler { }); let confirmBtn; const input = createElement("input", { - type:"number", placeholder:"Limit", + margin: "5px", + placeholder:"Limit", + type:"number", onkeyup: (e) => { e.preventDefault(); if (e.keyCode === KEY.ENTER) { confirmBtn.click(); } @@ -550,9 +552,9 @@ export class CorporationEventHandler { }); confirmBtn = createElement("button", { class: "std-button", - display:"inline-block", - innerText:"Limit production", - margin:'6px', + display: "inline-block", + innerText: "Limit production", + margin: "5px", clickListener: () => { if (input.value === "") { product.prdman[city][0] = false; diff --git a/src/ui/React/CharacterOverview.jsx b/src/ui/React/CharacterOverview.jsx index 1bdc69c9c..a3594cc75 100644 --- a/src/ui/React/CharacterOverview.jsx +++ b/src/ui/React/CharacterOverview.jsx @@ -8,47 +8,47 @@ const Component = React.Component; export class CharacterOverviewComponent extends Component { render() { - let intelligence = ""; - if (Player.intelligence >= 1) { - intelligence=( - - Int: {(Player.intelligence).toLocaleString()} - -); - } + const intelligence = ( + + Int: {(Player.intelligence).toLocaleString()} + + ); return ( -
- - - - - - - - - - - - - - - - - - - - - - - - - - - {intelligence} - -
Hp:{Player.hp + " / " + Player.max_hp}
Money: {numeralWrapper.format(Player.money.toNumber(), '$0.000a')}
Hack: {(Player.hacking_skill).toLocaleString()}
Str: {(Player.strength).toLocaleString()}
Def: {(Player.defense).toLocaleString()}
Dex: {(Player.dexterity).toLocaleString()}
Agi: {(Player.agility).toLocaleString()}
Cha: {(Player.charisma).toLocaleString()}
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + { + Player.intelligence >= 1 && + intelligence + } + +
Hp:{Player.hp + " / " + Player.max_hp}
Money: {numeralWrapper.format(Player.money.toNumber(), '$0.000a')}
Hack: {(Player.hacking_skill).toLocaleString()}
Str: {(Player.strength).toLocaleString()}
Def: {(Player.defense).toLocaleString()}
Dex: {(Player.dexterity).toLocaleString()}
Agi: {(Player.agility).toLocaleString()}
Cha: {(Player.charisma).toLocaleString()}
+
) } -} \ No newline at end of file +}