Also two suggestions about new civic system:
1. Buff Democracy, +1 free specialist per city, change civics only take at most one turn of anarchy.
2. Buff Isolationism, +1 specialist in core cities, no foreign trade, +0.5 production(or culture/food/health) per military unit stationed in a city(max: +4), the upkeep could turn to high.
For democracy, I'm not sure if that's actually appropriate, because you could also argue that democracy requires institutional stability and some consistency in how things work. Gameplay wise, I think it's already quite strong.
I do like the idea behind isolationism though, more so even than the current +1 specialist. Let me think about it.
Quick question, just because I'm unclear on how to use GIT. Why do I have to fetch before Switching/Checkout? Is there a reason I can't just go straight to that while switching to this branch?
What fetch does is to update your local git program with all the branches that exist in the online repository. If you have installed git or cloned the mod repo after the hrtechs branch was created, the step isn't required anymore. But the guide was also written with the people in mind who had git before the branch was created, and those would have to run fetch once so their git instance would become aware of the new branch. If you have already run it once, or only recently cloned the repo, you can skip the step without issues.
Can you please give very approximate estimate -- when will you finally merge both branches?
Not sure to be honest. The main reason for keeping it split was to have the inclusion of the new tech tree and all the new units, buildings, civics etc. done before making it the develop state, but since the new civics are in now that is basically done.
I have a couple of things planned that I want to do before we get close to 1.15 release, which would be the feature freeze phase where I do my own playtesting and balancing. That includes:
- some changes to workers, improvements and slaves
- some changes to unit types, their interaction and unit upgrades
- culture level effects and their relationship to wonders and national wonders
- finishing the (mostly aesthetic) religion stuff I'm currently working on
But all of these could also be done in develop. What does everyone think? Should I keep it separate for longer, or merge as soon as possible?
(In any case, before I merge I will create a tag for the develop state before the merge, so you can stick to it if you want.)