Implemented missing Korean UA (#3416)

* try to implement korean ability

* Corrected typo error

Coreect camel typo errror

* updated new korean feautre translation.

* edited korean unique text to get right sentence.

* merge duplicated code into addScience(Int)
This commit is contained in:
이휘찬 2020-12-13 19:28:05 +09:00 committed by GitHub
parent b264876b6b
commit d1387a04c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 61 additions and 19 deletions

View File

@ -392,7 +392,7 @@
"outerColor": [20,25,173], "outerColor": [20,25,173],
"innerColor": [187,33,51], "innerColor": [187,33,51],
"uniqueName": "Scholars of the Jade Hall", "uniqueName": "Scholars of the Jade Hall",
"uniques": ["[+2 Science] from every specialist", "[+2 Science] from every [Great Improvement]"], "uniques": ["[+2 Science] from every specialist", "[+2 Science] from every [Great Improvement]","Receive a tech boost when scientific buildings/wonders are built in capital"],
"cities": ["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan", "cities": ["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju", "Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"] "Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]

View File

@ -2315,6 +2315,8 @@ We have many things to discuss and have much to benefit from each other. = Nós
Oh, it's you = Ah, é você Oh, it's you = Ah, é você
Scholars of the Jade Hall = Estudiosos do Hall de Jade Scholars of the Jade Hall = Estudiosos do Hall de Jade
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -2259,6 +2259,8 @@ We have many things to discuss and have much to benefit from each other. =
# Requires translation! # Requires translation!
Oh, it's you = Oh, it's you =
Scholars of the Jade Hall = Učenci Nefritové síně Scholars of the Jade Hall = Učenci Nefritové síně
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Soul Seoul = Soul
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -3331,6 +3331,8 @@ Oh, it's you =
# Requires translation! # Requires translation!
Scholars of the Jade Hall = Scholars of the Jade Hall =
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -2160,6 +2160,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Meillä on paljon puhuttavaa, ja meillä on paljon tarjottavaa toisillemme. We have many things to discuss and have much to benefit from each other. = Meillä on paljon puhuttavaa, ja meillä on paljon tarjottavaa toisillemme.
Oh, it's you = Ai, se olet sinä. Oh, it's you = Ai, se olet sinä.
Scholars of the Jade Hall = Jade salin oppineet Scholars of the Jade Hall = Jade salin oppineet
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Seoul Seoul = Seoul
Busan = Busan Busan = Busan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -2120,6 +2120,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Nous avons beaucoup de choses à partager. We have many things to discuss and have much to benefit from each other. = Nous avons beaucoup de choses à partager.
Oh, it's you = Oh, c'est vous. Oh, it's you = Oh, c'est vous.
Scholars of the Jade Hall = Les érudits de la salle de Jade Scholars of the Jade Hall = Les érudits de la salle de Jade
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Séoul Seoul = Séoul
Busan = Busan Busan = Busan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -1997,6 +1997,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Wir haben viele Dinge zu besprechen und können viel voneinander profitieren. We have many things to discuss and have much to benefit from each other. = Wir haben viele Dinge zu besprechen und können viel voneinander profitieren.
Oh, it's you = Sie sinds. Oh, it's you = Sie sinds.
Scholars of the Jade Hall = Die Gelehrten der Jadehalle Scholars of the Jade Hall = Die Gelehrten der Jadehalle
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Seoul Seoul = Seoul
Busan = Busan Busan = Busan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -2216,6 +2216,8 @@ We have many things to discuss and have much to benefit from each other. =
Oh, it's you = Oh, it's you =
# Requires translation! # Requires translation!
Scholars of the Jade Hall = Scholars of the Jade Hall =
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Szöul Seoul = Szöul
Busan = Puszan Busan = Puszan
Jeonju = Csondzsu Jeonju = Csondzsu

View File

@ -1994,6 +1994,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Kita punya banyak hal untuk didiskusikan dan keuntungan satu sama lain. We have many things to discuss and have much to benefit from each other. = Kita punya banyak hal untuk didiskusikan dan keuntungan satu sama lain.
Oh, it's you = Oh, ini kamu Oh, it's you = Oh, ini kamu
Scholars of the Jade Hall = Pelajar-pelajar Aula Giok Scholars of the Jade Hall = Pelajar-pelajar Aula Giok
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Seoul Seoul = Seoul
Busan = Busan Busan = Busan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -1994,6 +1994,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Abbiamo molte cose da discutere e tanto da guadagnare tra di noi. We have many things to discuss and have much to benefit from each other. = Abbiamo molte cose da discutere e tanto da guadagnare tra di noi.
Oh, it's you = Oh, sei tu... Oh, it's you = Oh, sei tu...
Scholars of the Jade Hall = Sapienti della Sala di Giada Scholars of the Jade Hall = Sapienti della Sala di Giada
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Seoul Seoul = Seoul
Busan = Busan Busan = Busan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -1994,6 +1994,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = 話し合うことで、お互いに得をすることがたくさんあるぞ。 We have many things to discuss and have much to benefit from each other. = 話し合うことで、お互いに得をすることがたくさんあるぞ。
Oh, it's you = ああ、そなたか Oh, it's you = ああ、そなたか
Scholars of the Jade Hall = 翡翠の間の学者たち Scholars of the Jade Hall = 翡翠の間の学者たち
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = ソウル Seoul = ソウル
Busan = 釜山 Busan = 釜山
Jeonju = 全州 Jeonju = 全州

View File

@ -1997,6 +1997,7 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = 동지여, 우리는 상의해야 할 것이 많고 서로에게 얻을 수 있는 것이 많소. We have many things to discuss and have much to benefit from each other. = 동지여, 우리는 상의해야 할 것이 많고 서로에게 얻을 수 있는 것이 많소.
Oh, it's you = 네놈이로구나. Oh, it's you = 네놈이로구나.
Scholars of the Jade Hall = 집현전 Scholars of the Jade Hall = 집현전
Receive a tech boost when scientific buildings/wonders are built in capital = 수도에 과학 관련 건물/불가사의를 건설할 때마다 과학 보너스를 받음
Seoul = 서울 Seoul = 서울
Busan = 부산 Busan = 부산
Jeonju = 전주 Jeonju = 전주

View File

@ -3029,6 +3029,8 @@ Oh, it's you =
# Requires translation! # Requires translation!
Scholars of the Jade Hall = Scholars of the Jade Hall =
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -3527,6 +3527,8 @@ Oh, it's you =
# Requires translation! # Requires translation!
Scholars of the Jade Hall = Scholars of the Jade Hall =
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -2961,6 +2961,8 @@ We have many things to discuss and have much to benefit from each other. =
Oh, it's you = Oh, it's you =
Scholars of the Jade Hall = Pažoohešgarān e Tālār e Jeyd Scholars of the Jade Hall = Pažoohešgarān e Tālār e Jeyd
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -2958,6 +2958,8 @@ We have many things to discuss and have much to benefit from each other. =
Oh, it's you = Oh, it's you =
Scholars of the Jade Hall = Pazhooheshgaraan e Taalaar e Jeyd Scholars of the Jade Hall = Pazhooheshgaraan e Taalaar e Jeyd
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -2029,6 +2029,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Mój przyjacielu, mamy razem wiele do omówienia i wiele możemy się wzajemnie nauczyć. We have many things to discuss and have much to benefit from each other. = Mój przyjacielu, mamy razem wiele do omówienia i wiele możemy się wzajemnie nauczyć.
Oh, it's you = Oh, to ty Oh, it's you = Oh, to ty
Scholars of the Jade Hall = Uczeni z Jadeitowej Komnaty Scholars of the Jade Hall = Uczeni z Jadeitowej Komnaty
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Seul Seoul = Seul
Busan = Pusan Busan = Pusan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -2850,6 +2850,8 @@ We have many things to discuss and have much to benefit from each other. =
Oh, it's you = Oh, it's you =
Scholars of the Jade Hall = Estudiosos do Hall de Jade Scholars of the Jade Hall = Estudiosos do Hall de Jade
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -2914,6 +2914,8 @@ We have many things to discuss and have much to benefit from each other. =
Oh, it's you = Oh, it's you =
Scholars of the Jade Hall = Savanții Sălii de Jad Scholars of the Jade Hall = Savanții Sălii de Jad
# Requires translation! # Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
# Requires translation!
Seoul = Seoul =
# Requires translation! # Requires translation!
Busan = Busan =

View File

@ -1999,6 +1999,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Нам есть, что обсудить и чем помочь друг другу. We have many things to discuss and have much to benefit from each other. = Нам есть, что обсудить и чем помочь друг другу.
Oh, it's you = А, это вы. Oh, it's you = А, это вы.
Scholars of the Jade Hall = Ученые Джейд Холл Scholars of the Jade Hall = Ученые Джейд Холл
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Сеул Seoul = Сеул
Busan = Пусан Busan = Пусан
Jeonju = Чонджу Jeonju = Чонджу

View File

@ -2002,6 +2002,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = 我们有很多事情需要讨论,还可以从中受益。 We have many things to discuss and have much to benefit from each other. = 我们有很多事情需要讨论,还可以从中受益。
Oh, it's you = 哦,是你。 Oh, it's you = 哦,是你。
Scholars of the Jade Hall = 集贤殿学士 Scholars of the Jade Hall = 集贤殿学士
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = 首尔 Seoul = 首尔
Busan = 釜山 Busan = 釜山
Jeonju = 全州 Jeonju = 全州

View File

@ -1995,6 +1995,8 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo
We have many things to discuss and have much to benefit from each other. = Tenemos muchas cosas que discutir y mucho que ofrecer el uno al otro. We have many things to discuss and have much to benefit from each other. = Tenemos muchas cosas que discutir y mucho que ofrecer el uno al otro.
Oh, it's you = Oh, eres tú Oh, it's you = Oh, eres tú
Scholars of the Jade Hall = Eruditos del Salón de Jade Scholars of the Jade Hall = Eruditos del Salón de Jade
# Requires translation!
Receive a tech boost when scientific buildings/wonders are built in capital =
Seoul = Seúl Seoul = Seúl
Busan = Busan Busan = Busan
Jeonju = Jeonju Jeonju = Jeonju

View File

@ -301,6 +301,9 @@ class CityConstructions {
else else
civ.addNotification("[${construction.name}] has been built in a faraway land",null,Color.BROWN) civ.addNotification("[${construction.name}] has been built in a faraway land",null,Color.BROWN)
} }
if(construction.science > 0 && cityInfo.civInfo.hasUnique("Receive a tech boost when scientific buildings/wonders are built in capital")){
cityInfo.civInfo.tech.addScience(cityInfo.civInfo.tech.scienceOfLast8Turns.sum() / 8)
}
} else } else
cityInfo.civInfo.addNotification("[${construction.name}] has been built in [" + cityInfo.name + "]", cityInfo.location, Color.BROWN) cityInfo.civInfo.addNotification("[${construction.name}] has been built in [" + cityInfo.name + "]", cityInfo.location, Color.BROWN)
} }

