diff --git a/core/src/com/unciv/models/TutorialTrigger.kt b/core/src/com/unciv/models/TutorialTrigger.kt index 19649859ae..da9a64aff7 100644 --- a/core/src/com/unciv/models/TutorialTrigger.kt +++ b/core/src/com/unciv/models/TutorialTrigger.kt @@ -24,10 +24,8 @@ enum class TutorialTrigger(val value: String, val isCivilopedia: Boolean = !valu AfterConquering("After_Conquering"), BarbarianEncountered("_BarbarianEncountered"), OtherCivEncountered("_OtherCivEncountered"), - ApolloProgram("Apollo_Program"), InjuredUnits("Injured_Units"), Workers("Workers"), - SiegeUnits("Siege_Units"), Embarking("Embarking"), IdleUnits("Idle_Units"), ContactMe("Contact_Me"), diff --git a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt index d6a852cd4d..78d9a2d5ca 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt @@ -298,6 +298,7 @@ class WorldScreen( globalShortcuts.add(KeyboardBinding.DeveloperConsole, action = ::openDeveloperConsole) } + @Readonly fun openDeveloperConsole() { // No cheating unless you're by yourself if (gameInfo.civilizations.count { it.isHuman() } > 1) return @@ -767,8 +768,6 @@ class WorldScreen( viewingCiv.getKnownCivs().filter { viewingCiv.isAtWarWith(it) } .flatMap { it.cities.asSequence() }.any { viewingCiv.hasExplored(it.getCenterTile()) } } - displayTutorial(TutorialTrigger.ApolloProgram) { viewingCiv.hasUnique(UniqueType.EnablesConstructionOfSpaceshipParts) } - displayTutorial(TutorialTrigger.SiegeUnits) { viewingCiv.units.getCivUnits().any { it.baseUnit.isProbablySiegeUnit() } } displayTutorial(TutorialTrigger.Embarking) { viewingCiv.hasUnique(UniqueType.LandUnitEmbarkation) } displayTutorial(TutorialTrigger.NaturalWonders) { viewingCiv.naturalWonders.size > 0 } displayTutorial(TutorialTrigger.WeLoveTheKingDay) { viewingCiv.cities.any { it.demandedResource != "" } }