From f7aa47c7773f44f350779d936d1196b9f064c1b3 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 23 Feb 2021 12:56:45 -0800
Subject: [PATCH] RE Royal Blood fixes
---
src/events/randomEvent.js | 2 +-
src/events/reRoyalBlood.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/events/randomEvent.js b/src/events/randomEvent.js
index b3df721c081..b564c26455e 100644
--- a/src/events/randomEvent.js
+++ b/src/events/randomEvent.js
@@ -50,7 +50,6 @@ App.Events.getIndividualEvents = function() {
new App.Events.RETSAnalCowgirl(),
new App.Events.RETSFucktoyPrefersRelative(),
new App.Events.RETSInterslaveBegging(),
- new App.Events.RERoyalBlood(),
new App.Events.RETSSadisticDescription(),
new App.Events.RETSSiblingTussle(),
new App.Events.RETSSimpleAssault(),
@@ -74,6 +73,7 @@ App.Events.getNonindividualEvents = function() {
new App.Events.RERelativeRecruiter(),
new App.Events.REStaffedMorning(),
new App.Events.REFullBed(),
+ new App.Events.RERoyalBlood(),
new App.Events.RENickname().setType("RNIE"),
];
diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js
index 6275de99e49..5ed1f85bf76 100644
--- a/src/events/reRoyalBlood.js
+++ b/src/events/reRoyalBlood.js
@@ -1,7 +1,7 @@
App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
eventPrerequisites() {
return [
- () => (V.rep - 10000 > random(1, 12500) || V.cheatMode)
+ () => (V.rep - 10000 > random(1, 12500) || V.cheatMode !== 0)
];
}
@@ -456,7 +456,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
let race;
if (V.realRoyalties === 1) {
- const nationality = setup.royalNationalities.random();
+ const nationality = App.Data.royalNationalities.random();
switch (nationality) {
case "Japanese":
case "Cambodian":
--
GitLab