Thunderbrd
C2C War Dog
9599
- Numerous XML repairs.
9601
- Added a whole bunch of future era buildings. These are most of my buildings that can be built on Earth, Cislunar Space, the Moon, and Mars. There are a few that are not added because they interact in some way with buildings in other domains that are not added.
- Due to the large number of new buildings added, all my content for now is in Assets/Modules/Pepper2000.
- Added building icons, including for buildings not yet added but that will hopefully be added someday.
- Building consolidation: many buildings that didn't go obsolete before now do.
- Added a Cislunar Settler, Lunar Settler, Planetary Settler (for Mars), and Martian Settler (which is built on Mars). All but the last of these use custom python code, so please let me know if there are any problems.
- Fixed Construction Ship and Lunar Rover. Lunar Rover also uses custom python code, so ditto on letting me know if there are problems.
- Police Station no longer goes obsolete because several other buildings require it.
- Fantasy Materials is now a prereq for Transdimensional Commerce.
- Added some notes about techs whose tags should be changed at the next save-breaking update.
- The older Space Settler, Seedship, and Martian colony wonders are shunted to Cold Fusion so they can't be built. Later I think they should be taken out of the game entirely.
Also, I'm seeing an XML error, tag BUILDING_GUARD_STATION in xml\Units\CIV4UnitInfos.xml. I don't think it's my fault.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Cislunar_CIV4BuildingInfos.xml:1896,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Cislunar_CIV4BuildingInfos.xml:1931,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:1726,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:1731,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:3272,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:3277,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:7114,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:7483,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:7516,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:7549,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:7582,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:9019,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:9270,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:10522,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:10655,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:10660,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:10665,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:11283,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:11403,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:11470,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:18856,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19005,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19009,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19550,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19555,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19630,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19674,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19708,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:19745,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20000,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20150,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20156,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20519,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20642,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20687,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20732,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20775,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20816,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20821,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20874,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20878,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:20882,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:21783,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:21788,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:21793,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:21916,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:21957,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22023,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22056,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22088,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22122,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22163,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22169,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22257,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22291,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22296,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22301,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22570,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:22575,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Earth_CIV4BuildingInfos.xml:23079,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Mars_CIV4BuildingInfos.xml:912,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Mars_CIV4BuildingInfos.xml:2226,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Mars_CIV4BuildingInfos.xml:2231,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingExtraCommerce' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000Mars_CIV4BuildingInfos.xml:2377,6: The 'x-schema:Pepper2000_CIV4BuildingsSchema.xml:GlobalBuildingClassProductionModifier' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000_CIV4UnitInfos.xml:80,30: The 'x-schema:Pepper2000_CIV4UnitSchema.xml:PythonName' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000_CIV4UnitInfos.xml:194,30: The 'x-schema:Pepper2000_CIV4UnitSchema.xml:PythonName' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000_CIV4UnitInfos.xml:289,30: The 'x-schema:Pepper2000_CIV4UnitSchema.xml:PythonName' element is not declared.
C:\New folder (11)\trunk\Assets\Modules\Pepper2000\Pepper2000_CIV4UnitInfos.xml:387,30: The 'x-schema:Pepper2000_CIV4UnitSchema.xml:PythonName' element is not declared.
Yeah, I would do that. Revert the SVN to 9600. Then before you commit, you need to update to the latest SVN. This is always a necessary step. After updating you'll probably have to sort out a number of things stemming from the differences the latest SVN resources brought into your files. Then once all smoothed out, update AGAIN (because you ALWAYS want to update JUST before committing to make sure other's changes will be adapted into yours) and if no further conflicts take place, then you can commit.Sorry about all that. I thought I was at SVN 9600 when I made the update, so I don't know what went wrong. Probably the best solution is to revert everything I did and I'll try again later.
@DH: we need to revert the SVN to 9600 before we can add anything. I'm not 100% sure how to best go about this but at the moment, it's clear than anything added afterwards is going to be removed and will need to be re-installed on the SVN after the correction takes place. I've gotta basically figure out how to make this happen. I was hoping Pepper would take care of it so that he could sort it out and get it all updated without overwriting all the XML he overwrote on 9601. But it might be a little advanced and I haven't looked into how to reverse the SVN fileset itself back to a revision yet. Looking into it now. In the meantime, you should save your changes in a copy so you can easily re-install them after updating to a corrected fileset.9604
- Activate the Coa Dai religion
- Move it to a better location in the Tech Tree
- Update the comments in the Tech Infos file about religions
@DH: we need to revert the SVN to 9600 before we can add anything. I'm not 100% sure how to best go about this but at the moment, it's clear than anything added afterwards is going to be removed and will need to be re-installed on the SVN after the correction takes place. I've gotta basically figure out how to make this happen. I was hoping Pepper would take care of it so that he could sort it out and get it all updated without overwriting all the XML he overwrote on 9601. But it might be a little advanced and I haven't looked into how to reverse the SVN fileset itself back to a revision yet. Looking into it now. In the meantime, you should save your changes in a copy so you can easily re-install them after updating to a corrected fileset.
Then, from there, I suppose you would simply commit what you have to lock in your working copy as the SVN current fileset?It's possible to revert commits using the TortoiseSVN revision log dialog.
Let's say you have these N sucessive commits: 1, 2, 3 and 4.
If you select the commit 2 and choose "Revert changes from this revision", your working copy will contain the changes brought by commits 1, 3 and 4. Commit 2 will be "canceled", or rather, played in reverse on the top of commit 4: if a line was added, it will be removed. If a line was removed, it will be readded.
This must be done with 9601 and then 9600.
<UnitClassTargetType>UNITCLASS_JUNGLE_TARANTULA</UnitClassTargetType>
<bUnitClassTarget>1</bUnitClassTarget>
</UnitClassTarget>
<UnitClassTarget>
<UnitClassTargetType>UNITCLASS_DESERT_TARANTULA</UnitClassTargetType>
<bUnitClassTarget>1</bUnitClassTarget>
</UnitClassTarget>