AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

English translations

Browse Source
This commit is contained in:
Yair Morgenstern 2019-09-08 19:27:00 +03:00
parent 3974842265
commit 462fc6fab7
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Translations/Units,Promotions.json
View File

@ -27,6 +27,7 @@
} }
"WaterCivilian":{ // In the file "Uints.json", every unit have the "unitType", i think we should show the "unitType" in wiki,because some units get a bonus attack to other units. "WaterCivilian":{ // In the file "Uints.json", every unit have the "unitType", i think we should show the "unitType" in wiki,because some units get a bonus attack to other units.
English:"Water Civilian"
Italian:"marittima civile" //Unità marittima civile Italian:"marittima civile" //Unità marittima civile
Simplified_Chinese:"海上平民单位" Simplified_Chinese:"海上平民单位"
French:"Civil embarqué" French:"Civil embarqué"
@ -46,6 +47,7 @@
} }
"WaterMelee":{ "WaterMelee":{
English:"Water Melee"
Italian:"marittima da mischia" //Unità marittima da mischia Italian:"marittima da mischia" //Unità marittima da mischia
Simplified_Chinese:"海军近战单位" Simplified_Chinese:"海军近战单位"
French:"Navire de combat rapproché" French:"Navire de combat rapproché"
@ -65,6 +67,7 @@
} }
"WaterRanged":{ "WaterRanged":{
English:"Water Ranged"
Italian:"marittima a distanza" //Unità marittima a distanza Italian:"marittima a distanza" //Unità marittima a distanza
Simplified_Chinese:"海军远程单位" Simplified_Chinese:"海军远程单位"
French:"Navire de combat à distance" French:"Navire de combat à distance"
@ -72,6 +75,7 @@
} }
"WaterSubmarine":{ //In the file "Uints.json", every unit have the "unitType".This unitType includes submarine and nuclear submarine. "WaterSubmarine":{ //In the file "Uints.json", every unit have the "unitType".This unitType includes submarine and nuclear submarine.
English:"Submarine"
Italian:"sottomarina" //Unità sottomarina Italian:"sottomarina" //Unità sottomarina
Simplified_Chinese:"海军潜艇单位" Simplified_Chinese:"海军潜艇单位"
French:"Navires sous-marins" French:"Navires sous-marins"

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -24,6 +24,7 @@ class CityInfo {
var location: Vector2 = Vector2.Zero var location: Vector2 = Vector2.Zero
var name: String = "" var name: String = ""
var foundingCiv = ""
var health = 200 var health = 200
var resistanceCounter = 0 var resistanceCounter = 0
@ -41,6 +42,7 @@ class CityInfo {
constructor() // for json parsing, we need to have a default constructor constructor() // for json parsing, we need to have a default constructor
constructor(civInfo: CivilizationInfo, cityLocation: Vector2) { // new city! constructor(civInfo: CivilizationInfo, cityLocation: Vector2) { // new city!
this.civInfo = civInfo this.civInfo = civInfo
foundingCiv = civInfo.civName
this.location = cityLocation this.location = cityLocation
setTransients() setTransients()

5
core/src/com/unciv/ui/worldscreen/optionstable/DropBox.kt
View File

@ -64,6 +64,11 @@ class DropBox(){
data,"application/octet-stream", """{"path":"$fileName"$overwriteModeString}""") data,"application/octet-stream", """{"path":"$fileName"$overwriteModeString}""")
} }
fun deleteFile(fileName:String){
val response = dropboxApi("https://api.dropboxapi.com/2/files/delete_v2",
"{\"path\":\"$fileName\"}","application/json")
}
class FolderList{ class FolderList{
var entries = ArrayList<FolderListEntry>() var entries = ArrayList<FolderListEntry>()