From 3db6d9d007ea3184727c8f904b707006c0cc2574 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Sun, 13 Aug 2017 00:01:33 -0500 Subject: [PATCH] 0.27.0 2nd Tier Prestige + Gangs --- css/menupages.css | 82 ++- css/popupboxes.css | 22 +- index.html | 56 +- src/Augmentations.js | 894 ++++++++++++++------------- src/BitNode.js | 67 ++- src/Company.js | 2 +- src/CompanyJobApplication.js | 25 +- src/CompanyManagement.js | 8 + src/Constants.js | 95 +-- src/Faction.js | 95 ++- src/Gang.js | 1033 ++++++++++++++++++++++++++++++++ src/Infiltration.js | 50 +- src/Literature.js | 62 ++ src/Location.js | 44 +- src/Message.js | 2 +- src/NetscriptFunctions.js | 70 ++- src/NetscriptWorker.js | 1 + src/Player.js | 81 +-- src/Prestige.js | 230 ++++++- src/RedPill.js | 147 +++-- src/SaveObject.js | 39 +- src/Script.js | 11 +- src/Server.js | 3 +- src/SourceFile.js | 122 ++++ src/Terminal.js | 5 +- src/engine.js | 66 +- utils/PurchaseRamForHomeBox.js | 55 -- utils/TravelBox.js | 41 -- utils/YesNoBox.js | 76 +++ 29 files changed, 2626 insertions(+), 858 deletions(-) create mode 100644 src/CompanyManagement.js create mode 100644 src/Gang.js create mode 100644 src/Literature.js create mode 100644 src/SourceFile.js delete mode 100644 utils/PurchaseRamForHomeBox.js delete mode 100644 utils/TravelBox.js create mode 100644 utils/YesNoBox.js diff --git a/css/menupages.css b/css/menupages.css index c00fc1a34..3d8d98612 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -365,19 +365,13 @@ display: inline; } -#faction-hack-div, -#faction-fieldwork-div, -#faction-securitywork-div, -#faction-donate-div { +.faction-work-div { overflow: hidden; width: 70%; height: 100%; } -#faction-hack-div-wrapper, -#faction-fieldwork-div-wrapper, -#faction-securitywork-div-wrapper, -#faction-donate-div-wrapper { +.faction-work-div-wrapper { float: left; border: 2px solid #333; padding: 14px 6px 4px 6px; @@ -592,3 +586,75 @@ div.faction-clear { text-decoration: none; cursor: pointer; } + +/* Gang */ +#gang-container { + position: fixed; + padding: 6px; +} + + + +.gang-member-header { + background-color: #444; + font-size: 20px; + color: white; + margin: 6px 6px 0px 6px; + padding: 6px; + cursor: pointer; + width: 80%; + text-align: left; + border: none; + outline: none; +} + +.gang-member-header.active, +.gang-member-header:hover { + background-color: #555; +} + +.gang-member-header.active:hover { + background-color: #666; +} + +.gang-member-header:after { + content: '\02795'; /* "plus" sign (+) */ + font-size: 13px; + color: white; + float: right; + margin-left: 5px; +} + +.gang-member-header.active:after { + content: "\2796"; /* "minus" sign (-) */ + font-size: 13px; + color: white; + float: right; + margin-left: 5px; +} + +.gang-member-panel { + margin: 0px 6px 6px 6px; + padding: 0px 6px 6px 6px; + width: 75%; + margin-left: 5%; + display: none; + background-color: #555; + overflow:auto; +} + +.gang-member-panel div, +.gang-member-panel ul, +.gang-member-panel p, +.gang-member-panel ul > li { + background-color: #555; +} + +#gang-management-subpage > p { + padding: 4px; +} + +.gang-member-info-div { + float:left; + background-color: #555; +} diff --git a/css/popupboxes.css b/css/popupboxes.css index 87fafca7c..d283fb759 100644 --- a/css/popupboxes.css +++ b/css/popupboxes.css @@ -97,12 +97,7 @@ color: white; } -/* Purchase RAM for Home computer pop-up box */ -#purchase-ram-for-home-box-container { - transition: opacity 400ms ease-in; -} - -/* Purchase Invitation Box */ +/* Purchase Augmentation Box */ #purchase-augmentation-box-container { transition: opacity 400ms ease-in; } @@ -116,16 +111,6 @@ padding: 4px; } -/* Travel Pop-up Box */ -#travel-box-container { - transition: opacity 400ms ease-in; -} - - -#travel-box-text { - margin: 8px; -} - /* Infiltration-box */ #infiltration-box-sell, #infiltration-box-faction { @@ -134,6 +119,11 @@ margin: 8px; } +/* Generic Yes No Box */ +#yes-no-text-input-box-input { + color: white; +} + /* Game Options */ #game-options-container { transition: opacity 400ms ease-in; diff --git a/index.html b/index.html index 61ab261e3..49f0fafbb 100644 --- a/index.html +++ b/index.html @@ -466,8 +466,8 @@ use your terminal or create scripts when you are performing a task!



-
-
+
+
Hacking Contracts

Complete hacking contracts for your faction. @@ -478,8 +478,8 @@

-
-
+
+
Field Work

Carry out field missions for your faction. @@ -490,8 +490,8 @@

-
-
+
+
Security Work

Serve in a security detail for your faction. @@ -502,8 +502,8 @@

-
-
+
+
Donate Money

Donate money to your faction. You will gain reputation based on how much money you donate @@ -542,7 +542,7 @@

Purchased Augmentations

Below is a list of all Augmentations you have purchased but not yet installed. Click the button below to install them. -
WARNING: Purchasing an Augmentation resets most of your progress, including:

+
WARNING: Installing your Augmentations resets most of your progress, including:

Stats/Skill levels and Experience
Money
Scripts on every computer but your home computer
@@ -550,8 +550,8 @@ Hacknet Nodes
Faction/Company reputation
Stocks

- Purchasing an Augmentation lets you start over with the perks and benefits granted by all - of the Augmentations you have ever purchased. Also, you will keep any scripts and RAM upgrades + Installing Augmentations lets you start over with the perks and benefits granted by all + of the Augmentations you have ever installed. Also, you will keep any scripts and RAM upgrades on your home computer (but you will lose all programs besides NUKE.exe).



@@ -560,7 +560,7 @@ Install Augmentations

Installed Augmentations

-

List of all augmentations that have been installed. You have gained the effects of these augmentations

+

List of all augmentations (including Source Files) that have been installed. You have gained the effects of these augmentations

@@ -746,27 +746,28 @@

Enter new server hostname:

- + Purchase Cancel
- -