Merge pull request #1865 from danielyxie/dev

many fixes
This commit is contained in:
hydroflame 2021-12-12 13:30:41 -05:00 committed by GitHub
commit 7e474da3fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 67 additions and 29 deletions

@ -1,4 +1,4 @@
const { app, BrowserWindow, Menu, globalShortcut, shell } = require("electron"); const { app, BrowserWindow, Menu, shell } = require("electron");
const greenworks = require("./greenworks"); const greenworks = require("./greenworks");
if (greenworks.init()) { if (greenworks.init()) {
@ -12,9 +12,6 @@ const debug = false;
function createWindow() { function createWindow() {
const win = new BrowserWindow({ const win = new BrowserWindow({
show: false, show: false,
webPreferences: {
devTools: debug,
},
}); });
win.removeMenu(); win.removeMenu();
@ -22,12 +19,6 @@ function createWindow() {
win.loadFile("index.html"); win.loadFile("index.html");
win.show(); win.show();
if (debug) win.webContents.openDevTools(); if (debug) win.webContents.openDevTools();
globalShortcut.register("f5", function () {
win.loadFile("index.html");
});
globalShortcut.register("f8", function () {
win.loadFile("index.html", { query: { noScripts: "true" } });
});
win.webContents.on("new-window", function (e, url) { win.webContents.on("new-window", function (e, url) {
// make sure local urls stay in electron perimeter // make sure local urls stay in electron perimeter
@ -55,6 +46,50 @@ function createWindow() {
{ label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }, { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" },
], ],
}, },
{
label: "reloads",
submenu: [
{
label: "reload",
accelerator: "f5",
click: () => {
win.loadFile("index.html");
},
},
{
label: "reload & kill all scripts",
click: () => {
win.webContents.forcefullyCrashRenderer();
setTimeout(() => win.loadFile("index.html", { query: { noScripts: "true" } }), 5000);
},
},
],
},
{
label: "fullscreen",
submenu: [
{
label: "toggle",
accelerator: "f9",
click: (() => {
let full = false;
return () => {
full = !full;
win.setFullScreen(full);
};
})(),
},
],
},
{
label: "debug",
submenu: [
{
label: "activate",
click: () => win.webContents.openDevTools(),
},
],
},
]), ]),
); );

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -22,7 +22,7 @@ getWeakenTime(host: string): number;
number number
Returns the amount of time in milliseconds it takes to execute the grow Netscript function. Returns Infinity if called on a Hacknet Server. Returns the amount of time in milliseconds it takes to execute the weaken Netscript function. Returns Infinity if called on a Hacknet Server.
## Remarks ## Remarks

4
package-lock.json generated

@ -1,11 +1,11 @@
{ {
"name": "bitburner", "name": "bitburner",
"version": "1.0.2", "version": "1.1.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "1.0.2", "version": "1.1.0",
"hasInstallScript": true, "hasInstallScript": true,
"license": "SEE LICENSE IN license.txt", "license": "SEE LICENSE IN license.txt",
"dependencies": { "dependencies": {

@ -2415,7 +2415,7 @@ function initAugmentations(): void {
repCost: 1e6, repCost: 1e6,
moneyCost: 0, moneyCost: 0,
info: info:
"The next evolution is near, A coming together of man and machine. A synthesis greater than the birth of the human " + "The next evolution is near, a coming together of man and machine. A synthesis greater than the birth of the human " +
"organism. Time spent with the gift has allowed for acclimatization of the invasive augment and the toll it takes upon " + "organism. Time spent with the gift has allowed for acclimatization of the invasive augment and the toll it takes upon " +
"your frame granting lesser penalty of 5% to all stats.", "your frame granting lesser penalty of 5% to all stats.",
prereqs: [AugmentationNames.StaneksGift1], prereqs: [AugmentationNames.StaneksGift1],
@ -2457,7 +2457,7 @@ function initAugmentations(): void {
moneyCost: 0, moneyCost: 0,
info: info:
"The synthesis of human and machine is nothing to fear. It is our destiny. " + "The synthesis of human and machine is nothing to fear. It is our destiny. " +
"You will become greater than the sum of our parts. As One. Enbrace your gift " + "You will become greater than the sum of our parts. As One. Embrace your gift " +
"fully and wholly free of it's accursed toll. Serenity brings tranquility the form " + "fully and wholly free of it's accursed toll. Serenity brings tranquility the form " +
"of no longer suffering a stat penalty. ", "of no longer suffering a stat penalty. ",
prereqs: [AugmentationNames.StaneksGift2], prereqs: [AugmentationNames.StaneksGift2],

@ -22,8 +22,8 @@ export function StaneksGiftRoot({ staneksGift }: IProps): React.ReactElement {
<Typography> <Typography>
The gift is a grid on which you can place upgrades called fragments. The main type of fragment increases a stat, The gift is a grid on which you can place upgrades called fragments. The main type of fragment increases a stat,
like your hacking skill or agility exp. Once a stat fragment is placed it then needs to be charged via scripts like your hacking skill or agility exp. Once a stat fragment is placed it then needs to be charged via scripts
in order to become useful. The other kind of fragment is called booster fragments. They increase the efficiency in order to become useful. The other kind of fragments are called booster fragments. They increase the
of the charged happening on fragments neighboring them (no diagonal). Q/E to rotate fragments. efficiency of neighboring fragments them (no diagonal). Q/E to rotate fragments.
</Typography> </Typography>
{staneksGift.storedCycles > 5 && ( {staneksGift.storedCycles > 5 && (
<Typography> <Typography>

@ -192,9 +192,9 @@ export function SpecialLocation(props: IProps): React.ReactElement {
<> <>
<Typography> <Typography>
<i> <i>
Allison "Mother" Stanek: I see you've taken to my creation. So much so it could hardly be recoginized as Allison "Mother" Stanek: I see you've taken to my creation. So much so it could hardly be recognized as
one of my own after your tinkering with it. I see you follow the ways of the Machine God as I do, and your one of my own after your tinkering with it. I see you follow the ways of the Machine God as I do, and your
mastery of the gift thus for clearly demonstrates that. My hopes are climbing by the day for you. mastery of the gift clearly demonstrates that. My hopes are climbing by the day for you.
</i> </i>
</Typography> </Typography>
{symbol} {symbol}

@ -651,9 +651,12 @@ export function runScriptFromScript(
return 0; return 0;
} }
args.forEach((arg) => { args.forEach((arg, i) => {
if (typeof arg !== "string" && typeof arg !== "number" && typeof arg !== "boolean") if (typeof arg !== "string" && typeof arg !== "number" && typeof arg !== "boolean")
throw new Error("Only strings, numbers, and booleans can be passed as arguments to otherscripts."); throw new Error(
"Only strings, numbers, and booleans can be passed as arguments to other scripts.\n" +
`${scriptname} argument index ${i} is of type ${typeof arg} and value ${JSON.stringify(arg)}`,
);
}); });
// Check if the script is already running // Check if the script is already running

@ -130,10 +130,10 @@ function BladeburnerMults(): React.ReactElement {
return ( return (
<MultiplierTable <MultiplierTable
rows={[ rows={[
["Bladeburner Success Chance", player.bladeburner_max_stamina_mult], ["Bladeburner Success Chance", player.bladeburner_success_chance_mult],
["Bladeburner Max Stamina", player.bladeburner_stamina_gain_mult], ["Bladeburner Max Stamina", player.bladeburner_max_stamina_mult],
["Bladeburner Stamina Gain", player.bladeburner_analysis_mult], ["Bladeburner Stamina Gain", player.bladeburner_stamina_gain_mult],
["Bladeburner Field Analysis", player.bladeburner_success_chance_mult], ["Bladeburner Field Analysis", player.bladeburner_analysis_mult],
]} ]}
/> />
); );