Excess settler food to production conversion moved to CityStats, solving the "0 production for settler" bug and also it's now displayed in the stats breakdown =)
This commit is contained in:
Yair Morgenstern
parent
fc2286dfe3
commit
7abd0143c6
6 changed files with 17 additions and 71 deletions
|
|
@ -2,31 +2,18 @@
|
|||
# Tutorial tasks
|
||||
|
||||
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = Eine Einheit bewegen!\nKlicke auf eine Einheit > Klicke auf ein Ziel > Klicke auf das Pfeil-Popup.
|
||||
|
||||
Found a city!\nSelect the Settler (flag unit) > Click on 'Found city' (bottom-left corner) = Eine Stadt gründen!\nWähle den Siedler (Flaggensymbol) > Klicke auf 'Stadt gründen' (unten links).
|
||||
|
||||
Enter the city screen!\nClick the city button twice = Öffne den Stadtbildschirm!\n Klicke zweimal den Stadtknopf.
|
||||
|
||||
Pick a technology to research!\nClick on the tech button (greenish, top left) > \n select technology > click 'Research' (bottom right) = Wähle eine Technologie zum Erforschen!\nKlicke auf den Tech-Button (grünlich, oben links) > \n wähle Technologie > klicke auf 'Forschung' (unten rechts).
|
||||
|
||||
Pick a construction!\nEnter city screen > Click on a unit or building (left side) = Wähle eine Konstruktion!\nÖffne den Stadtbildschirm > Klicke auf eine Einheit oder ein Gebäude (linke Seite)
|
||||
|
||||
Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = Beende eine Runde!\nGehe durch die Einheiten mit 'Nächste Einheit' > Klicke auf 'Nächste Runde'.
|
||||
|
||||
Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population = Weise bearbeitete Felder neu zu!\nÖffne den Stadtbildschirm > klicke auf das zugewiesene (grüne) Feld, um es zu entfernen > \n klicke auf ein nicht zugewiesenes Feld, um die Bevölkerungszahl zuzuweisen.
|
||||
|
||||
Meet another civilization!\nExplore the map until you encounter another civilization! = Triff eine andere Zivilisation!\n Erkunde die Karte, bis du einer anderen Zivilisation begegnest!
|
||||
|
||||
Open the options table!\nClick the menu button (top left) > click 'Options' = Öffne die Optionen!\nKlicke auf die Menütaste (oben links) > klicke auf 'Optionen'.
|
||||
|
||||
Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Choose 'Create improvement' > Choose the farm > \n Leave the worker there until it's finished = Baue eine Verbesserung!\nBaue eine Arbeitereinheit > Bewege sie auf eine Ebene oder ein Grünland feld > \n Wähle 'Verbesserung bauen' > Wähle 'Farm' > \n Lasse den Arbeiter dort, bis er fertig ist.
|
||||
|
||||
Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = Erstelle eine Handelsroute!\n Baue Straßen zwischen deiner Hauptstadt und einer anderen Stadt.\nOder automatisiere deinen Arbeiter und lasse sie schließlich dazu kommen.
|
||||
|
||||
Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = Erobere eine Stadt!\nBringe eine feindliche Stadt auf wenig leben > \nBetrete die Stadt mit einer Nahkampfeinheit.
|
||||
|
||||
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Bewege eine Lufteinheit!\nWähle eine Lufteinheit > Wähle eine andere Stadt in Reichweite > \nVerschiebe die Einheit zu der anderen Stadt.
|
||||
|
||||
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Schaue deine Statistiken an!\nGehe in den Übersichtsbildschirm (obere rechte Ecke) >\nKlicke auf 'Statistiken'.
|
||||
|
||||
# Buildings
|
||||
|
|
|
|||
|
|
@ -1,34 +1,20 @@
|
|||
|
||||
# Tutorial tasks
|
||||
|
||||
# Requires translation!
|
||||
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = Sposta un'unità!\nClicca su un'unità > Clicca su una destinazione > Clicca sul popup con la freccia
|
||||
# Requires translation!
|
||||
Found a city!\nSelect the Settler (flag unit) > Click on 'Found city' (bottom-left corner) = Fonda una Città!\nSeleziona il Colono (l'icona con la bandiera) > Clicca su 'Fonda Città' (angolo in basso a sinistra)
|
||||
# Requires translation!
|
||||
Enter the city screen!\nClick the city button twice = Entra nella schermata cittadina!\nClicca due volte sul tasto.
|
||||
# Requires translation!
|
||||
Pick a technology to research!\nClick on the tech button (greenish, top left) > \n select technology > click 'Research' (bottom right) = Ricerca una tecnologia!\nClicca sul tasto tecnologia (verdognolo, in alto a sinistra) > \nScegli una tecnologia > Clicca su 'Ricerca' (in basso a destra)
|
||||
# Requires translation!
|
||||
Pick a construction!\nEnter city screen > Click on a unit or building (left side) = Scegli una costruzione\nEntra nella schermata cittadina > Clicca su un'unità o un edificio (lato sinistro)
|
||||
# Requires translation!
|
||||
Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = Termina il turno!\nClicca su 'Prossima unità' varie volte > Clicca su 'Prossimo turno'
|
||||
# Requires translation!
|
||||
Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population =
|
||||
Riorganizza le caselle sfruttate!\nEntra nella schermata cittadina > Clicca sulla casella sfruttata (icona abitante verde chiaro) per lasciarla libera > \n Clicca su una casella non sfruttata per assegnarle un abitante.
|
||||
# Requires translation!
|
||||
Meet another civilization!\nExplore the map until you encounter another civilization! = Incontra un'altra civiltà!\nEsplora la mappa finché non incontri un'altra civiltà.
|
||||
# Requires translation!
|
||||
Open the options table!\nClick the menu button (top left) > click 'Options' = Apri il menu delle opzioni!\nClicca sul tasto menu (in altro a sinistra) > Clicca su 'Opzioni'.
|
||||
# Requires translation!
|
||||
Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Choose 'Create improvement' > Choose the farm > \n Leave the worker there until it's finished = Costruisci un miglioramento!\nCostruisci un Lavoratore > Spostalo su una Pianura o su una Prateria > \n Scegli 'Costruisci miglioramento' > Scegli 'Fattoria' > \n Lascia lì il Lavoratore finché non ha finito.
|
||||
# Requires translation!
|
||||
Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = Crea una rotta commerciale!\nCostruisci una strada tra la tua capitale e un'altra città.\nProva ad automatizzare un Lavoratore perché lo faccia.
|
||||
# Requires translation!
|
||||
Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = Conquista una città!\nPorta a zero la salute di una Città appartenente al nemico > \nEntra nella Città con un'unità da mischia.
|
||||
# Requires translation!
|
||||
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Sposta un'unità aerea!\nSeleziona un'unità aerea > Seleziona un'altra Città nel suo raggio > \nSposta l'unità in quell'altra Città.
|
||||
# Requires translation!
|
||||
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Visualizza le tue statistiche!\nEntra nella tua schermata Panoramica (in alto a sinistra)\nClicca su 'Statistiche'
|
||||
|
||||
# Buildings
|
||||
|
|
@ -705,7 +691,6 @@ Landing = Atterraggio
|
|||
Flanking = Attacco ai fianchi
|
||||
vs [unitType] = contro [unitType]
|
||||
Terrain = Terreno
|
||||
# Requires translation!
|
||||
Hurry Research = Accelera icerca
|
||||
Conduct Trade Mission = Conduci missione commerciale
|
||||
Your trade mission to [civName] has earned you [goldAmount] gold and [influenceAmount] influence! = La tua missione commerciale con [civName] ti ha fruttato [goldAmount] Oro e [influenceAmount] Influenza!
|
||||
|
|
@ -1330,7 +1315,6 @@ Unbuildable = Non costruibile
|
|||
Can start an 8-turn golden age = Può avviare un'Età dell'Oro di 8 turni
|
||||
Can build improvement: Landmark = Può costruire il miglioramento: Punto di riferimento
|
||||
Great Scientist = Grande Scienziato
|
||||
# Requires translation!
|
||||
Can hurry technology research = Può accelerare la ricerca tecnologica
|
||||
Can build improvement: Academy = Può costruire il miglioramento: Accademia
|
||||
Great Merchant = Grande Mercante
|
||||
|
|
|
|||
|
|
@ -578,23 +578,15 @@ We have lost alliance with [nation]. = Nie jesteśmy już w sojuszu z [nation].
|
|||
Working... =
|
||||
# Requires translation!
|
||||
Waiting for other players... =
|
||||
# Requires translation!
|
||||
in = w
|
||||
# Requires translation!
|
||||
Next turn = Następna tura
|
||||
# Requires translation!
|
||||
Turn = Tura
|
||||
# Requires translation!
|
||||
turns = tury
|
||||
# Requires translation!
|
||||
turn = tura
|
||||
# Requires translation!
|
||||
Next unit = Następna jednostka
|
||||
# Requires translation!
|
||||
Pick a policy =
|
||||
# Requires translation!
|
||||
Movement = Ruch
|
||||
# Requires translation!
|
||||
Strength = Siła
|
||||
# Requires translation!
|
||||
Ranged strength =
|
||||
|
|
@ -647,7 +639,6 @@ GOLDEN AGE = ZŁOTA ERA
|
|||
Golden Age = Złota era
|
||||
[year] BC = [year] p.n.e
|
||||
[year] AD = [year] n.e
|
||||
# I can't think of any specific translation here / Requires translation
|
||||
Civilopedia = Civilopedia
|
||||
Start new game = Rozpocznij nową grę
|
||||
Save game = Zapisz grę
|
||||
|
|
@ -698,7 +689,7 @@ Growth bonus =
|
|||
# Requires translation!
|
||||
Unassigned population =
|
||||
# Requires translation!
|
||||
[turnsToExpansion] turns to expansion =
|
||||
[turnsToExpansion] turns to expansion =
|
||||
# Requires translation!
|
||||
Stopped expansion =
|
||||
# Requires translation!
|
||||
|
|
@ -1377,7 +1368,6 @@ Electricity =
|
|||
Steam Power =
|
||||
# Requires translation!
|
||||
'The nations of the West hope that by means of steam communication all the world will become as one family.' - Townsend Harris =
|
||||
# Requires translation!
|
||||
Dynamite = Dynamit
|
||||
# Requires translation!
|
||||
'As soon as men decide that all means are permitted to fight an evil, then their good becomes indistinguishable from the evil that they set out to destroy.' - Christopher Dawson =
|
||||
|
|
@ -1397,7 +1387,7 @@ Combustion =
|
|||
# Requires translation!
|
||||
Plastics =
|
||||
# Requires translation!
|
||||
'Ben, I want to say one word to you, just one word: plastics.' - Buck Henry and Calder Willingham, The Graduate =
|
||||
'Ben, I want to say one word to you, just one word: plastics.' - Buck Henry and Calder Willingham, The Graduate =
|
||||
Electronics = Elektronika
|
||||
# Requires translation!
|
||||
'There's a basic principle about consumer electronics: it gets more powerful all the time and it gets cheaper all the time.' - Trip Hawkins =
|
||||
|
|
@ -1422,7 +1412,6 @@ Radar = Radar
|
|||
Atomic Theory =
|
||||
# Requires translation!
|
||||
'The unleashed power of the atom has changed everything save our modes of thinking, and we thus drift toward unparalleled catastrophes.' - Albert Einstein =
|
||||
# Requires translation!
|
||||
Computers = Komputery
|
||||
# Requires translation!
|
||||
'Computers are like Old Testament gods: lots of rules and no mercy.' - Joseph Campbell =
|
||||
|
|
@ -1438,7 +1427,6 @@ Combined Arms =
|
|||
Nuclear Fission =
|
||||
# Requires translation!
|
||||
'I am become Death, the destroyer of worlds.' - J. Robert Oppenheimer =
|
||||
# Requires translation!
|
||||
Ecology = Ekologia
|
||||
# Requires translation!
|
||||
'Only within the moment of time represented by the present century has one species, man, acquired significant power to alter the nature of his world.' - Rachel Carson =
|
||||
|
|
@ -1511,9 +1499,7 @@ Future era =
|
|||
Grassland =
|
||||
# Requires translation!
|
||||
Plains =
|
||||
# Requires translation!
|
||||
Tundra = Tundra
|
||||
# Requires translation!
|
||||
Desert = Pustynia
|
||||
# Requires translation!
|
||||
Lakes =
|
||||
|
|
@ -1521,9 +1507,7 @@ Lakes =
|
|||
Hill =
|
||||
# Requires translation!
|
||||
Mountain =
|
||||
# Requires translation!
|
||||
Forest = Las
|
||||
# Requires translation!
|
||||
Jungle = Dżungla
|
||||
# Requires translation!
|
||||
Marsh =
|
||||
|
|
@ -1535,7 +1519,6 @@ Oasis =
|
|||
Snow =
|
||||
# Requires translation!
|
||||
Coast =
|
||||
# Requires translation!
|
||||
Ocean = Ocean
|
||||
# Requires translation!
|
||||
Flood plains =
|
||||
|
|
|
|||
|
|
@ -1,35 +1,21 @@
|
|||
|
||||
# Tutorial tasks
|
||||
|
||||
# Requires translation!
|
||||
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = 移動你的人民!\點擊一個單位 > 點擊其目的地 > 點擊確認箭頭前進
|
||||
# Requires translation!
|
||||
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = 移動你的人民!\n點擊一個單位 > 點擊其目的地 > 點擊確認箭頭前進
|
||||
Found a city!\nSelect the Settler (flag unit) > Click on 'Found city' (bottom-left corner) = 建立你的首都!\n選取移民(旗子圖樣單位) > 點擊"建立首都"(螢幕左下角)
|
||||
# Requires translation!
|
||||
Enter the city screen!\nClick the city button twice = 進入城市介面!\n點擊城市兩下
|
||||
# Requires translation!
|
||||
Pick a technology to research!\nClick on the tech button (greenish, top left) > \n select technology > click 'Research' (bottom right) =
|
||||
選一個科技開始研究!\n點擊科技按鈕(左上方,綠色按鈕) > \n選擇一個科技 > 點擊"開始研究" (右下角)
|
||||
# Requires translation!
|
||||
Pick a technology to research!\nClick on the tech button (greenish, top left) > \n select technology > click 'Research' (bottom right) = 選一個科技開始研究!\n點擊科技按鈕(左上方,綠色按鈕) > \n選擇一個科技 > 點擊"開始研究" (右下角)
|
||||
Pick a construction!\nEnter city screen > Click on a unit or building (left side) = 選一個設施開始建造!\n進入城市介面 > 點擊一個單位或建築 (畫面左邊)
|
||||
# Requires translation!
|
||||
Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = 跳過一回合!\n用"下一個單位"來循環你的單位 > 點擊"下一回合"
|
||||
# Requires translation!
|
||||
Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population =
|
||||
重新分配勞動人口!\n進入城市介面 > 點擊已被分配勞力的領域已取消分配 > \n 接著點擊未被分配勞力的領域已分配勞動人口
|
||||
# Requires translation!
|
||||
Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population = 重新分配勞動人口!\n進入城市介面 > 點擊已被分配勞力的領域已取消分配 > \n 接著點擊未被分配勞力的領域已分配勞動人口
|
||||
Meet another civilization!\nExplore the map until you encounter another civilization! = 認識其他文明!\n探險地圖直到你遇見令一個文明!
|
||||
# Requires translation!
|
||||
Open the options table!\nClick the menu button (top left) > click 'Options' = 打開選項列表!\n點擊主畫面(左上角按鈕) > 典籍"選項"
|
||||
# Requires translation!
|
||||
Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Choose 'Create improvement' > Choose the farm > \n Leave the worker there until it's finished =
|
||||
# Requires translation!
|
||||
Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually =
|
||||
# Requires translation!
|
||||
Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = 佔領一座城市!\n攻擊敵方城市直到血量為零 > \n用近戰單位進入城市
|
||||
# Requires translation!
|
||||
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = 移動你的空中單位!\n選取一個空中單位 > 選取一個範圍內的城市 > \n將單位移至此城市
|
||||
# Requires translation!
|
||||
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = 看看你的數據分析!\n進入蓋覽介面(右上角按鈕) > \n點擊"遊戲數據"
|
||||
|
||||
# Buildings
|
||||
|
|
|
|||
|
|
@ -276,10 +276,6 @@ class CityInfo {
|
|||
|
||||
fun endTurn() {
|
||||
val stats = cityStats.currentCityStats
|
||||
if (cityConstructions.currentConstruction == Constants.settler && stats.food > 0) {
|
||||
stats.production += stats.food
|
||||
stats.food = 0f
|
||||
}
|
||||
|
||||
cityConstructions.endTurn(stats)
|
||||
expansion.nextTurn(stats.culture)
|
||||
|
|
|
|||
|
|
@ -450,8 +450,12 @@ class CityStats {
|
|||
totalFood = newFinalStatList.values.map { it.food }.sum() // recalculate because of previous change
|
||||
|
||||
// Since growth bonuses are special, (applied afterwards) they will be displayed separately in the user interface as well.
|
||||
val foodFromGrowthBonuses = getGrowthBonusFromPolicies() * totalFood
|
||||
newFinalStatList["Policies"]!!.food += foodFromGrowthBonuses
|
||||
if(totalFood>0) {
|
||||
val foodFromGrowthBonuses = getGrowthBonusFromPolicies() * totalFood
|
||||
newFinalStatList["Policies"]!!.food += foodFromGrowthBonuses
|
||||
totalFood = newFinalStatList.values.map { it.food }.sum() // recalculate again
|
||||
}
|
||||
|
||||
|
||||
// Same here - will have a different UI display.
|
||||
var buildingsMaintenance = cityInfo.cityConstructions.getMaintenanceCosts().toFloat() // this is AFTER the bonus calculation!
|
||||
|
|
@ -460,6 +464,12 @@ class CityStats {
|
|||
}
|
||||
newFinalStatList["Maintenance"] = Stats().apply { gold -= buildingsMaintenance.toInt() }
|
||||
|
||||
|
||||
if (cityInfo.cityConstructions.currentConstruction == Constants.settler && totalFood > 0) {
|
||||
newFinalStatList["Excess food to production"] =
|
||||
Stats().apply { production=totalFood; food=-totalFood }
|
||||
}
|
||||
|
||||
if (cityInfo.resistanceCounter > 0)
|
||||
newFinalStatList.clear() // NOPE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue