Page MenuHomeWildfire Games

delete duplicate kush_pyramid
ClosedPublic

Authored by Nescio on Jun 13 2020, 7:46 PM.

Details

Reviewers
Stan
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23833: Delete duplicate kush_pyramid actor
Summary

The art/actors/kushites/pyramid.xml file is identical to the pyramid_large.xml file (except for two unnecessary lines) and the difference between simulation/templates/structures/pyramid.xml and pyramid_large.xml is that the former has the cost of the pyramid_small.xml, otherwise they're the same, but since it's not buildable nor used in any maps, this is irrelevant.
Because there is no point in maintaining duplicate files, this patch deletes that unused actor and template.
It's a bit surprising nobody noticed before.

Test Plan

Check for completeness.

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

Nescio created this revision.Jun 13 2020, 7:46 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Jun 13 2020, 7:46 PM

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

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

Stan added a comment.Jun 17 2020, 12:00 AM

It was actually rendered that way in rP21180. The goal was for the pyramid to switch between the small and big variants somehow I guess I never implemented it correctly. Probably could use Phenotype to do this, although I guess footprints and obstruction would be incorrect.

Stan edited reviewers, added: Restricted Owners Package; removed: Restricted Owners Package.Jun 17 2020, 12:00 AM
Stan updated this revision to Diff 12669.Jul 14 2020, 11:46 AM

Add missing change

Stan updated this revision to Diff 12670.Jul 14 2020, 11:47 AM

Remove useless files

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

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

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

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

Stan accepted this revision.Jul 14 2020, 12:38 PM
This revision is now accepted and ready to land.Jul 14 2020, 12:38 PM
This revision was landed with ongoing or failed builds.Jul 14 2020, 12:42 PM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Jul 14 2020, 12:42 PM

Thanks! It's not the first time I missed a map file.

Stan added a comment.Jul 14 2020, 1:07 PM

You're welcome, if you run checkrefs.pl --check-map-xml it should tell you. Currently missing files don't break the build, so you won't be notified directly by the CI, however checkrefs is ran there, so you can see the logs by cliking on the Linux jenkins link (when it works :P)

Of course I guess good old grep works too :)