View File

@ -156,20 +156,6 @@ class TechManager {
scienceOfLast8Turns[civInfo.gameInfo.turns % 8] = allCitiesScience.toInt() scienceOfLast8Turns[civInfo.gameInfo.turns % 8] = allCitiesScience.toInt()
} }
fun hurryResearch() {
val currentTechnology = currentTechnologyName()
if (currentTechnology == null) return
techsInProgress[currentTechnology] = researchOfTech(currentTechnology) + getScienceFromGreatScientist()
if (techsInProgress[currentTechnology]!! < costOfTech(currentTechnology))
return
// We finished it!
// http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976
val extraScienceLeftOver = techsInProgress[currentTechnology]!! - costOfTech(currentTechnology)
overflowScience += limitOverflowScience(extraScienceLeftOver)
addTechnology(currentTechnology)
}
fun limitOverflowScience(overflowscience: Int): Int { fun limitOverflowScience(overflowscience: Int): Int {
// http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976 // http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976
// Apparently yes, we care about the absolute tech cost, not the actual calculated-for-this-player tech cost, // Apparently yes, we care about the absolute tech cost, not the actual calculated-for-this-player tech cost,
@ -210,7 +196,19 @@ class TechManager {
overflowScience = limitOverflowScience(overflowscience) overflowScience = limitOverflowScience(overflowscience)
addTechnology(currentTechnology) addTechnology(currentTechnology)
} }
fun addScience(scienceGet : Int) {
val currentTechnology = currentTechnologyName()
if (currentTechnology == null) return
techsInProgress[currentTechnology] = researchOfTech(currentTechnology) + scienceGet
if (techsInProgress[currentTechnology]!! < costOfTech(currentTechnology))
return
// We finished it!
// http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976
val extraScienceLeftOver = techsInProgress[currentTechnology]!! - costOfTech(currentTechnology)
overflowScience += limitOverflowScience(extraScienceLeftOver)
addTechnology(currentTechnology)
}
fun getFreeTechnology(techName: String) { fun getFreeTechnology(techName: String) {
freeTechs-- freeTechs--
addTechnology(techName) addTechnology(techName)

View File

@ -296,7 +296,7 @@ object UnitActions {
type = UnitActionType.HurryResearch, type = UnitActionType.HurryResearch,
uncivSound = UncivSound.Chimes, uncivSound = UncivSound.Chimes,
action = { action = {
unit.civInfo.tech.hurryResearch() unit.civInfo.tech.addScience(unit.civInfo.tech.getScienceFromGreatScientist())
addGoldPerGreatPersonUsage(unit.civInfo) addGoldPerGreatPersonUsage(unit.civInfo)
unit.destroy() unit.destroy()
}.takeIf { unit.civInfo.tech.currentTechnologyName() != null }) }.takeIf { unit.civInfo.tech.currentTechnologyName() != null })