Page MenuHomeWildfire Games

Update teamboni in civ.jsons
ClosedPublic

Authored by Imarok on May 8 2017, 10:31 PM.

Details

Summary

Update the teamboni in civ.jsons (This can be seen in the History tab and the gamesetup civinfo.

Test Plan

Look at it.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
https://svn.wildfiregames.com/svn/ps/trunk
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 1916
Build 3030: Vulcan Build (Windows)Jenkins
Build 3029: Vulcan BuildJenkins
Build 3028: arc lint + arc unit

Event Timeline

Imarok created this revision.May 8 2017, 10:31 PM
Owners added a subscriber: Restricted Owners Package.May 8 2017, 10:31 PM
Vulcan added a subscriber: Vulcan.May 9 2017, 9:07 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!

http://jw:8080/job/phabricator/1094/ for more details.

fatherbushido edited edge metadata.May 16 2017, 7:21 AM

D502
D480

(In another patch, Civ bonuses and special techs could be updated too.)

elexis added a subscriber: elexis.May 16 2017, 2:53 PM
elexis added inline comments.
binaries/data/mods/public/simulation/data/civs/brit.json
73

Please don't follow what previous people have done to our loading screen tooltips and civ files.
We either implement the missing things, remove the strings altogether or don't touch the strings.
It's not appealing to the player to be informed about things that the game doesn't contain.
That string should rather be (IMPLEMENTED NOW) :P
Also Druids, not Druides?

Imarok updated this revision to Diff 2061.May 20 2017, 9:46 PM

Update for mace, rome, brit and gaul teambonus (see D502 & D480)

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!

http://jw:8080/job/phabricator/1277/ for more details.

fatherbushido added inline comments.May 22 2017, 10:39 AM
binaries/data/mods/public/simulation/data/civs/maur.json
71

name was changed

binaries/data/mods/public/simulation/data/civs/rome.json
65–66

You can use that (source: Design Doc)
"Many Roman soldiers were conscripted into service. While volunteers were preferred, the Roman state did maintain an annual military draft. During an emergency the draft and the terms of service were enlarged. The importance of military service in Republican Rome was so great it was a prerequisite for a political career. Members of the Senate were called Conscript Fathers because of this, reflected in how the ordo equester was said to have been "conscripted" into the Senate. "

Imarok updated this revision to Diff 2147.May 23 2017, 11:38 AM

Adjust maur name and rome history

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!

http://jw:8080/job/phabricator/1323/ for more details.

Build is green

Executing section Default...
Executing section Source...
Executing section JS...
Executing section Python...
Executing section Perl...

http://jw:8080/job/phabricator_lint/16/ for more details.

Thanks for the update.
I would perhaps update also a bit the Athenian and the Ptolemian ones. (And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/
You did the choice to put numbers in those files, it's ok imo for the moment as it's the only place where that could be shown.

Thanks for the update.
I would perhaps update also a bit the Athenian and the Ptolemian ones. (And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/
You did the choice to put numbers in those files, it's ok imo for the moment as it's the only place where that could be shown.

Why not just commandeer this revision?
I will then review your changes :)

In D460#21981, @Imarok wrote:

Thanks for the update.
I would perhaps update also a bit the Athenian and the Ptolemian ones. (And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/
You did the choice to put numbers in those files, it's ok imo for the moment as it's the only place where that could be shown.

Why not just commandeer this revision?
I will then review your changes :)

Was the last comment, I promise ;-)
I already changed too much strings, translators will hate me :/

In D460#21981, @Imarok wrote:

Thanks for the update.
I would perhaps update also a bit the Athenian and the Ptolemian ones. (And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/
You did the choice to put numbers in those files, it's ok imo for the moment as it's the only place where that could be shown.

Why not just commandeer this revision?
I will then review your changes :)

Was the last comment, I promise ;-)
I already changed too much strings, translators will hate me :/

I'm not that good with the english language, so I thought you might do that better... ;)

Thanks for the update.
I would perhaps update also a bit the Athenian and the Ptolemian ones.

What should be updated?

(And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/

Huh? You mean I should fully remove the History and Description of those civ.jsons?

You did the choice to put numbers in those files, it's ok imo for the moment as it's the only place where that could be shown.

I would perhaps update also a bit the Athenian and the Ptolemian ones.

What should be updated?

(And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/

Huh? You mean I should fully remove the History and Description of those civ.jsons?

No No, in the team bonus aura json files

Imarok added a comment.EditedMay 27 2017, 8:31 PM

I would perhaps update also a bit the Athenian and the Ptolemian ones.

What should be updated?

(And while at it remove the history and put the effect in their related aura files). Sorry I should have said it before :/

Huh? You mean I should fully remove the History and Description of those civ.jsons?

No No, in the team bonus aura json files

The aura files have no history. From where should the effect be put into the aura files?
(Sorry, I don't understand, what you want...)

Imarok updated this revision to Diff 2252.May 27 2017, 9:56 PM

Adapt athen team bonus aura file

fatherbushido accepted this revision.May 27 2017, 9:58 PM
This revision is now accepted and ready to land.May 27 2017, 9:58 PM
This revision was automatically updated to reflect the committed changes.
Executing section Default...
Executing section Source...
Executing section JS...
Executing section XML GUI...
Executing section Python...
Executing section Perl...

http://jw:8080/job/phabricator_lint/63/ for more details.

Build has FAILED

Link to build: http://jw:8080/job/phabricator/1384/
See console output for more information: http://jw:8080/job/phabricator/1384/console