From 2c6c22041bde891f9dc798099feeea0230b44af5 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 12 May 2021 18:59:40 -0400
Subject: [PATCH] conflict?
---
CHANGELOG.md | 1 +
src/events/PE/concubineInterview.js | 2 +-
src/events/nonRandomEvent.js | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25056e68084..297aa3daaae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* Reminders system improvements
* Elohiem's webgl art update 2 & 3
* added new hairstyles (bangs, hime, drills)
+* added slave distribution presets (PLC, Japan/Korea, Carribean)
* heavy reconstruction of the event systems
* REFI conversion complete
* fixes
diff --git a/src/events/PE/concubineInterview.js b/src/events/PE/concubineInterview.js
index c177077e95c..7676299c764 100644
--- a/src/events/PE/concubineInterview.js
+++ b/src/events/PE/concubineInterview.js
@@ -105,7 +105,7 @@ App.Events.PEConcubineInterview = class PEConcubineInterview extends App.Events.
} else if (eventSlave.intelligence + eventSlave.intelligenceImplant > 15) {
t.push(`${He} manages to sway the topic away from ${his} apparent underageness. ${speak(`"I'm really ${eventSlave.actualAge}, believe it or not. Wouldn't you like to know my secret?"`)}`);
} else {
- t.push(`${He} manages to completely miss the insinuation and <span class="red">make things worse than they really are.</span> ${speak(`"Master loves the way I look, that's why I'm hisP favorite after all, but I'm still ${eventSlave.actualAge}-years old."`)}`);
+ t.push(`${He} manages to completely miss the insinuation and <span class="red">make things worse than they really are.</span> ${speak(`"Master loves the way I look, that's why I'm ${hisP} favorite after all, but I'm still ${eventSlave.actualAge}-years old."`)}`);
rep(-100);
}
diff --git a/src/events/nonRandomEvent.js b/src/events/nonRandomEvent.js
index 7a668892caa..7f4d2661dc7 100644
--- a/src/events/nonRandomEvent.js
+++ b/src/events/nonRandomEvent.js
@@ -103,6 +103,7 @@ App.Events.getNonrandomEvents = function() {
new App.Events.MurderAttempt(),
new App.Events.MurderAttemptFollowup(),
new App.Events.pRaped(),
+ new App.Events.pAbducted(),
];
};
--
GitLab