mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-08 23:08:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Differentiating Vanilla & G&K (#5654)

Browse Source 
* Fixed tests checking for mod correctness

* Update G&K jsons to current vanilla versions

* First pass over buildings & beliefs

* First pass over nations

* First pass over eras.json

* Fully updated tech tree

* First pass over units

* Second pass over buildings -- fixed techs

* Fixed last prerequisites and row numbers of tech

* Went through the entire tech tree and moved things to their correct spot

* Fixed tests
This commit is contained in:
Xander Lenstra
2021-11-09 05:23:30 +01:00
committed by GitHub
parent 2854d88e11
commit 003f2434c1
19 changed files with 708 additions and 1745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
android/assets/jsons/Civ V - Vanilla/Eras.json
View File

@ -66,7 +66,7 @@
"startingGold": 25,
"startingCulture": 200,
"settlerPopulation": 1,
"settlerBuildings": ["Shrine","Monument"],
"settlerBuildings": ["Monument"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus"],
"baseUnitBuyCost": 200,
"startPercent": 25,
@ -96,9 +96,9 @@
"startingGold": 50,
"startingCulture": 300,
"settlerPopulation": 2,
"settlerBuildings": ["Shrine","Monument","Granary","Lighthouse"],
"settlerBuildings": ["Monument","Granary","Lighthouse"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "Terracotta Army", "The Oracle", "Petra", "Great Wall", "Colossus"],
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus"],
"baseUnitBuyCost": 300,
"startPercent": 37,
"friendBonus": {
@ -127,10 +127,10 @@
"startingGold": 100,
"startingCulture": 400,
"settlerPopulation": 3,
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Amphitheater","Barracks","Library","Colosseum"],
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Temple","Barracks","Library","Colosseum"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "Terracotta Army", "The Oracle", "Petra", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Alhambra", "Notre Dame"],
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame"],
"baseUnitBuyCost": 400,
"startPercent": 50,
"friendBonus": {
@ -148,10 +148,6 @@
"Militaristic": ["Provides military units every ≈[17] turns"]
},
"iconRGB": [63, 81, 182],
"uniques": ["May not generate great prophet equivalents naturally",
"May buy [Great Prophet] units for [200] [Faith] [in all cities in which the majority religion is a major religion] at an increasing price ([100])",
"Starting in this era disables religion"
]
},
{
"name": "Modern era",
@ -163,11 +159,11 @@
"startingGold": 200,
"startingCulture": 500,
"settlerPopulation": 3,
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Amphitheater","Barracks","Library","Colosseum"],
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Temple","Barracks","Library","Colosseum"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "Terracotta Army", "The Oracle", "Petra", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Alhambra", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Leaning Tower of Pisa", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin"],
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin"],
"baseUnitBuyCost": 600,
"startPercent": 65,
"friendBonus": {
@ -185,10 +181,6 @@
"Militaristic": ["Provides military units every ≈[17] turns"]
},
"iconRGB": [33, 150, 243],
"uniques": ["May not generate great prophet equivalents naturally",
"May buy [Great Prophet] units for [200] [Faith] [in all cities in which the majority religion is a major religion] at an increasing price ([100])",
"Starting in this era disables religion"
]
},
{
"name": "Atomic era",
@ -200,11 +192,11 @@
"startingGold": 200,
"startingCulture": 500,
"settlerPopulation": 4,
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Amphitheater","Barracks","Library","Colosseum"],
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Temple","Barracks","Library","Colosseum"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "Terracotta Army", "The Oracle", "Petra", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Alhambra", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Leaning Tower of Pisa", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin",
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin",
"The Louvre", "Big Ben", "Brandenburg Gate"],
"baseUnitBuyCost": 800,
"startPercent": 65,
@ -223,10 +215,6 @@
"Militaristic": ["Provides military units every ≈[17] turns"]
},
"iconRGB": [0, 150, 136],
"uniques": ["May not generate great prophet equivalents naturally",
"May buy [Great Prophet] units for [200] [Faith] [in all cities in which the majority religion is a major religion] at an increasing price ([100])",
"Starting in this era disables religion"
]
},
{
"name": "Information era",
@ -234,17 +222,17 @@
"startingSettlerCount": 3,
"startingWorkerCount": 3,
"startingMilitaryUnitCount": 5,
"startingMilitaryUnit": "Marine",
"startingMilitaryUnit": "Infantry",
"startingGold": 400,
"startingCulture": 600,
"settlerPopulation": 5,
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Amphitheater","Barracks","Library","Colosseum","Theatre","Bank"],
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Temple","Barracks","Library","Colosseum","Theatre","Bank"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "Terracotta Army", "The Oracle", "Petra", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Alhambra", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Leaning Tower of Pisa", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin",
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin",
"The Louvre", "Big Ben", "Brandenburg Gate",
"Eiffel Tower", "Statue of Liberty", "Neuschwanstein", "Cristo Redentor"],
"Eiffel Tower", "Statue of Liberty", "Cristo Redentor"],
"baseUnitBuyCost": 1000,
"startPercent": 80,
// So theoretically this is always just all the wonders at least 2 eras old. So we could just use that.
@ -266,10 +254,6 @@
},
"iconRGB": [76, 176, 81],
"uniques": ["May not generate great prophet equivalents naturally",
"May buy [Great Prophet] units for [200] [Faith] [in all cities in which the majority religion is a major religion] at an increasing price ([100])",
"Starting in this era disables religion"
]
},
{ // Technically, this Era doesn't exist in the original game.
// But as it is _really_ usefull to have for testing, I'd like to keep it.
@ -279,17 +263,16 @@
"startingSettlerCount": 3,
"startingWorkerCount": 3,
"startingMilitaryUnitCount": 5,
"startingMilitaryUnit": "Marine",
"startingMilitaryUnit": "Infantry",
"startingGold": 400,
"startingCulture": 600,
"settlerPopulation": 5,
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Amphitheater","Barracks","Library","Colosseum","Theatre","Bank"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "Terracotta Army", "The Oracle", "Petra", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Alhambra", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Leaning Tower of Pisa", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin",
"settlerBuildings": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin",
"The Louvre", "Big Ben", "Brandenburg Gate",
"Eiffel Tower", "Statue of Liberty", "Neuschwanstein", "Cristo Redentor"],
"Eiffel Tower", "Statue of Liberty", "Cristo Redentor"],
"baseUnitBuyCost": 1000,
"startPercent": 80,
"friendBonus": {
@ -308,9 +291,5 @@
},
"iconRGB": [76, 176, 81],
"uniques": ["May not generate great prophet equivalents naturally",
"May buy [Great Prophet] units for [200] [Faith] [in all cities in which the majority religion is a major religion] at an increasing price ([100])",
"Starting in this era disables religion"
]
}
]