Skip to content

Commit

Permalink
Merge pull request #157 from EGO-Tech/mapper-v1.0.4
Browse files Browse the repository at this point in the history
Mapper v1.0.4
  • Loading branch information
vinteo authored Apr 29, 2024
2 parents 5a52ea1 + a992cd2 commit 601361f
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 7 deletions.
5 changes: 5 additions & 0 deletions mapper/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v1.0.4 (Current) - 29/04/2024

- Updated ship manual URL in help chip
- Fixed broken pipe which made four crates inaccessible, now all 20 crates are accessible

## v1.0.3 (Current) - 18/03/2023

- Fixed reset ISAN button
Expand Down
Binary file modified mapper/blueprints/mapper.fbe
Binary file not shown.
Binary file added mapper/blueprints/mapper_v1.0.3.fbe
Binary file not shown.
Binary file modified mapper/images/build_cost.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 14 additions & 5 deletions mapper/ship.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Mapper",
"version": "1.0.3",
"version": "1.0.4",
"path": "mapper",
"types": [
{
Expand All @@ -13,10 +13,18 @@
"filename": "mapper.fbe",
"path": "blueprints/mapper.fbe",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/mapper/blueprints/mapper.fbe",
"version": "1.0.3",
"version": "1.0.4",
"description": "",
"current": true
},
{
"filename": "mapper_v1.0.3.fbe",
"path": "blueprints/mapper_v1.0.3.fbe",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/mapper/blueprints/mapper_v1.0.3.fbe",
"version": "1.0.3",
"description": "",
"current": false
},
{
"filename": "mapper_v1.0.2.fbe",
"path": "blueprints/mapper_v1.0.2.fbe",
Expand Down Expand Up @@ -343,9 +351,9 @@
}
],
"cost": {
"assembly": 223933,
"assembly": 223961,
"manufacturing": 455057,
"total": 678990
"total": 679018
}
},
"links": [
Expand Down Expand Up @@ -411,5 +419,6 @@
"usage": {
"path": "USAGE.md",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/mapper/USAGE.md"
}
},
"updated": true
}
1 change: 1 addition & 0 deletions www/scripts/generateConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ const getShipVideos = (table) =>
.sort((a, b) => semverCompare(b.version, a.version));
if (!_.isEmpty(json.blueprints)) {
_.set(json.blueprints, '[0].current', true);
_.set(json.blueprints, '[0].version', json.version);
json.cost ??= 0;
} else {
json.cost ??= 500000;
Expand Down
4 changes: 2 additions & 2 deletions www/website/_includes/layouts/base.njk
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ currentTitle: Home
</nord-stack>
<nord-nav-group heading="Ships For Sale">
{% for shipForSale in ships.bySaleType['for-sale'] %}
<nord-nav-item {% if shipForSale.new %}badge="NEW"{% endif %} {% if shipForSale.slug === ship.slug %}active{% endif %} href="{{ ('/ships/' + shipForSale.slug + '/') | url }}">
<nord-nav-item {% if shipForSale.new %}badge="NEW"{% elseif shipForSale.updated %}badge="UPDATED"{% endif %} {% if shipForSale.slug === ship.slug %}active{% endif %} href="{{ ('/ships/' + shipForSale.slug + '/') | url }}">
{{shipForSale.name}}
</nord-nav-item>
{% endfor %}
</nord-nav-group>
<nord-nav-group heading="Free Ships">
{% for shipFree in ships.bySaleType['free'] %}
<nord-nav-item {% if shipFree.new %}badge="NEW"{% endif %} {% if shipFree.slug === ship.slug %}active{% endif %} href="{{ ('/ships/' + shipFree.slug + '/') | url }}">
<nord-nav-item {% if shipFree.new %}badge="NEW"{% elseif shipFree.updated %}badge="UPDATED"{% endif %} {% if shipFree.slug === ship.slug %}active{% endif %} href="{{ ('/ships/' + shipFree.slug + '/') | url }}">
{{shipFree.name}}
</nord-nav-item>
{% endfor %}
Expand Down
2 changes: 2 additions & 0 deletions www/website/_includes/shipVersion.njk
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<nord-stack direction="horizontal" gap="s">
{% if ship.new %}
<nord-badge variant="danger">NEW</nord-badge>
{% elseif ship.updated %}
<nord-badge variant="danger">UPDATED</nord-badge>
{% endif %}
<nord-badge>v{{ ship.version }}</nord-badge>
</nord-stack>

0 comments on commit 601361f

Please sign in to comment.