diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index bab438ce..c58273e0 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-10 17:07 -commit: 168d8297 (main) -subject: Rapidfire keys: USER_REM_RAPIDFIRE (the macro on / off) and USER_REM_RAPIDFIRE_SETUP (its window) +date: 2026-11-10 19:21 +commit: fd520380 (main) +subject: Waypoint bot window, settings, keys and notes; notification cards no longer stretch tree: clean build: OK diff --git a/DATA/INTERFACE/keylist.ini b/DATA/INTERFACE/keylist.ini index 7f5f3b2f..734aae85 100644 --- a/DATA/INTERFACE/keylist.ini +++ b/DATA/INTERFACE/keylist.ini @@ -328,6 +328,15 @@ id = USER_REM_ACTIVATE_PROBE [key] id = USER_REM_WAYPOINT_BOT +[key] +id = USER_REM_WAYPOINT_BOT_PAUSE + +[key] +id = USER_REM_WAYPOINT_BOT_SKIP + +[key] +id = USER_REM_WAYPOINT_BOT_SETUP + [key] id = USER_REM_SECTOR_SCANNER diff --git a/DATA/INTERFACE/keymap.ini b/DATA/INTERFACE/keymap.ini index e4ffff09..af80c6b2 100644 --- a/DATA/INTERFACE/keymap.ini +++ b/DATA/INTERFACE/keymap.ini @@ -1108,6 +1108,25 @@ ids_name = 524536 ids_info = 524537 state = keydown +; REM: the waypoint bot (REM-Client rem_waypoint_bot.h): pause / go on, skip a waypoint, its settings window +[KeyCmd] +nickname = USER_REM_WAYPOINT_BOT_PAUSE +ids_name = 524538 +ids_info = 524539 +state = keydown + +[KeyCmd] +nickname = USER_REM_WAYPOINT_BOT_SKIP +ids_name = 524540 +ids_info = 524541 +state = keydown + +[KeyCmd] +nickname = USER_REM_WAYPOINT_BOT_SETUP +ids_name = 524542 +ids_info = 524543 +state = keydown + [KeyMap] nickname = IDR_ALWAYS_PRESENT key = USER_REM_WAYPOINTS @@ -1117,6 +1136,7 @@ key = USER_REM_CONTRACTS key = USER_REM_PLAYER key = USER_REM_HUDLESS key = USER_REM_RAPIDFIRE_SETUP +key = USER_REM_WAYPOINT_BOT_SETUP key = USER_YES key = USER_NO key = USER_CANCEL @@ -1156,6 +1176,8 @@ key = USER_REM_SECTOR_SCANNER key = USER_CLOAK key = USER_REM_JUMPDRIVE key = USER_REM_RAPIDFIRE +key = USER_REM_WAYPOINT_BOT_PAUSE +key = USER_REM_WAYPOINT_BOT_SKIP key = USER_REM_WAYPOINT_BOT key = USER_REM_SENSOR_PROBE key = USER_REM_ACTIVATE_PROBE diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index e3bc1b32..25e534f6 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua index 92e439db..bd395e11 100644 --- a/EXE/REM/Lua/Infocards.lua +++ b/EXE/REM/Lua/Infocards.lua @@ -51,6 +51,12 @@ rem.AddInfoCard(524534, "RAPIDFIRE") rem.AddInfoCard(524535, "Starts / stops the rapidfire macro: every weapon switched on fires as soon as its cooldown allows.") rem.AddInfoCard(524536, "RAPIDFIRE SETTINGS") rem.AddInfoCard(524537, "Opens / closes the rapidfire window: weapons, firing order, cooldowns, key.") +rem.AddInfoCard(524538, "WAYPOINT BOT PAUSE") +rem.AddInfoCard(524539, "Pauses the waypoint bot (the ship is yours) or lets it fly on.") +rem.AddInfoCard(524540, "WAYPOINT BOT SKIP") +rem.AddInfoCard(524541, "Drops the next waypoint; the bot flies to the one after it.") +rem.AddInfoCard(524542, "WAYPOINT BOT SETTINGS") +rem.AddInfoCard(524543, "Opens / closes the waypoint bot window: state, arrival, tradelanes, fire, notes.") -- RACE INFOCARDS rem.AddInfoCard(9001, "1") diff --git a/EXE/remui/notify.rml b/EXE/remui/notify.rml index 1bb8d9c7..a693272a 100644 --- a/EXE/remui/notify.rml +++ b/EXE/remui/notify.rml @@ -4,8 +4,9 @@ + + +
+ WAYPOINT BOT\\\ +
+
+
+
Flies your waypoints one after the other - tradelanes, gates and jump holes on the way - and docks at the end if you like.
+
+ {{ state }} +
{{ active ? 'Stop' : 'Start' }}
+
{{ paused ? 'Go on' : 'Pause' }}
+
Skip waypoint
+
+
+
{{ left }}
waypoints left
+
{{ reached }}
reached
+
{{ dist }}
to the next
+
{{ speed }}
speed
+
+
{{ event }}
+ +
Route
+
+ Fly through waypoints +
{{ flythrough ? 'On' : 'Off' }}On: free-space waypoints are passed without braking, the next one is taken at once.
+
+
+ At the destination +
Stop
+
DockA waypoint on a base docks there; a waypoint in free space docks at the nearest base within the range.
+ withinkm +
+ +
Tradelane disrupted
+
+
Try againWaits, then flies on - three times, then it pauses.
+
Pause
+
Stop
+ waits +
+ +
Under fire
+
+
Fly onKeeps flying, with a note.
+
PauseThe autopilot stops and the ship is yours; it flies on after the quiet time without a hit (0: only by hand).
+
Stop
+ quiets +
+ +
Notes
+
+ Every waypoint reached +
{{ note_wp ? 'On' : 'Off' }}
+
+
+ Also in the chat +
{{ note_chat ? 'On' : 'Off' }}
+
+
Keys (Options, Controls, REMNANT): Waypoint bot, pause, skip waypoint, this window. F2 on a route starts it too.
+
{{ msg }}
+
+
+
+
Close
+
Save times
+
+ +