Page MenuHomeWildfire Games

brit_champion_cavalry* → brit_champion_chariot*
ClosedPublic

Authored by Nescio on Jan 3 2020, 6:15 PM.

Details

Summary

The Briton champion cavalry is, in fact, a chariot, and ought to be named as such; cf.
maur_champion_chariot.xml and sele_champion_chariot.xml.
This patch therefore moves brit_champion_cavalry.xml to brit_champion_chariot.xml and updates all files that use it accordingly.

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

Nescio created this revision.Jan 3 2020, 6:15 PM
Owners added a subscriber: Restricted Owners Package.Jan 3 2020, 6:15 PM
Vulcan added a comment.Jan 3 2020, 6:15 PM

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

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

Vulcan added a comment.Jan 3 2020, 6:16 PM

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

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

Vulcan added a comment.Jan 3 2020, 6:16 PM

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

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

Nescio added a subscriber: elexis.Jan 3 2020, 6:17 PM

Build failed, presumably because it contains a map file with spaces in its name. (D1042 is still relevant, @elexis.)

Nescio added a reviewer: Restricted Owners Package.Jan 6 2020, 10:27 PM
Nescio added a subscriber: Stan.Jan 8 2020, 11:39 AM

@Stan, this is a tiny move, interested?

Stan added a comment.EditedJan 8 2020, 11:42 AM

Might,

@Angen: Petra doesn't use template names right? Cause the last time I changed cavalry to camelry it did not go well... (rP21275)

Stan added a subscriber: Silier.Jan 8 2020, 11:42 AM
Nescio added a comment.EditedJan 8 2020, 11:45 AM

Petra doesn't use template names right?

It does for structures, merchant ships, traders, and healers (which is annoying), but not for other units.

Stan accepted this revision.Jan 8 2020, 7:41 PM

Alright then.

This revision is now accepted and ready to land.Jan 8 2020, 7:41 PM
Stan requested changes to this revision.Jan 8 2020, 7:49 PM

Wait does that mean you can't recruit cavalry at enemy barracks anymore?

This revision now requires changes to proceed.Jan 8 2020, 7:49 PM
Nescio added a comment.Jan 8 2020, 8:06 PM

It means you can train brit chariots at all structures that can champion chariots (e.g. maur and sele fortresses), but no longer at structures that can train champion cavalry (e.g. gaul, iber, mace, rome fortress and barracks). And vice versa: champion cavalry can no longer be trained at the brit fortress and barracks, but enemy chariots can.
If you want to be able to train infantry, cavalry, and chariot champions at all enemy barracks, then the correct way would be to insert those in the production queue of the parent barracks. I could make a patch for that.

Stan added a comment.Jan 8 2020, 8:08 PM

Isn't that unbalanced then? Cause there is more cavalry than chariots therefore making it more rewarding for some civs?

Nescio added a comment.Jan 8 2020, 8:19 PM

It is unbalanced right now without this patch and it will remain unbalanced with this patch, albeit slightly less.

Nescio added a comment.Jan 8 2020, 8:51 PM

To give a better idea, let's lists which structures can train which champions.
champion chariot: from 2 to 4:

+ brit_barracks
+ brit_fortress
maur_fortress
sele_fortress

champion cavalry: from 15 to 13:

- brit_barracks
- brit_fortress
cart_temple
cart_tophet
gaul_barracks
gaul_fortress
iber_barracks
iber_fortress
mace_barracks
mace_fortress
pers_fortress
ptol_fortress
rome_barracks
rome_fortress
sele_fortress

champion infantry: at 15:

athen_gymnasium
brit_barracks
brit_fortress
cart_temple
cart_tophet
gaul_barracks
gaul_fortress
iber_barracks
iber_fortress
kush_fortress
maur_barracks
maur_fortress
pers_apadana
rome_barracks
rome_fortress

D2547 allows training all barracks champions at any barracks.

Stan added a comment.Jan 8 2020, 9:09 PM

We should wait for that patch to be accepted then. Another trivial change that could change gameplay because of me being careless...

Nescio updated this revision to Diff 12069.May 31 2020, 12:30 PM

We should wait for that patch to be accepted then.

Now D2547 is committed, this differential shouldn't be problematic anymore.

Owners added a subscriber: Restricted Owners Package.May 31 2020, 12:31 PM

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

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

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

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

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

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

Vulcan still doesn't like spaces in map file names ... (D1042)

bb accepted this revision.May 31 2020, 4:00 PM
bb removed a reviewer: Restricted Owners Package.
bb added a subscriber: bb.

All champion chariots similar now. Won't affect gameplay too much, since we only group brit with maur and sele now, instead of with the rest of them.

This revision was not accepted when it landed; it landed in state Needs Review.May 31 2020, 4:16 PM
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.