Page MenuHomeWildfire Games

Fix collecting treasures near position.
ClosedPublic

Authored by Freagarach on May 9 2021, 7:34 AM.

Details

Reviewers
Angen
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP25421: Fix collecting treasures near position.
Trac Tickets
#6175
Summary
  • Removes a target where it was not applicable (noticed by @Langbart).
  • Autocontinue was not really applicable (confer resource gathering).
  • Refactors a bit to be the same as other UnitAI commands.
  • Fixes some conversion errors.
Test Plan

Gather treasures in more ways than one.
E.g.

  • Using the rally point of a structure when the entity (does not) exist.
  • By ordering entities.
  • By PetraAI.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Freagarach created this revision.May 9 2021, 7:34 AM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.May 9 2021, 7:34 AM
Vulcan added a comment.May 9 2021, 7:41 AM

Successful build - Chance fights ever on the side of the prudent.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

Release: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5284/display/redirect

Vulcan added a comment.May 9 2021, 8:00 AM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/spidermonkey/include-unix-debug/mozilla/LinkedList.h' has been modified since the precompiled header 'obj/engine_Debug/precompiled.h.gch' was builtfatal error: 
file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/spidermonkey/include-unix-debug/mozilla/LinkedList.h' has been modified since the precompiled header 'obj/engine_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/engine_Debug/precompiled.h.gch'
note: please rebuild precompiled header 'obj/engine_Debug/precompiled.h.gch'
fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/spidermonkey/include-unix-debug/mozilla/LinkedList.h' has been modified since the precompiled header 'obj/engine_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/engine_Debug/precompiled.h.gch'
1 error generated.
make[1]: *** [obj/engine_Debug/SavedGame.o] Error 1
make[1]: *** Waiting for unfinished jobs....
fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/spidermonkey/include-unix-debug/mozilla/LinkedList.h' has been modified since the precompiled header 'obj/engine_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/engine_Debug/precompiled.h.gch'
1 error generated.
make[1]: *** [obj/engine_Debug/VisualReplay.o] Error 1
1 error generated.
make[1]: *** [obj/engine_Debug/ModIo.o] Error 1
1 error generated.
make[1]: *** [obj/engine_Debug/GameSetup.o] Error 1
make: *** [engine] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4191/display/redirect

Freagarach requested review of this revision.May 9 2021, 8:00 AM

Using the rally point of a structure when the entity (does not) exist.

When I test D3942 with my working copy rP25403, I no longer get error messages as described in ticket #6175.

By ordering entities.
By PetraAI.

I started the map Lower Nubia as Nomad and in Normal mode with both players as AI and as a player, but got no errors.

wraitii retitled this revision from Fix collecting near position. to Fix collecting treasures near position..May 9 2021, 10:18 AM
This revision was not accepted when it landed; it landed in state Needs Review.May 11 2021, 9:41 AM
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.