From c744cd928247fd0059dad04645667fe6dc74446c Mon Sep 17 00:00:00 2001 From: Paul Holt Date: Wed, 5 Jan 2022 02:09:38 +1100 Subject: [PATCH] Remove suicide reference by default --- 53_King/kotlin/King.kt | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/53_King/kotlin/King.kt b/53_King/kotlin/King.kt index f16f24e5..71e6d505 100644 --- a/53_King/kotlin/King.kt +++ b/53_King/kotlin/King.kt @@ -3,7 +3,8 @@ import kotlin.random.Random import kotlin.system.exitProcess lateinit var gameState: GameState -const val INCLUDE_BUGS_FROM_ORIGINAL = false +const val KEEP_ORIGINAL_BUGS = false +const val KEEP_ORIGINAL_SUICIDE_REFERENCE = false val rnd: Double get() = Random.nextDouble() fun tab(i: Int) = " ".repeat(i) @@ -198,15 +199,26 @@ sealed class YearOutcome { object StarvationWithFullTreasury : YearOutcome() { override fun displayConsequences() { println( - """ - MONEY WAS LEFT OVER IN THE TREASURY WHICH YOU DID - NOT SPEND. AS A RESULT, SOME OF YOUR COUNTRYMEN DIED - OF STARVATION. THE PUBLIC IS ENRAGED AND YOU HAVE - BEEN FORCED TO EITHER RESIGN OR COMMIT SUICIDE. - THE CHOICE IS YOURS. - IF YOU CHOOSE THE LATTER, PLEASE TURN OFF YOUR COMPUTER - BEFORE PROCEEDING. - """.trimIndent() + if (KEEP_ORIGINAL_SUICIDE_REFERENCE) { + """ + MONEY WAS LEFT OVER IN THE TREASURY WHICH YOU DID + NOT SPEND. AS A RESULT, SOME OF YOUR COUNTRYMEN DIED + OF STARVATION. THE PUBLIC IS ENRAGED AND YOU HAVE + BEEN FORCED TO EITHER RESIGN OR COMMIT SUICIDE. + THE CHOICE IS YOURS. + IF YOU CHOOSE THE LATTER, PLEASE TURN OFF YOUR COMPUTER + BEFORE PROCEEDING. + """.trimIndent() + } else { + """ + MONEY WAS LEFT OVER IN THE TREASURY WHICH YOU DID + NOT SPEND. AS A RESULT, SOME OF YOUR COUNTRYMEN DIED + OF STARVATION. THE PUBLIC IS ENRAGED AND YOU HAVE + BEEN FORCED TO RESIGN. + PLEASE TURN OFF YOUR COMPUTER AND SURRENDER IT TO + THE NEAREST POLICE STATION. + """.trimIndent() + } ) } } @@ -566,7 +578,7 @@ class GameState(val yearsRequired: Int = 8) { https://github.com/coding-horror/basic-computer-games/blob/main/53_King/king.bas#:~:text=1450%20V3%3DINT,INT(A%2BV3) */ - if (INCLUDE_BUGS_FROM_ORIGINAL) { + if (KEEP_ORIGINAL_BUGS) { tourists += rallods } else { tourists = abs(v1 - v2)