Page MenuHomeWildfire Games

Regrouped special technologies
ClosedPublic

Authored by Nescio on Sep 8 2017, 12:41 PM.

Details

Summary

D1472/rP22083 grouped all civbonus technologies in a single civbonuses/ folder.
D1775/rP23770 deleted unused technologies that were deprecated years ago.

Special technologies are technologies that have a "civ": or "notciv": requirement, i.e. they're available to one or more factions, but not all. Currently some are grouped alongside regular technologies, others are arbitrarily distibuted over the carthaginians/, hellenes/, kushites/, persians/, romans/, and successors/ subdirectories.
This patch moves special technologies out of those subdirectories, occassionally implementing more consistent naming, and updates the relevant templates accordingly.

Test Plan

Check for mistakes and omissions, verify everything still works as before.

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.Sep 8 2017, 12:41 PM
Owners added a subscriber: Restricted Owners Package.Sep 8 2017, 12:41 PM
Nescio updated this revision to Diff 3579.Sep 8 2017, 4:24 PM
Nescio retitled this revision from Grouped all civbonuses under /technologies/civbonuses/ to Regrouped civbonuses and special technologies.
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)
Nescio added a reviewer: fatherbushido.

Regrouped all civbonuses under /technologies/civbonuses/ *and* all special technologies under /technologies/special/

Reason: I was informed it was more important that diffs are complete than that they're small.

Nescio edited the summary of this revision. (Show Details)Sep 8 2017, 4:25 PM
Nescio added a reviewer: bb.Sep 8 2017, 11:42 PM
fatherbushido resigned from this revision.EditedSep 9 2017, 6:58 AM

I have a lot of respect for your work. I'd say also that your mod really shows your ability to manage such things (even if I am basically not fond of those hard bonuses). So, if I was the guy who gives congratulations, I'd congratulate you.
I also share your observation/analysis.
For information there were such a suggestion: (staff only) https://wildfiregames.com/forum/index.php?/topic/21563-subfolders-in-simulationdatatechnologies/
But I won't review your diff, sorry.

Nescio updated this revision to Diff 3603.Sep 9 2017, 8:50 AM
Nescio edited the summary of this revision. (Show Details)

Minor correction

Vulcan added a subscriber: Vulcan.Sep 9 2017, 9:37 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...

http://jenkins-master:8080/job/phabricator/2002/ for more details.

Nescio edited the summary of this revision. (Show Details)Sep 9 2017, 1:19 PM
Nescio updated this revision to Diff 7485.Feb 16 2019, 10:29 AM
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)
Nescio removed reviewers: fatherbushido, bb.
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)
Nescio added subscribers: Stan, fatherbushido.

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

Link to build: https://jenkins.wildfiregames.com/job/differential/1057/

Nescio edited the summary of this revision. (Show Details)Feb 16 2019, 10:31 AM
Nescio retitled this revision from Regrouped civbonuses and special technologies to Regrouped special technologies.Feb 16 2019, 10:35 AM

@Nescio think this needs a rebase

Nescio planned changes to this revision.Jul 28 2020, 10:45 AM

Yes, it does. (I believe D918 is up to date, though.)

Nescio updated this revision to Diff 12965.Jul 30 2020, 8:09 PM
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)

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

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

Nescio updated this revision to Diff 12966.Jul 30 2020, 8:19 PM
  • forgot athen marines

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

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

Nescio planned changes to this revision.Dec 28 2020, 3:43 PM
Nescio updated this revision to Diff 15138.Jan 11 2021, 4:48 PM
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)
Nescio edited subscribers, added: Freagarach; removed: Vulcan.
  • rebased

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2769/display/redirect for more details.

I think some of these techs now get too generic names for quite specific techs. E.g. traditional/reformed armies, colonization, metropolis.

Feel free to suggest alternatives!

I think some of these techs now get too generic names for quite specific techs.

Generally I prefer technology with file names making it clear what it does (hence training_naval_architects.jsonship_cost_time.json), but for these specific files I think it's fine to have their file names match their names displayed in game. But yeah, generic names often tend to be rather, well, generic.

traditional/reformed armies

This one I particularly dislike too. I considered unlock_macedonian_infantry.json, respectively unlock_romanized_infantry.json instead, but that didn't feel particularly satisfying either. As I wrote earlier, suggestions are welcome.

colonization

To me, special_colonization suggests there exists an ordinary colonization too (which isn't true) or that it affects the colonization of some special entity or class (which isn't true either).

metropolis

I dropped the “Hellenistic” part because it seemed superfluous, there are no non-Hellenistic metropoleis in 0 A.D.
Metropoleis/-ēs/-ises (in the modern sense of the word) were something that emerged during the Hellenistic period and continued in Roman times.
The word metropolis literally means mother-city and originally had a different meaning, e.g. Sparta was the mother city of Taras (Taranto). Colonization in the archaic period is not the same as urbanization in Hellenistic times. But I digress.

I had this waiting to be submitted.

I think the reform should be renamed. The rest are okayish.

binaries/data/mods/public/simulation/data/technologies/colonization.json
1 ↗(On Diff #15138)

carthaginian_colonisation

binaries/data/mods/public/simulation/data/technologies/exploration.json
1 ↗(On Diff #15138)

naval_exploration

binaries/data/mods/public/simulation/data/technologies/metropolis.json
1 ↗(On Diff #15138)

hellenistic_metropolis

binaries/data/mods/public/simulation/data/technologies/unlock_reformed_army.json
1 ↗(On Diff #15138)

reformed_army_sele

binaries/data/mods/public/simulation/data/technologies/unlock_traditional_army.json
1 ↗(On Diff #15138)

traditional_army_sele

Nescio added inline comments.Jan 12 2021, 3:11 PM
binaries/data/mods/public/simulation/data/technologies/colonization.json
1 ↗(On Diff #15138)

Writing out civ names in full is not done elsewhere, is it> Besides, then it would have to be renamed if it became available to e.g. Athens.
We could go with civic_cost_time.json, but I'm not sure that's better in this specific case.

binaries/data/mods/public/simulation/data/technologies/exploration.json
1 ↗(On Diff #15138)

Also affects land traders.

Nescio updated this revision to Diff 15178.Jan 12 2021, 3:28 PM

Rename a few, per @Freagarach:

  • metropolis.jsonhellenistic_metropolis.json
  • unlock_reformed_army.jsonreformed_army_sele.json
  • unlock_traditional_army.jsontraditional_army_sele.json
Freagarach accepted this revision.Jan 12 2021, 3:32 PM
  • UnitDemo loads fine.
  • Change is nice.
This revision is now accepted and ready to land.Jan 12 2021, 3:32 PM

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framewor

See https://jenkins.wildfiregames.com/job/macos-differential/2796/display/redirect for more details.

This revision was automatically updated to reflect the committed changes.