Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-18 20:25:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from danielyxie/dev

Browse Source 
Dev v0.17.4
This commit is contained in:
danielyxie 2017-05-30 10:07:44 -05:00 committed by GitHub
commit 9f90d20f57
6 changed files with 27 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
css/popupboxes.css
View File

@ -1,10 +1,8 @@
/* Pop-up boxes */
/* Pop-up Dialog Box */
#dialog-box-container {
.popup-box-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 2; /* Sit on top */
z-index: 1; /* Sit on top */
left: 0;
top: 0;
width: 100%; /* Full width */
@ -15,7 +13,7 @@
}
#dialog-box-content {
z-index: 2;
z-index: 1;
background-color: black;
margin: 20% auto; /* 20% from the top and centered */
padding: 10px;
@ -49,18 +47,6 @@
/* Purchase server box */
#purchase-server-box-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
right: 0;
bottom: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: black; /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
transition: opacity 400ms ease-in;
}
@ -104,18 +90,6 @@
/* Purchase RAM for Home computer pop-up box */
#purchase-ram-for-home-box-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
right: 0;
bottom: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: black; /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
transition: opacity 400ms ease-in;
}
@ -155,18 +129,6 @@
/* Purchase Invitation Box */
#purchase-augmentation-box-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
right: 0;
bottom: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: black; /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
transition: opacity 400ms ease-in;
}
@ -206,18 +168,6 @@
/* Faction invitation box */
#faction-invitation-box-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
right: 0;
bottom: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: black; /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
transition: opacity 400ms ease-in;
}
@ -262,18 +212,6 @@
/* Travel Pop-up Box */
#travel-box-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
right: 0;
bottom: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: black; /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
transition: opacity 400ms ease-in;
}
@ -317,18 +255,6 @@
/* Game Options */
#game-options-container {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
right: 0;
bottom: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: black; /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
transition: opacity 400ms ease-in;
}

14
index.html
View File

@ -632,7 +632,7 @@
</div>
<!-- Dialog Box, displays status text only -->
<div id="dialog-box-container">
<div id="dialog-box-container" class="popup-box-container">
<div id="dialog-box-content" class="dialog-box">
<span id="dialog-box-close-button">&times;</span>
<p id="dialog-box-text-1" class="dialog-box-text"> </p>
@ -646,7 +646,7 @@
</div>
<!-- Purchase Server Pop-up Box -->
<div id="purchase-server-box-container">
<div id="purchase-server-box-container" class="popup-box-container">
<div id="purchase-server-box-content">
<p id="purchase-server-box-text"> </p>
<p id="purchase-server-box-enter-name"> Enter new server hostname: </p>
@ -657,7 +657,7 @@
</div>
<!-- Purchase RAM for Home Computer Pop-up Box -->
<div id="purchase-ram-for-home-box-container">
<div id="purchase-ram-for-home-box-container" class="popup-box-container">
<div id="purchase-ram-for-home-box-content">
<p id="purchase-ram-for-home-box-text"> </p>
<span id="purchase-ram-for-home-box-confirm"> Purchase </span>
@ -666,7 +666,7 @@
</div>
<!-- Travel Pop-up Box -->
<div id="travel-box-container">
<div id="travel-box-container" class="popup-box-container">
<div id="travel-box-content">
<p id="travel-box-text"> </p>
<span id="travel-box-confirm"> Yes </span>
@ -675,7 +675,7 @@
</div>
<!-- Purchase Augmentation Pop-up Box -->
<div id="purchase-augmentation-box-container">
<div id="purchase-augmentation-box-container" class="popup-box-container">
<div id="purchase-augmentation-box-content">
<h2 id="purchase-augmentation-box-aug-name"> </h2>
<p id="purchase-augmentation-box-aug-info"> </p>
@ -697,7 +697,7 @@
</div>
<!-- Faction Invitation Pop-up Box -->
<div id="faction-invitation-box-container">
<div id="faction-invitation-box-container" class="popup-box-container">
<div id="faction-invitation-box-content">
<p id="faction-invitation-box-text"> </p>
<p id="faction-invitation-box-message"> </p>
@ -741,7 +741,7 @@
</div>
<!-- Game Options -->
<div id="game-options-container">
<div id="game-options-container" class="popup-box-container">
<div id="game-options-content" class="game-options-box">
<span id="game-options-close-button">&times;</span>
<h1> Game Options </h1>

2
src/Constants.js
View File

@ -1,5 +1,5 @@
CONSTANTS = {
Version: "0.17.1",
Version: "0.17.4",
//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience
//and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then

6
src/Faction.js
View File

@ -305,15 +305,15 @@ PlayerObject.prototype.checkForFactionInvitations = function() {
var bitrunnersFac = Factions["BitRunners"];
var homeComp = Player.getHomeComputer();
if (bitrunnersFac.isBanned == false && bitrunnersFac.isMember == false &&
this.hacking_skill >= 600 && homeComp.maxRam >= 128) {
this.hacking_skill >= 500 && homeComp.maxRam >= 128) {
invitedFactions.push(bitrunnersFac);
}
//The Black Hand
var theblackhandFac = Factions["The Black Hand"];
if (theblackhandFac.isBanned == false && theblackhandFac.isMember == false &&
this.hacking_skill >= 400 && this.strength >= 200 && this.defense >= 200 &&
this.agility >= 200 && this.dexterity >= 200 && homeComp.maxRam >= 64) {
this.hacking_skill >= 300 && this.strength >= 100 && this.defense >= 100 &&
this.agility >= 100 && this.dexterity >= 100 && homeComp.maxRam >= 64) {
invitedFactions.push(theblackhandFac);
}

24
src/Perk.js
View File

@ -111,24 +111,24 @@ applyPerk = function(perk) {
switch (perk.name) {
case PerkNames.FreeCoffeeCompanyPerk:
//Increase money and hacking exp gain
Player.hacking_money_mult += 1.1;
Player.hacking_exp_mult += 1.1;
Player.hacking_money_mult *= 1.25;
Player.hacking_exp_mult *= 1.25;
break;
case PerkNames.FreeFoodCompanyPerk:
Player.strength_exp_mult += 1.05;
Player.defense_exp_mult += 1.05;
Player.dexterity_exp_mult += 1.05;
Player.agility_exp_mult += 1.05;
Player.strength_exp_mult *= 1.2;
Player.defense_exp_mult *= 1.2;
Player.dexterity_exp_mult *= 1.2;
Player.agility_exp_mult *= 1.2;
break;
case PerkNames.NetworkingCompanyPerk:
Player.company_rep_mult += 1.1;
Player.charisma_exp_mult += 1.2;
Player.company_rep_mult *= 1.1;
Player.charisma_exp_mult *= 1.2;
break;
case PerkNames.PersonalTrainerCompanyPerk:
Player.strength_exp_mult += 1.15;
Player.defense_exp_mult += 1.15;
Player.dexterity_exp_mult += 1.15;
Player.agility_exp_mult += 1.15;
Player.strength_exp_mult *= 1.15;
Player.defense_exp_mult *= 1.15;
Player.dexterity_exp_mult *= 1.15;
Player.agility_exp_mult *= 1.15;
break;
case PerkNames.KnowledgeBaseCompanyPerk:
break;

2
src/Player.js
View File

@ -1095,7 +1095,7 @@ PlayerObject.prototype.finishCrime = function(cancelled) {
++this.numTimesShoplifted;
break;
case CONSTANTS.CrimeMug:
this.karma -= 0.2;
this.karma -= 0.25;
++this.numPeopleMugged;
break;
case CONSTANTS.CrimeDrugs: