mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 00:08:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added Water Mill building

Browse Source
This commit is contained in:
Yair Morgenstern
2020-07-13 22:42:30 +03:00
parent 0c7d4b296a
commit e179f1a472
6 changed files with 444 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/BuildingIcons/Water Mill.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

851
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 460 KiB

After

Width:  |  Height:  |  Size: 468 KiB

9
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -78,6 +78,15 @@
"hurryCostModifier": 25, "hurryCostModifier": 25,
"requiredTech": "Trapping" "requiredTech": "Trapping"
}, },
{
"name": "Water Mill",
"maintenance": 2,
"food": 2,
"production": 1,
"hurryCostModifier": 25,
"uniques": ["Must be next to river"],
"requiredTech": "The Wheel"
},
/* /*
{ {

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

@ -248,6 +248,9 @@ class Building : NamedStats(), IConstruction{
&& !cityCenter.neighbors.any { it.baseTerrain == Constants.mountain }) && !cityCenter.neighbors.any { it.baseTerrain == Constants.mountain })
return "Must be next to mountain" return "Must be next to mountain"
if("Must be next to river" in uniques && !cityCenter.isAdjacentToRiver())
return "Must be next to river"
if("Must have an owned mountain within 2 tiles" in uniques if("Must have an owned mountain within 2 tiles" in uniques
&& !cityCenter.getTilesInDistance(2) && !cityCenter.getTilesInDistance(2)
.any { it.baseTerrain==Constants.mountain && it.getOwner()==construction.cityInfo.civInfo }) .any { it.baseTerrain==Constants.mountain && it.getOwner()==construction.cityInfo.civInfo })

6
core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
View File

@ -94,11 +94,11 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe
OnlineMultiplayer().tryUploadGame(newGame!!) OnlineMultiplayer().tryUploadGame(newGame!!)
GameSaver.autoSave(newGame!!) {} GameSaver.autoSave(newGame!!) {}
//Saved as Multiplayer game to show up in the session browser // Saved as Multiplayer game to show up in the session browser
GameSaver.saveGame(newGame!!, newGame!!.gameId, true) GameSaver.saveGame(newGame!!, newGame!!.gameId, true)
//Save gameId to clipboard because you have to do it anyway. // Save gameId to clipboard because you have to do it anyway.
Gdx.app.clipboard.contents = newGame!!.gameId Gdx.app.clipboard.contents = newGame!!.gameId
//Popup to notify the User that the gameID got copied to the clipboard // Popup to notify the User that the gameID got copied to the clipboard
Gdx.app.postRunnable { ResponsePopup("gameID copied to clipboard".tr(), UncivGame.Current.worldScreen, 2500) } Gdx.app.postRunnable { ResponsePopup("gameID copied to clipboard".tr(), UncivGame.Current.worldScreen, 2500) }
} catch (ex: Exception) { } catch (ex: Exception) {
Gdx.app.postRunnable { Gdx.app.postRunnable {