diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index 60c63e5c..bab438ce 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,6 +1,6 @@ REM-Client test build (64-bit) -date: 2026-11-10 16:57 -commit: ef5450da (main) -subject: Rapidfire macro, native: every mounted weapon fires alone as soon as its cooldown allows +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) tree: clean build: OK diff --git a/DATA/INTERFACE/keylist.ini b/DATA/INTERFACE/keylist.ini index 819bb729..7f5f3b2f 100644 --- a/DATA/INTERFACE/keylist.ini +++ b/DATA/INTERFACE/keylist.ini @@ -337,6 +337,12 @@ id = USER_CLOAK [key] id = USER_REM_JUMPDRIVE +[key] +id = USER_REM_RAPIDFIRE + +[key] +id = USER_REM_RAPIDFIRE_SETUP + [key] id = USER_REM_HUDLESS diff --git a/DATA/INTERFACE/keymap.ini b/DATA/INTERFACE/keymap.ini index c5d8720c..e4ffff09 100644 --- a/DATA/INTERFACE/keymap.ini +++ b/DATA/INTERFACE/keymap.ini @@ -1095,6 +1095,19 @@ ids_info = 524533 state = keydown key = "K" +; REM: the rapidfire macro (REM-Client rem_rapidfire.h): on / off, and its settings window +[KeyCmd] +nickname = USER_REM_RAPIDFIRE +ids_name = 524534 +ids_info = 524535 +state = keydown + +[KeyCmd] +nickname = USER_REM_RAPIDFIRE_SETUP +ids_name = 524536 +ids_info = 524537 +state = keydown + [KeyMap] nickname = IDR_ALWAYS_PRESENT key = USER_REM_WAYPOINTS @@ -1103,6 +1116,7 @@ key = USER_REM_MISSIONS key = USER_REM_CONTRACTS key = USER_REM_PLAYER key = USER_REM_HUDLESS +key = USER_REM_RAPIDFIRE_SETUP key = USER_YES key = USER_NO key = USER_CANCEL @@ -1141,6 +1155,7 @@ nickname = IDR_SPACE key = USER_REM_SECTOR_SCANNER key = USER_CLOAK key = USER_REM_JUMPDRIVE +key = USER_REM_RAPIDFIRE 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 b19f0b3b..e3bc1b32 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 2eaf4729..92e439db 100644 --- a/EXE/REM/Lua/Infocards.lua +++ b/EXE/REM/Lua/Infocards.lua @@ -47,6 +47,10 @@ rem.AddInfoCard(524530, "CLOAK") rem.AddInfoCard(524531, "Switches the cloaking device on or off.") rem.AddInfoCard(524532, "JUMP DRIVE") rem.AddInfoCard(524533, "In cruise: charges the jump drive to the last waypoint (again: stops the charge or the flight).") +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.") -- RACE INFOCARDS rem.AddInfoCard(9001, "1")