mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2026-04-20 16:22:56 +02:00
Merge branch 'dev' into feature/add-infiltration-faction
# Conflicts: # src/Netscript/RamCostGenerator.ts
This commit is contained in:
@@ -70,11 +70,11 @@ export const RamCostConstants: IMap<number> = {
|
||||
ScriptStanekPlace: 5,
|
||||
ScriptStanekFragmentAt: 2,
|
||||
ScriptStanekDeleteAt: 0.15,
|
||||
|
||||
ScriptInfiltrationCalculateDifficulty: 2.5,
|
||||
ScriptInfiltrationCalculateRewards: 2.5,
|
||||
ScriptInfiltrationGetLocations: 5,
|
||||
ScriptInfiltrationGetInfiltrations: 15,
|
||||
ScriptStanekAcceptGift: 2,
|
||||
};
|
||||
|
||||
function SF4Cost(cost: number): (player: IPlayer) => number {
|
||||
@@ -296,6 +296,7 @@ const stanek: IMap<any> = {
|
||||
placeFragment: RamCostConstants.ScriptStanekPlace,
|
||||
getFragment: RamCostConstants.ScriptStanekFragmentAt,
|
||||
removeFragment: RamCostConstants.ScriptStanekDeleteAt,
|
||||
acceptGift: RamCostConstants.ScriptStanekAcceptGift,
|
||||
};
|
||||
|
||||
// UI API
|
||||
|
||||
Reference in New Issue
Block a user