misc. so they don't get in the way of the main work

This commit is contained in:
Yair Morgenstern
2020-01-05 21:45:09 +02:00
parent 43d68c2638
commit 6a9de727ad
5 changed files with 7 additions and 59 deletions

View File

@ -1,33 +1,19 @@
# Tutorial tasks
# Requires translation!
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = Een eenheid verplaatsen!\nKlik op een eenheid > Klik op een bestemming > Klik op de pijl popup
# Requires translation!
Found a city!\nSelect the Settler (flag unit) > Click on 'Found city' (bottom-left corner) = Sticht een stad!\nSelecteer de kolonist (vlaggeneenheid) > Klik op 'Stad Stichten' (linksonder)
# Requires translation!
Enter the city screen!\nClick the city button twice = Open het Stadscherm!\nKlik tweemaal op de stadsknop
# Requires translation!
Pick a technology to research!\nClick on the tech button (greenish, top left) > \n select technology > click 'Research' (bottom right) = Kies een technologie om te onderzoeken!\nKlik op de technologie knop (groenachtig, linksboven) > \n selecteer technologie > klik op 'Onderzoek' (rechtsonder)
# Requires translation!
Pick a construction!\nEnter city screen > Click on a unit or building (left side) = Kies een constructie!\nOpen het stadsscherm > Klik op een eenheid of gebouw (linkerkant)
# Requires translation!
Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = Beëindig je beurt!\nGa door de eenheden heen met 'Volgende eenheid' > Klik op 'Volgende beurt'
# Requires translation!
Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to unassign > \n click an unassigned tile to assign population = Wijs bewerkte tegels opnieuw toe!\nOpen het stadsscherm > klik op de toegewezen (groene) tegel om de toewijzing ongedaan te maken > \n klik op een niet-toegewezen tegel om populatie toe te wijzen
# Requires translation!
Meet another civilization!\nExplore the map until you encounter another civilization! = Ontmoet een andere beschaving!\nOntdek de kaart totdat je een andere beschaving tegenkomt!
# Requires translation!
Open the options table!\nClick the menu button (top left) > click 'Options' = Open de optiemenu!\nKlik op de menuknop (linksboven) > klik op 'Opties'
# Requires translation!
Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Create improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = Bouw een verbetering!\nProduceer een werker eenheid > Verplaats naar een vlakte- of graslandtegel > \n Klik op 'Creër verbetering' (boven de eenheidstabel, linksonder)\n > Kies de boerderij > \n Laat de werker daar totdat deze klaar is
# 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 = Maak een handelsroute!\nConstrueer wegen tussen je hoofdstad en een andere stad\nOf, automatiseer je werker en laat hem daar uiteindelijk aan toe komen
# Requires translation!
Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = Verover een stad!\nBreng een vijandelijke stad tot lage gezondheid > \nGa de stad binnen met een melee-eenheid
# Requires translation!
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Verplaats een luchteenheid!\nSelecteer een luchteenheid > selecteer een andere stad binnen bereik > \nVerplaats de eenheid naar de andere stad
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Bekijk je statistiekenoverzicht! \nOpen het overzichtsscherm (rechterbovenhoek) > \nKlik op 'Statistieken'
# Requires translation!
@ -39,18 +25,15 @@ Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not s
## Ancient era buildings
# Requires translation!
Palace = Paleis
# Requires translation!
Indicates the capital city =
# Requires translation!
Monument = Monument
# Requires translation!
Granary =
# Requires translation!
Stone Works =
# Requires translation!
Must not be on plains = Mag niet op een vlakte
# Requires translation!
@ -58,27 +41,21 @@ Stonehenge =
# Requires translation!
'Time crumbles things; everything grows old and is forgotten under the power of time' - Aristotle =
# Requires translation!
Library = Bibliotheek
+1 Science Per 2 Population = +1 Wetenschap per 2 Populatie
# Requires translation!
Paper Maker = Papier Maker
# Requires translation!
The Great Library =
# Requires translation!
Free Technology = Gratis Technologie
# Requires translation!
'Libraries are as the shrine where all the relics of the ancient saints, full of true virtue, and all that without delusion or imposture are preserved and reposed.' - Sir Francis Bacon =
# Requires translation!
Circus =
# Requires translation!
Walls = Muren
# Requires translation!
Walls of Babylon = Muren van Babylon
# Requires translation!
The Pyramids = De piramides
# Requires translation!
'O, let not the pains of death which come upon thee enter into my body. I am the god Tem, and I am the foremost part of the sky, and the power which protecteth me is that which is with all the gods forever.' - The Book of the Dead, translated by Sir Ernest Alfred Wallis Budge =
@ -96,26 +73,19 @@ Culture and Gold costs of acquiring new tiles reduced by 25% in this city =
Colossus =
# Requires translation!
'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar =
# Requires translation!
+1 gold from worked water tiles in city = +1 goud van bewerkte water tegels in een stad
# Requires translation!
Temple = Tempel
# Requires translation!
Burial Tomb = Graftombe
# Requires translation!
The Oracle = Het Orakel
# Requires translation!
'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing' - Socrates =
Free Social Policy = Gratis sociaalbeleid
# Requires translation!
Lighthouse = Vuurtoren
# Requires translation!
Can only be built in coastal cities = Kan alleen gebouwd worden in kuststeden
# Requires translation!
+1 food from Ocean and Coast tiles = +1 voedsel van Oceaan en Kust tegels
# Requires translation!
@ -134,7 +104,6 @@ Chichen Itza =
'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam =
Golden Age length increases +50% = Gouden eeuw lengte neem toe met +50%
# Requires translation!
Courthouse = Gerechtsgebouw
# Requires translation!
Remove extra unhappiness from annexed cities =
@ -482,21 +451,14 @@ Requires [resource] =
# Requires translation!
Required tech: [requiredTech] =
# Requires translation!
Diplomacy = Diplomatiek
# Requires translation!
War = Oorlog
# Requires translation!
Peace = Vrede
# Requires translation!
Declare war = Verklaar oorlog
# Requires translation!
Declare war on [civName]? = Verklaar oorlog met [civName]
# Requires translation!
[civName] has declared war on us! = [civName] heeft ons de oorlog verklaard!
# Requires translation!
[leaderName] of [nation] =
# Requires translation!
You'll pay for this! = Je zult hier voor betalen!
# Requires translation!
Negotiate Peace =
@ -504,17 +466,13 @@ Negotiate Peace =
Very well. =
# Requires translation!
Farewell. =
# Requires translation!
Sounds good! = Klinkt goed!
# Requires translation!
Not this time. = Niet deze keer.
# Requires translation!
Excellent! = Uitstekend!
# Requires translation!
How about something else... =
# Requires translation!
A pleasure to meet you. =
# Requires translation!
Our relationship: = Onze relatie:
# Requires translation!
We have encountered the City-State of [name]! =
@ -526,7 +484,6 @@ May our nations forever remain united! =
Indeed! =
# Requires translation!
Denounce ([numberOfTurns] turns) =
# Requires translation!
We will remember this. = We zullen dit onthouden.
# Requires translation!
@ -540,17 +497,11 @@ We will remember this. = We zullen dit onthouden.
# Requires translation!
Unforgivable =
# Requires translation!
Enemy = Vijand
# Requires translation!
Competitor = Concurrent
# Requires translation!
Neutral = Neutraal
# Requires translation!
Favorable = Gunstig
# Requires translation!
Friend = Vriend
# Requires translation!
Ally = Bondgenoot
## Diplomatic modifiers
@ -2711,9 +2662,7 @@ Evasion =
Reduces damage taken from interception by 50% =
# Requires translation!
Bonus when intercepting [amount]% =
# Requires translation!
Ambush I = Hinderlaag I
# Requires translation!
Ambush II = Hinderlaag II
# Requires translation!
Haka War Dance =

