Merge pull request #111 from EGO-Tech/trebler-v1.0.1

trebler, trebler x: version 1.0.1
EGO-Tech · Oct 10, 2023 · d82ace7 · d82ace7
2 parents bef461c + 74c83a1
commit d82ace7
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -24,8 +24,8 @@ Want to build your own ships? Try the [Welder Modular Ship Framework](https://eg
 | <img src="shifter/premium/photos/20221202233246_1.jpg" alt="Shifter X" width="200" /> | [Shifter X](shifter/premium/)<br />![Blueprint for Sale][bp-sale] | The premium version of the [Shifter](shifter) with T3 generators and thrusters. | v1.0.1 | 450 | 8 |
 | <img src="piercer/photos/20220225204743_1.jpg" alt="Piercer" width="200" /> | [Piercer](piercer)<br />![Free Blueprint][bp-free] | The Piercer is a 342 ore crate capacity mining ship with an automated rotating laser drill for mining operations.  | v1.1.2 | 342 | 4 |
 | <img src="piercer/premium/photos/20221006153255_1.jpg" alt="Piercer X" width="200" /> | [Piercer X](piercer/premium/)<br />![Blueprint for Sale][bp-sale] | The premium version of the [Piercer](piercer) with T3 generators, fuel chambers, enhancers and thrusters. | v1.0.2 | 342 | 4 |
-| <img src="trebler/photos/20230426173418_1.jpg" alt="Trebler" width="200" /> | [Trebler](trebler)<br />![Free Blueprint][bp-free] | The Trebler is a 534 ore crate capacity mining ship with three automated rotating laser drills for mining operations. It is designed to be a short range, high capacity and high efficiency miner used out of a capital ship.  | v1.0.0 | 534 | 9 |
-| <img src="trebler/premium/photos/20230507173014_1.jpg" alt="Trebler X" width="200" /> | [Trebler X](trebler/premium/)<br />![Blueprint for Sale][bp-sale] | The premium version of the [Trebler](trebler) with T3 generators, fuel chambers, enhancers and thrusters plus three extra mining lasers. | v1.0.0 | 534 | 12 |
+| <img src="trebler/photos/20230426173418_1.jpg" alt="Trebler" width="200" /> | [Trebler](trebler)<br />![Free Blueprint][bp-free] | The Trebler is a 534 ore crate capacity mining ship with three automated rotating laser drills for mining operations. It is designed to be a short range, high capacity and high efficiency miner used out of a capital ship.  | v1.0.1 | 534 | 9 |
+| <img src="trebler/premium/photos/20230507173014_1.jpg" alt="Trebler X" width="200" /> | [Trebler X](trebler/premium/)<br />![Blueprint for Sale][bp-sale] | The premium version of the [Trebler](trebler) with T3 generators, fuel chambers, enhancers and thrusters plus three extra mining lasers. | v1.0.1| 534 | 12 |
 
 ## Surface Miners
 

diff --git a/trebler/README.md b/trebler/README.md
@@ -1,7 +1,7 @@
 # Trebler by EGOTech
 
 [![CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg)](http://creativecommons.org/licenses/by-nc-sa/4.0/)
-[![Version](https://img.shields.io/static/v1?label=Version&message=1.0.0&color=blue)](#changelog)
+[![Version](https://img.shields.io/static/v1?label=Version&message=1.0.1&color=blue)](#changelog)
 [![Blueprint](https://img.shields.io/static/v1?label=Blueprint&message=Free%20Download&color=brightgreen)](#download-blueprint)
 
 The Trebler is a 534 ore crate capacity mining ship with three automated rotating laser drills for mining operations. It is designed to be a short range, high capacity and high efficiency miner used out of a capital ship.
@@ -50,6 +50,11 @@ The ship has the following features:
 
 ## Changelog
 
+### v1.0.1 (Current) - 10/10/2023
+
+- Added four forward facing rangefinders as extra guides
+- Added switch to use one, two or three drills at a time.
+
 ### v1.0.0 - 26/04/2023
 
 - Initial release
@@ -83,9 +88,10 @@ The left lever on the center console controls backwards thrust (braking) and the
 | `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.|
 | `Aim` | Reduces the response time of key presses for pitch and yaw. |
+| `Guides` | Activates four forward facing rangefinders as guides. |
 | `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). |
+| `Scanner` & `Materials` | Turns on the [Ore Scanner](#ore-scanner) and shows results of scan. |
+| `Approach`, `Collect`, `Mine`, `Lasers`, `Rotate`, `Eco`, `Drill Mode`, `Drill Pitch` & `Drill Count` | Mining controls. See [Mining](#mining). |
 | `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. |
 | Transponder `Toggle` & `Ping` | Transponder controls, `Toggle` turns on and off ship transponder while `Ping` will activate transponder for three seconds |
@@ -104,7 +110,7 @@ The laser drill has three modes.
 - `Manual` mode allows adjustment of the `Drill Pitch`. The pitch range is from `-15` to `20` degrees.
 - `Auto` mode will activate `Rotate` and progressively increase the drill pitch with the rotations
 
-`Drill Pitch` can only be adjusted in `Manual` mode. `Eco` mode will only use two lasers to conserve power.
+`Drill Pitch` can only be adjusted in `Manual` mode. `Eco` mode will only use two lasers to conserve power. `Drill Count` controls whether one, two or three drills are activated when mining.
 
 `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`.
 

diff --git a/trebler/blueprints/trebler.fbe b/trebler/blueprints/trebler.fbe
diff --git a/trebler/blueprints/trebler_v1.0.0.fbe b/trebler/blueprints/trebler_v1.0.0.fbe
diff --git a/trebler/images/build_cost.png b/trebler/images/build_cost.png
diff --git a/trebler/images/pilot_center_console.jpg b/trebler/images/pilot_center_console.jpg
diff --git a/trebler/premium/README.md b/trebler/premium/README.md
@@ -1,7 +1,7 @@
 # Trebler X by EGOTech
 
 [![CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg)](http://creativecommons.org/licenses/by-nc-sa/4.0/)
-[![Version](https://img.shields.io/static/v1?label=Version&message=1.0.0&color=blue)](#changelog)
+[![Version](https://img.shields.io/static/v1?label=Version&message=1.0.1&color=blue)](#changelog)
 [![Blueprint](https://img.shields.io/static/v1?label=Blueprint&message=For%20Sale&color=brightgreen)](#purchase-blueprint)
 
 The Trebler X is a premium version of the [Trebler](../) with [T3 generators, fuel chambers, enhancers and thrusters plus three extra mining lasers](#comparison).
@@ -44,7 +44,12 @@ The blueprint is available for purchase on the EGOTech Discord server.
 
 ## Changelog
 
-### v1.0.0 (Current) - 12/05/2023
+### v1.0.1 (Current) - 10/10/2023
+
+- Added four forward facing rangefinders as extra guides
+- Added switch to use one, two or three drills at a time.
+
+### v1.0.0 - 12/05/2023
 
 - Initial release
 

diff --git a/trebler/premium/images/build_cost.png b/trebler/premium/images/build_cost.png
diff --git a/trebler/yolol/mining/lasers_1_basic.yolol b/trebler/yolol/mining/lasers_1_basic.yolol
@@ -0,0 +1,2 @@
+if:lasers<1then:lsr1=0 :lsr2=0 :dp1=0 :rf1=0 goto1end
+a=:dns!=0 :lsr1=a :lsr2=a-:leco :rf1=1 goto1
diff --git a/trebler/yolol/mining/lasers_2_basic.yolol b/trebler/yolol/mining/lasers_2_basic.yolol
@@ -0,0 +1,2 @@
+if:lasers<1then:lsr3=0 :lsr4=0 :dp2=0 :rf2=0 goto1end
+a=:dns>=0 :lsr3=a :lsr4=a-:leco :rf2=1 goto1
diff --git a/trebler/yolol/mining/lasers_3_basic.yolol b/trebler/yolol/mining/lasers_3_basic.yolol
@@ -0,0 +1,2 @@
+if:lasers<1then:lsr5=0 :lsr6=0 :dp3=0 :rf3=0 goto1end
+a=:dns>=0 :lsr5=a :lsr6=a-:leco :rf3=1 goto1
diff --git a/trebler/yolol/mining/lasers_basic.yolol b/trebler/yolol/mining/lasers_basic.yolol
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		if:lasers<1then:lsr1=0 :lsr2=0 :dp1=0 :rf1=0 goto1end
		a=:dns!=0 :lsr1=a :lsr2=a-:leco :rf1=1 goto1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		if:lasers<1then:lsr3=0 :lsr4=0 :dp2=0 :rf2=0 goto1end
		a=:dns>=0 :lsr3=a :lsr4=a-:leco :rf2=1 goto1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		if:lasers<1then:lsr5=0 :lsr6=0 :dp3=0 :rf3=0 goto1end
		a=:dns>=0 :lsr5=a :lsr6=a-:leco :rf3=1 goto1