Page MenuHomeWildfire Games

Fix checkrefs script following phenotype D1955/rP22586.
ClosedPublic

Authored by wraitii on Fri, Aug 2, 8:56 AM.

Details

Summary

In D1955/rP22586 the gender-tag was replaced with phenotype. Many occurrences were replaced, but apparently not all. This fixes one more.
Also included is a check for the VisualActor-replacement of {phenotype}, which was new in the patch this corrects.

Test Plan

Verify its correctness.

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.Fri, Aug 2, 8:56 AM
Vulcan added a comment.Fri, Aug 2, 9:01 AM

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/290/display/redirect

elexis added a subscriber: elexis.EditedFri, Aug 2, 1:08 PM

Is the male default still necessary?
I suppose it also should have the VisualActor replacement?

I've grepped for gender in the 0ad-folder and found some in .svn/pristine, what is that? And ought they to be replaced?

No, thats internal svn data (also it can grow up to several gigabytes for no reason)

elexis retitled this revision from Fix test script from D1955/rP22586. to Fix checkrefs script following phenotype D1955/rP22586..Fri, Aug 2, 1:09 PM
Freagarach updated this revision to Diff 9200.Fri, Aug 2, 2:58 PM
Freagarach edited the summary of this revision. (Show Details)

This script still won't work with a "random" phenotype.
Apparently, using datatype="tokens" twice just adds the token to the list. Nice to know ;)

Vulcan added a comment.Fri, Aug 2, 3:02 PM

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/291/display/redirect

wraitii commandeered this revision.Sun, Aug 4, 11:15 AM
wraitii updated this revision to Diff 9218.
wraitii edited reviewers, added: Freagarach; removed: wraitii.

Commandeering 'cause it's perl and it's annoying.

I'm basically splitting the phenotype and thus random phenotypes ought to work.

Also try and fix the map being wrong... Can't see why it would fail except for whitespace issues.

Owners added a subscriber: Restricted Owners Package.Sun, Aug 4, 11:16 AM

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/302/display/redirect

When running the checkrefs.pl I got:

Use of /g modifier is meaningless in split at checkrefs.pl line 141.
Use of /g modifier is meaningless in split at checkrefs.pl line 159.

and

Duplicate terrain name 'medit_city_tile' (from 'art/terrains/biome-mediterranean/medit_city_tile.xml' and 'art/terrains/road/medit_city_tile.xml')

Or is this wat you meant with

Also try and fix the map being wrong... Can't see why it would fail except for whitespace issues.

?

wraitii updated this revision to Diff 9294.Sun, Aug 11, 7:02 PM

No, I mean (see jenkins)=

Relax-NG validity error : Extra element Entities in interleave
/public/maps/scenarios/unit_motion_integration_test.xml:0: Relax-NG validity error : Element Scenario failed to validate content

I can't actually reproduce locally because for some reason the libXML module in perl won't install and can't be bothered to understand why.

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/357/display/redirect

wraitii updated this revision to Diff 9301.Mon, Aug 12, 9:51 AM

Save the failing unit motion map in Atlas, so it probably can't be wrong now.

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/363/display/redirect

This revision was not accepted when it landed; it landed in state Needs Review.Mon, Aug 12, 10:03 AM
This revision was automatically updated to reflect the committed changes.