From 843a56eed9b3440ae52de9c65246d50ba71b7235 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 1 Nov 2021 20:15:37 -0400
Subject: [PATCH] more cats
---
src/Mods/Catmod/events/CMRESS/catLove.js | 6 ++--
.../backwardsCompatibility.js | 3 ++
src/descriptions/officeDescription.js | 36 +++++++++++++++++++
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/Mods/Catmod/events/CMRESS/catLove.js b/src/Mods/Catmod/events/CMRESS/catLove.js
index 28219ea0958..afefe3a3aec 100644
--- a/src/Mods/Catmod/events/CMRESS/catLove.js
+++ b/src/Mods/Catmod/events/CMRESS/catLove.js
@@ -155,10 +155,10 @@ App.Events.CMRESSCatLove = class CMRESSCatLove extends App.Events.BaseEvent {
t.push(`${He} purrs from the back of ${his} throat so intensely you can hear it against your heart,`);
}
t.push(`filled with <span class="trust inc">safety</span> and <span class="devotion inc">love from the bottom of ${his} heart.</span>`);
- addTrinket(`a small, elegant clay sculpture made by ${eventSlave.slaveName} showing you surrounded by happy catgirl slaves`);
+ addTrinket(`cat clay sculpture`, {name: eventSlave.slaveName, id:eventSlave.ID});
} else if (eventSlave.intelligence + eventSlave.intelligenceImplant > 35) {
t.push(`pretty drawn picture from ${his} hands, open your display case with a twist of your private key, and place it inside. ${eventSlave.slaveName} takes a moment to process what's happening, then chokes out a shocked meow, opens ${his} mouth, half-meows again, and stutters. ${canTalk(eventSlave) ? `"Y-you really like it that much, ${title}?" She squeaks, and then, tears forming in the corner of ${his} eyes, launches into a tight, warm hug around your waist.` : `Incapable of saying anything further, ${he} simply launches himself at you and hugs you so tight it nearly squeezes on your ribs, tears forming at the corner of ${his} eyes.`} ${He}'s filled with the kind of <span class="trust inc">safety</span> and <span class="devotion inc">love from the bottom of ${his} heart</span> that only comes from genuine adoration.`);
- addTrinket(`a pretty drawing of you and ${eventSlave.slaveName} cuddling together peacefully`);
+ addTrinket(`cat drawing`, {name: eventSlave.slaveName, id:eventSlave.ID});
} else {
t.push(`construction paper heart from ${his} hands, open your display case with a twist of your private key, and place it inside. ${eventSlave.slaveName} looks at you, looks at the display case, looks back at you, and then suddenly breaks into tears.`);
if (canTalk(eventSlave)) {
@@ -170,7 +170,7 @@ App.Events.CMRESSCatLove = class CMRESSCatLove extends App.Events.BaseEvent {
t.push(`${He} simply sobs for a few moments, then hugs you with so much furry warmth that you swear you can feel ${his} heart beating against yours.`);
}
t.push(`${He}'s filled with the kind of <span class="trust inc">safety</span> and <span class="devotion inc">love from the bottom of ${his} heart</span> that only comes from genuine adoration.`);
- addTrinket(`a red construction paper heart with crude crayon figures of you and ${eventSlave.slaveName} holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`);
+ addTrinket(`cat crayon`, {name: eventSlave.slaveName, id:eventSlave.ID});
}
eventSlave.trust += 20;
eventSlave.devotion += 20;
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 2ff2f540c6b..65c45c00b76 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -994,6 +994,9 @@ App.Update.globalVariables = function(node) {
[`famous whore`, /a framed pornographic advertisement for (.*?) from the week.*became a famous whore/g],
[`a cloth napkin`, /a cloth napkin skillfully folded into the shape of (.*?) given to you by (.*)/g],
[`catgirl icon`, /a gorgeous quasi-religious icon made by (.*?) showing you creating the catgirl race/g],
+ [`cat clay sculpture`, /a small, elegant clay sculpture made by (.*?) showing you surrounded by happy catgirl slaves/g],
+ [`cat drawing`, /a pretty drawing of you and (.*?) cuddling together peacefully/g],
+ [`cat crayon`, /a red construction paper heart with crude crayon figures of you and (.*?) holding hands above text reading/g],
]);
for (const trinket of V.trinkets) {
let slaveName = "";
diff --git a/src/descriptions/officeDescription.js b/src/descriptions/officeDescription.js
index cae45ce4553..21d86a4683c 100644
--- a/src/descriptions/officeDescription.js
+++ b/src/descriptions/officeDescription.js
@@ -579,6 +579,42 @@ App.Desc.officeDescription = function(lastElement) {
} else {
return null;
}
+ case "cat clay sculpture":
+ if (array.length > 0) {
+ const el = document.createElement("span");
+ if (array.length === 1) {
+ App.Events.addNode(el, [`A small, elegant clay sculpture made by`, slaveSentence(array), `showing you surrounded by happy catgirl slaves`]);
+ } else {
+ App.Events.addNode(el, [`Small, elegant clay sculptures made by`, slaveSentence(array), `showing you surrounded by happy catgirl slaves`]);
+ }
+ return el;
+ } else {
+ return null;
+ }
+ case "cat drawing":
+ if (array.length > 0) {
+ const el = document.createElement("span");
+ if (array.length === 1) {
+ App.Events.addNode(el, [`A pretty drawing of you and`, slaveSentence(array), `cuddling together peacefully`]);
+ } else {
+ App.Events.addNode(el, [`Pretty drawings of you and`, slaveSentence(array), `cuddling together peacefully`]);
+ }
+ return el;
+ } else {
+ return null;
+ }
+ case "cat crayon":
+ if (array.length > 0) {
+ const el = document.createElement("span");
+ if (array.length === 1) {
+ App.Events.addNode(el, [`A red construction paper heart with crude crayon figures of you and`, slaveSentence(array), `holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`]);
+ } else {
+ App.Events.addNode(el, [`Red construction paper hearts with crude crayon figures of you and`, slaveSentence(array), `holding hands above text reading "I LUV U ${V.PC.title !== 0 ? `MASTER` : `MISTRESS`}"`]);
+ }
+ return el;
+ } else {
+ return null;
+ }
case "a cloth napkin":
if (array.length > 0) {
const el = document.createElement("span");
--
GitLab