diff --git a/piercer/CHANGELOG.md b/piercer/CHANGELOG.md
index 89bb18b0..214fea20 100644
--- a/piercer/CHANGELOG.md
+++ b/piercer/CHANGELOG.md
@@ -1,6 +1,13 @@
# Changelog
-## v1.1.2 (Current) - 27/12/2022
+## v1.1.3 (Current) - 08/12/2024
+
+- Added warnings panel
+- Added flight profiles system
+- Reshuffled pilot consoles
+- Updated ship manual link in help chip
+
+## v1.1.2 - 27/12/2022
- Added Discord link to help chip
- Renamed `Material` panel to `Materials`
diff --git a/piercer/FEATURES.md b/piercer/FEATURES.md
index 54dde2b8..e43c0dde 100644
--- a/piercer/FEATURES.md
+++ b/piercer/FEATURES.md
@@ -2,7 +2,7 @@
- 342 ore crates
- Standard Cruise function
-- Turtle and Sloth functions with adjustable rates
+- Turtle and Sloth functions with adjustable rates and preset profiles
- Transponder system with ping function
- Automated rotating drill with four mining lasers
- Four ore collectors
@@ -21,7 +21,6 @@
- 48 T2 triangle thrusters for maneuvers
- Basic crafting bench to craft refills plus the tools bench
- [NavGrid by StandPeter](https://github.com/pcbennion/starbase-navgrid)
-- [NavCas by fixerid](https://github.com/fixerid/sb-projects/tree/main/NavCas), using custom avoidance system and ISAN 3 in 1 from [Compass by Firestar99](https://gitlab.com/Firestar99/yolol/-/blob/master/src/compass/README.md), with ability to load target from NavGrid
- Warning lights and alarm for obstacle detection and avoidance, powered by 31 rangefinders
- Speedometer
- Timer panel
diff --git a/piercer/USAGE.md b/piercer/USAGE.md
index 086de523..df1cd18b 100644
--- a/piercer/USAGE.md
+++ b/piercer/USAGE.md
@@ -21,11 +21,10 @@ To enter the ship, there is a button on top of the ship that will open `Hatch`.
| `Range` & `Distance` | Activates center rangefinder, with `Distance` showing distance to object. |
| `Material Scanner` & `Materials` | Turns on the [Ore Scanner](#ore-scanner) and shows results of scan. |
| `Approach`, `Collect`, `Mine`, `Lasers`, `Rotate`, `Eco`, `Drill Mode` & `Drill Pitch` | Mining controls. See [Mining](#mining). |
-| `Nav`, `Autopilot`, `Avoidance` & `Target` | Autopilot controls. See [Autopilot and Crash Avoidance](#auto-pilot-and-crash-avoidance). |
+| `Avoidance` | Activates avoidance. See [Crash Avoidance](#crash-avoidance). |
| `ISAN2` | Current ISAN coordinates of ship. |
| `NavGrid`, `NavP`, `NavC` & `Attitude` | [NavGrid](https://github.com/pcbennion/starbase-navgrid) system, see [Using the Waypoint System](#using-the-waypoint-system). |
-| `SafeZone` | Whether current location is in the safe zone. |
-| `StrengthFactor` | Current strength of ship. May fluctuate as ore crates are filled. Anything below 1.0 means ship is damaged. |
+| `Warnings`, `SafeZone` & `StrengthFactor` | Warnings for being outside safe zone, ship damage as well as low fuel or propellant. See [Warnings Panel](https://starbase.egotech.space/pages/systems/utility/#warnings). |
| Transponder `Toggle` & `Ping` | [Transponder](https://starbase.egotech.space/pages/systems/utility/#transponder) controls, `Toggle` turns on and off ship transponder while `Ping` will activate transponder for three seconds |
| `Timer` | See [Timer](https://starbase.egotech.space/pages/systems/utility/#timer). |
| `Odometer` | See [Odometer](https://starbase.egotech.space/pages/systems/utility/#odometer). |
@@ -60,24 +59,14 @@ To edit currently selected waypoint, use your `U` tool to add name, X, Y and Z v
Use `Load to Auto Pilot` to load curretnly selected waypoint to `Target` to be used with the auto pilot system.
-## Auto Pilot and Crash Avoidance
-
-The ship uses a modified version of [NavCas](https://github.com/fixerid/sb-projects/tree/main/NavCas) which uses the 3 in 1 ISAN from Compass. Waypoints are loaded from NavGrid waypoint system.
-
-Use while the ship is stationary. Activating `Nav` will start point the ship towards `Target` waypoint and deactivate itself when done. `Autopilot` will activate `Nav` and fly to within 5km of `Target` waypoint with `Avoidance` activated.
-
-
-
-**NOTE:** `Nav` may not be very accurate. I recommend using it in conjunction with the NavGrid compass. The `dd` panel on the pilot left console shows debugging information for NavCas.
-
-
+## Crash Avoidance
`Avoidance` will activate `Guides`. If the guides detect objects it will cut thrust and strafe up or down (will flash either the top or bottom `Blue` warning lights on the pilot center console according to the direction) while sounding an alarm (check game settings if you do not hear the alarm).
-It will also flash `Red` warning lights on the pilot center console according to the position of obstacle detected. If `Autopilot` is activated, it will readjust and continue its flight.
+It will also flash `Red` warning lights on the pilot center console according to the position of obstacle detected.
-**NOTE:** For safety, `Avoidance` will not activate if the mining lasers are turned on. Do not turn on `Avoidance`, `Autopilot` and `Nav` while lasers are turned on.
+**NOTE:** For safety, `Avoidance` will not activate if the mining lasers are turned on.
diff --git a/piercer/blueprints/piercer.fbe b/piercer/blueprints/piercer.fbe
index c0f468c6..759cb328 100644
Binary files a/piercer/blueprints/piercer.fbe and b/piercer/blueprints/piercer.fbe differ
diff --git a/piercer/blueprints/piercer_v1.1.2.fbe b/piercer/blueprints/piercer_v1.1.2.fbe
new file mode 100644
index 00000000..c0f468c6
Binary files /dev/null and b/piercer/blueprints/piercer_v1.1.2.fbe differ
diff --git a/piercer/images/build_cost.png b/piercer/images/build_cost.png
index 5a6bbe88..bff73b25 100644
Binary files a/piercer/images/build_cost.png and b/piercer/images/build_cost.png differ
diff --git a/piercer/images/pilot_center_console.jpg b/piercer/images/pilot_center_console.jpg
index 77185fbd..6f583edb 100644
Binary files a/piercer/images/pilot_center_console.jpg and b/piercer/images/pilot_center_console.jpg differ
diff --git a/piercer/images/pilot_left_console.jpg b/piercer/images/pilot_left_console.jpg
index 7ad452d0..ec10e86a 100644
Binary files a/piercer/images/pilot_left_console.jpg and b/piercer/images/pilot_left_console.jpg differ
diff --git a/piercer/images/pilot_right_console.jpg b/piercer/images/pilot_right_console.jpg
index 8c6a1cb5..5a669098 100644
Binary files a/piercer/images/pilot_right_console.jpg and b/piercer/images/pilot_right_console.jpg differ
diff --git a/piercer/photos/20241208134625_1.jpg b/piercer/photos/20241208134625_1.jpg
new file mode 100644
index 00000000..202024d4
Binary files /dev/null and b/piercer/photos/20241208134625_1.jpg differ
diff --git a/piercer/photos/20241208134629_1.jpg b/piercer/photos/20241208134629_1.jpg
new file mode 100644
index 00000000..03688ee4
Binary files /dev/null and b/piercer/photos/20241208134629_1.jpg differ
diff --git a/piercer/photos/20241208134635_1.jpg b/piercer/photos/20241208134635_1.jpg
new file mode 100644
index 00000000..a745c475
Binary files /dev/null and b/piercer/photos/20241208134635_1.jpg differ
diff --git a/piercer/ship.json b/piercer/ship.json
index 304bd0b4..a47c725f 100644
--- a/piercer/ship.json
+++ b/piercer/ship.json
@@ -1,6 +1,6 @@
{
"name": "Piercer",
- "version": "1.1.2",
+ "version": "1.1.3",
"path": "piercer",
"types": [
{
@@ -13,10 +13,18 @@
"filename": "piercer.fbe",
"path": "blueprints/piercer.fbe",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/piercer/blueprints/piercer.fbe",
- "version": "1.1.2",
+ "version": "1.1.3",
"description": "",
"current": true
},
+ {
+ "filename": "piercer_v1.1.2.fbe",
+ "path": "blueprints/piercer_v1.1.2.fbe",
+ "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/piercer/blueprints/piercer_v1.1.2.fbe",
+ "version": "1.1.2",
+ "description": "",
+ "current": false
+ },
{
"filename": "piercer_v1.1.1.fbe",
"path": "blueprints/piercer_v1.1.1.fbe",
@@ -253,6 +261,24 @@
"path": "photos/20220225210947_1.jpg",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/piercer/photos/20220225210947_1.jpg",
"description": ""
+ },
+ {
+ "filename": "20241208134625_1.jpg",
+ "path": "photos/20241208134625_1.jpg",
+ "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/piercer/photos/20241208134625_1.jpg",
+ "description": ""
+ },
+ {
+ "filename": "20241208134629_1.jpg",
+ "path": "photos/20241208134629_1.jpg",
+ "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/piercer/photos/20241208134629_1.jpg",
+ "description": ""
+ },
+ {
+ "filename": "20241208134635_1.jpg",
+ "path": "photos/20241208134635_1.jpg",
+ "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/piercer/photos/20241208134635_1.jpg",
+ "description": ""
}
],
"readme": {
@@ -414,19 +440,19 @@
{
"ore": "ajatite",
"label": "Ajatite Ore",
- "kv": 17404,
- "stacks": 10.1
+ "kv": 17554,
+ "stacks": 10.2
},
{
"ore": "arkanium",
"label": "Arkanium Ore",
- "kv": 3077,
+ "kv": 3043,
"stacks": 1.8
},
{
"ore": "bastium",
"label": "Bastium Ore",
- "kv": 284359,
+ "kv": 284427,
"stacks": 164.6
},
{
@@ -438,7 +464,7 @@
{
"ore": "exorium",
"label": "Exorium Ore",
- "kv": 20061,
+ "kv": 20062,
"stacks": 11.6
},
{
@@ -456,7 +482,7 @@
{
"ore": "karnite",
"label": "Karnite Crystal",
- "kv": 235,
+ "kv": 216,
"stacks": 0.1
},
{
@@ -468,26 +494,26 @@
{
"ore": "nhurgite",
"label": "Nhurgite Crystal",
- "kv": 83098,
+ "kv": 83096,
"stacks": 48.1
},
{
"ore": "vokarium",
"label": "Vokarium Ore",
- "kv": 137322,
- "stacks": 79.5
+ "kv": 137484,
+ "stacks": 79.6
},
{
"ore": "total",
"label": "Total ore",
- "kv": 994298,
- "stacks": 575.4
+ "kv": 994623,
+ "stacks": 575.6
}
],
"cost": {
- "assembly": 270337,
- "manufacturing": 947012,
- "total": 1217348
+ "assembly": 270683,
+ "manufacturing": 947115,
+ "total": 1217798
},
"discord": "https://discord.com/channels/1013328685564178472/1025255426373189654/1235740277168406610"
},
@@ -670,6 +696,11 @@
"id": "sloth",
"label": "Sloth Mode",
"value": "Variable"
+ },
+ {
+ "id": "profiles",
+ "label": "Flight Profiles",
+ "value": true
}
]
},
@@ -898,6 +929,12 @@
"value": true,
"subSpecs": []
},
+ {
+ "id": "warnings",
+ "label": "Warnings Panel",
+ "value": true,
+ "subSpecs": []
+ },
{
"id": "timer",
"label": "Timer Panel",
@@ -917,5 +954,6 @@
"path": "piercer",
"name": "Piercer",
"slug": "piercer"
- }
+ },
+ "updated": true
}
diff --git a/piercer/variants/piercer-x/CHANGELOG.md b/piercer/variants/piercer-x/CHANGELOG.md
index f47c41c2..53e88f0d 100644
--- a/piercer/variants/piercer-x/CHANGELOG.md
+++ b/piercer/variants/piercer-x/CHANGELOG.md
@@ -1,6 +1,13 @@
# Changelog
-## v1.0.2 (Current) - 27/12/2022
+## v1.0.3 (Current) - 08/12/2024
+
+- Added warnings panel
+- Added flight profiles system
+- Reshuffled pilot consoles
+- Updated ship manual link in help chip
+
+## v1.0.2 - 27/12/2022
- Renamed `Material` panel to `Materials`
- Fixed upper limit of laser pitch control
diff --git a/piercer/variants/piercer-x/images/build_cost.png b/piercer/variants/piercer-x/images/build_cost.png
index a507175b..af43f5a1 100644
Binary files a/piercer/variants/piercer-x/images/build_cost.png and b/piercer/variants/piercer-x/images/build_cost.png differ
diff --git a/piercer/variants/piercer-x/ship.json b/piercer/variants/piercer-x/ship.json
index fc8a0d84..dff30028 100644
--- a/piercer/variants/piercer-x/ship.json
+++ b/piercer/variants/piercer-x/ship.json
@@ -1,6 +1,6 @@
{
"name": "Piercer X (Anorak Edition)",
- "version": "1.0.2",
+ "version": "1.0.3",
"path": "piercer/variants/piercer-x",
"types": [
{
@@ -66,19 +66,19 @@
{
"ore": "ajatite",
"label": "Ajatite Ore",
- "kv": 11227,
- "stacks": 6.5
+ "kv": 11376,
+ "stacks": 6.6
},
{
"ore": "arkanium",
"label": "Arkanium Ore",
- "kv": 25944,
+ "kv": 25910,
"stacks": 15
},
{
"ore": "bastium",
"label": "Bastium Ore",
- "kv": 265261,
+ "kv": 265329,
"stacks": 153.5
},
{
@@ -96,7 +96,7 @@
{
"ore": "exorium",
"label": "Exorium Ore",
- "kv": 28492,
+ "kv": 28493,
"stacks": 16.5
},
{
@@ -114,7 +114,7 @@
{
"ore": "karnite",
"label": "Karnite Crystal",
- "kv": 5540,
+ "kv": 5521,
"stacks": 3.2
},
{
@@ -132,7 +132,7 @@
{
"ore": "nhurgite",
"label": "Nhurgite Crystal",
- "kv": 83098,
+ "kv": 83096,
"stacks": 48.1
},
{
@@ -144,8 +144,8 @@
{
"ore": "vokarium",
"label": "Vokarium Ore",
- "kv": 153443,
- "stacks": 88.8
+ "kv": 153605,
+ "stacks": 88.9
},
{
"ore": "xhalium",
@@ -162,14 +162,14 @@
{
"ore": "total",
"label": "Total ore",
- "kv": 1274252,
- "stacks": 737.4
+ "kv": 1274576,
+ "stacks": 737.6
}
],
"cost": {
- "assembly": 272628,
- "manufacturing": 1407760,
- "total": 1680388
+ "assembly": 272974,
+ "manufacturing": 1407864,
+ "total": 1680837
}
},
"links": [
@@ -343,6 +343,11 @@
"id": "sloth",
"label": "Sloth Mode",
"value": "Variable"
+ },
+ {
+ "id": "profiles",
+ "label": "Flight Profiles",
+ "value": true
}
]
},
@@ -576,6 +581,12 @@
"value": true,
"subSpecs": []
},
+ {
+ "id": "warnings",
+ "label": "Warnings Panel",
+ "value": true,
+ "subSpecs": []
+ },
{
"id": "timer",
"label": "Timer Panel",
@@ -595,5 +606,6 @@
"path": "piercer",
"name": "Piercer",
"slug": "piercer"
- }
+ },
+ "updated": true
}
diff --git a/stocker/USAGE.md b/stocker/USAGE.md
index 9d908990..42ef00f3 100644
--- a/stocker/USAGE.md
+++ b/stocker/USAGE.md
@@ -60,7 +60,7 @@ To edit currently selected waypoint, use your `U` tool to add name, X, Y and Z v
`Avoidance` will activate `Guides`. If the guides detect objects it will cut thrust and strafe up or down (will flash either the top or bottom `Blue` warning lights on the pilot center console according to the direction) while sounding an alarm (check game settings if you do not hear the alarm).
It will also flash `Red` warning lights on the pilot center console according to the position of obstacle detected.
-`Avoids` will show the counters for number of avoidances. The `Trip` counter can be reset by clearing the panel value using the `U` tool.
+`Avoids` will show the counters for number of avoidances. The `Trip` counter can be reset by holding down the `Avoids` `Reset Trips` button.