mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-11-26 17:43:48 +01:00
Merge branch 'danielyxie:dev' into sleevesUIFix
This commit is contained in:
commit
14af88c3fc
@ -86,8 +86,8 @@ export class Augmentation {
|
|||||||
this.info = params.info;
|
this.info = params.info;
|
||||||
this.prereqs = params.prereqs ? params.prereqs : [];
|
this.prereqs = params.prereqs ? params.prereqs : [];
|
||||||
|
|
||||||
this.baseRepRequirement = params.repCost * CONSTANTS.AugmentationRepMultiplier * BitNodeMultipliers.AugmentationRepCost;
|
this.baseRepRequirement = params.repCost * BitNodeMultipliers.AugmentationRepCost;
|
||||||
this.baseCost = params.moneyCost * CONSTANTS.AugmentationCostMultiplier * BitNodeMultipliers.AugmentationMoneyCost;
|
this.baseCost = params.moneyCost * BitNodeMultipliers.AugmentationMoneyCost;
|
||||||
this.startingCost = this.baseCost;
|
this.startingCost = this.baseCost;
|
||||||
|
|
||||||
if (params.isSpecial) {
|
if (params.isSpecial) {
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,6 @@
|
|||||||
import { IMap } from "../../types";
|
import { IMap } from "../../types";
|
||||||
|
|
||||||
export const AugmentationNames: IMap<string> = {
|
export const AugmentationNames: IMap<string> = {
|
||||||
CircadianRhythm: "Circadian Modulator",
|
|
||||||
Targeting1: "Augmented Targeting I",
|
Targeting1: "Augmented Targeting I",
|
||||||
Targeting2: "Augmented Targeting II",
|
Targeting2: "Augmented Targeting II",
|
||||||
Targeting3: "Augmented Targeting III",
|
Targeting3: "Augmented Targeting III",
|
||||||
@ -79,6 +78,7 @@ export const AugmentationNames: IMap<string> = {
|
|||||||
PhotosyntheticCells: "Photosynthetic Cells",
|
PhotosyntheticCells: "Photosynthetic Cells",
|
||||||
Neurolink: "BitRunners Neurolink",
|
Neurolink: "BitRunners Neurolink",
|
||||||
TheBlackHand: "The Black Hand",
|
TheBlackHand: "The Black Hand",
|
||||||
|
UnstableCircadianModulator: "Unstable Circadian Modulator",
|
||||||
CRTX42AA: "CRTX42-AA Gene Modification",
|
CRTX42AA: "CRTX42-AA Gene Modification",
|
||||||
Neuregen: "Neuregen Gene Modification",
|
Neuregen: "Neuregen Gene Modification",
|
||||||
CashRoot: "CashRoot Starter Kit",
|
CashRoot: "CashRoot Starter Kit",
|
||||||
|
@ -51,8 +51,6 @@ export const CONSTANTS: IMap<any> = {
|
|||||||
PurchasedServerMaxRam: 1048576, // 2^20
|
PurchasedServerMaxRam: 1048576, // 2^20
|
||||||
|
|
||||||
// Augmentation Constants
|
// Augmentation Constants
|
||||||
AugmentationCostMultiplier: 5, // Used for balancing costs without having to readjust every Augmentation cost
|
|
||||||
AugmentationRepMultiplier: 2.5, // Used for balancing rep cost without having to readjust every value
|
|
||||||
MultipleAugMultiplier: 1.9,
|
MultipleAugMultiplier: 1.9,
|
||||||
|
|
||||||
// TOR Router
|
// TOR Router
|
||||||
|
@ -746,7 +746,7 @@ class DevMenuComponent extends Component {
|
|||||||
<td><span className="text text-center">All:</span></td>
|
<td><span className="text text-center">All:</span></td>
|
||||||
<td>
|
<td>
|
||||||
<button className="std-button tooltip" onClick={this.tonsOfExp}>Tons of exp<span className="tooltiptext">Sometimes you just need a ton of experience in every stat</span></button>
|
<button className="std-button tooltip" onClick={this.tonsOfExp}>Tons of exp<span className="tooltiptext">Sometimes you just need a ton of experience in every stat</span></button>
|
||||||
<button className="std-button tooltip" onClick={this.resetAllExp}>Reset<span className="tooltiptext">Sometimes you just need a ton of experience in every stat</span></button>
|
<button className="std-button tooltip" onClick={this.resetAllExp}>Reset<span className="tooltiptext">Reset all experience to 0</span></button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -190,8 +190,8 @@ export function purchaseAugmentation(aug, fac, sing=false) {
|
|||||||
var nextLevel = getNextNeurofluxLevel();
|
var nextLevel = getNextNeurofluxLevel();
|
||||||
--nextLevel;
|
--nextLevel;
|
||||||
var mult = Math.pow(CONSTANTS.NeuroFluxGovernorLevelMult, nextLevel);
|
var mult = Math.pow(CONSTANTS.NeuroFluxGovernorLevelMult, nextLevel);
|
||||||
aug.baseRepRequirement = 500 * mult * CONSTANTS.AugmentationRepMultiplier * BitNodeMultipliers.AugmentationRepCost;
|
aug.baseRepRequirement = 500 * mult * BitNodeMultipliers.AugmentationRepCost;
|
||||||
aug.baseCost = 750e3 * mult * CONSTANTS.AugmentationCostMultiplier * BitNodeMultipliers.AugmentationMoneyCost;
|
aug.baseCost = 750e3 * mult * BitNodeMultipliers.AugmentationMoneyCost;
|
||||||
|
|
||||||
for (var i = 0; i < Player.queuedAugmentations.length-1; ++i) {
|
for (var i = 0; i < Player.queuedAugmentations.length-1; ++i) {
|
||||||
aug.baseCost *= CONSTANTS.MultipleAugMultiplier;
|
aug.baseCost *= CONSTANTS.MultipleAugMultiplier;
|
||||||
|
Loading…
Reference in New Issue
Block a user