Details
- Reviewers
temple - Commits
- rP20543: Count Trained Cattle as resource and not as unit. Also only count the net…
- Trac Tickets
- #3948
Trained Sheeps and goats should appear in the summary under resources -> livestock and not be counted to total units.
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
binaries/data/mods/public/gui/summary/counters.js | ||
---|---|---|
249 ↗ | (On Diff #4304) | Is that an extra space between return and the statement ? |
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (307 tests)...................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (307 tests)...................................................................................................................................................................................................................................................................................................................OK! Checking XML files... Relax-NG validity error : Extra element props in interleave /public/art/actors/structures/carthaginians/stable_elephant.xml:0: Relax-NG validity error : Element variant failed to validate content /public/art/actors/structures/carthaginians/stable_elephant.xml:0: Relax-NG validity error : Element group has extra content: variant Relax-NG validity error : Extra element group in interleave /public/art/actors/structures/carthaginians/stable_elephant.xml:0: Relax-NG validity error : Element actor failed to validate content
Executing section Default... Executing section Source... Executing section JS... binaries/data/mods/public/gui/summary/counters.js | 249| » return··playerState.sequences.unitsTrained["Domestic"][index]; | | [NORMAL] JSHintBear: | | ['Domestic'] is better written in dot notation.
binaries/data/mods/public/gui/summary/counters.js | ||
---|---|---|
249 ↗ | (On Diff #4304) | Ah, yeah, thanks. |
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (307 tests)...................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (307 tests)...................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
Executing section Default... Executing section Source... Executing section JS... binaries/data/mods/public/gui/summary/counters.js | 249| » return·playerState.sequences.unitsTrained["Domestic"][index]; | | [NORMAL] JSHintBear: | | ['Domestic'] is better written in dot notation.
It might be nice to also adjust the food gathered/used to take into account livestock. Instead of each trained unit counting as +50 food used, have them count as -50 food gathered. Then the food totals would be comparable between players who use corrals and those who don't (currently they're meaningless), and we wouldn't have to make an adjustment for livestock when calculating the economy score.
Good, right idea to address the issue.
(Making things worse for 1024x786? If so, we don't care about making it worse?)
binaries/data/mods/public/gui/summary/counters.js | ||
---|---|---|
249 ↗ | (On Diff #4304) | .Domestic |
binaries/data/mods/public/gui/summary/layout.js | ||
121 ↗ | (On Diff #4308) | The word training fits for military units. Breed seems more accurate for domestic animals. |
Good idea. Sounds correct.
I don't like to make it worse for 1024x768, but there is no choice, so I just hope for horizontal scrolling...
binaries/data/mods/public/gui/summary/layout.js | ||
---|---|---|
121 ↗ | (On Diff #4308) | I've chosen resource panel, so that it is clear livestock isn't added to the unit totals. |
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...
We keep track of the vegetarian food gathered, so I think the vegetarian ratio is still correct. It can get weird if we train some sheep but don't gather them, since that counts as negative food gathered, so the ratio could be over 100% or even negative in the very early game. But I don't think that's anything to worry about.
That would be nice.