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

Merge remote-tracking branch 'upstream/master'

Browse Source 
update
This commit is contained in:
YueR 2019-09-17 19:23:00 +08:00
commit 6231117340
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
android/assets/jsons/Nations/Nations.json
View File

@ -1239,6 +1239,34 @@
innerColor:[0,102,102], innerColor:[0,102,102],
cities:["Edinburgh"] cities:["Edinburgh"]
}, },
{
name:"Singapore",
adjective:["Singapore"],
cityStateType:"Mercantile",
declaringWar:"You leave us no choice. War it must be.",
attacked:"Very well, this shall not be forgotten.",
afterPeace:"May peace forever bless our lands.",
defeated:"Perhaps, in another world, we could have been friends..."
outerColor:[0, 0, 0],
innerColor:[255,255,0],
cities:["Singapore"]
},
{
name:"Zanzibar",
adjective:["Zanzibar"],
cityStateType:"Mercantile",
declaringWar:"You leave us no choice. War it must be.",
attacked:"Very well, this shall not be forgotten.",
afterPeace:"May peace forever bless our lands.",
defeated:"May the Heavens forgive you for inflicting this humiliation to our people."
outerColor:[0, 0, 0],
innerColor:[255,153,255],
cities:["Zanzibar"]
},

2
core/src/com/unciv/models/gamebasics/Building.kt
View File

@ -184,7 +184,7 @@ class Building : NamedStats(), IConstruction{
} }
override fun canBePurchased(): Boolean { override fun canBePurchased(): Boolean {
return !isWonder && !isNationalWonder return !isWonder && !isNationalWonder && ("Spaceship part" !in uniques)
} }

3
docs/Credits.md
View File

@ -30,6 +30,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Spear](https://thenounproject.com/search/?q=Spear&i=11432) By Stephen Copinger for Spearman * [Spear](https://thenounproject.com/search/?q=Spear&i=11432) By Stephen Copinger for Spearman
* [Greek shield](https://thenounproject.com/search/?q=hoplite&i=440135) for Hoplite * [Greek shield](https://thenounproject.com/search/?q=hoplite&i=440135) for Hoplite
* [Spiked club](https://thenounproject.com/search/?q=club%20weapon&creator=1933477&i=831794) for Brute * [Spiked club](https://thenounproject.com/search/?q=club%20weapon&creator=1933477&i=831794) for Brute
* [Hoplite](https://www.flaticon.com/free-icon/hoplite_659126#term=hoplite&page=1&position=20) by Eucalyp for Immortal
### Classical Era ### Classical Era
@ -213,6 +214,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 for Porcelain Tower * [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 for Porcelain Tower
* [Bank](https://thenounproject.com/term/bank/1882194/) By projecthayat * [Bank](https://thenounproject.com/term/bank/1882194/) By projecthayat
* [Harbor](https://thenounproject.com/term/harbor/225583/) By Rflor for Seaport * [Harbor](https://thenounproject.com/term/harbor/225583/) By Rflor for Seaport
* [Mansion](https://www.flaticon.com/free-icon/mansion_509903#term=persian&page=1&position=19) by Freepik for Satrap's Court
### Industrial Era ### Industrial Era
@ -439,6 +441,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Ashika Chakra](https://thenounproject.com/search/?q=ashoka%20chakra&i=2328559) by sahua d for India * [Ashika Chakra](https://thenounproject.com/search/?q=ashoka%20chakra&i=2328559) by sahua d for India
* Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans * Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans
* [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea * [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea
* Two [Sword] Scimitars(https://www.flaticon.com/free-icon/sword_812259#term=scimitar&page=1&position=2) by Those Icons for Persia
## Promotions ## Promotions