Merge pull request #1824 from danielyxie/dev

add bn14 location
This commit is contained in:
hydroflame 2021-12-04 23:50:00 -05:00 committed by GitHub
commit aa7cf7469e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 25 deletions

32
dist/vendor.bundle.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -112,9 +112,9 @@ Cities[CityName.Ishima].asciiArt = `
o | / \\ o-------x------o o | / \\ o-------x------o
/ o / \\ / / o / \\ /
48 o / 55 x \\ / 48 o / 55 x \\ /
\\ / / x \\ / / x [glitch]
\\ / [nova medical] / 4/30 \\ \\ / [nova medical] / 4/30 \\
49 x A \\ 49 x A \\ H
/ \\ / \\ / \\ / \\
/ \\ [travel agency] F o 31 / \\ [travel agency] F o 31
/ \\ 51 / / \\ 51 /

@ -59,6 +59,7 @@ export enum LocationName {
IshimaNovaMedical = "Nova Medical", IshimaNovaMedical = "Nova Medical",
IshimaOmegaSoftware = "Omega Software", IshimaOmegaSoftware = "Omega Software",
IshimaStormTechnologies = "Storm Technologies", IshimaStormTechnologies = "Storm Technologies",
IshimaGlitch = "0x6C1",
// Volhaven // Volhaven
VolhavenCompuTek = "CompuTek", VolhavenCompuTek = "CompuTek",

@ -445,4 +445,9 @@ export const LocationsMetadata: IConstructorParams[] = [
name: LocationName.ChongqingChurchOfTheMachineGod, name: LocationName.ChongqingChurchOfTheMachineGod,
types: [LocationType.Special], types: [LocationType.Special],
}, },
{
city: CityName.Ishima,
name: LocationName.IshimaGlitch,
types: [LocationType.Special],
},
]; ];

@ -28,6 +28,7 @@ import { SnackbarEvents } from "../../ui/React/Snackbar";
import { N00dles } from "../../utils/helpers/N00dles"; import { N00dles } from "../../utils/helpers/N00dles";
import { Exploit } from "../../Exploits/Exploit"; import { Exploit } from "../../Exploits/Exploit";
import { applyAugmentation } from "../../Augmentation/AugmentationHelpers"; import { applyAugmentation } from "../../Augmentation/AugmentationHelpers";
import { CorruptableText } from "../../ui/React/CorruptableText";
type IProps = { type IProps = {
loc: Location; loc: Location;
@ -252,6 +253,16 @@ export function SpecialLocation(props: IProps): React.ReactElement {
); );
} }
function renderGlitch(): React.ReactElement {
return (
<>
<Typography>
<CorruptableText content={"An eerie aura surround this area. You feel you should leave."} />
</Typography>
</>
);
}
switch (props.loc.name) { switch (props.loc.name) {
case LocationName.NewTokyoVitaLife: { case LocationName.NewTokyoVitaLife: {
return renderResleeving(); return renderResleeving();
@ -268,6 +279,9 @@ export function SpecialLocation(props: IProps): React.ReactElement {
case LocationName.ChongqingChurchOfTheMachineGod: { case LocationName.ChongqingChurchOfTheMachineGod: {
return renderCotMG(); return renderCotMG();
} }
case LocationName.IshimaGlitch: {
return renderGlitch();
}
default: default:
console.error(`Location ${props.loc.name} doesn't have any special properties`); console.error(`Location ${props.loc.name} doesn't have any special properties`);
return <></>; return <></>;

@ -31,11 +31,11 @@ export function CorruptableText(props: IProps): JSX.Element {
counter = Math.random() * 5; counter = Math.random() * 5;
const index = Math.random() * content.length; const index = Math.random() * content.length;
const letter = content.charAt(index); const letter = content.charAt(index);
setContent(replace(content, index, randomize(letter))); setContent((content) => replace(content, index, randomize(letter)));
setTimeout(() => { setTimeout(() => {
setContent(content); setContent((content) => replace(content, index, letter));
}, 50); }, 500);
}, 100); }, 20);
return () => { return () => {
clearInterval(id); clearInterval(id);