Page MenuHomeWildfire Games

aura style corrections
ClosedPublic

Authored by Nescio on Jun 18 2019, 2:34 PM.

Details

Summary

D1953 standardizes the formatting style of the technologies json files. This one does the same for auras. Changes:

  • use tabs for indentation, not (two) spaces
  • alphabetize modifications, except for damage types and resources, which have a fixed order (hack, pierce, crush and food, wood, stone, metal, respectively)
  • remove unnecessary trailing zeroes

See also D2222.

Test Plan

Check for mistakes and omissions.

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

There are a very large number of changes, so older changes are hidden. Show Older Changes
Nescio edited the summary of this revision. (Show Details)Aug 24 2019, 8:29 PM
Nescio edited the test plan for this revision. (Show Details)

Rebased and updated.

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

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

Nescio updated this revision to Diff 9491.Aug 24 2019, 8:40 PM
Nescio edited the summary of this revision. (Show Details)

"Attack/Capture/Value" → "Attack/Capture/Capture" (including the two technologies)

Nescio added reviewers: wraitii, Restricted Owners Package.Aug 24 2019, 8:43 PM

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

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

In D2000#92375, @Nescio wrote:

"Attack/Capture/Value" → "Attack/Capture/Capture" (including the two technologies)

Ref. rP22754.

Nescio updated this revision to Diff 9505.Aug 25 2019, 12:15 PM

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

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

I've incorporated the aura/tech fix in D2224 since code also needed changing, thanks for reporting that.

Nescio updated this revision to Diff 9511.Aug 25 2019, 8:20 PM
Nescio edited the summary of this revision. (Show Details)
Nescio removed a reviewer: wraitii.

Rebased because of rP22786.

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

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

Nescio updated this revision to Diff 9794.Sep 15 2019, 7:20 PM
Nescio edited the summary of this revision. (Show Details)

Rebased because of D1808/rP22905.

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

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

Freagarach accepted this revision.Nov 6 2019, 9:25 AM

Patch is compleat and useful.

This revision is now accepted and ready to land.Nov 6 2019, 9:25 AM
Nescio removed a reviewer: bb.Jan 7 2020, 6:29 PM
Nescio removed a subscriber: bb.
Nescio updated this revision to Diff 11017.Jan 14 2020, 8:35 PM

Rebased because of rP23347.

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

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

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

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

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

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

Nescio updated this revision to Diff 11026.Jan 15 2020, 1:35 PM

Rebased because of rP23399.

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

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

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

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

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

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

Nescio updated this revision to Diff 11072.Jan 17 2020, 7:53 PM
Nescio edited the summary of this revision. (Show Details)

Updated.

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

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

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

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

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

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

I thought the convention still is Hack, Pierce, Crush?

Apparently it no longer is:

Yeah, there is a concern raised IIRC. And moreover: a fix proposed somewhere.

Freagarach requested changes to this revision.Jan 17 2020, 8:45 PM

rP22527, D1936/D2337.

Please revert the ordering.

This revision now requires changes to proceed.Jan 17 2020, 8:45 PM
Nescio updated this revision to Diff 11079.Jan 17 2020, 9:08 PM
Nescio edited the summary of this revision. (Show Details)

Hack, Pierce, Crush again.

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

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

Freagarach accepted this revision.Jan 17 2020, 9:12 PM

Thanks :)

This revision is now accepted and ready to land.Jan 17 2020, 9:12 PM

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

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

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

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

Angen requested changes to this revision.Mar 26 2020, 8:39 PM
Angen removed reviewers: Restricted Owners Package, wraitii.
Angen added a subscriber: Angen.

Remaining
iber_player_teambonus.json

This revision now requires changes to proceed.Mar 26 2020, 8:39 PM
Nescio updated this revision to Diff 11570.Mar 26 2020, 9:33 PM
Owners added a subscriber: Restricted Owners Package.Mar 26 2020, 9:33 PM

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

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

Angen accepted this revision.Mar 26 2020, 9:45 PM

Changes are complete.
Changes are good following similar cleaning patches and keeping CC for json.

This revision is now accepted and ready to land.Mar 26 2020, 9:45 PM

Thanks. D2222 is a similar patch for the {civ}.json data files.

This revision was automatically updated to reflect the committed changes.