Merge pull request #219 from EGO-Tech/stocker-1.2.0

stocker: version 1.2.0

bugger/FEATURES.md

@@ -20,7 +20,6 @@
 - 32 T2 triangle thrusters providing braking thrust
 - 104 T2 triangle thrusters for maneuvers, with extra thrust upwards
 - Basic crafting bench to craft refills plus the tools and advanced bench
-- Warning lights and alarm for obstacle detection and avoidance
 - Speedometer
 - Timer panel
 - Odometer panel

crawler/FEATURES.md

@@ -20,7 +20,6 @@
 - 52 T3 triangle thrusters providing braking thrust
 - 120 T3 triangle thrusters for maneuvers, with extra thrust upwards
 - Basic crafting bench to craft refills plus the tools and advanced bench
-- Warning lights and alarm for obstacle detection and avoidance
 - Speedometer
 - Timer panel
 - Odometer panel

roamer/FEATURES.md

@@ -15,7 +15,6 @@
 - 24 T2 box and 44 T2 triangle thrusters providing forward thrust
 - Eight T2 triangle thrusters providing braking thrust
 - 32 T2 triangle thrusters for maneuvers
-- Warning lights and alarm for obstacle detection and avoidance
 - Speedometer
 - Timer panel
 - Odometer panel

stocker/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
-## v1.1.2 (Current) - 29/12/2022
+## v1.2.0 (Current) - 09/08/2024
+
+- Removed NavCas auto pilot system
+- Removed `HeatTransferRate`, `StoredHeat` & `Generator Limit` panels
+- Replaced `Generator` panel with larger variant
+- Replaced `Odometer` and `Timer` with reset button variants
+- Moved mining lasers forward for better safety
+- Fixed sweeping of bottom two lasers (again!)
+- Added `Fixed` and `Manual` modes to mining lasers. `Manual` mode disables flight controls of the ship.
+- Added warnings panel
+- Added flight profiles system
+- Updated ship manual link in help chip
+
+## v1.1.2 - 29/12/2022
 
 - Added Discord link to help chip
 - Added cruise safety chip

stocker/FEATURES.md

@@ -2,7 +2,7 @@
 
 - 232 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
 - Four mining lasers on turrets that point towards asteroids with sweeping
 - Two ore collectors that point towards asteroids
@@ -22,8 +22,7 @@
 - Basic crafting bench to craft refills
 - 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 34 rangefinders
+- Warning lights and alarm for obstacle detection and avoidance
 - Speedometer
 - Timer panel
 - Odometer panel

stocker/USAGE.md

@@ -15,18 +15,19 @@ To enter the ship, there is a button on top of the center of the ship that will
 | `Cruise` | Activates cruise control, forward thrust will not reset to zero unless turned down. |
 | `Turtle` | Activates turtle mode which sets forward thrust to a maximum limit of `TurtleRate` of full thrust. |
 | `Sloth` | Activates the low sensitvity mode of pitch and yaw by limiting thrust. Use the `Sensitivity` switch to set the maximum thrust rate of sloth mode.|
+| `Profiles` | Adjusts preset flight profiles. See [Flight Profiles](https://starbase.egotech.space/pages/systems/flight/#flight-profiles). |
 | `Aim` | Reduces the response time of key presses for pitch and yaw. |
 | `Guides` | Activates rangefinders (except center one which can be activated separately). Can be used as guide lasers. `Red` warning lights show location of obstacles (left, right and centre). |
 | `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`, `Mining Lasers`, `Eco`, `Laser Sweep Height` & `Laser Sweep Depth` | 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). |
 
 </nord-table>
 
@@ -54,24 +55,10 @@ 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.
 
 `Avoids` will show the counters for number of avoidances. The `Trip` counter can be reset by clearing the panel value using the `U` tool.
 
@@ -91,13 +78,26 @@ The first time will show ISAN as offline, repeat clearing the value again to res
 ## Mining
 
 To approach an asteroid, point the center range finder at an asteroid and activate `Approach`. Once in range (optimum range is 10 to 14m on `Distance`), activate `Mining Lasers` to turn on the mining lasers.
-`Laser Sweep Height` and `Laser Sweep Depth` will adjust sweeping distances of the lasers. `Eco` mode will only use the top two lasers to conserve power if needed.
+
+The lasers have three modes.
+
+- `Fixed` mode will keep all lasers converged to the asteroid detected by the center range finder.
+- `Manual` mode allows manual control of the lasers using the pitch and yaw controls (including mouse control, default button `C`) of the ship. **This mode disables flight controls of the ship**
+- `Auto` mode will activate laser sweeping. `Laser Sweep Height` and `Laser Sweep Depth` can be adjusted in this mode to change sweeping distances of the lasers.
+
+<nord-banner variant="warning">
+
+**NOTE:** `Manual` mode disables flight controls of the ship.
+
+</nord-banner>
+
+`Eco` mode will only use the top two lasers to conserve power if needed.
 
 `Mine` is a button which will activate automated mining. Point the center range finder at an asteroid and activate. It will activate `Material Scanner` and `Approach`, and once in range it will automatically activate `Lasers`.
 
 `Collect` turns on the two ore collectors. Ore collectors automatically adjust to point towards objects detected by the center range finder.
 
-If batteries start running out of charge while mining, turn on `Min Gen`. Continous use of the lasers and collectors at the same time requires a `Min Generator Limit` of around 90%.
+If batteries start running out of charge while mining, turn on `Min Gen`. Continous use of the lasers and collectors at the same time requires a `Min Generator Rate` of around 90%.
 
 <nord-banner variant="warning">
 
@@ -122,12 +122,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 20 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. |
 | `Canopy` | Opens or closes glass canopy. |

stocker/ship.json

