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)
2025-09-26 21:35:14 -04:00 · 2020-12-13 19:28:05 +09:00 · 2020-12-13 19:28:05 +09:00 · d1387a04c3
commit d1387a04c3
parent b264876b6b
25 changed files with 61 additions and 19 deletions
--- a/android/assets/jsons/Civ
+++ b/android/assets/jsons/Civ
@ -392,7 +392,7 @@
 		"outerColor": [20,25,173],
 		"innerColor": [187,33,51],
 		"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",
 			"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
 			"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@ -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ê
 Scholars of the Jade Hall = Estudiosos do Hall de Jade
 # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
+ # Requires translation!
 Seoul = 
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@ -2259,6 +2259,8 @@ We have many things to discuss and have much to benefit from each other. =
 # Requires translation!
 Oh, it's you = 
 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
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@ -3329,7 +3329,9 @@ We have many things to discuss and have much to benefit from each other. =
 # Requires translation!
 Oh, it's you = 
 # 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 =  
 # Requires translation!
 Seoul = 
 # Requires translation!
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@ -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.
 Oh, it's you = Ai, se olet sinä.
 Scholars of the Jade Hall = Jade salin oppineet
+ # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
 Seoul = Seoul
 Busan = Busan
 Jeonju = Jeonju
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@ -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.
 Oh, it's you = Oh, c'est vous.
 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
 Busan = Busan
 Jeonju = Jeonju
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@ -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.
 Oh, it's you = Sie sinds.
 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
 Busan = Busan
 Jeonju = Jeonju
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@ -2216,6 +2216,8 @@ We have many things to discuss and have much to benefit from each other. =
 Oh, it's you = 
 # Requires translation!
 Scholars of the Jade Hall = 
+ # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
 Seoul = Szöul
 Busan = Puszan
 Jeonju = Csondzsu
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@ -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.
 Oh, it's you = Oh, ini kamu
 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
 Busan = Busan
 Jeonju = Jeonju
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@ -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.
 Oh, it's you = Oh, sei tu...
 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
 Busan = Busan
 Jeonju = Jeonju
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@ -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. = 話し合うことで、お互いに得をすることがたくさんあるぞ。
 Oh, it's you = ああ、そなたか
 Scholars of the Jade Hall = 翡翠の間の学者たち
+ # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
 Seoul = ソウル
 Busan = 釜山
 Jeonju = 全州
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@ -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. = 동지여, 우리는 상의해야 할 것이 많고 서로에게 얻을 수 있는 것이 많소.
 Oh, it's you = 네놈이로구나.
 Scholars of the Jade Hall = 집현전
+Receive a tech boost when scientific buildings/wonders are built in capital = 수도에 과학 관련 건물/불가사의를 건설할 때마다 과학 보너스를 받음
 Seoul = 서울
 Busan = 부산
 Jeonju = 전주
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@ -3029,6 +3029,8 @@ Oh, it's you =
 # Requires translation!
 Scholars of the Jade Hall = 
 # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
+ # Requires translation!
 Seoul = 
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@ -3525,7 +3525,9 @@ We have many things to discuss and have much to benefit from each other. =
 # Requires translation!
 Oh, it's you = 
 # 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 =  
 # Requires translation!
 Seoul = 
 # Requires translation!
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@ -2961,6 +2961,8 @@ We have many things to discuss and have much to benefit from each other. =
 Oh, it's you = 
 Scholars of the Jade Hall = Pažoohešgarān e Tālār e Jeyd
 # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
+ # Requires translation!
 Seoul = 
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@ -2958,6 +2958,8 @@ We have many things to discuss and have much to benefit from each other. =
 Oh, it's you = 
 Scholars of the Jade Hall = Pazhooheshgaraan e Taalaar e Jeyd
 # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
+ # Requires translation!
 Seoul = 
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@ -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ć.
 Oh, it's you = Oh, to ty
 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
 Busan = Pusan
 Jeonju = Jeonju
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@ -2850,6 +2850,8 @@ We have many things to discuss and have much to benefit from each other. =
 Oh, it's you = 
 Scholars of the Jade Hall = Estudiosos do Hall de Jade
 # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
+ # Requires translation!
 Seoul = 
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@ -2914,6 +2914,8 @@ We have many things to discuss and have much to benefit from each other. =
 Oh, it's you = 
 Scholars of the Jade Hall = Savanții Sălii de Jad
 # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
+ # Requires translation!
 Seoul = 
 # Requires translation!
 Busan = 
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@ -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. = Нам есть, что обсудить и чем помочь друг другу.
 Oh, it's you = А, это вы.
 Scholars of the Jade Hall = Ученые Джейд Холл
+ # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
 Seoul = Сеул 
 Busan = Пусан 
 Jeonju = Чонджу
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@ -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. = 我们有很多事情需要讨论，还可以从中受益。
 Oh, it's you = 哦，是你。 
 Scholars of the Jade Hall = 集贤殿学士
+ # Requires translation!
+Receive a tech boost when scientific buildings/wonders are built in capital = 
 Seoul = 首尔
 Busan = 釜山
 Jeonju = 全州
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@ -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.
 Oh, it's you = Oh, eres tú
 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
 Busan = Busan
 Jeonju = Jeonju
--- a/core/src/com/unciv/logic/city/CityConstructions.kt
+++ b/core/src/com/unciv/logic/city/CityConstructions.kt
@ -301,6 +301,9 @@ class CityConstructions {
                else
                    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
            cityInfo.civInfo.addNotification("[${construction.name}] has been built in [" + cityInfo.name + "]", cityInfo.location, Color.BROWN)
    }
@ -427,4 +430,4 @@ class CityConstructions {
        this[idx1] = this[idx2]
        this[idx2] = tmp
    }
-} // for json parsing, we need to have a default constructor
+} // for json parsing, we need to have a default constructor
--- a/core/src/com/unciv/logic/civilization/TechManager.kt
+++ b/core/src/com/unciv/logic/civilization/TechManager.kt
@ -156,20 +156,6 @@ class TechManager {
        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 {
        // 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,
@ -210,7 +196,19 @@ class TechManager {
        overflowScience = limitOverflowScience(overflowscience)
        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) {
        freeTechs--
        addTechnology(techName)
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@ -296,7 +296,7 @@ object UnitActions {
                        type = UnitActionType.HurryResearch,
                        uncivSound = UncivSound.Chimes,
                        action = {
-                            unit.civInfo.tech.hurryResearch()
+                            unit.civInfo.tech.addScience(unit.civInfo.tech.getScienceFromGreatScientist())
                            addGoldPerGreatPersonUsage(unit.civInfo)
                            unit.destroy()
                        }.takeIf { unit.civInfo.tech.currentTechnologyName() != null })