mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-16 10:49:17 +07:00
Removed UniqueAbility from Nations
This commit is contained in:
Yair Morgenstern
@ -29,7 +29,6 @@
|
||||
|
||||
"outerColor": [27,53,63],
|
||||
"innerColor": [213,249,255],
|
||||
"unique": "INGENUITY",
|
||||
"uniqueName": "Ingenuity",
|
||||
"uniques": ["Receive free [Great Scientist] when you discover [Writing]", "[Great Scientist] is earned [50]% faster"],
|
||||
"cities": ["Babylon","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna",
|
||||
@ -59,7 +58,6 @@
|
||||
|
||||
"outerColor": [181, 232, 232],
|
||||
"innerColor": [68,142,249],
|
||||
"unique": "HELLENIC_LEAGUE",
|
||||
"uniqueName": "Hellenic League",
|
||||
"uniques": ["City-State Influence degrades at half rate", "City-State Influence recovers at twice the normal rate"],
|
||||
"cities": ["Athens","Sparta","Corinth","Argos","Knossos","Mycenae","Pharsalos","Ephesus","Halicarnassus","Rhodes",
|
||||
@ -85,7 +83,6 @@
|
||||
"tradeRequest": "My friend, do you think you can accept this request?",
|
||||
"outerColor": [9, 112, 84],
|
||||
"innerColor": [255,255,255],
|
||||
"unique": "ART_OF_WAR",
|
||||
"uniqueName": "Art of War",
|
||||
"uniques": ["Great General provides double combat bonus", "[Great General] is earned [50]% faster"],
|
||||
"cities": ["Beijing","Shanghai","Guangzhou","Nanjing","Xian","Chengdu","Hangzhou","Tianjin","Macau","Shandong",
|
||||
@ -115,7 +112,6 @@
|
||||
|
||||
"outerColor": [ 231, 213, 0],
|
||||
"innerColor": [98,10,210],
|
||||
"unique": "MONUMENT_BUILDERS",
|
||||
"uniqueName": "Monument Builders",
|
||||
"uniques": ["+[20]% Production when constructing [Wonders]"],
|
||||
"cities": ["Thebes","Memphis","Heliopolis","Elephantine","Alexandria","Pi-Ramesses","Giza","Byblos","Akhetaten",
|
||||
@ -142,7 +138,6 @@
|
||||
"tradeRequest": "Would you be interested in a trade agreement with England?",
|
||||
"outerColor": [ 114, 0, 0],
|
||||
"innerColor": [255,255,255],
|
||||
"unique": "SUN_NEVER_SETS",
|
||||
"uniqueName": "Sun Never Sets",
|
||||
"uniques": ["+2 movement for all naval units"],
|
||||
"cities": ["London","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool",
|
||||
@ -167,7 +162,6 @@
|
||||
"tradeRequest": "France offers you this exceptional proposition.",
|
||||
"outerColor": [ 38, 98, 255],
|
||||
"innerColor": [239,236,148],
|
||||
"unique": "ANCIEN_REGIME",
|
||||
"uniqueName": "Ancien Régime",
|
||||
"uniques": ["+2 Culture per turn from cities before discovering Steam Power"],
|
||||
"cities": ["Paris","Orleans","Lyon","Troyes","Tours","Marseille","Chartres","Avignon","Rouen","Grenoble",
|
||||
@ -193,7 +187,6 @@
|
||||
"tradeRequest": "How would you like it if I propose this kind of exchange?",
|
||||
"outerColor": [ 236, 178, 0],
|
||||
"innerColor": [0,0,0],
|
||||
"unique": "SIBERIAN_RICHES",
|
||||
"uniqueName": "Siberian Riches",
|
||||
"uniques": ["[+1 Production] from every [Strategic resource]","Double quantity of [Horses] produced",
|
||||
"Double quantity of [Iron] produced","Double quantity of [Uranium] produced"],
|
||||
@ -220,7 +213,6 @@
|
||||
"tradeRequest": "I offer this, for your consideration.",
|
||||
"outerColor": [ 53,0,87],
|
||||
"innerColor": [238,201,9],
|
||||
"unique": "GLORY_OF_ROME",
|
||||
"uniqueName": "The Glory of Rome",
|
||||
"uniques": ["+25% Production towards any buildings that already exist in the Capital"],
|
||||
"cities": ["Rome","Antium","Cumae","Neapolis","Ravenna","Arretium","Mediolanum","Arpinum","Circei","Setia",
|
||||
@ -246,7 +238,6 @@
|
||||
"tradeRequest": "Come forth, let's do business.",
|
||||
"outerColor": [ 41,83,42],
|
||||
"innerColor": [146,221,9],
|
||||
"unique": "TRADE_CARAVANS",
|
||||
"uniqueName": "Trade Caravans",
|
||||
"uniques": ["[+1 Gold] from each Trade Route", "Double quantity of [Oil] produced"],
|
||||
"cities": ["Mecca","Medina","Damascus","Baghdad","Najran","Kufah","Basra","Khurasan","Anjar","Fustat",
|
||||
@ -270,7 +261,6 @@
|
||||
"tradeRequest": "Is the following trade of interest to you?",
|
||||
"outerColor": [ 28,51,119],
|
||||
"innerColor": [255,255,255],
|
||||
"unique": "MANIFEST_DESTINY",
|
||||
"uniqueName": "Manifest Destiny",
|
||||
"uniques": ["+1 Sight for all land military units", "-50% cost when purchasing tiles"],
|
||||
"cities": ["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles","Houston",
|
||||
@ -298,7 +288,6 @@
|
||||
"tradeRequest": "I would be grateful if you agreed on the following proposal.",
|
||||
"outerColor": [215,225,225],
|
||||
"innerColor": [185,0,0],
|
||||
"unique": "BUSHIDO",
|
||||
"uniqueName": "Bushido",
|
||||
"uniques": ["Units fight as though they were at full strength even when damaged"],
|
||||
"cities": ["Kyoto","Osaka","Tokyo","Satsuma","Kagoshima","Nara","Nagoya","Izumo","Nagasaki","Yokohama",
|
||||
@ -324,7 +313,6 @@
|
||||
"tradeRequest": "My friend, are you interested in this arrangement?",
|
||||
"outerColor": [16,126,5],
|
||||
"innerColor": [255,153,51],
|
||||
"unique": "POPULATION_GROWTH",
|
||||
"uniqueName": "Population Growth",
|
||||
"uniques": ["Unhappiness from number of Cities doubled", "Unhappiness from population decreased by [50]%"],
|
||||
"cities": ["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad",
|
||||
@ -348,7 +336,6 @@
|
||||
"tradeRequest": "It would be in your best interest, to carefully consider this proposal.",
|
||||
"outerColor": [150,150,150],
|
||||
"innerColor": [60,60,60],
|
||||
"unique": "FUROR_TEUTONICUS",
|
||||
"uniqueName": "Furor Teutonicus",
|
||||
"uniques": ["67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment", "-25% land units maintenance"],
|
||||
"cities": ["Berlin","Hamburg","Munich","Cologne","Frankfurt","Essen","Dortmund","Stuttgart","Dusseldorf","Bremen",
|
||||
@ -378,7 +365,6 @@
|
||||
"tradeRequest": "Let us do business! Would you be interested?",
|
||||
"outerColor": [245,248,185],
|
||||
"innerColor": [18,84,30],
|
||||
"unique": "BARBARY_CORSAIRS",
|
||||
"uniqueName": "Barbary Corsairs",
|
||||
"uniques": ["Pay only one third the usual cost for naval unit maintenance", "Melee naval units have a 1/3 chance to capture defeated naval units"],
|
||||
"cities": ["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",
|
||||
@ -405,7 +391,6 @@
|
||||
"tradeRequest": "We have many things to discuss and have much to benefit from each other.",
|
||||
"outerColor": [20,25,173],
|
||||
"innerColor": [187,33,51],
|
||||
"unique": "SCHOLARS_OF_THE_JADE_HALL",
|
||||
"uniqueName": "Scholars of the Jade Hall",
|
||||
"uniques": ["[+2 Science] from every specialist", "[+2 Science] from every [Great Improvement]"],
|
||||
"cities": ["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
|
||||
@ -431,7 +416,6 @@
|
||||
"tradeRequest": "Does this trade work for you, my friend?",
|
||||
"outerColor": [54,72,72],
|
||||
"innerColor": [246,205,137],
|
||||
"unique": "GREAT_WARPATH",
|
||||
"uniqueName": "The Great Warpath",
|
||||
"uniques": ["All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel."],
|
||||
"cities": ["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River",
|
||||
@ -456,7 +440,6 @@
|
||||
"tradeRequest": "In my endless magnanimity, I am making you this offer. You agree, of course?",
|
||||
"outerColor": [153,5,3],
|
||||
"innerColor": [244,232,54],
|
||||
"unique": "ACHAEMENID_LEGACY",
|
||||
"uniqueName": "Achaemenid Legacy",
|
||||
"uniques": ["Golden Age length increases +50%", "+1 Movement for all units during Golden Age", "+10% Strength for all units during Golden Age"],
|
||||
"cities": ["Persepolis","Parsagadae","Susa","Ecbatana","Tarsus","Gordium","Bactra","Sardis","Ergili","Dariushkabir",
|
||||
@ -485,7 +468,6 @@
|
||||
"tradeRequest": "Come, let our people feast together!",
|
||||
"outerColor": [225,105,0],
|
||||
"innerColor": [255,255,78],
|
||||
"unique": "WAYFINDING",
|
||||
"uniqueName": "Wayfinding",
|
||||
"uniques": ["Can embark and move over Coasts and Oceans immediately", "+1 Sight when embarked", "+[10]% Strength if within 2 tiles of a [Moai]"],
|
||||
"cities": ["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui",
|
||||
@ -511,7 +493,6 @@
|
||||
"tradeRequest": "Greetings. I believe this is a fair proposal for both parties. What do you think?",
|
||||
"outerColor": [228,208,43],
|
||||
"innerColor": [193,21,17],
|
||||
"unique": "FATHER_GOVERNS_CHILDREN",
|
||||
"uniqueName": "Father Governs Children",
|
||||
"uniques": ["Food and Culture from Friendly City-States are increased by 50%"],
|
||||
"cities": ["Sukhothai","Si Satchanalai","Muang Saluang","Lampang","Phitsanulok","Kamphaeng Pet","Nakhom Chum","Vientiane",
|
||||
@ -537,7 +518,6 @@
|
||||
"tradeRequest": "I hope this deal will receive your blessing.",
|
||||
"outerColor": [102,0,0],
|
||||
"innerColor": [255,102,102],
|
||||
"unique": "SEVEN_CITIES_OF_GOLD",
|
||||
"uniqueName": "Seven Cities of Gold",
|
||||
"uniques": ["100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it)",
|
||||
"Double Happiness from Natural Wonders", "Tile yields from Natural Wonders doubled"],
|
||||
@ -564,7 +544,6 @@
|
||||
"tradeRequest": "Can I interest you in this deal?",
|
||||
"outerColor": [214,145,19],
|
||||
"innerColor": [90,0,10],
|
||||
"unique": "RIVER_WARLORD",
|
||||
"uniqueName": "River Warlord",
|
||||
"uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Embarked units can defend themselves"],
|
||||
"cities": ["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu",
|
||||
@ -589,7 +568,6 @@
|
||||
"tradeRequest": "I am not always this generous, but we hope you take this rare opportunity we give you.",
|
||||
"outerColor": [81,0,9],
|
||||
"innerColor": [255,120,0],
|
||||
"unique": "MONGOL_TERROR",
|
||||
"uniqueName": "Mongol Terror",
|
||||
"uniques": ["+30% Strength when fighting City-State units and cities", "+[1] Movement for all [Mounted] units"],
|
||||
"cities": ["Karakorum","Beshbalik","Turfan","Hsia","Old Sarai","New Sarai","Tabriz","Tiflis","Otrar","Sanchu","Kazan",
|
||||
@ -617,7 +595,6 @@
|
||||
"tradeRequest": " Accept this agreement or suffer the consequences.",
|
||||
"outerColor": [255,51,51],
|
||||
"innerColor": [153,255,255],
|
||||
"unique": "SACRIFICIAL_CAPTIVES",
|
||||
"cities": ["Tenochtitlan","Teotihuacan","Tlatelolco","Texcoco","Tlaxcala","Calixtlahuaca","Xochicalco","Tlacopan",
|
||||
"Atzcapotzalco","Tzintzuntzan","Malinalco","Tula","Tamuin","Teayo","Cempoala","Chalco","Tlalmanalco",
|
||||
"Ixtapaluca","Huexotla","Tepexpan","Tepetlaoxtoc","Chiconautla","Zitlaltepec","Coyotepec","Tequixquiac",
|
||||
@ -655,7 +632,6 @@
|
||||
|
||||
"outerColor": [253,245,155],
|
||||
"innerColor": [4,144,95],
|
||||
"unique": "GREAT_ANDEAN_ROAD",
|
||||
"uniqueName": "Great Andean Road",
|
||||
"uniques": ["Units ignore terrain costs when moving into any tile with Hills", "50% Maintenance costs reduction",
|
||||
"No Maintenance costs for improvements in Hills"],
|
||||
@ -682,7 +658,6 @@
|
||||
"tradeRequest": "This is a fine deal! Even a drunk beggar would agree!",
|
||||
"outerColor": [51,25,0],
|
||||
"innerColor": [255,255,102],
|
||||
"unique": "VIKING_FURY",
|
||||
"uniqueName": "Viking Fury",
|
||||
"uniques": ["+1 Movement for all embarked units", "Units pay only 1 movement point to embark and disembark",
|
||||
"Melee units pay no movement cost to pillage"],
|
||||
@ -711,7 +686,6 @@
|
||||
"hateHello": "Oh, it is you.",
|
||||
"tradeRequest": "My friend, it is my belief that this settlement can benefit both our peoples.",
|
||||
"innerColor": [194,97,255]
|
||||
"unique": "LION_OF_THE_NORTH",
|
||||
"cities": ["StockHolm","Malmo","Gothenburg","Visby","Upssala","Umea","Lund","Kiruna","Helsingborg",
|
||||
"Orebro","Vasteras","Linkoping","Norrkoping","Gavle","Karlskrona","Halmstad","Karlstad","Vaxjo",
|
||||
"Copenhagen","Jonkoping",Boras",]
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
package com.unciv
|
||||
|
||||
enum class UniqueAbility(val description: String, val displayName: String) {
|
||||
GREAT_EXPANSE("Founded cities start with additional territory, Units receive a combat bonus when fighting within their own territory (+15% unit strength)", "Great Expanse"),
|
||||
INGENUITY("Receive free Great Scientist when you discover Writing, Earn Great Scientists 50% faster", "Ingenuity"),
|
||||
HELLENIC_LEAGUE("City-State Influence degrades at half and recovers at twice the normal rate", "Hellenic League"),
|
||||
ART_OF_WAR("Great general provides double combat bonus, and spawns 50% faster", "Art of War"),
|
||||
MONUMENT_BUILDERS("+20% production towards Wonder construction", "Monument Builders"),
|
||||
SUN_NEVER_SETS("+2 movement for all naval units", "Sun Never Sets"),
|
||||
ANCIEN_REGIME("+2 Culture per turn from cities before discovering Steam Power", "Ancien Régime"),
|
||||
SIBERIAN_RICHES("Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity", "Siberian Riches"),
|
||||
GLORY_OF_ROME("+25% Production towards any buildings that already exist in the Capital", "The Glory of Rome"),
|
||||
TRADE_CARAVANS("+1 Gold from each Trade Route, Oil resources provide double quantity", "Trade Caravans"),
|
||||
MANIFEST_DESTINY("All land military units have +1 sight, 50% discount when purchasing tiles", "Manifest Destiny"),
|
||||
BUSHIDO("Units fight as though they were at full strength even when damaged", "Bushido"),
|
||||
FUROR_TEUTONICUS("67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment, -25% land units maintenance.", "Furor Teutonicus"),
|
||||
BARBARY_CORSAIRS("Pay only one third the usual cost for naval unit maintenance. Melee naval units have a 1/3 chance to capture defeated naval units.", "Barbary Corsairs"),
|
||||
SCHOLARS_OF_THE_JADE_HALL("+2 Science for all specialists and Great Person tile improvements", "Scholars of the Jade Hall"),
|
||||
GREAT_WARPATH("All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel.", "The Great Warpath"),
|
||||
ACHAEMENID_LEGACY("Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength", "Achaemenid Legacy"),
|
||||
WAYFINDING("Can embark and move over Coasts and Oceans immediately. +1 Sight when embarked. +10% Combat Strength bonus if within 2 tiles of a Moai.", "Wayfinding"),
|
||||
FATHER_GOVERNS_CHILDREN("Food and Culture from Friendly City-States are increased by 50%", "Father Governs Children"),
|
||||
SEVEN_CITIES_OF_GOLD("100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it). Culture, Happiness and tile yields from Natural Wonders doubled.", "Seven Cities of Gold"),
|
||||
RIVER_WARLORD("Receive triple Gold from Barbarian encampments and pillaging Cities. Embarked units can defend themselves.", "River Warlord"),
|
||||
MONGOL_TERROR("Strength +30% when fighting City-State units or attacking a City-State itself. All mounted units have +1 Movement.", "Mongol Terror"),
|
||||
SACRIFICIAL_CAPTIVES("Gain Culture for the empire from each enemy unit killed.", "Sacrificial Captives"),
|
||||
GREAT_ANDEAN_ROAD("Units ignore terrain costs when moving into any tile with Hills. No maintenance costs for improvements in Hills; half cost elsewhere.", "Great Andean Road"),
|
||||
VIKING_FURY("+1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage.", "Viking Fury"),
|
||||
LION_OF_THE_NORTH("Gain 90 Influence with a Great Person gift to a City-State,When declaring friendship, Sweden and their friend gain a +10% boost to Great Person generation", "The Lion of the North"),
|
||||
POPULATION_GROWTH("Unhappiness from number of Cities doubled, Unhappiness from number of Citizens halved.", "Population Growth")
|
||||
}
|
||||
@ -2,7 +2,6 @@ package com.unciv.models.ruleset
|
||||
|
||||
import com.badlogic.gdx.graphics.Color
|
||||
import com.unciv.Constants
|
||||
import com.unciv.UniqueAbility
|
||||
import com.unciv.logic.civilization.CityStateType
|
||||
import com.unciv.models.stats.INamed
|
||||
import com.unciv.models.translations.Translations
|
||||
@ -36,7 +35,6 @@ class Nation : INamed {
|
||||
var hateHello = ""
|
||||
|
||||
lateinit var outerColor: List<Int>
|
||||
var unique: UniqueAbility? = null
|
||||
var uniqueName = ""
|
||||
var uniques = HashSet<String>()
|
||||
val uniqueObjects: List<Unique> by lazy { uniques.map { Unique(it) } }
|
||||
@ -91,17 +89,11 @@ class Nation : INamed {
|
||||
textList += getLeaderDisplayName().tr()
|
||||
textList += ""
|
||||
}
|
||||
if (unique != null) {
|
||||
textList += unique!!.displayName.tr() + ":"
|
||||
textList += " " + unique!!.description.tr()
|
||||
|
||||
textList += ""
|
||||
}
|
||||
else {
|
||||
if (uniqueName != "") textList += uniqueName.tr() + ":"
|
||||
textList += " " + uniques.joinToString(", ").tr()
|
||||
textList += ""
|
||||
}
|
||||
if (uniqueName != "") textList += uniqueName.tr() + ":"
|
||||
textList += " " + uniques.joinToString(", ").tr()
|
||||
textList += ""
|
||||
|
||||
if (startBias.isNotEmpty()) {
|
||||
textList += "Start bias:".tr() + startBias.joinToString(", ", " ") { it.tr() }
|
||||
textList += ""
|
||||
|
||||
Reference in New Issue
Block a user