Rebase, use enum.

As for your test plan (assuming you have SVN installed), you could do something like this ingame: Go to singleplayer -> matches. Make player 1 and player 2 allies, give player 1 The Athenians civ and player 2 the Carthaginians Civ. ingame in chat enter gift from the gods cheat. With ALT+D you can open dev console, you'll see a change perspective option, click it and next to the menu button on top right side you can change to player 2. Make a foundation for an Embassy building (but don't build it). Now change perspective back to player 1 and see what your check does.

pull0ad is convenient and probably enough for me as I rarely have to patch binary files.

Another issue to me is that stuff that should be upgrades (stone walls, various towers) are not which make the panel fuller that needs be. But that's another topic.

@Freagarach @marder

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

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

Rebase

rebase

Mostly arc patch gets the job done, if not I use one of @wraitii's formulae:

• pull0ad or
• P246.

However, they also do not filter out empty files.

I download the raw diff and apply it with patch. For most cases, it works good enough. I simply don't have arcanist installed is the main reason. Using patch is by no means a better workflow though.

In D4735#201589, @Stan wrote:

I think you should ask balancing. I don't have a strong opinion.
I sometimes wonder if one should see all the buildings they can't build, or if they should be revealed when they become available.
Or if the UI is good at all, and it should not be more starcrafty (It's a gif)

I think you should ask balancing. I don't have a strong opinion.
I sometimes wonder if one should see all the buildings they can't build, or if they should be revealed when they become available.
Or if the UI is good at all, and it should not be more starcrafty (It's a gif)

In D4735#201575, @lyv wrote:

the files are always empty and not deleted

If you are applying with patch, you can use the -E flag. I generate patches using git diff which has a slightly different format (even phab shows those files as just deleted while this revision shows the files cleared). If you are using arc patch I have no idea what to do.

• Neomadoes cost 30 food 20 metal
• Syssiton no build limits
• Promote to olympic instead of upgrade
• Tyrtean paeans now affects all melee infantry (no hero)

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

fix test

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

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

In D4705#201569, @Stan wrote:

Header date, the test has been lost,

In D4735#201571, @marder wrote:

In D4735#201544, @phosit wrote:

In most civs this looks weird: wall; tower; tower; wall; tower
IMO we shouldn't sort by phase.

Could you expand on that / how would you sort it ?
Rather by function e.g. eco buildings p1, eco buildings p2, military buildings p1 .... Ect?

the files are always empty and not deleted

If you are applying with patch, you can use the -E flag. I generate patches using git diff which has a slightly different format (even phab shows those files as just deleted while this revision shows the files cleared). If you are using arc patch I have no idea what to do.

@Freagarach @Stan @wowgetoffyourcellphone (or anyone else)

In D4735#201544, @phosit wrote:

In most civs this looks weird: wall; tower; tower; wall; tower
IMO we shouldn't sort by phase.

In D4735#201547, @Langbart wrote:

In D4735#201530, @marder wrote:

I think the problem is I don't use arcanist to upload the patch to phabricator since it is stupidly annoying to setup on windows.

😑

• vlad is on windows also does not use arcanist and on his patches it works. (D4434)
• works for smiley too (D4611)

Header date, the test has been lost,

In D4735#201547, @Langbart wrote:

• vlad is on windows also does not use arcanist and on his patches it works. (D4434)
• works for smiley too (D4611)

Forests might be some trouble though as they should preferably have same style as the rest of the map, and to balance them is not an easy task in my (now blurry) experience. The amount of trees can vary quite a bit for fixed parameters, and hard constraints can make them look unnatural.

Is it okay if they are roughly the same? Being visually similar in size might actually be enough.

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

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

• braces
• function names
• CStr

Did i miss something?

In D4735#201530, @marder wrote:

I think the problem is I don't use arcanist to upload the patch to phabricator since it is stupidly annoying to setup on windows.

😑

• vlad is on windows also does not use arcanist and on his patches it works. (D4434)
• works for smiley too (D4611)

In most civs this looks weird: wall; tower; tower; wall; tower
IMO we shouldn't sort by phase.

In D4735#201539, @Langbart wrote:

In D4735#201530, @marder wrote:

delete the sele & mace library templates

You need to find out how to delete these files correctly when you create a patch. Every time I try to apply one of your patches with deleted files, the files are always empty and not deleted, I have to do it manually. This is also the reason why the ci in D4713 failed.

In D4735#201530, @marder wrote:

delete the sele & mace library templates

You need to find out how to delete these files correctly when you create a patch. Every time I try to apply one of your patches with deleted files, the files are always empty and not deleted, I have to do it manually. This is also the reason why the ci in D4713 failed.

In D4735#201534, @marder wrote:

Question to everybody, which is better?:

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

Build is unstable, some tests have failed - The Moirai have given mortals hearts that can endure.

In D4735#201450, @Freagarach wrote:

Instead of comments, one could also try using whitespace to make the distinction clearer. I'm not a great fan of splitting per phase, because e.g. Mauryans can construct the elephant stable in phase 2, but the rest only in phase 3.
I guess one could/should check whether the comments are kept when running the template reorganiser.

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

fix the problems @Langbart found
i.e. move the athen buildings to the builder mixin

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

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

I'm not sure about the archer either, but the patch itself sounds interesting.

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

fix build

So it seems there would be now two distinct groups of resources. The primary group directly adjacent to the CC, starting animals, small forest, berries and two mines. And a secondary group somewhat far away but still part of the greater player base. Neutral resources would be outside of the greater area I suppose.

Indeed that's the goal (this emulates fairly well former mainland gameplay except this time resources are balanced)

I can agree that tyreans are for all melee infantry units.

Superseeded by D4705

#6587
s0600204 wrote:

The issue with the Structure Tree is that r26015 removed default Researcher/TechCostMultiplier values; and whilst r26192 fixed that for the simulation, a fix was not applied to globalscripts which expects there to be values for each possible resource specified within templates.
This is causing other technology costs to be displayed incorrectly within the Structure Tree, such as those of the Mauryan temple and the Gallic forge

rP27009

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

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

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

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

I forgot to add the test file

• Test
• helper function
• return std::string

Maybe you can extract the js code that does that for the game settings and then call it?

In D4736#201456, @real_tabasco_sauce wrote:

Yeah I think skiritai are already plenty unique. I also think at least for now weapon switching should be exclusive to immortals.

In D4730#201162, @phosit wrote:

I'll try to embed the SharedState in to Future. or i join the diff with one that adds continuation.

Yeah I think skiritai are already plenty unique. I also think at least for now weapon switching should be exclusive to immortals.
The more general speed buff to melee units (instead of just champs) and adding Cretan merc archers sounds great.
Like I said earlier, the cheap hoplites need an armor reduction.

In D4736#201453, @wowgetoffyourcellphone wrote:

Perhaps Tyrtean Paeans can be more generic: +10% movement speed for all units instead of +20% just for champions? Seems like a lot of techs and bonuses focused solely on the Spartiates. My opinion isn't super strong on that one though.

I'd like to see something focused specifically onto the Skiritai. Either a small tech or some kind of bonus. If their bonus is just that they run fast, then let's maybe come up with a name for it or something for the civ's literature. My suggestion is that they normally fight with a sword, but can go to a spear when in phalanx or can switch back and forth from sword to spear, like how the Immortals switch from spear to bow. Just a suggestion.

Both special techs in the tech pair reduce effectiveness of Helot Skirmishers. Not sure what to make of that. The focus on the melee infantry arm is excellent, but you also don't want to kneecap them too much on ranged infantry considering how important ranged infantry is to the current meta (this can change of course). I suggest to balance this, you add a Mercenary Cretan Archer to their roster-their only mercenary- or a Helot Slinger.

In D4736#201453, @wowgetoffyourcellphone wrote:

Perhaps Tyrtean Paeans can be more generic: +10% movement speed for all units instead of +20% just for champions? Seems like a lot of techs and bonuses focused solely on the Spartiates. My opinion isn't super strong on that one though.

I'd like to see something focused specifically onto the Skiritai. Either a small tech or some kind of bonus. If their bonus is just that they run fast, then let's maybe come up with a name for it or something for the civ's literature. My suggestion is that they normally fight with a sword, but can go to a spear when in phalanx or can switch back and forth from sword to spear, like how the Immortals switch from spear to bow. Just a suggestion.

Both special techs in the tech pair reduce effectiveness of Helot Skirmishers. Not sure what to make of that. The focus on the melee infantry arm is excellent, but you also don't want to kneecap them too much on ranged infantry considering how important ranged infantry is to the current meta (this can change of course). I suggest to balance this, you add a Mercenary Cretan Archer to their roster. Their only mercenary.

Perhaps Tyrtean Paeans can be more generic: +10% movement speed for all units instead of +20% just for champions? Seems like a lot of techs and bonuses focused solely on the Spartiates. My opinion isn't super strong on that one though.

@chrstgtr neomadoes file is on

Instead of comments, one could also try using whitespace to make the distinction clearer. I'm not a great fan of splitting per phase, because e.g. Mauryans can construct the elephant stable in phase 2, but the rest only in phase 3.
I guess one could/should check whether the comments are kept when running the template reorganiser.

I like it for the most part. We should definitely schedule some testing team games soon, so that we do not release unbalanced civs.

This looks good overall. Some suggestions below.

Comments are possible although I'm not sure whether it works with tokens, though.
I'm not a fan of XML comments, espcecially when it requires more maintenance but up to the person committing this ;)

Thanks @Langbart !
Gonna fix it tomorrow.

General

• The fortress should come after the defense_tower

Civ list

athen

• @wraitii has already began something differnt here, see rP25239
• that is why the gymnasium and prytaneion is listed before the wonder

• super_dock should sit next to the wonder (only accessible in phase 3)

• they have one extra building now

• they have one extra building now

ok, i'm finishing the sparta patch and today i updated this one.