diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index 58d0c33ede8c9eecb32e90b77eb34bccdf38ae65..3ae681aad5861ffb9c147b5514139093069b1a5d 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -1385,7 +1385,7 @@ App.Data.resetOnNGPlus = { postSexCleanUp: 1, sideBarOptions: { - compact: 1, Cash: 1, Upkeep: 1, SexSlaveCount: 1, roomPop: 1, Rep: 1, GSP: 1, Authority: 1, Security: 1, Crime: 1 + compact: 1, Cash: 1, Upkeep: 1, SexSlaveCount: 1, roomPop: 1, Rep: 1, GSP: 1, Authority: 1, Security: 1, Crime: 1, confirmWeekEnd: 0, }, DefaultBirthDestination: "individually decided fates", abbreviateHormoneBalance: 2, diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index eea233a5d347c5e2315bdb12dc2688836e02332b..40e7b1dd992bac117142061b8fb275ca48296579 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -182,6 +182,9 @@ App.Update.globalVariables = function(node) { if (typeof V.sideBarOptions.compact === "undefined") { V.sideBarOptions.compact = 1; } + if (typeof V.sideBarOptions.confirmWeekEnd === "undefined") { + V.sideBarOptions.confirmWeekEnd = 0; + } if (V.sortSlavesBy === "income" || V.sortSlavesBy === "lastWeeksCashIncome") { V.sortSlavesBy = "weeklyIncome"; } diff --git a/src/gui/storyCaption.tw b/src/gui/storyCaption.tw index 8e00530340e639c9059025f8e360b058b2060021..5bb3c9a4daed1029e8db5940dd94a83d7cc3bf12 100644 --- a/src/gui/storyCaption.tw +++ b/src/gui/storyCaption.tw @@ -22,8 +22,8 @@ <</if>> <<script>> $(document).one(':passageend', () => { - $('#endWeekButton').click(function() { - if (confirm("Are you sure you want to end the week?")) { + $('#endWeekButton').click(() => { + if (!V.sideBarOptions.confirmWeekEnd || confirm("Are you sure you want to end the week?")) { Engine.play(V.nextLink); } }); diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index dd546e29ee8e920d4ae90aec786da36a7ab62112..27e7fb9e3087d70ac6ec527d5cab874d33b25446 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -297,6 +297,14 @@ This save was created using FC version $ver build $releaseID. <<option 0 "Hidden">> <</options>> + <<options $sideBarOptions.confirmWeekEnd>> + Confirmation before ending a week: + <<option 1 "Enabled">> + <<option 0 "Disabled">> + <<comment>> + Enabling this will open a dialog box to confirm you meant to end a week. + <</options>> + <<if $secExpEnabled > 0>> <<options $sideBarOptions.Authority>> Authority is