This commit is contained in:
Yair Morgenstern 2022-05-22 20:40:51 +03:00
parent 39adaed6b1
commit 6836038252
34 changed files with 305 additions and 644 deletions

View File

@ -1132,17 +1132,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Por favor coloque um novo nome para sua cidade
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -1295,17 +1295,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1052,17 +1052,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Zadejte nové jméno pro město
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -1051,17 +1051,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Vul een nieuwe naam voor je stad in
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -1801,17 +1801,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1072,17 +1072,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Mangyaring maglagay ng bagong pangalan para sa iyong lungsod
Please select a tile for this building's [improvement] = Mangyaring pumili ng tile para sa [improvement] ng gusali

View File

@ -1219,17 +1219,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -970,17 +970,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Veuillez entrer un nouveau nom pour votre ville
Please select a tile for this building's [improvement] = Veuillez sélectionner une case pour la construction de [improvement]

View File

@ -970,17 +970,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Bitte gib einen neuen Namen für deine Stadt ein
Please select a tile for this building's [improvement] = Bitte wähle ein Feld für [improvement] dieses Gebäudes

View File

@ -1506,17 +1506,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1277,17 +1277,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -970,17 +970,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Silakan masukkan nama baru untuk kotamu
Please select a tile for this building's [improvement] = Silakan memilih daerah untuk [improvement] bangunan ini

View File

@ -974,17 +974,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Digita un nuovo nome per la tua città
Please select a tile for this building's [improvement] = Scegli una casella per il miglioramento [improvement] per questo edificio

View File

@ -1065,17 +1065,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = 都市の新しい名前を入力
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -999,17 +999,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = 도시 새 이름 입력
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -1310,17 +1310,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1210,17 +1210,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1333,17 +1333,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1330,17 +1330,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1054,17 +1054,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Podaj nowe imię dla twojego miasta
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -1170,17 +1170,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -979,17 +979,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Vă rugăm să introduceți un nume nou pentru orașul dvs
Please select a tile for this building's [improvement] = Vă rugăm să selectați o placă pentru [improvement] acestei clădiri

View File

@ -972,17 +972,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Пожалуйста, введите новое название для вашего города
Please select a tile for this building's [improvement] = Пожалуйста, выберите клетку для этого улучшения [improvement]

View File

@ -973,17 +973,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = 请输入城市的新名称
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -971,17 +971,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Por favor introduce un nuevo nombre para tu ciudad
Please select a tile for this building's [improvement] = Por favor, selecciona una casilla para la mejora [improvement] de este edificio

View File

@ -1073,17 +1073,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Ange ett nytt namn för din stad
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -1237,17 +1237,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
# Requires translation!
Please enter a new name for your city =
# Requires translation!

View File

@ -1109,17 +1109,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Lütfen şehrinize yeni bir ad girin
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -973,17 +973,7 @@ Avoid Growth =
# Requires translation!
Default Focus =
# Requires translation!
Food Focus =
# Requires translation!
Production Focus =
# Requires translation!
Gold Focus =
# Requires translation!
Science Focus =
# Requires translation!
Culture Focus =
# Requires translation!
Happiness Focus =
[stat] Focus =
Please enter a new name for your city = Вкажіть нову назву міста
# Requires translation!
Please select a tile for this building's [improvement] =

View File

@ -14,7 +14,7 @@ Spanish = 99
Malay = 27
Brazilian_Portuguese = 54
Traditional_Chinese = 64
Polish = 73
Polish = 74
Lithuanian = 16
Romanian = 63
Simplified_Chinese = 99

View File

@ -964,12 +964,7 @@ Reset Citizens =
Citizen Management =
Avoid Growth =
Default Focus =
Food Focus =
Production Focus =
Gold Focus =
Science Focus =
Culture Focus =
Happiness Focus =
[stat] Focus =
Please enter a new name for your city =
Please select a tile for this building's [improvement] =

File diff suppressed because it is too large Load Diff

View File

