Right, but if the commit then fails with a conflict, resolve it (intelligently, not by just overwriting!). If you just overwrote one file in fact (without checking the semantics of what you did) you could easily break things, since the unconflicted files in the other person's checkin could have en relying on some changes you overwrote.
Industrial and later Building/Unit Costs
- Thread starter ls612
- Start date
Right, but if the commit then fails with a conflict, resolve it (intelligently, not by just overwriting!). If you just overwrote one file in fact (without checking the semantics of what you did) you could easily break things, since the unconflicted files in the other person's checkin could have en relying on some changes you overwrote.
Thunderbrd
C2C War Dog
Right. But when you update and you get a conflict you need to take a moment to merge the files rather than selecting either version to override the other.
Dancing Hoskuld
Deity
No over writing occurred. The problem was that this forum was faster that the SVN so I was looking here not at the commit which was still doing its thing and had not reported a problem yet!
That was what I was in the process doing after we found that the conflict since I pressed commit just after ls612. The bigger problem was that I was updating some schema files so did some renaming to tidy up as I went.
Thunderbrd
C2C War Dog
No... the problem was this action here:
And selecting to override rather than to merge.
Dancing Hoskuld
Deity
AH, didn't see that. I made no changes to that file anyway so it would be someone else's changes that were lost which is worse since mine would have been the same ones ls612 would have been doing any way.
You just undid all my unit changes! I'll re-do them, but can you please try not to do this in the future?
AH, didn't see that. I made no changes to that file anyway so it would be someone else's changes that were lost which is worse since mine would have been the same ones ls612 would have been doing any way.
Yes, my unit changes just got lost. I'm suddenly very glad that I documented everything I did in the SVN thread.
Sorry!
I thought that was DH's, and thought I'd got your's in my update last night. Tortoise was being really stupid and saying that it had some 3000 conflicts in the one file, so something screwy was going on on my end then. I'll be more careful next time. 
Sorry!
OK. It was probably because I tweaked all the Criminal units, the Vassal units, the Merchant units, and the Warlord units. All of them except for Assassin and the last unit in each line got new <ForceObsoleteTechs> so that they aren't available once the later unit in the line turns up. That might have been causing the number of conflicts you got. I also modified the Vassal units so that they form one promotional line instead of two (Noble - Warlord Vassal - Lord - Viceroy).
On another note: if you're redoing earlier unit costs, watch the Noble and Warlord Vassal. I lowered their costs because I lowered the amount of XP they give. Noble only gives 6 now and Warlord Vassal gives 10.
Third: After the freeze is over, I will be remapping the Industrial and later eras on the tree. I will keep track of what I move so we can recalibrate after. I'd rather we keep this current scheme in place for the v27 release, and then we can make what I expect to be smaller modifications. The end of the Modern Era is definitely going to be three columns rightward and the Transhuman Era may get pushed. I'll find out as I look.
Hydromancerx
C2C Modder
Should I stop updating the cost? I don' want to have to do all the eras over again. They were so hard to begin with.
No, because if I'm understanding Vokarya correctly he's just going to be making more tech tree real estate, not significantly changing the progress of buildings and units generally. Also, I and DH have done all of the units, so we'd need to do the Buildings as well to avoid issues.
Hydromancerx
C2C Modder
Here is a list of all the buildings/wonders that I don't know or are not mine.
- Giverny
- Crystal Palace
- Alcatraz
- 221B Bakers Street
- Homeland Security Department
- Lotus Temple
-Cristo Redentor
- Berlin Wall
- Colt Tower
- Palace of the Soviets
- Maginot Line
- Cabaret Voltaire
- Disneyland
- Bauhaus School
- River Rogue Complex
- Willow Run
-Empire State Building
- Weather Station
- Giverny
- Crystal Palace
- Alcatraz
- 221B Bakers Street
- Homeland Security Department
- Lotus Temple
-
- Berlin Wall
- Colt Tower
- Palace of the Soviets
- Maginot Line
- Cabaret Voltaire
- Disneyland
- Bauhaus School
- River Rogue Complex
- Willow Run
-
- Weather Station
Cristo Redentor is in the main buildings file. Lotus Temple and Empire State Building are Platyping wonders. Homeland Security is DH's. The rest are mine - I will go ahead and adjust.
Dancing Hoskuld
Deity
I did the Empire State Building yesterday. Cristo Redentor should be in the core files.
Well, some techs are going to adjust by a column or two (or more in the late Modern and up), but if you are keeping to a consistent scheme, I can keep track of what I adjust and then I could do any cost changes as well. Would anyone have a problem with that?
Hockey Night is actually at Mass Media, so it's going to need to be even more expensive than what you are suggesting now.
I'll be adjusting wonder costs tonight, but I'm going to have three Wonders that diverge from the scheme:
- Berlin Wall will only cost 5000 hammers. Berlin Wall has a massive instability penalty that I think should offset its cost.
- Cabaret Voltaire will only cost 4500 hammers. CV has a local instability penalty, so it's not as offseting.
- I'm going to move River Rouge Complex all the way to 8000 hammers. It's a very large production boost for the city that gets it (+100% with all resources), so I think it should cost more to compensate.
Hydromancerx
C2C Modder
Yeah I found the Cristo Redentor in the core.
EDIT: I also cannot find ...
- Propaganda Net
A thought occurred to me as I'm tweaking Wonder costs. Should the Great Engineer be upgraded so it provides more hammers when used to rush a building? I thought the idea was that if you were willing to spend a Great Engineer, you should get a Wonder on the spot. I'm afraid that with all the increases we are doing, Engineers will only be able to provide a small fraction of the cost.
It's one of DH's custom wonders.
Similar threads
- Locked
- Poll
