Page MenuHomeWildfire Games
Differential D1071

Wild domestic animals should stay visible in FOW
ClosedPublic
Actions

Authored by Imarok on Nov 26 2017, 4:05 PM.

Details

Reviewers
temple
Commits
rP20542: Wild domestic animals should stay visible in FOW.
Summary

This is broken since rP20248.
Fixed by adding _trainable variants that are hidden in FOW.

Test Plan

Look how wild and trained domestic herd animals behave in FOW

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

Imarok created this revision.Nov 26 2017, 4:05 PM
Owners added a subscriber: Restricted Owners Package.Nov 26 2017, 4:05 PM
temple added a comment.Nov 26 2017, 4:48 PM

Missing brit, otherwise looks good.

~/0ad/binaries/data/mods/public/simulation/templates$ grep "\-gaia/faun" * -R
structures/cart_corral.xml: -gaia/fauna_sheep
structures/maur_corral.xml: -gaia/fauna_sheep
structures/iber_corral.xml: -gaia/fauna_sheep
structures/ptol_corral.xml: -gaia/fauna_sheep
structures/brit_corral.xml: -gaia/fauna_sheep
structures/gaul_corral.xml: -gaia/fauna_sheep

Imarok updated this revision to Diff 4401.Nov 26 2017, 4:52 PM

Missed Brit

Imarok added a comment.Nov 26 2017, 4:52 PM
In D1071#42533, @temple wrote:

Missing brit, otherwise looks good.

~/0ad/binaries/data/mods/public/simulation/templates$ grep "\-gaia/faun" * -R
structures/cart_corral.xml: -gaia/fauna_sheep
structures/maur_corral.xml: -gaia/fauna_sheep
structures/iber_corral.xml: -gaia/fauna_sheep
structures/ptol_corral.xml: -gaia/fauna_sheep
structures/brit_corral.xml: -gaia/fauna_sheep
structures/gaul_corral.xml: -gaia/fauna_sheep

True /.

temple accepted this revision.Nov 26 2017, 4:55 PM
This revision is now accepted and ready to land.Nov 26 2017, 4:55 PM
Vulcan added a subscriber: Vulcan.Nov 26 2017, 8:15 PM
Executing section Default...
Executing section Source...
Executing section JS...
Vulcan added a comment.Nov 26 2017, 8:19 PM

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

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...
Harbormaster completed remote builds in B3834: Diff 4398.Nov 26 2017, 8:19 PM
Vulcan added a comment.Nov 26 2017, 8:29 PM
Executing section Default...
Executing section Source...
Executing section JS...
Vulcan added a comment.Nov 26 2017, 8:32 PM

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

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...
Harbormaster completed remote builds in B3837: Diff 4401.Nov 26 2017, 8:33 PM
Closed by commit rP20542: Wild domestic animals should stay visible in FOW. (authored by Imarok). · Explain WhyNov 27 2017, 8:38 PM
This revision was automatically updated to reflect the committed changes.
elexis mentioned this in rP20952: Move domestic animal Cost to the trainable templates new in rP20542 / D1071..Jan 22 2018, 12:41 AM

Revision Contents
Changeset List

Diff 4413

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat_trainable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep_trainable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml

Loading...
Wildfire Games · Phabricator