From f721e21622ecf5e379ef2a5a54e2a39605fe31fa Mon Sep 17 00:00:00 2001 From: Mat Jaworski Date: Fri, 7 Sep 2018 00:15:36 +1000 Subject: [PATCH] More minor font colour and Infiltration details updates --- css/_theme.scss | 3 ++- css/popupboxes.scss | 10 ++++++++++ css/styles.scss | 4 ++++ index.html | 30 +++++++++++++++--------------- src/Faction.js | 2 +- src/Infiltration.js | 29 +++++++++++++++-------------- src/Player.js | 2 +- src/SaveObject.js | 6 +++--- src/engine.js | 6 +++--- src/index.html | 4 ++-- utils/InfiltrationBox.js | 10 +++++----- 11 files changed, 61 insertions(+), 45 deletions(-) diff --git a/css/_theme.scss b/css/_theme.scss index 54c868bca..0b727d702 100644 --- a/css/_theme.scss +++ b/css/_theme.scss @@ -6,11 +6,12 @@ $hacker-green: #adff2f; $success-green: #3adb76; $alert-red: #ff2929; $money-gold: #ffd700; +$light-yellow: #faffdf; /* Attributes */ $my-stat-hp-color: #dd3434; $my-stat-money-color: $money-gold; $my-stat-hack-color: $hacker-green; -$my-stat-physical: #faffdf; +$my-stat-physical: $light-yellow; $my-stat-cha-color: #a671d1; $my-stat-int-color: #6495ed; diff --git a/css/popupboxes.scss b/css/popupboxes.scss index 453a06e7a..d6536f2c5 100644 --- a/css/popupboxes.scss +++ b/css/popupboxes.scss @@ -87,6 +87,11 @@ z-index: 2; background-color: var(--my-background-color); padding: 10px; + + p span { + padding: 0; + margin: 0; + } } .dialog-box-close-button { @@ -138,6 +143,11 @@ margin: 8px; } +#infiltration-box-content span { + padding: 0; + margin: 0; +} + #infiltration-faction-select { background-color: #000; } diff --git a/css/styles.scss b/css/styles.scss index d2156b3d8..c0ee086e3 100644 --- a/css/styles.scss +++ b/css/styles.scss @@ -618,6 +618,10 @@ a:visited { color: $money-gold; } +.light-yellow { + color: $light-yellow; +} + .failure { color: $alert-red; text-shadow: 0 0 0 $alert-red; diff --git a/index.html b/index.html index 2df50a3b7..7c6a79b0a 100644 --- a/index.html +++ b/index.html @@ -187,9 +187,9 @@ provides information about each script's production. The scripts are categorized by the hostname of the servers on which they are running.

Total online production of - Active scripts: $0.000 / sec
+ Active scripts: $0.000 / sec
Total online production since last Aug installation: $0.000 - ($0.000 / sec)

+ ($0.000 / sec)

@@ -201,19 +201,19 @@ The Hacknet is a global, decentralized network of machines. It is used by hackers all around the world to anonymously share computing power and perform distributed cyberattacks without the fear of being traced. -

+

Here, you can purchase a Hacknet Node, a specialized machine that can connect and contribute its resources to the Hacknet network. This allows you to take a small percentage of profits from hacks performed on the network. Essentially, you are renting out your Node's computing power. -

+

Each Hacknet Node you purchase will passively earn you money. Each Hacknet Node can be upgraded in order to increase its computing power and thereby increase the profit you earn from it.

Purchase Hacknet Node -
+

- Money:
+ Money:
Total Hacknet Node Production:

@@ -623,7 +623,7 @@

You have entered the Slums, a poverty-ridden district filled with gangs, criminals, and other shadowy entities. The city's government and police have neglected this area for years... -


+


In the Slums, you can commit crimes to earn money and experience. Crime attempts are not always successful. Your chance at successfully committing a crime is determined by your stats.

@@ -670,7 +670,7 @@

- Welcome to the World Stock Exchange (WSE)!

+ Welcome to the World Stock Exchange (WSE)!

To begin trading, you must first purchase an account. WSE accounts will persist after you 'reset' by installing Augmentations. @@ -683,7 +683,7 @@ TIX, short for Trade Information eXchange, is the communications protocol supported by the WSE. Purchasing access to the TIX API lets you write code to create your own algorithmic/automated trading strategies. -

+

If you purchase access to the TIX API, you will retain that access even after you 'reset' by installing Augmentations.

@@ -693,7 +693,7 @@

Four Sigma's (4S) Market Data Feed provides information about stocks that will help your trading strategies. -

+

If you purchase access to 4S Market Data and/or the 4S TIX API, you will retain that access even after you 'reset' by installing Augmentations.