View File

@ -945,7 +945,6 @@ Clear improvements = Удалить улучшения
Clear resource = Удалить ресурсы
Requires = Требует
Menu = Меню
# Requires translation!
Brush Size = Размер кисти
# Civilopedia Tutorials names

View File

@ -945,7 +945,6 @@ Clear improvements = Видалити вдосконалення
Clear resource = Видалити ресурс
Requires = Потребує
Menu = Меню
# Requires translation!
Brush Size = Розмір пензля
# Civilopedia Tutorials names

View File

@ -1,17 +1,17 @@
Traditional_Chinese = 96
Italian = 100
Polish = 99
Russian = 99
Russian = 100
Romanian = 48
Korean = 94
Simplified_Chinese = 96
German = 95
English = 0
Ukrainian = 99
Ukrainian = 100
French = 99
Portuguese = 83
Indonesian = 66
Czech = 96
Malay = 13
Spanish = 98
Dutch = 21
Dutch = 25

View File

@ -19,7 +19,8 @@ class SpecificUnitAutomation{
}
fun automateWorkBoats(unit: MapUnit) {
val seaResourcesInCities = unit.civInfo.cities.asSequence().flatMap { city -> city.getWorkableTiles() }
val seaResourcesInCities = unit.civInfo.cities.asSequence()
.flatMap { city -> city.getWorkableTiles() }
.filter { hasWorkableSeaResource(it, unit.civInfo) && (unit.movement.canMoveTo(it) || unit.currentTile == it) }
val closestReachableResource = seaResourcesInCities.sortedBy { it.arialDistanceTo(unit.currentTile) }
.firstOrNull { unit.movement.canReach(it) }
@ -29,8 +30,8 @@ class SpecificUnitAutomation{
if (unit.currentMovement > 0 && unit.currentTile == closestReachableResource) {
val createImprovementAction = UnitActions().getUnitActions(unit, UncivGame.Current.worldScreen)
.firstOrNull { it.name.startsWith("Create") }?.action // could be either fishing boats or oil well
if (createImprovementAction != null)
return createImprovementAction() // unit is already gone, can't "Explore"
if (createImprovementAction != null) // If it's null, then unit is already gone
return createImprovementAction()
}
}
else UnitAutomation().tryExplore(unit, unit.movement.getDistanceToTiles())