mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 17:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Archers now require Archery (as should be!)

Browse Source
This commit is contained in:
Yair Morgenstern
2018-06-14 21:00:44 +03:00
parent 2df88c8517
commit c815863124
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/assets/jsons/Translations.json
View File

@ -13,7 +13,7 @@
Romanian:"Runda" Romanian:"Runda"
} }
"in "{ // As in "Opera House in 3 turns" "in ":{ // As in "Opera House in 3 turns"
} }
@ -97,7 +97,7 @@
} }
"Science":{ "Science":{
Italian:"Scienza" Italian:"Scienza"
Russian:"Наука Russian:"Наука"
French:"Science" French:"Science"
Romanian:"Ştiinţă" Romanian:"Ştiinţă"
} }
@ -205,22 +205,22 @@
} }
// Notifications // Notifications
" has grown"{ // eg Alexandria has grown " has grown":{ // eg Alexandria has grown
} }
" is starving"{ " is starving":{
} }
" has expanded its borders"{ // eg Alexandria has grown " has expanded its borders":{ // eg Alexandria has grown
} }
"An enemy "{ "An enemy ":{
} }
" has attacked our "{ // eg Alexandria has grown " has attacked our ":{ // eg Alexandria has grown
} }
" has destroyed our "{ // eg Alexandria has grown " has destroyed our ":{ // eg Alexandria has grown
} }

2
android/assets/jsons/Units.json
View File

@ -45,7 +45,7 @@
rangedStrength:7, rangedStrength:7,
cost: 40, cost: 40,
hurryCostModifier:20 hurryCostModifier:20
requiredTech:"Ranged", requiredTech:"Archery",
obsoleteTech:"Machinery", obsoleteTech:"Machinery",
upgradesTo:"Crossbowman" upgradesTo:"Crossbowman"
}, },

2
core/src/com/unciv/logic/automation/Automation.kt
View File

@ -85,7 +85,7 @@ class Automation {
chosenUnit = combatUnits.filter { it.unitType== UnitType.Ranged }.maxBy { it.cost }!! chosenUnit = combatUnits.filter { it.unitType== UnitType.Ranged }.maxBy { it.cost }!!
else{ // randomize type of unit and takee the most expensive of its kind else{ // randomize type of unit and takee the most expensive of its kind
val chosenUnitType = combatUnits.map { it.unitType }.distinct().getRandom() val chosenUnitType = combatUnits.map { it.unitType }.distinct().filterNot{it==UnitType.Scout}.getRandom()
chosenUnit = combatUnits.filter { it.unitType==chosenUnitType }.maxBy { it.cost }!! chosenUnit = combatUnits.filter { it.unitType==chosenUnitType }.maxBy { it.cost }!!
} }

2
core/src/com/unciv/ui/CivilopediaScreen.kt
View File

@ -74,7 +74,7 @@ class CivilopediaScreen : CameraStageBaseScreen() {
buttonClicked() buttonClicked()
} }
buttonTable.add(button).width(button.width * 0.7f) buttonTable.add(button)
} }
val sp = ScrollPane(nameList) val sp = ScrollPane(nameList)