@@ -1,6 +1,6 @@
 {
   "name": "Stocker",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "path": "stocker",
   "types": [
     {
@@ -13,10 +13,18 @@
       "filename": "stocker.fbe",
       "path": "blueprints/stocker.fbe",
       "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/blueprints/stocker.fbe",
-      "version": "1.1.2",
+      "version": "1.2.0",
       "description": "",
       "current": true
     },
+    {
+      "filename": "stocker_v1.1.2.fbe",
+      "path": "blueprints/stocker_v1.1.2.fbe",
+      "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/blueprints/stocker_v1.1.2.fbe",
+      "version": "1.1.2",
+      "description": "",
+      "current": false
+    },
     {
       "filename": "stocker_v1.1.1.fbe",
       "path": "blueprints/stocker_v1.1.1.fbe",
@@ -262,6 +270,30 @@
       "path": "photos/20211022233219_1.jpg",
       "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/photos/20211022233219_1.jpg",
       "description": ""
+    },
+    {
+      "filename": "20240809154436_1.jpg",
+      "path": "photos/20240809154436_1.jpg",
+      "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/photos/20240809154436_1.jpg",
+      "description": ""
+    },
+    {
+      "filename": "20240809154513_1.jpg",
+      "path": "photos/20240809154513_1.jpg",
+      "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/photos/20240809154513_1.jpg",
+      "description": ""
+    },
+    {
+      "filename": "20240809154527_1.jpg",
+      "path": "photos/20240809154527_1.jpg",
+      "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/photos/20240809154527_1.jpg",
+      "description": ""
+    },
+    {
+      "filename": "20240809155024_1.jpg",
+      "path": "photos/20240809155024_1.jpg",
+      "url": "https://github.com/EGO-Tech/starbase-ships/raw/main/stocker/photos/20240809155024_1.jpg",
+      "description": ""
     }
   ],
   "readme": {
@@ -395,26 +427,26 @@
       {
         "ore": "ajatite",
         "label": "Ajatite Ore",
-        "kv": 15741,
-        "stacks": 9.1
+        "kv": 16031,
+        "stacks": 9.3
       },
       {
         "ore": "arkanium",
         "label": "Arkanium Ore",
-        "kv": 2995,
+        "kv": 2961,
         "stacks": 1.7
       },
       {
         "ore": "bastium",
         "label": "Bastium Ore",
-        "kv": 251725,
-        "stacks": 145.7
+        "kv": 251189,
+        "stacks": 145.4
       },
       {
         "ore": "charodium",
         "label": "Charodium Ore",
-        "kv": 187109,
-        "stacks": 108.3
+        "kv": 187889,
+        "stacks": 108.7
       },
       {
         "ore": "exorium",
@@ -437,7 +469,7 @@
       {
         "ore": "karnite",
         "label": "Karnite Crystal",
-        "kv": 226,
+        "kv": 207,
         "stacks": 0.1
       },
       {
@@ -449,26 +481,26 @@
       {
         "ore": "nhurgite",
         "label": "Nhurgite Crystal",
-        "kv": 70838,
+        "kv": 70836,
         "stacks": 41
       },
       {
         "ore": "vokarium",
         "label": "Vokarium Ore",
-        "kv": 124761,
-        "stacks": 72.2
+        "kv": 125199,
+        "stacks": 72.5
       },
       {
         "ore": "total",
         "label": "Total ore",
-        "kv": 847307,
-        "stacks": 490.3
+        "kv": 848225,
+        "stacks": 490.9
       }
     ],
     "cost": {
-      "assembly": 349943,
-      "manufacturing": 880946,
-      "total": 1230888
+      "assembly": 349167,
+      "manufacturing": 881277,
+      "total": 1230443
     },
     "discord": "https://discord.com/channels/1013328685564178472/1025283071966195742/1235742055440060447"
   },
@@ -525,10 +557,6 @@
       "id": "isan",
       "label": "ISAN"
     },
-    {
-      "id": "auto-pilot",
-      "label": "Auto Pilot"
-    },
     {
       "id": "asteroid-avoidance",
       "label": "Asteroid Avoidance"
@@ -581,6 +609,11 @@
               "label": "Adjustable Sweeping Lasers",
               "value": ""
             },
+            {
+              "id": "mouse-control",
+              "label": "Mouse Control",
+              "value": ""
+            },
             {
               "id": "eco",
               "label": "Eco Mode",
@@ -640,6 +673,11 @@
               "id": "sloth",
               "label": "Sloth Mode",
               "value": "Variable"
+            },
+            {
+              "id": "profiles",
+              "label": "Flight Profiles",
+              "value": true
             }
           ]
         },
@@ -867,6 +905,12 @@
           "value": true,
           "subSpecs": []
         },
+        {
+          "id": "warnings",
+          "label": "Warnings Panel",
+          "value": true,
+          "subSpecs": []
+        },
         {
           "id": "timer",
           "label": "Timer Panel",
@@ -881,5 +925,6 @@
         }
       ]
     }
-  ]
+  ],
+  "updated": true
 }

stocker/yolol/flight/profile_load_1_basic.yolol

@@ -0,0 +1,3 @@
+if:p1 thengoto2end if:p2 thengoto3end goto1
+:TurtleRate=:tr1 :sensitivity=:ss1 :p1=0 goto1
+:TurtleRate=:tr2 :sensitivity=:ss2 :p2=0 goto1

stocker/yolol/flight/profile_load_2_basic.yolol

@@ -0,0 +1,3 @@
+if:p3 thengoto2end if:p4 thengoto3end goto1
+:TurtleRate=:tr3 :sensitivity=:ss3 :p3=0 goto1
+:TurtleRate=:tr4 :sensitivity=:ss4 :p4=0 goto1