@@ -711,7 +711,7 @@ Expand tickers Collapse tickers -

+

Update Watchlist
    @@ -753,7 +753,7 @@

    - Would you like to join?

    + Would you like to join?

    Warning: Joining this faction may prevent you from joining other factions during this run!

    Yes @@ -766,8 +766,8 @@

    - Sell on Black Market

    -
    + Sell on Black Market

    +
    Give to Faction for Reputation
    @@ -853,7 +853,7 @@
    ×

    Game Options

    -
    +
    diff --git a/src/Faction.js b/src/Faction.js index 688021af9..133675548 100644 --- a/src/Faction.js +++ b/src/Faction.js @@ -115,7 +115,7 @@ function factionExists(name) { // This might change in the future for balance function initFactions() { for(const name in FactionInfos) { - resetFaction(new Faction(name)); + resetFaction(new Faction(name)); } } diff --git a/src/Infiltration.js b/src/Infiltration.js index 0e4a0f2cd..504c3407f 100644 --- a/src/Infiltration.js +++ b/src/Infiltration.js @@ -429,9 +429,9 @@ function endInfiltrationLevel(inst) { BitNodeMultipliers.InfiltrationMoney; inst.secretsStolen.push(baseSecretValue); dialogBoxCreate("You found and stole a set of classified documents from the company. " + - "These classified secrets could probably be sold for money ($" + - formatNumber(secretMoneyValue, 2) + "), or they " + - "could be given to factions for reputation (" + formatNumber(secretValue, 3) + " rep)"); + "These classified secrets could probably be sold for money ($" + + formatNumber(secretMoneyValue, 2) + "), or they " + + "could be given to factions for reputation (" + formatNumber(secretValue, 3) + " rep)"); } //Increase security level based on difficulty @@ -469,17 +469,18 @@ function updateInfiltrationLevelText(inst) { var expMultiplier = 2 * inst.clearanceLevel / inst.maxClearanceLevel; document.getElementById("infiltration-level-text").innerHTML = - "Facility name:   " + inst.companyName + "
    " + - "Clearance Level: " + inst.clearanceLevel + "
    " + - "Security Level:  " + formatNumber(inst.securityLevel, 3) + "

    " + - "Total reputation value of secrets stolen: " + formatNumber(totalValue, 3) + "
    " + - "Total monetary value of secrets stolen:  $" + formatNumber(totalMoneyValue, 2) + "

    " + - "Hack exp gained: " + formatNumber(inst.hackingExpGained * expMultiplier, 3) + "
    " + - "Str exp gained:  " + formatNumber(inst.strExpGained * expMultiplier, 3) + "
    " + - "Def exp gained:  " + formatNumber(inst.defExpGained * expMultiplier, 3) + "
    " + - "Dex exp gained:  " + formatNumber(inst.dexExpGained * expMultiplier, 3) + "
    " + - "Agi exp gained:  " + formatNumber(inst.agiExpGained * expMultiplier, 3) + "
    " + - "Cha exp gained:  " + formatNumber(inst.chaExpGained * expMultiplier, 3); + "Facility name:    " + inst.companyName + "
    " + + "Clearance Level:  " + inst.clearanceLevel + "
    " + + "Security Level:   " + formatNumber(inst.securityLevel, 3) + "

    " + + "Total value of stolen secrets
    " + + "Reputation:       " + formatNumber(totalValue, 3) + "
    " + + "Money:           $" + formatNumber(totalMoneyValue, 2) + "

    " + + "Hack exp gained:  " + formatNumber(inst.hackingExpGained * expMultiplier, 3) + "
    " + + "Str exp gained:   " + formatNumber(inst.strExpGained * expMultiplier, 3) + "
    " + + "Def exp gained:   " + formatNumber(inst.defExpGained * expMultiplier, 3) + "
    " + + "Dex exp gained:   " + formatNumber(inst.dexExpGained * expMultiplier, 3) + "
    " + + "Agi exp gained:   " + formatNumber(inst.agiExpGained * expMultiplier, 3) + "
    " + + "Cha exp gained:   " + formatNumber(inst.chaExpGained * expMultiplier, 3); } function updateInfiltrationButtons(inst, scenario) { diff --git a/src/Player.js b/src/Player.js index 27ad67086..b8236a692 100644 --- a/src/Player.js +++ b/src/Player.js @@ -1072,7 +1072,7 @@ PlayerObject.prototype.workForFaction = function(numCycles) { var txt = document.getElementById("work-in-progress-text"); txt.innerHTML = "You are currently " + this.currentWorkFactionDescription + " for your faction " + faction.name + - " (Current Faction Reputation: " + formatNumber(faction.playerReputation, 0) + "). " + + " (Current Faction Reputation: " + formatNumber(faction.playerReputation, 0) + ").
    " + "You have been doing this for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "

    " + "You have earned:

    " + "$" + formatNumber(this.workMoneyGained, 2) + " (" + formatNumber(this.workMoneyGainRate * cyclesPerSec, 2) + " / sec)

    " + diff --git a/src/SaveObject.js b/src/SaveObject.js index 55db3250e..1c3eae367 100644 --- a/src/SaveObject.js +++ b/src/SaveObject.js @@ -516,9 +516,9 @@ function loadImportedGame(saveObj, saveString) { Player.lastUpdate = Engine._lastUpdate; Engine.start(); //Run main game loop and Scripts loop - dialogBoxCreate("While you were offline, your scripts generated $" + - formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" + - formatNumber(offlineProductionFromHacknetNodes, 2)); + dialogBoxCreate("While you were offline, your scripts generated $" + + formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" + + formatNumber(offlineProductionFromHacknetNodes, 2) + ""); return true; } diff --git a/src/engine.js b/src/engine.js index 034be3ebb..f7e20b8d1 100644 --- a/src/engine.js +++ b/src/engine.js @@ -1324,9 +1324,9 @@ let Engine = { Player.lastUpdate = Engine._lastUpdate; Engine.start(); //Run main game loop and Scripts loop removeLoadingScreen(); - dialogBoxCreate("While you were offline, your scripts generated $" + - formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" + - formatNumber(offlineProductionFromHacknetNodes, 2)); + dialogBoxCreate("While you were offline, your scripts generated $" + + formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" + + formatNumber(offlineProductionFromHacknetNodes, 2) + ""); //Close main menu accordions for loaded game var visibleMenuTabs = [terminal, createScript, activeScripts, stats, hacknetnodes, city, tutorial, options, dev]; diff --git a/src/index.html b/src/index.html index c1b65ec74..76cfe57d3 100644 --- a/src/index.html +++ b/src/index.html @@ -189,9 +189,9 @@ if (htmlWebpackPlugin.options.googleAnalytics.trackingId) { %> provides information about each script's production. The scripts are categorized by the hostname of the servers on which they are running.

    Total online production of - Active scripts: $0.000 / sec
    + Active scripts: $0.000 / sec
    Total online production since last Aug installation: $0.000 - ($0.000 / sec)

    + ($0.000 / sec)

    diff --git a/utils/InfiltrationBox.js b/utils/InfiltrationBox.js index efd86089b..8c1290179 100644 --- a/utils/InfiltrationBox.js +++ b/utils/InfiltrationBox.js @@ -57,9 +57,9 @@ function infiltrationBoxCreate(inst) { CONSTANTS.InfiltrationRepValue * BitNodeMultipliers.InfiltrationRep; var moneyValue = totalValue * CONSTANTS.InfiltrationMoneyValue * BitNodeMultipliers.InfiltrationMoney; infiltrationSetText("You can sell the classified documents and secrets " + - "you stole from " + inst.companyName + " for $" + - formatNumber(moneyValue, 2) + " on the black market or you can give it " + - "to a faction to gain " + formatNumber(facValue, 3) + " reputation with " + + "you stole from " + inst.companyName + " for $" + + formatNumber(moneyValue, 2) + " on the black market or you can give it " + + "to a faction to gain " + formatNumber(facValue, 3) + " reputation with " + "that faction."); var selector = document.getElementById("infiltration-faction-select"); selector.innerHTML = ""; @@ -85,7 +85,7 @@ function infiltrationBoxCreate(inst) { if (!e.isTrusted) {return false;} Player.gainMoney(moneyValue); dialogBoxCreate("You sold the classified information you stole from " + inst.companyName + - " for $" + moneyValue + " on the black market!

    " + + " for $" + formatNumber(moneyValue, 2) + " on the black market!

    " + "You gained:
    " + formatNumber(inst.hackingExpGained, 3) + " hacking exp
    " + formatNumber(inst.strExpGained, 3) + " str exp
    " + @@ -111,7 +111,7 @@ function infiltrationBoxCreate(inst) { } faction.playerReputation += facValue; dialogBoxCreate("You gave the classified information you stole from " + inst.companyName + - " to " + facName + " and gained " + formatNumber(facValue, 3) + " reputation with the faction.

    " + + " to " + facName + " and gained " + formatNumber(facValue, 3) + " reputation with the faction.

    " + "You gained:
    " + formatNumber(inst.hackingExpGained, 3) + " hacking exp
    " + formatNumber(inst.strExpGained, 3) + " str exp
    " +