Differential D291

Relic auras fixup
ClosedPublic
Actions

Authored by Hannibal_Barca on Apr 4 2017, 10:33 PM.

Details

Reviewers

elexis

Commits

rP19384: Fix three catafalque auras.

Summary

Fixed some "bugs" found in the newly committed patch of D269:

2nd, unnecessary empty line removed.
population max modification type changed from "global" to "player"
previously not working macedonian loot aura fixed and modified
Cavalry excluded from benefits of Spartan aura (spartans were famed for their hoplites)

Also tested in-game the not-so-visible auras, such as:
Ambiorix XP requirements and farming penalty
New macedonian loot aura
Roman gather bonus aura for women

Other auras have all been tested, but some might have been overlooked.

Test Plan

Test all auras to see if they give what is promised.
Check for possible improvements in description or aura.

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

Hannibal_Barca created this revision.Apr 4 2017, 10:33 PM

Hannibal_Barca edited the summary of this revision. (Show Details)

elexis awarded a token.Apr 4 2017, 10:34 PM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!

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

Harbormaster completed remote builds in B1012: Diff 1099.Apr 4 2017, 11:17 PM

Grugnas added inline comments.Apr 5 2017, 9:23 AM

binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json
3 ↗	(On Diff #1099)	did you have problems multiplying Looter resources? are you sure that this aura should affect structures too? I'd suggest you to watch at trac #4503

Yes, % didn't work when I tested it (you might have overlooked this in review)
Yes, this aura has to affect structures too or we can make a new aura.

elexis mentioned this in D269: Civ specific catafalque templates and auras.Apr 8 2017, 5:24 AM

So far so good, but should have also

Changed the +10% armor to +1 armor, since having 1.1 armor is surely not what we wanted
fixed the order of resources to food/wood/metal/stone

binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json
3 ↗	(On Diff #1099)	Units that can receive loot when they killed enemies use the Looter component. But the loot they get is the sum of Looter of the killer plus the Loot of the killed entity. But since the defaults in Looter are all 0, multiplying those still yields zero.

This revision is now accepted and ready to land.Apr 8 2017, 5:36 AM

Closed by commit rP19384: Fix three catafalque auras. (authored by elexis). · Explain WhyApr 8 2017, 5:40 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

simulation/

data/

auras/

catafalques/

athen_catafalque_2.json

2 lines

mace_catafalque.json

9 lines

pers_catafalque.json

2 lines

ptol_catafalque.json

2 lines

rome_catafalque_2.json

8 lines

sele_catafalque_1.json

2 lines

sele_catafalque_2.json

2 lines

sele_catafalque_3.json

4 lines

spart_catafalque_2.json

4 lines

templates/

other/

catafalque/

1 line

1 line

1 line

1 line

1 line

1 line

1 line

1 line

1 line

1 line

1 line

Diff 1145

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json

View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml

Relic auras fixupClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 1145

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json

ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml

Relic auras fixup
ClosedPublic
Actions

Revision Contents
Changeset List