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

Fixed lighthouse & trireme problems

Browse Source
This commit is contained in:
Yair Morgenstern 2018-10-18 22:57:45 +03:00
parent dea7775be5
commit f9f46391ea
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Credits.md
View File

@ -17,7 +17,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Bow And Arrow](https://thenounproject.com/search/?q=Bow%20and%20Arrow&i=338261) By Viktor Ostrovsky for Archer * [Bow And Arrow](https://thenounproject.com/search/?q=Bow%20and%20Arrow&i=338261) By Viktor Ostrovsky for Archer
* [Bow](https://thenounproject.com/search/?q=bow&i=101736) By Arthur Shlain for Bowman * [Bow](https://thenounproject.com/search/?q=bow&i=101736) By Arthur Shlain for Bowman
* [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats * [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats
* [Greek Trireme](https://thenounproject.com/search/?q=ancient%20boat&i=1626303) By Zachary McCune for Trireme * [Greek Trireme](https://thenounproject.com/search/?q=ancient%20boat&i=1626303) By Zachary McCune for Triremehos
* [Chariot](https://thenounproject.com/search/?q=Chariot&i=1189930) By Andrew Doane for Chariot Archer * [Chariot](https://thenounproject.com/search/?q=Chariot&i=1189930) By Andrew Doane for Chariot Archer
* [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
@ -118,6 +118,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
### Classical Era ### Classical Era
* [Lighthouse](https://thenounproject.com/search/?q=lighthouse&i=866966) By Dolly Holmes
* [Temple](https://thenounproject.com/term/temple/1808407/) By 1516 * [Temple](https://thenounproject.com/term/temple/1808407/) By 1516
* [Anubis](https://thenounproject.com/term/anubis/1080090/) By Carpe Diem for Burial Tomb * [Anubis](https://thenounproject.com/term/anubis/1080090/) By Carpe Diem for Burial Tomb
* [Parthenon](https://thenounproject.com/term/parthenon/493272/) By Christopher T. Howlett for The Oracle * [Parthenon](https://thenounproject.com/term/parthenon/493272/) By Christopher T. Howlett for The Oracle
@ -284,7 +285,8 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Mallet](https://thenounproject.com/term/mallet/1306669/) By Ben Avery for Bronze Working * [Mallet](https://thenounproject.com/term/mallet/1306669/) By Ben Avery for Bronze Working
### Classical ### Classical
* [Horse Riding](https://thenounproject.com/term/horse-riding/583093/) By Hea Poh Lin * [Telescope](https://thenounproject.com/term/telescope/1932888/) for Optics
* [Horse Riding](https://thenounproject.com/term/horse-riding/583093/) By Hea Poh Lin for Horseback Riding
* [Abacus](https://thenounproject.com/term/abacus/1943303/) By Yo! Baba for Mathematics * [Abacus](https://thenounproject.com/term/abacus/1943303/) By Yo! Baba for Mathematics
* [Arch](https://thenounproject.com/term/arch/1174168/) By Andrejs Kirma for Construction * [Arch](https://thenounproject.com/term/arch/1174168/) By Andrejs Kirma for Construction
* [Brain](https://thenounproject.com/term/brain/64073/) By Tony Gines for Philosophy * [Brain](https://thenounproject.com/term/brain/64073/) By Tony Gines for Philosophy

2
android/assets/jsons/Buildings.json
View File

@ -108,7 +108,7 @@
hurryCostModifier:25, hurryCostModifier:25,
maintenance:1, maintenance:1,
resourceBonusStats:{food:1}, resourceBonusStats:{food:1},
uniques:["+1 food from Ocean and Coast tiles"] uniques:["Can only be built in coastal cities","+1 food from Ocean and Coast tiles"]
requiredTech:"Optics" requiredTech:"Optics"
}, },
{ {

1
android/assets/jsons/Techs.json
View File

@ -90,6 +90,7 @@
techs:[ techs:[
{ {
name:"Optics", name:"Optics",
cost:85,
row:1, row:1,
prerequisites:["Sailing"], prerequisites:["Sailing"],
}, },

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

@ -177,6 +177,9 @@ class Building : NamedStats(), IConstruction{
if ("Must be next to desert" in uniques if ("Must be next to desert" in uniques
&& !construction.cityInfo.getCenterTile().getTilesInDistance(1).any { it.baseTerrain == "Desert" }) && !construction.cityInfo.getCenterTile().getTilesInDistance(1).any { it.baseTerrain == "Desert" })
return false return false
if("Can only be built in coastal cities" in uniques
&& construction.cityInfo.getCenterTile().neighbors.none { it.baseTerrain=="Coast" })
return false
if (requiredResource != null && !civInfo.getCivResources().containsKey(GameBasics.TileResources[requiredResource!!])) if (requiredResource != null && !civInfo.getCivResources().containsKey(GameBasics.TileResources[requiredResource!!]))
return false return false

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

@ -37,6 +37,6 @@ enum class UnitType{
} }
fun isWaterUnit(): Boolean { fun isWaterUnit(): Boolean {
return this == WaterCivilian return !isLandUnit() // if we ever get air units, this'll have to change
} }
} }