wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added "Sleep" action for units that can't fortify

Browse source 
Added tutorial after constructing the apollo program
This commit is contained in:
Yair Morgenstern 2018-09-16 13:58:35 +03:00
parent 9c8e173f4e
commit c1e6c8e894
12 changed files with 81 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Credits.md
View file

@ -196,4 +196,5 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Skull](https://thenounproject.com/search/?q=Skull&i=1030702) By Vladimir Belochkin
* [Crosshair](https://thenounproject.com/search/?q=crosshairs&i=916030) By Bakunetsu Kaito
* [City](https://thenounproject.com/search/?q=city&i=571332) By Felix Westphal
* [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys
* [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys
* [Sleep](https://thenounproject.com/search/?q=sleep&i=1760085) By Saeful Muslim

BIN
android/Images/OtherIcons/Sleep.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

113
android/assets/game.atlas
View file

@ -363,119 +363,119 @@ BuildingIcons/Sistine Chapel
index: -1
BuildingIcons/Spaceship Factory
rotate: false
xy: 1354, 1232
xy: 1660, 1436
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stable
rotate: false
xy: 1456, 1232
xy: 1660, 1334
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stadium
rotate: false
xy: 1660, 1334
xy: 1558, 1232
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stock Exchange
rotate: false
xy: 1558, 1232
xy: 1660, 1232
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stone Works
rotate: false
xy: 612, 1130
xy: 612, 1028
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stonehenge
rotate: false
xy: 612, 1028
xy: 714, 1130
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Taj Mahal
rotate: false
xy: 816, 1130
xy: 612, 824
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Temple
rotate: false
xy: 612, 824
xy: 714, 926
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/The Great Library
rotate: false
xy: 714, 926
xy: 816, 1028
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/The Louvre
rotate: false
xy: 816, 1028
xy: 918, 1130
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/The Oracle
rotate: false
xy: 918, 1130
xy: 612, 722
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/The Pyramids
rotate: false
xy: 612, 722
xy: 714, 824
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Theatre
rotate: false
xy: 714, 824
xy: 816, 926
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/University
rotate: false
xy: 1020, 1130
xy: 612, 620
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Walls
rotate: false
xy: 714, 722
xy: 816, 824
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Windmill
rotate: false
xy: 1020, 1028
xy: 1122, 1130
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Workshop
rotate: false
xy: 714, 620
xy: 816, 722
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -643,7 +643,7 @@ ImprovementIcons/Road
index: -1
ImprovementIcons/Trading post
rotate: false
xy: 816, 926
xy: 918, 1028
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -704,16 +704,23 @@ OtherIcons/Shield
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Sleep
rotate: false
xy: 1354, 1232
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Star
rotate: false
xy: 816, 728
xy: 918, 830
size: 100, 94
orig: 100, 94
offset: 0, 0
index: -1
OtherIcons/Stop
rotate: false
xy: 714, 1130
xy: 612, 926
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -818,49 +825,49 @@ PolicyIcons/Free Speech
index: -1
PolicyIcons/Free Thought
rotate: false
xy: 918, 874
xy: 1020, 976
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
PolicyIcons/Humanism
rotate: false
xy: 1020, 976
xy: 1122, 1078
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
PolicyIcons/Landed Elite
rotate: false
xy: 1122, 1078
xy: 1224, 1180
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
PolicyIcons/Legalism
rotate: false
xy: 1224, 1180
xy: 612, 466
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
PolicyIcons/Mandate Of Heaven
rotate: false
xy: 612, 466
xy: 714, 568
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
PolicyIcons/Mercantilism
rotate: false
xy: 714, 568
xy: 816, 670
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
PolicyIcons/Meritocracy
rotate: false
xy: 816, 676
xy: 918, 778
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -874,7 +881,7 @@ PolicyIcons/Militarism
index: -1
PolicyIcons/Military Caste
rotate: false
xy: 918, 822
xy: 1020, 924
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -895,7 +902,7 @@ PolicyIcons/Monarchy
index: -1
PolicyIcons/Oligarchy
rotate: false
xy: 816, 624
xy: 918, 726
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -909,7 +916,7 @@ PolicyIcons/Organized Religion
index: -1
PolicyIcons/Patronage
rotate: false
xy: 918, 770
xy: 1020, 872
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -1014,7 +1021,7 @@ PolicyIcons/Universal Suffrage
index: -1
PolicyIcons/Warrior Code
rotate: false
xy: 970, 874
xy: 1072, 976
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -1154,14 +1161,14 @@ ResourceIcons/Silver
index: -1
ResourceIcons/Spices
rotate: false
xy: 1558, 1334
xy: 1456, 1232
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Stone
rotate: false
xy: 1660, 1232
xy: 612, 1130
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1175,21 +1182,21 @@ ResourceIcons/Sugar
index: -1
ResourceIcons/Uranium
rotate: false
xy: 612, 620
xy: 714, 722
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Wheat
rotate: false
xy: 918, 926
xy: 1020, 1028
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Wine
rotate: false
xy: 1122, 1130
xy: 612, 518
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1280,7 +1287,7 @@ StatIcons/Science
index: -1
StatIcons/Strength
rotate: false
xy: 612, 926
xy: 714, 1028
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1518,35 +1525,35 @@ UnitIcons/Settler
index: -1
UnitIcons/Spearman
rotate: false
xy: 1660, 1436
xy: 1558, 1334
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitIcons/Swordsman
rotate: false
xy: 714, 1028
xy: 816, 1130
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitIcons/Trebuchet
rotate: false
xy: 918, 1028
xy: 1020, 1130
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitIcons/Warrior
rotate: false
xy: 816, 824
xy: 918, 926
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitIcons/Worker
rotate: false
xy: 612, 518
xy: 714, 620
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1644,63 +1651,63 @@ UnitPromotionIcons/Drill_I_(Civ5)
index: -1
UnitPromotionIcons/Formation_II_(Civ5)
rotate: false
xy: 1072, 1006
xy: 1174, 1108
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Formation_I_(Civ5)
rotate: false
xy: 1122, 1056
xy: 1224, 1158
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Indirect_Fire_(Civ5)
rotate: false
xy: 1174, 1108
xy: 664, 496
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Logistics_(Civ5)
rotate: false
xy: 1224, 1158
xy: 714, 546
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/March_(Civ5)
rotate: false
xy: 664, 496
xy: 766, 598
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Mobility_(Civ5)
rotate: false
xy: 714, 546
xy: 816, 648
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Range_(Civ5)
rotate: false
xy: 766, 598
xy: 868, 700
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Scouting_III_(Civ5)
rotate: false
xy: 868, 706
xy: 970, 808
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Scouting_II_(Civ5)
rotate: false
xy: 918, 748
xy: 1020, 850
size: 20, 20
orig: 20, 20
offset: 0, 0
@ -1714,14 +1721,14 @@ UnitPromotionIcons/Scouting_I_(Civ5)
index: -1
UnitPromotionIcons/Sentry_(Civ5)
rotate: false
xy: 970, 852
xy: 1072, 954
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
UnitPromotionIcons/Shock_III_(Civ5)
rotate: false
xy: 1020, 954
xy: 1122, 1056
size: 20, 20
orig: 20, 20
offset: 0, 0

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 636 KiB

After

Width:  |  Height:  |  Size: 638 KiB

8
android/assets/jsons/Tutorials_English.json
View file

@ -268,6 +268,12 @@
]
]
ApolloProgram: [
[
"You have completed the Apollo Program!",
"You can now start constructing spaceship parts in your cities (with the ",
" relevant technologies) to win a scientific victory!"
]
]
}

3
core/src/com/unciv/logic/battle/Battle.kt
View file

@ -83,7 +83,8 @@ class Battle(val gameInfo:GameInfo) {
}
else unit.currentMovement = 0f
unit.attacksThisTurn+=1
if(unit.isFortified()) attacker.unit.action=null // but not, for instance, if it's Set Up - then it should definitely keep the action!
if(unit.isFortified() || unit.action=="Sleep")
attacker.unit.action=null // but not, for instance, if it's Set Up - then it should definitely keep the action!
}
// XP!

1
core/src/com/unciv/logic/map/MapUnit.kt
View file

@ -104,6 +104,7 @@ class MapUnit {
if (currentMovement == 0f) return false
if (name == "Worker" && getTile().improvementInProgress != null) return false
if (isFortified()) return false
if (action=="Sleep") return false
return true
}

69
core/src/com/unciv/ui/DiplomacyScreen.kt
View file

@ -1,69 +0,0 @@
//package com.unciv.ui
//
//import com.badlogic.gdx.scenes.scene2d.ui.SplitPane
//import com.badlogic.gdx.scenes.scene2d.ui.Table
//import com.badlogic.gdx.scenes.scene2d.ui.TextButton
//import com.unciv.UnCivGame
//import com.unciv.logic.civilization.CivilizationInfo
//import com.unciv.logic.civilization.DiplomaticStatus
//import com.unciv.ui.utils.CameraStageBaseScreen
//import com.unciv.ui.utils.addClickListener
//import com.unciv.ui.utils.tr
//
//
//class DiplomacyScreen : CameraStageBaseScreen(){
//
// val civInfo = UnCivGame.Current.gameInfo.getPlayerCivilization()
// var otherCivilization: CivilizationInfo? = null
// val diplomacyTable = Table()
//
// init {
// val closeButton = TextButton("Close".tr(), skin)
// closeButton.addClickListener { UnCivGame.Current.setWorldScreen() }
// closeButton.y = stage.height - closeButton.height - 5
// stage.addActor(closeButton)
//
//
// val civPickerTable = Table().apply { defaults().pad(5f) }
// for(otherCivName in civInfo.diplomacy.keys){
// val chooseCiv = TextButton(otherCivName,skin)
// chooseCiv.addClickListener {
// otherCivilization = civInfo.gameInfo.civilizations.first{it.civName==otherCivName}
// updateDiplomacyTable()
// }
// civPickerTable.add().row()
// }
//
// val splitPane = SplitPane(diplomacyTable,civPickerTable,true, skin)
// splitPane.setSplitAmount(0.8f)
// stage.addActor(splitPane)
// }
//
// private fun updateDiplomacyTable() {
// diplomacyTable.clear()
// if(otherCivilization==null) return
// val otherCivDiplomacyManager = civInfo.diplomacy[otherCivilization!!.civName]!!
//
// if(otherCivDiplomacyManager.status==DiplomaticStatus.Peace) {
// val tradeButton = TextButton("Trade".tr(), skin)
// tradeButton .addClickListener {
// UnCivGame.Current.screen = TradeScreen(otherCivilization!!)
// }
//
// val declareWarButton = TextButton("Declare War".tr(), skin)
// declareWarButton.addClickListener {
// civInfo.diplomacy[otherCivilization!!.civName]!!.declareWar()
// updateDiplomacyTable()
// }
// }
//
// else{
// val declareWarButton = TextButton("Negotiate Peace".tr(), skin)
// declareWarButton.addClickListener {
// UnCivGame.Current.screen = TradeScreen(otherCivilization!!)
// }
// }
// diplomacyTable.add()
// }
//
//}

2
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View file

@ -1,5 +1,6 @@
package com.unciv.ui.trade
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.*
import com.unciv.UnCivGame
import com.unciv.ui.utils.*
@ -51,6 +52,7 @@ class DiplomacyScreen():CameraStageBaseScreen(){
if (!playerCiv.isAtWarWith(civ)) {
val declareWarButton = TextButton("Declare war".tr(), skin)
declareWarButton.color = Color.RED
val turnsToPeaceTreaty = civDiplomacy.turnsToPeaceTreaty()
if(turnsToPeaceTreaty>0){
declareWarButton.disable()

2
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View file

@ -247,6 +247,8 @@ class WorldScreen : CameraStageBaseScreen() {
if(resources.keys.any { it.resourceType==ResourceType.Strategic}) displayTutorials("StrategicResource")
if(civInfo.exploredTiles.map { gameInfo.tileMap[it] }.any { it.isCityCenter() && it.getOwner()!=civInfo })
displayTutorials("EnemyCity")
if("Enables construction of Spaceship parts" in civInfo.getBuildingUniques())
displayTutorials("ApolloProgram")
shouldUpdate=false
}

4
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View file

@ -52,6 +52,10 @@ class UnitActions {
actionList += UnitAction("Fortify", { unit.action = "Fortify 0" }, unit.currentMovement != 0f)
}
if(!unit.isFortified() && actionList.none{it.name=="Fortify"} && unit.action!="Sleep") {
actionList += UnitAction("Sleep", { unit.action = "Sleep" }, unit.currentMovement != 0f)
}
if(unit.baseUnit().unitType!= UnitType.Civilian && unit.promotions.canBePromoted()){
actionList += UnitAction("Promote",
{UnCivGame.Current.screen = PromotionPickerScreen(unit)},

1
core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt
View file

@ -36,6 +36,7 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){
"Construct Customs House" -> return ImageGetter.getImprovementIcon("Customs house")
"Set up" -> return ImageGetter.getUnitIcon("Catapult")
"Disband unit" -> return ImageGetter.getImage("OtherIcons/DisbandUnit.png")
"Sleep" -> return ImageGetter.getImage("OtherIcons/Sleep.png")
else -> return ImageGetter.getImage("OtherIcons/Star.png")
}
}