Merge pull request #153 from danielyxie/dev

Dev v0.31.0
danielyxie · Oct 16, 2017 · f1d6171 · f1d6171
2 parents cc6575d + 153831a
commit f1d6171
Show file tree

Hide file tree

Showing 24 changed files with 3,696 additions and 2,163 deletions.
diff --git a/css/menupages.css b/css/menupages.css
@@ -35,9 +35,6 @@
     font-family: 'Lucida Console', 'Lucida Sans Unicode', 'Fira Mono', 'Consolas', 'Courier New', Courier, monospace, 'Times New Roman';
 }
 
-#javascript-editor textarea {
-}
-
 .ace_line,
 .ace_line * {
     background-color:transparent;
@@ -629,8 +626,6 @@ div.faction-clear {
     padding: 6px;
 }
 
-
-
 .gang-member-header {
     background-color: #444;
     font-size: 20px;

diff --git a/css/missions.css b/css/missions.css
@@ -24,7 +24,6 @@
 }
 
 .hack-mission-node {
-    color:gray;
     z-index:5;
     background-color:gray;
     align-self: center;
@@ -33,9 +32,9 @@
 }
 
 .hack-mission-node p {
+    margin-top:8px;
     color:white;
     font-size:12px;
-    margin-top: 8px;
     text-align:center;
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -50,12 +49,11 @@
 
 .hack-mission-player-node-active {
     border: 2px solid white;
-    color: #6666ff;
     background-color: #6666ff;
 }
 
 .hack-mission-enemy-node {
-    color:red;
+    color:white;
     background-color:red;
 }
 
@@ -84,10 +82,39 @@
     -webkit-transform: skew(-20deg);
 	-moz-transform: skew(-20deg);
 	-o-transform: skew(-20deg);
+    color:white;
+    font-size:12px;
+    margin-top: 8px;
+    text-align:center;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.hack-mission-transfer-node {
+    width: 100%;
+	height: 90%;
+	-webkit-transform: skew(-20deg);
+	-moz-transform: skew(-20deg);
+	-o-transform: skew(-20deg);
+}
+
+.hack-mission-transfer-node p {
+    -webkit-transform: skew(20deg);
+	-moz-transform: skew(20deg);
+	-o-transform: skew(20deg);
+    color:white;
+    font-size:12px;
+    margin-top: 8px;
+    text-align:center;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
 .hack-mission-spam-node,
-.hack-mission-transfer-node,
 .hack-mission-shield-node {
     height:100%;
     width: 100%;

diff --git a/css/styles.css b/css/styles.css
@@ -398,3 +398,59 @@ a:link, a:visited {
 .scan-analyze-link:hover {
     text-decoration:none;
 }
+
+/* Accordion menus (Header with collapsible panel) */
+.accordion-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;
+}
+
+.accordion-header.active,
+.accordion-header:hover {
+    background-color: #555;
+}
+
+.accordion-header.active:hover {
+    background-color: #666;
+}
+
+.accordion-header:after {
+    content: '\02795'; /* "plus" sign (+) */
+    font-size: 13px;
+    color: white;
+    float: right;
+    margin-left: 5px;
+}
+
+.accordion-header.active:after {
+    content: "\2796"; /* "minus" sign (-) */
+    font-size: 13px;
+    color: white;
+    float: right;
+    margin-left: 5px;
+}
+
+.accordion-panel {
+    margin: 0px 6px 6px 6px;
+    padding: 0px 6px 6px 6px;
+    width: 75%;
+    margin-left: 5%;
+    display: none;
+    background-color: #555;
+    overflow:auto;
+}
+
+.accordion-panel div,
+.accordion-panel ul,
+.accordion-panel p,
+.accordion-panel ul > li {
+    background-color: #555;
+}
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/index.html b/index.html
@@ -733,8 +733,9 @@ <h1 id="location-name"></h1>
         <a id="location-slums-mug" class="a-link-button tooltip"> Mug someone </a>
         <a id="location-slums-larceny" class="a-link-button tooltip"> Commit Larceny </a>
         <a id="location-slums-deal-drugs" class="a-link-button tooltip"> Deal Drugs </a>
-        <a id="location-slums-traffic-arms" class="a-link-button tooltip"> Traffick Illegal Arms </a>
-        <a id="location-slums-homicide" class="a-link-button tooltip"> Homicide </a>
+        <a id="location-slums-bond-forgery" class="a-link-button tooltip">Bond Forgery</a>
+        <a id="location-slums-traffic-arms" class="a-link-button tooltip">Traffick Illegal Arms</a>
+        <a id="location-slums-homicide" class="a-link-button tooltip">Homicide</a>
         <a id="location-slums-gta" class="a-link-button tooltip"> Grand Theft Auto </a>
         <a id="location-slums-kidnap" class="a-link-button tooltip"> Kidnap and Ransom </a>
         <a id="location-slums-assassinate" class="a-link-button tooltip"> Assassinate </a>

diff --git a/src/BitNode.js b/src/BitNode.js
@@ -28,7 +28,7 @@ function initBitNodes() {
                             "people quickly succumbed to the innate human impulse of evil and savagery. The organized crime " +
                             "factions quickly rose to the top of the modern world.<br><br>" +
                             "In this BitNode:<br><br>The maximum amount of money available on a server is significantly decreased<br>" +
-                            "The amount of money gained from crimes is doubled<br>" +
+                            "The amount of money gained from crimes and Infiltration is tripled<br>" +
                             "Certain Factions (Slum Snakes, Tetrads, The Syndicate, The Dark Army, Speakers for the Dead, " +
                             "NiteSec, The Black Hand) give the player the ability to form and manage their own gangs. These gangs " +
                             "will earn the player money and reputation with the corresponding Faction<br>" +
@@ -61,6 +61,7 @@ function initBitNodes() {
                                           "The base security level of servers is doubled<br>" +
                                           "The starting money on servers is halved, but the maximum money is doubled<br>" +
                                           "Most methods of earning money now give significantly less<br>" +
+                                          "Infiltration gives 50% more reputation and money<br>" +
                                           "Augmentations are more expensive<br>" +
                                           "Hacking experience gain rates are reduced<br><br>" +
                                           "Destroying this BitNode will give you Source-File 5, or if you already have this Source-File it will " +
@@ -74,11 +75,11 @@ function initBitNodes() {
                                           "Level 1: 4%<br>" +
                                           "Level 2: 6%<br>" +
                                           "Level 3: 7%");
-    BitNodes["BitNode6"] = new BitNode(6, "Hacktocracy", "COMING SOON");               //Healthy Hacknet balancing mechanic
-    BitNodes["BitNode7"] = new BitNode(7, "Do Androids Dream?", "COMING SOON");        //Build androids for automation
+    BitNodes["BitNode6"] = new BitNode(6, "Do Androids Dream?", "COMING SOON");        //Build androids for automation
+    BitNodes["BitNode7"] = new BitNode(7, "Waste Runner", "COMING SOON");              //Postapocalyptic wasteland + blade runner
     BitNodes["BitNode8"] = new BitNode(8, "Ghost of Wall Street", "COMING SOON");      //Trading only viable strategy
-    BitNodes["BitNode9"] = new BitNode(9, "MegaCorp", "COMING SOON");                  //Single corp/server with increasing difficulty
-    BitNodes["BitNode10"] = new BitNode(10, "Wasteland", "COMING SOON");               //Postapocalyptic
+    BitNodes["BitNode9"] = new BitNode(9, "Hacktocracy", "COMING SOON");               //Healthy Hacknet balancing mechanic
+    BitNodes["BitNode10"] = new BitNode(10, "MegaCorp", "COMING SOON");                //Not sure yet
     BitNodes["BitNode11"] = new BitNode(11, "The Big Crash", "Okay. Sell it all.",
                                             "The 2050s was defined by the massive amounts of violent civil unrest and anarchic rebellion that rose all around the world. It was this period " +
                                             "of disorder that eventually lead to the governmental reformation of many global superpowers, most notably " +
@@ -92,6 +93,7 @@ function initBitNodes() {
                                             "Weakening a server is twice as effective<br>" +
                                             "Company wages are decreased by 50%<br>" +
                                             "Hacknet Node production is significantly decreased<br>" +
+                                            "Crime and Infiltration are more lucrative<br>" +
                                             "Augmentations are twice as expensive<br><br>" +
                                             "Destroying this BitNode will give you Source-File 11, or if you already have this Source-File it will " +
                                             "upgrade its level up to a maximum of 3. This Source-File makes it so that company favor increases BOTH " +
@@ -149,6 +151,9 @@ let BitNodeMultipliers = {
 
     AugmentationRepCost:    1,
     AugmentationMoneyCost:  1,
+
+    InfiltrationMoney:      1,
+    InfiltrationRep:        1,
 }
 
 function initBitNodeMultipliers() {
@@ -166,12 +171,15 @@ function initBitNodeMultipliers() {
             break;
         case 2: //Rise of the Underworld
             BitNodeMultipliers.ServerMaxMoney           = 0.2;
-            BitNodeMultipliers.CrimeMoney               = 2;
+            BitNodeMultipliers.ServerStartingMoney      = 0.4;
+            BitNodeMultipliers.CrimeMoney               = 3;
+            BitNodeMultipliers.InfiltrationMoney        = 3;
             BitNodeMultipliers.FactionWorkRepGain       = 0.5;
             BitNodeMultipliers.FactionPassiveRepGain    = 0;
             break;
         case 4: //The Singularity
             BitNodeMultipliers.ServerMaxMoney           = 0.15;
+            BitNodeMultipliers.ServerStartingMoney      = 0.75;
             BitNodeMultipliers.ScriptHackMoney          = 0.2;
             BitNodeMultipliers.CompanyWorkMoney         = 0.1;
             BitNodeMultipliers.CrimeMoney               = 0.2;
@@ -187,9 +195,11 @@ function initBitNodeMultipliers() {
             BitNodeMultipliers.ServerMaxMoney           = 2;
             BitNodeMultipliers.ServerStartingSecurity   = 2;
             BitNodeMultipliers.ServerStartingMoney      = 0.5;
-            BitNodeMultipliers.ScriptHackMoney          = 0.25;
+            BitNodeMultipliers.ScriptHackMoney          = 0.2;
             BitNodeMultipliers.HacknetNodeMoney         = 0.2;
             BitNodeMultipliers.CrimeMoney               = 0.5;
+            BitNodeMultipliers.InfiltrationRep          = 1.5;
+            BitNodeMultipliers.InfiltrationMoney        = 1.5;
             BitNodeMultipliers.AugmentationMoneyCost    = 2;
             BitNodeMultipliers.HackExpGain              = 0.5;
             break;
@@ -198,9 +208,12 @@ function initBitNodeMultipliers() {
             BitNodeMultipliers.ServerStartingMoney      = 0.1;
             BitNodeMultipliers.ServerGrowthRate         = 0.5;
             BitNodeMultipliers.ServerWeakenRate         = 2;
+            BitNodeMultipliers.CrimeMoney               = 3;
             BitNodeMultipliers.CompanyWorkMoney         = 0.5;
             BitNodeMultipliers.HacknetNodeMoney         = 0.1;
             BitNodeMultipliers.AugmentationMoneyCost    = 2;
+            BitNodeMultipliers.InfiltrationMoney        = 2.5;
+            BitNodeMultipliers.InfiltrationRep          = 2.5;
             break;
         default:
             console.log("WARNING: Player.bitNodeN invalid");