From 440c63926ced8a6d125c3dd2e46d2e33e3b0d359 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 12 Jun 2021 13:15:58 -0700
Subject: [PATCH] Move RE Standard Punishment back to Individual Events where
it belongs. Remove some stray returnTos from events.
---
src/events/RE/reStandardPunishment.js | 2 +-
src/events/randomEvent.js | 3 ++-
src/events/scheduled/seRaiding.js | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/events/RE/reStandardPunishment.js b/src/events/RE/reStandardPunishment.js
index 163ea869ae2..0ef37e059e3 100644
--- a/src/events/RE/reStandardPunishment.js
+++ b/src/events/RE/reStandardPunishment.js
@@ -19,7 +19,7 @@ App.Events.REStandardPunishment = class REStandardPunishment extends App.Events.
const {He2} = getPronouns(S.HeadGirl || {pronoun: 0}).appendSuffix("2");
const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
V.nextButton = "Continue";
- V.returnTo = "Next Week";
+ V.nextLink = "Next Week";
const artArray = [slave];
if (V.HeadGirlID !== 0) {
diff --git a/src/events/randomEvent.js b/src/events/randomEvent.js
index 72f84d5a96d..025e34d7396 100644
--- a/src/events/randomEvent.js
+++ b/src/events/randomEvent.js
@@ -94,6 +94,8 @@ App.Events.getIndividualEvents = function() {
new App.Events.rePregInventorInvite(),
new App.Events.rePregInventorShowOff(),
new App.Events.rePregInventorFCTV(),
+
+ new App.Events.REStandardPunishment()
];
};
@@ -136,7 +138,6 @@ App.Events.getNonindividualEvents = function() {
new App.Events.RESEndowment(),
new App.Events.RESMove(),
new App.Events.REBoomerang(),
- new App.Events.REStandardPunishment(),
// recFS
new App.Events.recFSArabianRevivalist(),
diff --git a/src/events/scheduled/seRaiding.js b/src/events/scheduled/seRaiding.js
index d4f96c85d40..5aa4d8bdcf7 100644
--- a/src/events/scheduled/seRaiding.js
+++ b/src/events/scheduled/seRaiding.js
@@ -12,7 +12,6 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
execute(node) {
V.nextLink = "Scheduled Event";
- V.returnTo = "Scheduled Event";
V.nextButton = "Continue";
V.raided = V.week;
let r = [];
--
GitLab