plenty of bug fix.

This commit is contained in:
Olivier Gagnon 2021-11-10 19:28:20 -05:00
parent 2cf3d640bb
commit 15b3a82a41
12 changed files with 24 additions and 67 deletions

@ -82,7 +82,7 @@ List of Factions and their Requirements
| | | server | |
| | | | |
+ +----------------+-----------------------------------------+-------------------------------+
| | Bitrunners | * Install a backdoor on the run4theh111z| |
| | BitRunners | * Install a backdoor on the run4theh111z| |
| | | server | |
| | | | |
+---------------------+----------------+-----------------------------------------+-------------------------------+

@ -67,7 +67,7 @@ BitNodes["BitNode2"] = new BitNode(
<br />
<br />
Organized crime groups quickly filled the void of power left behind from the collapse of Western government in the
2050s. As society and civlization broke down, people quickly succumbed to the innate human impulse of evil and
2050s. As society and civilization broke down, people quickly succumbed to the innate human impulse of evil and
savagery. The organized crime factions quickly rose to the top of the modern world.
<br />
<br />

@ -224,7 +224,6 @@ export class Action implements IAction {
let high = real + diff;
const city = inst.getCurrentCity();
const r = city.pop / city.popEst;
console.log(`${est} ${real}`);
if (r < 1) low *= r;
else high *= r;
return [clamp(low), clamp(high)];

@ -38,7 +38,7 @@ function EffectText(props: IEffectTextProps): React.ReactElement {
return (
<Typography>
Issue ${numeralWrapper.format(newShares, "0.000a")} new shares for{" "}
Issue {numeralWrapper.format(newShares, "0.000a")} new shares for{" "}
{numeralWrapper.formatMoney(newShares * newSharePrice)}?
</Typography>
);

@ -119,7 +119,6 @@ export function Game(props: IProps): React.ReactElement {
}
function Progress(): React.ReactElement {
console.log(results);
return (
<Typography variant="h4">
<span style={{ color: "gray" }}>{results.slice(0, results.length - 1)}</span>

@ -35,8 +35,6 @@ export const Literatures: IMap<Literature> = {};
"<u>Getting Started with Corporations</u><br>" +
"To get started, visit the City Hall in Sector-12 in order to create a Corporation. This requires " +
"$150b of your own money, but this $150b will get put into your Corporation's funds. " +
"After creating your Corporation, you will see it listed as one of the locations in the city. Click on " +
"your Corporation in order to manage it.<br><br>" +
"Your Corporation can have many different divisions, each in a different Industry. There are many different " +
"types of Industries, each with different properties. To create your first division, click the " +
"'Expand into new Industry' button at the top of the management UI. The Agriculture " +

@ -855,10 +855,7 @@ export function startFactionHackWork(this: IPlayer, router: IRouter, faction: Fa
this.resetWorkStatus(CONSTANTS.WorkTypeFaction, faction.name, CONSTANTS.FactionWorkHacking);
this.workHackExpGainRate = 0.15 * this.hacking_exp_mult * BitNodeMultipliers.FactionWorkExpGain;
this.workRepGainRate =
((this.hacking + this.intelligence) / CONSTANTS.MaxSkillLevel) *
this.faction_rep_mult *
this.getIntelligenceBonus(0.5);
this.workRepGainRate = getFactionFieldWorkRepGain(this, faction);
this.factionWorkType = CONSTANTS.FactionWorkHacking;
this.currentWorkFactionDescription = "carrying out hacking contracts";
@ -1695,9 +1692,7 @@ export function regenerateHp(this: IPlayer, amt: number): void {
export function hospitalize(this: IPlayer): number {
const cost = getHospitalizationCost(this);
if (Settings.SuppressHospitalizationPopup === false) {
SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, "warning");
}
SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, "warning");
this.loseMoney(cost, "hospitalization");
this.hp = this.max_hp;
@ -2631,6 +2626,7 @@ export function canAccessResleeving(this: IPlayer): boolean {
export function giveExploit(this: IPlayer, exploit: Exploit): void {
if (!this.exploits.includes(exploit)) {
this.exploits.push(exploit);
SnackbarEvents.emit("SF -1 acquired!", "success");
}
}

@ -42,11 +42,11 @@ export function OptionsModal(props: IProps): React.ReactElement {
<Box display="flex" flexDirection="row" alignItems="center">
<Typography>Theme: </Typography>
<Select onChange={(event) => setTheme(event.target.value)} value={theme}>
<MenuItem value="vs-dark">dark</MenuItem>
<MenuItem value="light">light</MenuItem>
<MenuItem value="monokai">monokai</MenuItem>
<MenuItem value="solarized-dark">solarized-dark</MenuItem>
<MenuItem value="solarized-light">solarized-light</MenuItem>
<MenuItem value="vs-dark">dark</MenuItem>
<MenuItem value="light">light</MenuItem>
</Select>
</Box>

@ -64,7 +64,7 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
},
});
monaco.editor.defineTheme("solarish-dark", {
monaco.editor.defineTheme("solarized-dark", {
base: "vs-dark",
inherit: true,
rules: [
@ -113,16 +113,16 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
foreground: "268bd2",
},
{
token: "type.identifier.js",
foreground: "b58900",
token: "type.identifier.js",
foreground: "b58900",
},
{
token: "delimiter.square.js",
foreground: "0087ff",
token: "delimiter.square.js",
foreground: "0087ff",
},
{
token: "delimiter.bracket.js",
foreground: "0087ff",
token: "delimiter.bracket.js",
foreground: "0087ff",
},
{
token: "this",
@ -141,13 +141,13 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
},
});
monaco.editor.defineTheme("solarish-light", {
monaco.editor.defineTheme("solarized-light", {
base: "vs",
inherit: true,
rules: [
{
foreground: "657b83",
background: "fdf6e3",
background: "fdf6e3",
token: "",
},
{
@ -191,16 +191,16 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
foreground: "268bd2",
},
{
token: "type.identifier.js",
foreground: "b58900",
token: "type.identifier.js",
foreground: "b58900",
},
{
token: "delimiter.square.js",
foreground: "0087ff",
token: "delimiter.square.js",
foreground: "0087ff",
},
{
token: "delimiter.bracket.js",
foreground: "0087ff",
token: "delimiter.bracket.js",
foreground: "0087ff",
},
{
token: "this",

@ -83,11 +83,6 @@ interface IDefaultSettings {
*/
SuppressFactionInvites: boolean;
/**
* Whether to show a popup message when player is hospitalized from taking too much damage
*/
SuppressHospitalizationPopup: boolean;
/**
* Whether the user should be shown a dialog box whenever they receive a new message file.
*/
@ -179,7 +174,6 @@ export const defaultSettings: IDefaultSettings = {
SaveGameOnFileSave: true,
SuppressBuyAugmentationConfirmation: false,
SuppressFactionInvites: false,
SuppressHospitalizationPopup: false,
SuppressMessages: false,
SuppressTravelConfirmation: false,
SuppressBladeburnerPopup: false,
@ -241,7 +235,6 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
SaveGameOnFileSave: defaultSettings.SaveGameOnFileSave,
SuppressBuyAugmentationConfirmation: defaultSettings.SuppressBuyAugmentationConfirmation,
SuppressFactionInvites: defaultSettings.SuppressFactionInvites,
SuppressHospitalizationPopup: defaultSettings.SuppressHospitalizationPopup,
SuppressMessages: defaultSettings.SuppressMessages,
SuppressTravelConfirmation: defaultSettings.SuppressTravelConfirmation,
SuppressBladeburnerPopup: defaultSettings.SuppressBladeburnerPopup,

@ -7,6 +7,5 @@ export function dialogBoxCreate(txt: string | JSX.Element): void {
AlertEvents.emit(txt);
} else {
AlertEvents.emit(<span dangerouslySetInnerHTML={{ __html: txt }} />);
console.log('emit"');
}
}

@ -66,9 +66,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
const [suppressBuyAugmentationConfirmation, setSuppressBuyAugmentationConfirmation] = useState(
Settings.SuppressBuyAugmentationConfirmation,
);
const [suppressHospitalizationPopup, setSuppressHospitalizationPopup] = useState(
Settings.SuppressHospitalizationPopup,
);
const [suppressBladeburnerPopup, setSuppressBladeburnerPopup] = useState(Settings.SuppressBladeburnerPopup);
@ -129,11 +126,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
Settings.SuppressBuyAugmentationConfirmation = event.target.checked;
}
function handleSuppressHospitalizationPopupChange(event: React.ChangeEvent<HTMLInputElement>): void {
setSuppressHospitalizationPopup(event.target.checked);
Settings.SuppressHospitalizationPopup = event.target.checked;
}
function handleSuppressBladeburnerPopupChange(event: React.ChangeEvent<HTMLInputElement>): void {
setSuppressBladeburnerPopup(event.target.checked);
Settings.SuppressBladeburnerPopup = event.target.checked;
@ -326,7 +318,7 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
</Typography>
}
>
<Typography>Suppress messages</Typography>
<Typography>Suppress story messages</Typography>
</Tooltip>
}
/>
@ -388,25 +380,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
}
/>
</ListItem>
<ListItem>
<FormControlLabel
control={
<Switch checked={suppressHospitalizationPopup} onChange={handleSuppressHospitalizationPopupChange} />
}
label={
<Tooltip
title={
<Typography>
If this is set, a popup message will no longer be shown when you are hospitalized after taking
too much damage.
</Typography>
}
>
<Typography>Suppress hospitalization popup</Typography>
</Tooltip>
}
/>
</ListItem>
{!!props.player.bladeburner && (
<ListItem>
<FormControlLabel