merge#205
Merged
Merged
Conversation
0xE232FE
commented
Mar 16, 2026
0xE232FE
commented
Collaborator
- fix overflow
* wrong values for fuelConsumption SmallCargo and Recycler Reported by @alexkidd
We want to use the sys variable we are looking at, not the System from the Origin.
…, will now make sure its up to date!
(cherry picked from commit 4b12edc)
(cherry picked from commit cab5459)
* fix develop version of osx-arm64 build process
Brain Transport Update && other fix
fix Brain.Transports
update LFBonuses
Add a Telegram command
…nto 20240626_develop
* delay instance loading * Add a Telegram command to collect resources without MinimumResources /collectall * Update the implementation of LFBonuses Expeditions now use the LFExpeditionBonus bonus, certain cost and duration bonuses are applied, and upgraded ships are finally recognized.
… into 20260305-merge
…ix' into 20260305-merge
…te' into 20260305-merge
…te' into 20260305-merge
## Add multi-origin cyclic discovery rotation to AutoDiscoveryWorker - Enabled sending AutoDiscovery missions from multiple configured coordinates (origins) - Implemented nearest-system-first traversal logic per origin - Added system-by-system rotation mechanism to cover multiple systems sequentially - Implemented cyclic loop (after finishing the configured/available systems, starts again from the beginning) - Preserved existing configuration compatibility ### Behaviour Instead of sending AutoDiscovery only from a single coordinate, the worker now iterates through multiple origins and dispatches AutoDiscovery missions to nearby systems sequentially in a rotating cycle. This improves discovery coverage and reduces repetitive targeting of the same systems. ### Notes Existing configurations remain functional. If only one origin is defined, behaviour remains unchanged. ## Introduce AutoFarm Model layer and update UserData integration This PR introduces a new Model layer for AutoFarm state handling. ### Changes: * Added TBot/Model folder * Implemented AutoFarmBlacklist * Implemented AutoFarmSuccessfulTargets * Implemented SharedFarmState * Updated UserData service to support new model integration * Structure remains clean and separated from existing Models namespace. ## Improve concurrency handling and async processing in DefenderWorker This PR refactors DefenderWorker to improve concurrency safety and async handling. ### Changes: * Introduced ConcurrentDictionary to prevent duplicate attack processing * Added TTL-based tracking for handled attacks * Replaced Task.Factory.StartNew with Task.Run * Updated attack handling to use proper async/await flow * Cleaned up obsolete comments and streamlined logic ### Impact: * Prevents duplicate or parallel processing of the same attack * Improves thread safety * Ensures controlled and sequential attack handling * Modernizes async usage to current best practices No other components were modified. ## Add multi-origin expedition support in ExpeditionWorker Refactored ExpeditionWorker to support multi-origin expedition dispatching. ### The worker now: * Accepts an arbitrary number of configured origin coordinates * Iterates through all origins during execution * Dispatches one expedition per origin * Maintains compatibility with existing configuration structure * This enables scalable expedition sending without manual per-origin configuration duplication. ## Improve FleetScheduler logic and enhance colonization handling ### Refactored and extended FleetScheduler to improve colonization logic and fleet scheduling behavior. * Enhanced colonization fleet dispatch strategy * Improved execution flow and scheduling control * Reduced potential edge-case misfires * Structural cleanup for maintainability * This change increases reliability of automated colonization operations. ## AutoFarmWorker update * Added configurable blacklist mechanism * Automatic blacklist reset after defined time window * Resource threshold filtering to avoid low-value farming * Optional full report processing for better coverage * Controlled stop after complete scan cycle * Structural cleanup for improved maintainability * Targets below the defined resource threshold are temporarily excluded * Blacklisted targets are automatically re-evaluated after reset period * Report scanning logic is more predictable and controlled * Reduced redundant farming attempts on low-profit targets * Improved execution flow stability * This update improves farming efficiency, reduces unnecessary attacks, and enhances the overall reliability of AutoFarmWorker operations.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.