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

Treat remaining untyped Uniques in default rulesets (#9763)

Browse Source 
* Treat remaining untyped Uniques in default rulesets, make unit test catch them

* Change untyped filtering Uniques check to Validation by inclusion in GlobalUniques instead of UniqueType.AircraftMarker

* Wiki for untyped filtering Uniques

* Re-include the "Who knows" of Future Tech on the Tech picker
This commit is contained in:
SomeTroglodyte
2023-08-03 10:38:50 +02:00
committed by GitHub
parent fc40da11d9
commit bcb26b6d2a
12 changed files with 121 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/assets/jsons/Civ V - Gods & Kings/GlobalUniques.json
View File

@ -7,7 +7,10 @@
"[-33]% Strength <for [All] units> <when below [-10] Happiness>",
"Cannot build [Settler] units <when below [-10] Happiness>",
"Rebel units may spawn <when below [-20] Happiness>",
"[-1] Sight <for [Embarked] units>"
"[-1] Sight <for [Embarked] units>",
// Filtering uniques must be listed here to tell RulesetValidator they're OK despite untyped
"Aircraft"
// TODO: Implement the uniques below
// "[+20]% [Culture] [in all cities] <during a golden age>",

12
android/assets/jsons/Civ V - Gods & Kings/Nations.json
View File

@ -68,7 +68,7 @@
"Paros","Elis","Syracuse","Herakleia","Gortyn","Chalkis","Pylos","Pella","Naxos","Sicyon",
"Larissa","Apollonia","Messene","Orchomenos","Ambracia","Kos","Knidos","Amphipolis",
"Patras","Lamia","Nafplion","Apolyton"],
"spyNames": ["Jason", "Helena", "Alexa", "Cletus", "Kassandra", "Andres", "Desdemona", "Anthea", "Aeneas", "Leander",]
"spyNames": ["Jason", "Helena", "Alexa", "Cletus", "Kassandra", "Andres", "Desdemona", "Anthea", "Aeneas", "Leander"]
},
{
"name": "China",
@ -246,7 +246,7 @@
"Satricum","Ardea","Ostia","Velitrae","Viroconium","Tarentum","Brundisium","Caesaraugusta","Caesarea","Palmyra",
"Signia","Aquileia","Clusium","Sutrium","Cremona","Placentia","Hispalis","Artaxata","Aurelianorum","Nicopolis",
"Agrippina","Verona","Corfinium","Treverii","Sirmium","Augustadorum","Curia","Interrama","Adria"],
"spyNames": ["Flavius", "Regula", "Servius", "Lucia", "Cornelius", "Licina", "Canus", "Serpens", "Agrippa", "Brutus",]
"spyNames": ["Flavius", "Regula", "Servius", "Lucia", "Cornelius", "Licina", "Canus", "Serpens", "Agrippa", "Brutus"]
},
{
"name": "Arabia",
@ -880,7 +880,7 @@
"Amstetten", "Bad Ischl", "Wolfsberg", "Kufstein", "Leoben", "Klosterneuburg", "Leonding",
"Kapfenberg", "Hallein", "Bischofshofen", "Waidhofen", "Saalbach", "Lienz", "Steyr"
],
"spyNames": ["Ferdinand", "Johanna", "Franz-Josef", "Astrid", "Anna", "Hubert", "Alois", "Natter", "Georg", "Arnold",]
"spyNames": ["Ferdinand", "Johanna", "Franz-Josef", "Astrid", "Anna", "Hubert", "Alois", "Natter", "Georg", "Arnold"]
},
{
"name": "Carthage",
@ -903,13 +903,13 @@
"innerColor": [81, 0, 137],
"favoredReligion": "Islam",
"uniqueName": "Phoenician Heritage",
"uniques": ["Gain a free [Harbor] [in all coastal cities]","Land units may cross [Mountain] tiles after the first [Great General] is earned",
"Units ending their turn on [Mountain] tiles take [50] damage"],
"uniques": ["Gain a free [Harbor] [in all coastal cities]","Land units may cross [Mountain] tiles after the first [Great General] is earned"],
"cities": ["Carthage","Utique","Hippo Regius","Gades","Saguntum","Carthago Nova","Panormus","Lilybaeum","Hadrumetum","Zama Regia",
"Karalis","Malaca","Leptis Magna","Hippo Diarrhytus","Motya","Sulci","Leptis Parva","Tharros","Soluntum","Lixus",
"Oea","Theveste","Ibossim","Thapsus","Aleria","Tingis","Abyla","Sabratha","Rusadir","Baecula",
"Saldae"],
"spyNames": ["Hamilcar", "Mago", "Baalhaan", "Sophoniba", "Yzebel", "Similce", "Kandaulo", "Zinnridi", "Gisgo", "Fierelus"]
"spyNames": ["Hamilcar", "Mago", "Baalhaan", "Sophoniba", "Yzebel", "Similce", "Kandaulo", "Zinnridi", "Gisgo", "Fierelus"],
"civilopediaText": [{"text": "Units ending their turn on [Mountain] tiles take [50] damage"}]
},
{
"name": "Byzantium",

7
android/assets/jsons/Civ V - Gods & Kings/Techs.json
View File

@ -649,9 +649,10 @@
{
"name": "Future Tech",
"row": 5,
"prerequisites": ["Globalization","Particle Physics", "Nuclear Fusion", "Nanotechnology", "Stealth"],
"uniques": ["Who knows what the future holds?", "Can be continually researched"],
"quote": "'I think we agree, the past is over.' - George W. Bush"
"prerequisites": ["Globalization","Particle Physics","Nuclear Fusion","Nanotechnology","Stealth"],
"uniques": ["Can be continually researched"],
"quote": "'I think we agree, the past is over.' - George W. Bush",
"civilopediaText": [{"text": "Who knows what the future holds?"}]
}
]
}

5
android/assets/jsons/Civ V - Vanilla/GlobalUniques.json
View File

@ -7,7 +7,10 @@
"[-33]% Strength <for [All] units> <when below [-10] Happiness>",
"Cannot build [Settler] units <when below [-10] Happiness>",
"Rebel units may spawn <when below [-20] Happiness>",
"[-1] Sight <for [Embarked] units>"
"[-1] Sight <for [Embarked] units>",
// Filtering uniques must be listed here to tell RulesetValidator they're OK despite untyped
"Aircraft"
// TODO: Implement the uniques below
// "[+20]% [Culture] [in all cities] <during a golden age>",

7
android/assets/jsons/Civ V - Vanilla/Techs.json
View File

@ -615,9 +615,10 @@
{
"name": "Future Tech",
"row": 5,
"prerequisites": ["Globalization","Nuclear Fusion", "Nanotechnology"],
"uniques": ["Who knows what the future holds?", "Can be continually researched"],
"quote": "'I think we agree, the past is over.' - George W. Bush"
"prerequisites": ["Globalization","Nuclear Fusion","Nanotechnology"],
"uniques": ["Can be continually researched"],
"quote": "'I think we agree, the past is over.' - George W. Bush",
"civilopediaText": [{"text": "Who knows what the future holds?"}]
}
]
}