Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shoreline map update #963

Merged
merged 3 commits into from
Jul 13, 2024
Merged

Shoreline map update #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd4e5e7
update shoreline map
Razzmatazzz Jul 10, 2024
8a9e870
Merge branch 'main' of https://github.com/the-hideout/tarkov-dev into…
Razzmatazzz Jul 10, 2024
a35d6e5
fix null item property error
Razzmatazzz Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/data/maps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,7 @@
"author": "Shebuka",
"authorLink": "https://github.com/TarkovTracker/tarkovdata/",
"svgPath": "https://assets.tarkov.dev/maps/svg/Shoreline-Ground_Level.svg",
"tilePath": "https://assets.tarkov.dev/maps/shoreline/main/{z}/{x}/{y}.png",
"tilePath": "https://assets.tarkov.dev/maps/shoreline/main_spring/{z}/{x}/{y}.png",
"layers": [
{
"name": "Underground",
Expand Down
22 changes: 11 additions & 11 deletions src/modules/property-format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import i18n from '../i18n.js';

const zonesFormat = (zones) => {
return zones
?.map((zoneName) => {
if (zoneName === zoneName.toUpperCase()) {
return zoneName.charAt(0).toUpperCase() + zoneName.substr(1).toLowerCase();
}

return zoneName;
})
.filter(Boolean)
.sort()
.join(' · ')
?.map((zoneName) => {
if (zoneName === zoneName.toUpperCase()) {
return zoneName.charAt(0).toUpperCase() + zoneName.substr(1).toLowerCase();
}

return zoneName;
})
.filter(Boolean)
.sort()
.join(' · ');
}

const ignoreCategories = [
Expand Down Expand Up @@ -51,7 +51,7 @@ const formatter = (key, value, id) => {
}
value = value.value;
}
if (typeof value === 'object') {
if (typeof value === 'object' && value !== null) {
if (Array.isArray(value)) {
value = [...value];
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/quest/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@ function Quest() {
})
.reduce((elements, current, index) => {
if (elements.length > 0) {
elements.push(<li key={`or-${index}`}><span style={{verticalAlign: 'middle', minHeight: '64px', display: 'inline-block', padding: '0px 3px'}}> or </span></li>);
elements.push(<li key={`or-${index}`}><span style={{verticalAlign: 'middle', minHeight: '64px', display: 'inline-block', padding: '0px 3px'}}> and </span></li>);
}
elements.push(current);
return elements;
Expand Down
Loading