Skip to content

Commit

Permalink
Merge pull request #242 from EGO-Tech/shifter-v2.0.2
Browse files Browse the repository at this point in the history
shifter, shifter-x: v2.0.2, v1.0.2
  • Loading branch information
vinteo authored Dec 8, 2024
2 parents 9ae9143 + 4b56002 commit 08e58fd
Show file tree
Hide file tree
Showing 18 changed files with 110 additions and 62 deletions.
1 change: 0 additions & 1 deletion piercer/KNOWN_ISSUES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Known Issues

- There is limited coverage of range finders for the crash avoidance system. **Use at your own risk!**
- Autopilot doesn't seem to point ship directly to destination (a bit off), use in conjunction with NavGrid.
11 changes: 10 additions & 1 deletion shifter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Changelog

## v2.0.1 (Current) - 28/12/2022
## v2.0.2 (Current) - 08/12/2024

- Removed NavCas auto pilot system
- Removed `HeatTransferRate`, `StoredHeat` & `Generator Limit` panels
- Reshuffled pilot center console
- Added warnings panels
- Added flight profiles system
- Updated help chip ship manual link

## v2.0.1 - 28/12/2022

- Renamed `Material` panel to `Materials`
- Fixed upper limit of laser pitch control
Expand Down
3 changes: 1 addition & 2 deletions shifter/FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- Spacious double level interior
- Two additional seats for co-pilots
- 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
- Two automated rotating drills with four mining lasers each
- Six ore collectors
Expand All @@ -24,7 +24,6 @@
- Basic crafting bench to craft refills with meter upgrade plus the other two benches
- Extra two small propellant tank with its own resource bridge for emergency refilling
- [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 35 rangefinders
- Speedometer
- Timer panel
Expand Down
1 change: 0 additions & 1 deletion shifter/KNOWN_ISSUES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Known Issues

- There is limited coverage of range finders for the crash avoidance system. **Use at your own risk!**
- Autopilot doesn't seem to point ship directly to destination (a bit off), use in conjunction with NavGrid.
- Right/left strafe will spin the ship slightly as well.
- There may be a slight drift when crates start to fill, especially at low speeds.
31 changes: 7 additions & 24 deletions shifter/USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ To enter the ship, there is are buttons on either side of the body of the ship t
| `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). |

Expand Down Expand Up @@ -55,28 +54,14 @@ To edit currently selected waypoint, use your `U` tool to add name, X, Y and Z v

</nord-banner>

### Loading Waypoint to Auto Pilot

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.

<nord-banner variant="warning">

**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.

</nord-banner>
## 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.

<nord-banner variant="warning">

**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.

</nord-banner>

Expand Down Expand Up @@ -138,12 +123,10 @@ Activate using the `Material Scanner` button. The laser will try to adjust to po
| `FuelTime` | Time and distance remaining of fuel based on current usage. Distance is calculated from speed. |
| `WithBackup` | Same as FuelTime but takes into account backup rods available. Use the switch for `Backup Rods` to set the number of backup rods available. As standard there are 48 extra rods. |
| `Fuel Rod 1` to `Fuel Rod 12` | Fuel remaining on fuel rods in individual fuel chambers, maximum of 300,000 units for each. |
| `Generator` | Current generator rate, maximum of `Generator Limit`. |
| `Min Gen` & `Min Generator Limit` | Toggle and sets minimum generator rate. See [Managing Power and Fuel](#managing-power-and-fuel). |
| `Generator` | Current generator rate. |
| `Min Gen` & `Min Generator Rate` | Toggle and sets minimum generator rate. See [Managing Power and Fuel](#managing-power-and-fuel). |
| `Shutdown` | Will turn off all fuel chambers thus shutting down generators. |
| `Battery` | Shows current battery charge of the batteries, maximum of 10,000 units. |
| `HeatTransferRate` | Current heat transfer rate of the heat sinks, maximum of 100%. |
| `StoredHeat` | Current stored heat in the heat sinks, maximum of 15,000 units. |
| `Flow In` & `Flow Out` | Toggle flow modes of resource bridges. See [Refilling Propellant](#refilling-propellant). |
| `Lights` | Turns on and off internal lights. |
| `Doors` | Opens or closes ship entry doors. |
Expand Down
Binary file modified shifter/blueprints/shifter.fbe
Binary file not shown.
Binary file added shifter/blueprints/shifter_v2.0.1.fbe
Binary file not shown.
Binary file modified shifter/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.
Binary file modified shifter/images/pilot_center_console.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shifter/images/pilot_left_console.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shifter/images/pilot_right_console.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shifter/photos/20241208142627_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shifter/photos/20241208142631_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shifter/photos/20241208142635_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 55 additions & 17 deletions shifter/ship.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Shifter",
"version": "2.0.1",
"version": "2.0.2",
"path": "shifter",
"types": [
{
Expand All @@ -13,10 +13,18 @@
"filename": "shifter.fbe",
"path": "blueprints/shifter.fbe",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/shifter/blueprints/shifter.fbe",
"version": "2.0.1",
"version": "2.0.2",
"description": "",
"current": true
},
{
"filename": "shifter_v2.0.1.fbe",
"path": "blueprints/shifter_v2.0.1.fbe",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/shifter/blueprints/shifter_v2.0.1.fbe",
"version": "2.0.1",
"description": "",
"current": false
},
{
"filename": "shifter_v2.0.0.fbe",
"path": "blueprints/shifter_v2.0.0.fbe",
Expand Down Expand Up @@ -300,6 +308,24 @@
"path": "photos/20221126234439_1.jpg",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/shifter/photos/20221126234439_1.jpg",
"description": ""
},
{
"filename": "20241208142627_1.jpg",
"path": "photos/20241208142627_1.jpg",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/shifter/photos/20241208142627_1.jpg",
"description": ""
},
{
"filename": "20241208142631_1.jpg",
"path": "photos/20241208142631_1.jpg",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/shifter/photos/20241208142631_1.jpg",
"description": ""
},
{
"filename": "20241208142635_1.jpg",
"path": "photos/20241208142635_1.jpg",
"url": "https://github.com/EGO-Tech/starbase-ships/raw/main/shifter/photos/20241208142635_1.jpg",
"description": ""
}
],
"readme": {
Expand Down Expand Up @@ -469,19 +495,19 @@
{
"ore": "ajatite",
"label": "Ajatite Ore",
"kv": 24426,
"stacks": 14.1
"kv": 24570,
"stacks": 14.2
},
{
"ore": "arkanium",
"label": "Arkanium Ore",
"kv": 6764,
"kv": 6730,
"stacks": 3.9
},
{
"ore": "bastium",
"label": "Bastium Ore",
"kv": 443010,
"kv": 443075,
"stacks": 256.4
},
{
Expand All @@ -499,7 +525,7 @@
{
"ore": "exorium",
"label": "Exorium Ore",
"kv": 46229,
"kv": 46230,
"stacks": 26.8
},
{
Expand All @@ -517,7 +543,7 @@
{
"ore": "karnite",
"label": "Karnite Crystal",
"kv": 4494,
"kv": 4475,
"stacks": 2.6
},
{
Expand All @@ -529,26 +555,26 @@
{
"ore": "nhurgite",
"label": "Nhurgite Crystal",
"kv": 147117,
"kv": 147113,
"stacks": 85.1
},
{
"ore": "vokarium",
"label": "Vokarium Ore",
"kv": 213994,
"stacks": 123.8
"kv": 214149,
"stacks": 123.9
},
{
"ore": "total",
"label": "Total ore",
"kv": 1433159,
"stacks": 829.4
"kv": 1433467,
"stacks": 829.6
}
],
"cost": {
"assembly": 498206,
"manufacturing": 1319916,
"total": 1818122
"assembly": 498290,
"manufacturing": 1320015,
"total": 1818305
},
"discord": "https://discord.com/channels/1013328685564178472/1025285307886731284/1235741537887981609"
},
Expand Down Expand Up @@ -739,6 +765,11 @@
"id": "sloth",
"label": "Sloth Mode",
"value": "Variable"
},
{
"id": "profiles",
"label": "Flight Profiles",
"value": true
}
]
},
Expand Down Expand Up @@ -988,6 +1019,12 @@
"value": true,
"subSpecs": []
},
{
"id": "warnings",
"label": "Warnings Panel",
"value": true,
"subSpecs": []
},
{
"id": "timer",
"label": "Timer Panel",
Expand All @@ -1007,5 +1044,6 @@
"path": "shifter",
"name": "Shifter",
"slug": "shifter"
}
},
"updated": true
}
11 changes: 10 additions & 1 deletion shifter/variants/shifter-x/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Changelog

## v1.0.1 (Current) - 28/12/2022
## v1.0.2 (Current) - 08/12/2024

- Removed NavCas auto pilot system
- Removed `HeatTransferRate`, `StoredHeat` & `Generator Limit` panels
- Reshuffled pilot center console
- Added warnings panels
- Added flight profiles system
- Updated help chip ship manual link

## v1.0.1 - 28/12/2022

- Renamed `Material` panel to `Materials`
- Fixed upper limit of laser pitch control
Expand Down
Binary file modified shifter/variants/shifter-x/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.
Loading

0 comments on commit 08e58fd

Please sign in to comment.