Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix recall again #6396

Merged
merged 16 commits into from
Nov 16, 2024
Merged

Fix recall again #6396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d84eb83
add better reporting and defeated army handling
Hdt80bro Aug 7, 2024
534699c
Merge branch 'develop' into fix-recall-reporting
lL1l1 Oct 15, 2024
ecf9ace
Test setup
lL1l1 Oct 19, 2024
3dd93a8
Fix recall finishing early
lL1l1 Oct 19, 2024
1a2eb6c
Annotate RecallSyncData
lL1l1 Nov 4, 2024
c6d9ed1
Fix overly long time bar after an army is defeated
lL1l1 Nov 4, 2024
992b958
Fix votes not updating in UI after army defeat
lL1l1 Nov 4, 2024
18810d1
Formatting
lL1l1 Nov 4, 2024
1fe4e25
Fix CanVote sync
lL1l1 Nov 4, 2024
81a2588
Properly sync defeated army's ability to recall
lL1l1 Nov 4, 2024
0bfcc8f
UI: Reset status of existing vote blocks
lL1l1 Nov 4, 2024
210072f
Add comments to `AddVotes`
lL1l1 Nov 4, 2024
33e5e86
Debug logging
lL1l1 Nov 4, 2024
c43b6b1
Revert "Debug logging"
lL1l1 Nov 4, 2024
6e3c694
Reset the top text in the recall panel on vote start
lL1l1 Nov 4, 2024
7e7b30a
Revert "Test setup"
lL1l1 Nov 4, 2024
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
1 change: 1 addition & 0 deletions lua/aibrain.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ AIBrain = Class(FactoryManagerBrainComponent, StatManagerBrainComponent, JammerM

import("/lua/simutils.lua").UpdateUnitCap(self:GetArmyIndex())
import("/lua/simping.lua").OnArmyDefeat(self:GetArmyIndex())
import("/lua/sim/Recall.lua").OnArmyDefeat(self:GetArmyIndex())

local function KillArmy()
local shareOption = ScenarioInfo.Options.Share
Expand Down
2 changes: 2 additions & 0 deletions lua/shared/RecallParams.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ TeamVoteCooldown = 1 * 60 * 10
--- ticks that the recall vote is open (30 seconds)
VoteTime = 30 * 10

---@param acceptanceVotes number
---@param totalVotes number
function RecallRequestAccepted(acceptanceVotes, totalVotes)
if totalVotes <= 3 then
return acceptanceVotes >= totalVotes
Expand Down
Loading