By the look of it it seems to include about each of Vokarya's wonders
I'll investigate that after finishing with Hydro.By the way, can Platyping's and Orions' stuff be merged?
Modules load order
- Thread starter Rwn
- Start date
By the look of it it seems to include about each of Vokarya's wonders
I'll investigate that after finishing with Hydro.By the way, can Platyping's and Orions' stuff be merged?
Dancing Hoskuld
Deity
What I can think of is to add a comment tag before the building with the credit - something like:
<!-- Great Zimbabwe -->
<!-- Design by Platyping -->
OK, so here's at last the merge including what's in Hydro's folder. Interestingly, the buildinginfo file is now thrice as large - I guess a lot of the new buildings from C2C were there 
Some precisions:
- The following buildings were duplicated from the core in Hydro's file, with a few properties changed and the bforceoverwrite tag added:
amusement_park, barracks, broadcast_tower, chinese_pavillon, colosseum, commercial_port, communication_tower, drydock, garrison, greek_odeon, guildhall, harbor, hotel, international_port, khmer_baray, mongol_ger, national_library_service, naval_yard, netherland_dike, opera_house, orbital_factory, ottoman_hammam, port, portugal_feitora, sumerian_ziggurat, town_hall, treasury
I replaced the core entry by Hydro's.
- The firepit was duplicated without the bforceoverwrite tag. I looked at the properties that were changed (I checked in the game, the version applied was Hydro's) and manually changed the original entry.
- The following buildings added or tweaked a few properties from the core file:
archery_range, siege workshop, tatoo_parlor
I manually added the new properties to the original entry.
- The following buildings are updated duplicates from buildings in Orionmod's folder:
national_archives, pharmacy, red_cross
Those should be removed from the corresponding files in Oriomod's folder.
- The following buildings are updated duplicates from buildings in Vokarya's folder:
masters_dojo, training_dojo
Those should be removed from the buildinginfo file in Vokarya's folder.
- I left Scotland Yard as is, but it looks like you have another entry for that one. Chose which version you want to keep.
- I deleted a useless entry for nuclear_plant (both duplicates were in Hydro's file, one already integrated the changes from the other)
- What was in the zzdepend files were tweaks on existing buildings for megafauna buildings. The megafauna building files were updated to integrate them and should replace the existing files in the corresponding megafauna folders.
- There were duplicate "education" buildings (BUILDING_EQ_PLUS1 etc.) inside Hydro's file; I kept them all unchanged, but at some point it would probably be useful to look deeper and merge them.
It seems to work fine on my version after using the new files and unloading Hydro's folder; let me know if anybody spots something that went wrong.
View attachment Merged - part 3.zip
Some precisions:
- The following buildings were duplicated from the core in Hydro's file, with a few properties changed and the bforceoverwrite tag added:
amusement_park, barracks, broadcast_tower, chinese_pavillon, colosseum, commercial_port, communication_tower, drydock, garrison, greek_odeon, guildhall, harbor, hotel, international_port, khmer_baray, mongol_ger, national_library_service, naval_yard, netherland_dike, opera_house, orbital_factory, ottoman_hammam, port, portugal_feitora, sumerian_ziggurat, town_hall, treasury
I replaced the core entry by Hydro's.
- The firepit was duplicated without the bforceoverwrite tag. I looked at the properties that were changed (I checked in the game, the version applied was Hydro's) and manually changed the original entry.
- The following buildings added or tweaked a few properties from the core file:
archery_range, siege workshop, tatoo_parlor
I manually added the new properties to the original entry.
- The following buildings are updated duplicates from buildings in Orionmod's folder:
national_archives, pharmacy, red_cross
Those should be removed from the corresponding files in Oriomod's folder.
- The following buildings are updated duplicates from buildings in Vokarya's folder:
masters_dojo, training_dojo
Those should be removed from the buildinginfo file in Vokarya's folder.
- I left Scotland Yard as is, but it looks like you have another entry for that one. Chose which version you want to keep.
- I deleted a useless entry for nuclear_plant (both duplicates were in Hydro's file, one already integrated the changes from the other)
- What was in the zzdepend files were tweaks on existing buildings for megafauna buildings. The megafauna building files were updated to integrate them and should replace the existing files in the corresponding megafauna folders.
- There were duplicate "education" buildings (BUILDING_EQ_PLUS1 etc.) inside Hydro's file; I kept them all unchanged, but at some point it would probably be useful to look deeper and merge them.
It seems to work fine on my version after using the new files and unloading Hydro's folder; let me know if anybody spots something that went wrong.
View attachment Merged - part 3.zip
Faustmouse
Deity
- Joined
- Jan 31, 2012
- Messages
- 3,524
BIG 
from me Rwn! 
I'm really happy you do this!
from me Rwn! I'm really happy you do this!
Dancing Hoskuld
Deity
Hopefully that will work OK. There are options and options, but since I need to go through the lot again and make sure that the optional modules are optional I expect no harm has been done.
.It is after midnight and I should retire and look at these in the morning but I am playing a game and am a few turns from taking the barbarians on a large island. That should leave room for a lot of animals. Ones that I have not seen elsewhere by the looks of things.
Hopefully that will work OK. There are options and options, but since I need to go through the lot again and make sure that the optional modules are optional I expect no harm has been done.
Well, if there's any problem, just keep the current existing files in the alt_timelines folders and instead put the zzDepend files (whose content I dispatched in the megafauna files) from Hydro's folder wherever you want.
But I'm rather confident that's everything is optional (it's mainly things like adding megafauna trainers as possible prerequisites for the stable).
Ah, the fabled untouched-for-hundreds-of-turns islands
I got one once, it feels like discovering El Dorado.Is it possible to use UTF-8 encoding for the gametext.xml files? (of course starting the file with <?xml version="1.0" encoding="utf-8"?> instead of <?xml version="1.0" encoding="iso-8859-1"?>)
That would help me for the merge of gametext files if that's allowed.
That would help me for the merge of gametext files if that's allowed.
Dancing Hoskuld
Deity
FTI, When you moved the transactions out of the hydro stuff into the megafauna stuff they needed their AndDependencies changed to be safe. For example the Stable was defined in the same folder when it was in Hydro but now that it is in the mega fauna folders Stable is not defined in those folders. Thus BUILDING_STABLE needs to be added to the AndDependencies on the Stable transaction and so forth for the other buildings.
I am about to test my merge of your merge.
I don't know. Perhabs Alberts does.
I am about to test my merge of your merge
.I don't know. Perhabs Alberts does.
Thunderbrd
C2C War Dog
FTI, When you moved the transactions out of the hydro stuff into the megafauna stuff they needed their AndDependencies changed to be safe. For example the Stable was defined in the same folder when it was in Hydro but now that it is in the mega fauna folders Stable is not defined in those folders. Thus BUILDING_STABLE needs to be added to the AndDependencies on the Stable transaction and so forth for the other buildings.
I am about to test my merge of your merge
OK, I've looked into your post regarding AndDependencies, I think I understand why you want it (though I would never have thought to add it myself, especially as it worked fine without it when I tested it). Thanks for the info!
Well, short answer is, it doesn't work
But I've found a workaround with a script so it's OK.As discussed earlier, here's a compilation of all the gametext.xml files in XML/Text, merged then sorted by category. This should allow an easier editing of the text without having to search in each file.
Bonus_CIV4GameText.xml
BUG_CIV4GameText.xml
Buildings_CIV4GameText.xml
Civics_CIV4GameText.xml
Combat_CIV4GameText.xml
Concepts_CIV4GameText.xml
Corporations_CIV4GameText.xml
Diplomacy_CIV4GameText.xml
Espionage_CIV4GameText.xml
Events_CIV4GameText.xml
Features_CIV4GameText.xml
Gameoptions_CIV4GameText.xml
Global_CIV4GameText.xml
Hints_CIV4GameText.xml
Improvements_CIV4GameText.xml
NamesCity_CIV4GameText.xml
NamesCivs_CIV4GameText.xml
NamesGreatPersons_CIV4GameText.xml
NamesLeaders_CIV4GameText.xml
Pedia_CIV4GameText.xml
Projects_CIV4GameText.xml
Promotions_CIV4GameText.xml
Properties_CIV4GameText.xml
Revolution_CIV4GameText.xml
Tech_CIV4GameText.xml
Terrain_CIV4GameText.xml
Traits_CIV4GameText.xml
Units_CIV4GameText.xml
The file names should be rather self-explanatory (notes: "Global" contains everything that doesn't fit elsewhere ; "Pedia" doesn't include the pedia entries for buildings, units etc. which are in their respective files).
I chose categories that looked convenient, but it's completely possible (and quick) to merge or to split them if necessary, or to reorganize the content otherwise. Inside the files the entries are sorted alphabetically by their keyword.
I only merged what was in XML/Text. What's in the modules was not merged. The files should replace everything that's in XML/Text.
During the process I had to slightly alter the files. Some remarks:
* I did not touch the files Strategy1_CIV4GameText.xml and Strategy2_CIV4GameText.xml. They contained too long strings for me to process and their content was already clearly delimited so I let them as they were.
* I removed the bribes of translations in anything other than english, french, german, italian and spanish (there were only very few entries translated in other languages, sometimes not even correctly, perhaps a leftover from other files).
* There were two different formats for entries: <language>foo</language> and <language><text>foo</text></language>, the latter being used when there was a different plural/gender. Now every entry is in the following format: <language><text>foo</text></language> even when there's no plural or gender. I needed to do that to process the entries correctly and it'd be a bit long to go back to the old format; as it works fine I'd rather keep it like this.
* I've been careful not to erase entries, but I can't guarantee that it didn't happen since the files were processed automatically. If you spot something that disappeared (again, that's unlikely), let me know so I can investigate what went wrong and restore it.
View attachment MergedGameText.zip
Dancing Hoskuld
Deity
I think it OK for you to merge in OrionsMods (except MineWarfare), The_J amd Tsentom1.
If I summarize what's left to merge:
- OrionsMods (except MineWarfare)
- The_J
- Tsentom1
- Faustmouse/Captives
- GreatPeople
- Promotions
- Units
Not sure yet (to be discussed at some point later) about:
- ls612 (traits)
- Platyping
- Natural_Wonders
- StrategyOnly/Better_Handicaps
- Yudishtira
Do you agree with that?
I did a mistake when merging the files, I got mixed up with Hydro's merge so I forgot to include its gametext in those files. -_-
Bottom line is, Hydro_CIV4Gametext.xml must remain in the XML/Text folder with the new files instead of being deleted. At some point I'll reintegrate its content in the main files but for now it'll prevent the game from missing the corresponding text.
Dancing Hoskuld
Deity
Dancing Hoskuld
Deity
Some of the Great people have lost their names and many buildings have lost their Help text. Did you get rid of empty help text entries?
Did you keep the Hydro_Civ4GameText.xml file? Cf. my post above, I forgot to integrate it in the big merge.
Also, I did fill the empty strings by the corresponding TXT_KEY_whatever as a reminder to fill them; maybe that wasn't such a good idea afterall...
Here's the list of empty strings which were replaced by the string name to check if that what you're talking about:
Spoiler :
