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

Civs clearing an encampment now get gold

Browse Source
This commit is contained in:
Yair Morgenstern 2019-06-01 22:47:41 +03:00
parent 8040cb01b9
commit f60ebbb7e1
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
android/assets/jsons/Translations/Notifications.json
View File

@ -226,9 +226,9 @@
Japanese:"敵[unit]が私たちの[ourUnit]を攻撃しました" Japanese:"敵[unit]が私たちの[ourUnit]を攻撃しました"
} }
"Enemy city [cityName] has attacked our [ourUnit]":{ "Enemy city [cityName] has attacked our [ourUnit]":{
Italian:"La città nemica [cityName] ha attaccato [ourUnit]" Italian:"La città nemica [cityName] ha attaccato [ourUnit]"
} }
"An enemy [unit] has captured [cityname]":{ "An enemy [unit] has captured [cityname]":{
Italian:"Un'unità nemica [unit] ha conquistato [cityname]" Italian:"Un'unità nemica [unit] ha conquistato [cityname]"
@ -269,9 +269,9 @@
Japanese:"敵[unit]が私たちの[ourUnit]を破壊しました" Japanese:"敵[unit]が私たちの[ourUnit]を破壊しました"
} }
"Enemy city [cityName] has destroyed our [ourUnit]":{ "Enemy city [cityName] has destroyed our [ourUnit]":{
Italian:"La città nemica [cityName] ha distrutto [ourUnit]" Italian:"La città nemica [cityName] ha distrutto [ourUnit]"
} }
"An enemy [unit] was destroyed while attacking [cityname]":{ "An enemy [unit] was destroyed while attacking [cityname]":{
Italian:"Un'unità nemica [unit] è stata distrutta mentre attaccava [cityname]" Italian:"Un'unità nemica [unit] è stata distrutta mentre attaccava [cityname]"
@ -350,6 +350,8 @@
Japanese:"[civName]の文明は破壊されました！" Japanese:"[civName]の文明は破壊されました！"
} }
"We have captured a barbarian encampment and recovered [goldAmount] gold!":{}
///////////////// ruins ///////////////// ruins
"We have found survivors in the ruins - population added to [cityName]":{ "We have found survivors in the ruins - population added to [cityName]":{

2
core/src/com/unciv/UnCivGame.kt
View File

@ -17,7 +17,7 @@ class UnCivGame(val version: String) : Game() {
* This exists so that when debugging we can see the entire map. * This exists so that when debugging we can see the entire map.
* Remember to turn this to false before commit and upload! * Remember to turn this to false before commit and upload!
*/ */
val viewEntireMapForDebug = true val viewEntireMapForDebug = false
// For when you need to test something in an advanced game and don't have time to faff around // For when you need to test something in an advanced game and don't have time to faff around
val superchargedForDebug = false val superchargedForDebug = false

9
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -459,11 +459,18 @@ class MapUnit {
if(tile.improvement==Constants.ancientRuins && !civInfo.isBarbarianCivilization()) if(tile.improvement==Constants.ancientRuins && !civInfo.isBarbarianCivilization())
getAncientRuinBonus() getAncientRuinBonus()
if(tile.improvement==Constants.barbarianEncampment && !civInfo.isBarbarianCivilization()) if(tile.improvement==Constants.barbarianEncampment && !civInfo.isBarbarianCivilization())
tile.improvement=null // todo get bonus from clearing encampment clearEncampment(tile)
updateViewableTiles() updateViewableTiles()
} }
private fun clearEncampment(tile: TileInfo) {
tile.improvement=null
val goldToAdd = 25 // game-speed-dependant
civInfo.gold+=goldToAdd
civInfo.addNotification("We have captured a barbarian encampment and recovered [$goldToAdd] gold!", tile.position, Color.RED)
}
fun disband(){ fun disband(){
destroy() destroy()
if(currentTile.isCityCenter() && currentTile.getOwner()==civInfo) if(currentTile.isCityCenter() && currentTile.getOwner()==civInfo)