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

Fixed merge conflicts. Fixed bug with Crimes

Browse Source
This commit is contained in:
danielyxie 2019-01-18 10:04:04 -08:00
commit 17bfbfeb80
4 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dist/engine.bundle.js vendored
View File

@ -21169,7 +21169,7 @@ function NetscriptFunctions(workerScript) {
return false;
}
if (!p.create.req()) {
if (!p.create.req(_Player__WEBPACK_IMPORTED_MODULE_23__[/* Player */ "a"])) {
workerScript.scriptRef.log("ERROR: createProgram() failed because hacking level is too low to create " + p.name + " (level " + p.create.level + " req)");
return false
}
@ -46798,18 +46798,18 @@ function displayLocationContent() {
case _Locations__WEBPACK_IMPORTED_MODULE_11__["Locations"].NewTokyoSlums:
case _Locations__WEBPACK_IMPORTED_MODULE_11__["Locations"].IshimaSlums:
case _Locations__WEBPACK_IMPORTED_MODULE_11__["Locations"].VolhavenSlums:
var shopliftChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Shoplift.successRate();
var robStoreChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].RobStore.successRate();
var mugChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Mug.successRate();
var larcenyChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Larceny.successRate();
var drugsChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].DealDrugs.successRate();
var bondChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].BondForgery.successRate();
var armsChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].TraffickArms.successRate();
var homicideChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Homicide.successRate();
var gtaChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].GrandTheftAuto.successRate();
var kidnapChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Kidnap.successRate();
var assassinateChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Assassination.successRate();
var heistChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Heist.successRate();
var shopliftChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Shoplift.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var robStoreChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].RobStore.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var mugChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Mug.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var larcenyChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Larceny.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var drugsChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].DealDrugs.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var bondChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].BondForgery.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var armsChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].TraffickArms.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var homicideChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Homicide.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var gtaChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].GrandTheftAuto.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var kidnapChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Kidnap.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var assassinateChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Assassination.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
var heistChance = _Crime_Crimes__WEBPACK_IMPORTED_MODULE_7__["Crimes"].Heist.successRate(_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"]);
slumsDescText.style.display = "block";
slumsShoplift.style.display = "block";
@ -48229,6 +48229,9 @@ exports.getJobRequirementText = getJobRequirementText;
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return findCrime; });
/* harmony import */ var _Crimes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Crimes */ 37);
/* harmony import */ var _Crimes__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_Crimes__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _utils_DialogBox__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../utils/DialogBox */ 9);
function determineCrimeSuccess(type, moneyGained) {
@ -48245,7 +48248,7 @@ function determineCrimeSuccess(type, moneyGained) {
if(!found) {
console.log(crime);
dialogBoxCreate("ERR: Unrecognized crime type. This is probably a bug please contact the developer");
Object(_utils_DialogBox__WEBPACK_IMPORTED_MODULE_1__["dialogBoxCreate"])("ERR: Unrecognized crime type. This is probably a bug please contact the developer");
return;
}

24
src/Location.js
View File

@ -987,18 +987,18 @@ function displayLocationContent() {
case Locations.NewTokyoSlums:
case Locations.IshimaSlums:
case Locations.VolhavenSlums:
var shopliftChance = Crimes.Shoplift.successRate();
var robStoreChance = Crimes.RobStore.successRate();
var mugChance = Crimes.Mug.successRate();
var larcenyChance = Crimes.Larceny.successRate();
var drugsChance = Crimes.DealDrugs.successRate();
var bondChance = Crimes.BondForgery.successRate();
var armsChance = Crimes.TraffickArms.successRate();
var homicideChance = Crimes.Homicide.successRate();
var gtaChance = Crimes.GrandTheftAuto.successRate();
var kidnapChance = Crimes.Kidnap.successRate();
var assassinateChance = Crimes.Assassination.successRate();
var heistChance = Crimes.Heist.successRate();
var shopliftChance = Crimes.Shoplift.successRate(Player);
var robStoreChance = Crimes.RobStore.successRate(Player);
var mugChance = Crimes.Mug.successRate(Player);
var larcenyChance = Crimes.Larceny.successRate(Player);
var drugsChance = Crimes.DealDrugs.successRate(Player);
var bondChance = Crimes.BondForgery.successRate(Player);
var armsChance = Crimes.TraffickArms.successRate(Player);
var homicideChance = Crimes.Homicide.successRate(Player);
var gtaChance = Crimes.GrandTheftAuto.successRate(Player);
var kidnapChance = Crimes.Kidnap.successRate(Player);
var assassinateChance = Crimes.Assassination.successRate(Player);
var heistChance = Crimes.Heist.successRate(Player);
slumsDescText.style.display = "block";
slumsShoplift.style.display = "block";

2
src/NetscriptFunctions.js
View File

@ -3534,7 +3534,7 @@ function NetscriptFunctions(workerScript) {
return false;
}
if (!p.create.req()) {
if (!p.create.req(Player)) {
workerScript.scriptRef.log("ERROR: createProgram() failed because hacking level is too low to create " + p.name + " (level " + p.create.level + " req)");
return false
}

1
src/engine.js
View File

@ -100,6 +100,7 @@ import "../css/mainmenu.scss";
import "../css/characteroverview.scss";
import "../css/terminal.scss";
import "../css/menupages.scss";
import "../css/redpill.scss";
import "../css/stockmarket.scss";
import "../css/workinprogress.scss";
import "../css/popupboxes.scss";