@ -40,11 +40,11 @@ enum class CityFocus(val label: String, val tableEnabled: Boolean, val stat: Sta
NoFocus("Default Focus", true, null) {
override fun getStatMultiplier(stat: Stat) = 1f // actually redundant, but that's two steps to see
},
FoodFocus("${Stat.Food.name} Focus", true, Stat.Food),
ProductionFocus("${Stat.Production.name} Focus", true, Stat.Production),
GoldFocus("${Stat.Gold.name} Focus", true, Stat.Gold),
ScienceFocus("${Stat.Science.name} Focus", true, Stat.Science),
CultureFocus("${Stat.Culture.name} Focus", true, Stat.Culture),
FoodFocus("[${Stat.Food.name}] Focus", true, Stat.Food),
ProductionFocus("[${Stat.Production.name}] Focus", true, Stat.Production),
GoldFocus("[${Stat.Gold.name}] Focus", true, Stat.Gold),
ScienceFocus("[${Stat.Science.name}] Focus", true, Stat.Science),
CultureFocus("[${Stat.Culture.name}] Focus", true, Stat.Culture),
GoldGrowthFocus("Gold Growth Focus", false) {
override fun getStatMultiplier(stat: Stat) = when (stat) {
Stat.Gold, Stat.Food -> 2f
@ -57,8 +57,8 @@ enum class CityFocus(val label: String, val tableEnabled: Boolean, val stat: Sta
else -> 1f
}
},
FaithFocus("${Stat.Faith.name} Focus", true, Stat.Faith),
HappinessFocus("${Stat.Happiness.name} Focus", false, Stat.Happiness);
FaithFocus("[${Stat.Faith.name}] Focus", true, Stat.Faith),
HappinessFocus("[${Stat.Happiness.name}] Focus", false, Stat.Happiness);
//GreatPersonFocus;
open fun getStatMultiplier(stat: Stat) = when (this.stat) {
@ -97,14 +97,14 @@ class CityInfo {
@Transient
// This is so that military units can enter the city, even before we decide what to do with it
var hasJustBeenConquered = false
var hasJustBeenConquered = false
var location: Vector2 = Vector2.Zero
var id: String = UUID.randomUUID().toString()
var name: String = ""
var foundingCiv = ""
// This is so that cities in resistance that are recaptured aren't in resistance anymore
var previousOwner = ""
var previousOwner = ""
var turnAcquired = 0
var health = 200
@ -399,9 +399,9 @@ class CityInfo {
val amount = getTileResourceAmount(tileInfo) * civInfo.getResourceModifier(resource)
if (amount > 0) cityResources.add(resource, amount, "Tiles")
}
for (tileInfo in getTiles()) {
val stateForConditionals = StateForConditionals(civInfo, this, tile = tileInfo)
if (tileInfo.improvement == null) continue
@ -439,8 +439,8 @@ class CityInfo {
val resource = getRuleset().tileResources[unique.params[1]]
if (resource != null) {
cityResources.add(
resource,
unique.params[0].toInt() * civInfo.getResourceModifier(resource),
resource,
unique.params[0].toInt() * civInfo.getResourceModifier(resource),
"Buildings+"
)
}
@ -505,7 +505,7 @@ class CityInfo {
if (!isStarving()) return null
return population.foodStored / -foodForNextTurn() + 1
}
fun containsBuildingUnique(uniqueType: UniqueType) =
cityConstructions.getBuiltBuildings().flatMap { it.uniqueObjects }.any { it.isOfType(uniqueType) }
@ -530,7 +530,7 @@ class CityInfo {
}
return allGppPercentageBonus
}
fun getGreatPersonPointsForNextTurn(): HashMap<String, Counter<String>> {
val sourceToGPP = HashMap<String, Counter<String>>()
@ -616,7 +616,7 @@ class CityInfo {
.mapNotNull { it.getOwner()?.civName }
.toSet()
}
//endregion
//region state-changing functions
@ -637,7 +637,7 @@ class CityInfo {
// so they won't be generated out in the open and vulnerable to enemy attacks before you can control them
cityConstructions.constructIfEnough()
cityConstructions.addFreeBuildings()
cityStats.update()
tryUpdateRoadStatus()
attackedThisTurn = false
@ -696,7 +696,7 @@ class CityInfo {
fun removeFlag(flag: CityFlags) {
flagsCountdown.remove(flag.name)
}
fun resetWLTKD() {
// Removes the flags for we love the king & resource demand
// The resource demand flag will automatically be readded with 15 turns remaining, see startTurn()
@ -881,7 +881,7 @@ class CityInfo {
.filter { it.isMajorCiv() && it != civInfo }
.flatMap { it.cities }
.filter { it.getCenterTile().aerialDistanceTo(getCenterTile()) <= 6 }
val civsWithCloseCities =
val civsWithCloseCities =
citiesWithin6Tiles
.map { it.civInfo }
.distinct()

View File

@ -1,40 +1,18 @@
welp these tests kind of existed before
Added test that improvements can be built on their tiles
4.1.1-patch2
4.1.1-patch1
By Azzurite:
- Refactor: change GameSaver from singleton to single instance pattern & move autosave logic into GameSaver
- Fix multiplayer turn checker potentially stopping turn checks for everyone that plays that game if a file was not found remotely
- Initial Event Bus implementation & Event-based multiplayer updates
- Fix screens not correctly being dispose()d
- Refactor: Split options into multiple files
- Fix images not being able to have their size set
- Refactor: Extract PickerPane from PickerScreen
- Fix turn check worker exception
Fixed multiplayer bugs (double files, turn checker problems) - By Azzurite
By SomeTroglodyte:
- Fix Autocracy Complete including unit test
- Refactor UncivShowableException
- Fix effect of new Beliefs not immediately visible in top bar
- Unify editor style settings
- SimpleHttp gets a connection timeout
- Build warnings cleanup
- Fix Autocracy Complete bug
- Fix effect of new Beliefs not immediately visible
Fix crashes when a civ does not have a capital - By OptimizedForDensity
Fix crashes when a civ does not have a capital - By OptimizedForDensity
By xlenstra:
- Added more unit tests for uniques; added missing unique implementations
- Fixed a bug blocking special improvements on removable terrain features
- Great improvements buildable on removable terrain features
By itanasi:
- Fix Zone of Control
- Assign Population Improvements
- Add more comments on Editor Settings
- Fix Zone of Control
- Assign Population Improvements
By JackRainy:
- A lot of smaller code/performance improvements
- Correct check for the city connection quest
- Performance improvements
- Better city connection quest check