Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Snapshot

on:
push:
branches: [ develop, newbb ]
branches: [ develop, newbb, 20240626_develop ]
pull_request:
branches: [ develop, newbb ]
branches: [ develop, newbb, 20240626_develop ]

jobs:
build:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-win64.zip publish/win64/
- name: Upload win64
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-win64
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-win64.zip
Expand All @@ -61,7 +61,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-win32.zip publish/win32/
- name: Upload win32
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-win32
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-win32.zip
Expand All @@ -81,7 +81,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linux64.zip publish/linux64/
- name: Upload linux64
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-linux64
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linux64.zip
Expand All @@ -101,7 +101,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linuxarm.zip publish/linuxarm/
- name: Upload linuxarm
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-linuxarm
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linuxarm.zip
Expand All @@ -121,7 +121,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linuxarm64.zip publish/linuxarm64/
- name: Upload linuxarm64
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-linuxarm64
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linuxarm64.zip
Expand All @@ -141,7 +141,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-osx64.zip publish/osx64/
- name: Upload osx64
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-osx64
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-osx64.zip
Expand All @@ -161,7 +161,7 @@ jobs:
with:
args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-osx-arm64.zip publish/osx-arm64/
- name: Upload osx-arm64
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TBot-${{ env.SNAP_VERSION }}-osx-arm64
path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-osx-arm64.zip
2 changes: 1 addition & 1 deletion TBot/Workers/AutoDiscoveryWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected override async Task Execute() {
new RankSlotsPriority(Feature.BrainAutoMine, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.Brain, ((bool)_tbotInstance.InstanceSettings.Brain.Active && (bool)_tbotInstance.InstanceSettings.Brain.Transports.Active && ((bool)_tbotInstance.InstanceSettings.Brain.AutoMine.Active || (bool)_tbotInstance.InstanceSettings.Brain.AutoResearch.Active || (bool)_tbotInstance.InstanceSettings.Brain.LifeformAutoMine.Active || (bool)_tbotInstance.InstanceSettings.Brain.LifeformAutoResearch.Active)), (int)_tbotInstance.InstanceSettings.Brain.Transports.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Transport)),
new RankSlotsPriority(Feature.Expeditions, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.Expeditions, (bool)_tbotInstance.InstanceSettings.Expeditions.Active, (int)_tbotInstance.UserData.slots.ExpTotal, (int)_tbotInstance.UserData.slots.ExpInUse),
new RankSlotsPriority(Feature.AutoFarm, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoFarm, (bool)_tbotInstance.InstanceSettings.AutoFarm.Active, (int)_tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, (bool)_tbotInstance.InstanceSettings.AutoColonize.Active, (bool)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : 1, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Colonize)),
new RankSlotsPriority(Feature.Colonize, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool)_tbotInstance.InstanceSettings.AutoColonize.Active, (bool)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : 1, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Colonize)),
new RankSlotsPriority(Feature.AutoDiscovery, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoDiscovery, (bool)_tbotInstance.InstanceSettings.AutoDiscovery.Active, (int)_tbotInstance.InstanceSettings.AutoDiscovery.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Discovery)),
new RankSlotsPriority(Feature.Harvest, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoHarvest, (bool)_tbotInstance.InstanceSettings.AutoHarvest.Active, (int)_tbotInstance.InstanceSettings.AutoHarvest.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Harvest))
};
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/AutoFarmWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ protected override async Task Execute() {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/Brain/AutoMineCelestialWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ private async Task AutoMineCelestial(Celestial celestial, Buildings maxBuildings
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/Brain/AutoResearchWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ protected override async Task Execute() {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/Brain/LifeformsAutoMineCelestialWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private async Task LifeformAutoMineCelestial(Celestial celestial) {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/Brain/LifeformsAutoResearchCelestialWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ private async Task LifeformAutoResearchCelestial(Celestial celestial) {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/ColonizeWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ protected override async Task Execute() {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/ExpeditionsWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected override async Task Execute() {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
2 changes: 1 addition & 1 deletion TBot/Workers/HarvestWorker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ protected override async Task Execute() {
(int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots,
(int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)),
new RankSlotsPriority(Feature.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize,
(int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize,
(bool) _tbotInstance.InstanceSettings.AutoColonize.Active,
(bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ?
(int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :
Expand Down
Loading