From 27dbe2b1ef26d49af8186cba3e85d5073de15c6b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 28 Feb 2021 16:19:29 -0500
Subject: [PATCH] Fixes + catmod event migrations
---
src/Mods/Catmod/events/SoSSniper.tw | 6 +++---
.../events/sheduled}/bodypuristprotest.tw | 0
.../Catmod/events/sheduled}/bodypuristriot.tw | 0
.../events/sheduled}/projectNBlowingTheLid.tw | 0
.../Catmod/events/sheduled}/projectNBubbles.tw | 0
.../events/sheduled}/projectNComplete.tw | 0
.../events/sheduled}/projectNInitialized.tw | 0
.../Catmod/events/sheduled}/projectNMoMoney.tw | 0
.../events/sheduled}/projectNSaboteur.tw | 0
.../events/sheduled}/projectNTechRelease.tw | 0
.../Catmod/events/sheduled}/vatcatboy.tw | 0
.../Catmod/events/sheduled}/vatcatgirl.tw | 0
src/events/RESS/hotPC.js | 2 +-
src/uncategorized/scheduledEvent.tw | 18 +++++++++---------
14 files changed, 13 insertions(+), 13 deletions(-)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/bodypuristprotest.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/bodypuristriot.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNBlowingTheLid.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNBubbles.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNComplete.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNInitialized.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNMoMoney.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNSaboteur.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/projectNTechRelease.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/vatcatboy.tw (100%)
rename src/{events/scheduled => Mods/Catmod/events/sheduled}/vatcatgirl.tw (100%)
diff --git a/src/Mods/Catmod/events/SoSSniper.tw b/src/Mods/Catmod/events/SoSSniper.tw
index 7c70359b6ff..885ab1e43ac 100644
--- a/src/Mods/Catmod/events/SoSSniper.tw
+++ b/src/Mods/Catmod/events/SoSSniper.tw
@@ -45,11 +45,11 @@ It's a particularly nice day out and you've decided to visit some of the more pr
<</if>>.
Two more shots slam into the wood around you as you all but leap into the citizen's apartment, one more bullet splintering the wood of the door as you close it shut behind you.
<<run cashX(-1000, "event", _S.Bodyguard)>>
-<<elseif _S.Bodyguard.intelligence + _S.Bodyguard.intelligenceImplant > 60>>
+<<elseif !_S.Bodyguard || _S.Bodyguard.intelligence + _S.Bodyguard.intelligenceImplant <= 60>>
+ <<set $gameover = "snipedbysons">><<goto "Gameover">>
+<<else>>
You blink once at the message in confusion before _S.Bodyguard.slaveName tackles you, $his shoulder bursting out with an explosion of red as $he catches a bullet clearly meant for you. $He cries out in pain, but it doesn't look like the hit was lethal; even injured and bleeding, $he shields you as you hustle into the open apartment along with the spooked citizen, more shots impacting around you as you wildly scramble into cover. A final bullet splinters the wood of the door as you close it shut behind you.
<<run cashX(-1000, "event", _S.Bodyguard), healthDamage(_S.Bodyguard, 60)>>
-<<else>>
- <<set $gameover = "snipedbysons">><<goto "Gameover">>
<</if>>
<br><br>
As you pant in the wake of the sudden attack, $assistant.name notifies you that they've traced the origin of the shots to somewhere in Sector Three. Having missed the killing shot, the sniper is undoubtedly packing up and moving to leave right now. You'll have to get a search party moving immediately if you want any hope of tracking them down.
diff --git a/src/events/scheduled/bodypuristprotest.tw b/src/Mods/Catmod/events/sheduled/bodypuristprotest.tw
similarity index 100%
rename from src/events/scheduled/bodypuristprotest.tw
rename to src/Mods/Catmod/events/sheduled/bodypuristprotest.tw
diff --git a/src/events/scheduled/bodypuristriot.tw b/src/Mods/Catmod/events/sheduled/bodypuristriot.tw
similarity index 100%
rename from src/events/scheduled/bodypuristriot.tw
rename to src/Mods/Catmod/events/sheduled/bodypuristriot.tw
diff --git a/src/events/scheduled/projectNBlowingTheLid.tw b/src/Mods/Catmod/events/sheduled/projectNBlowingTheLid.tw
similarity index 100%
rename from src/events/scheduled/projectNBlowingTheLid.tw
rename to src/Mods/Catmod/events/sheduled/projectNBlowingTheLid.tw
diff --git a/src/events/scheduled/projectNBubbles.tw b/src/Mods/Catmod/events/sheduled/projectNBubbles.tw
similarity index 100%
rename from src/events/scheduled/projectNBubbles.tw
rename to src/Mods/Catmod/events/sheduled/projectNBubbles.tw
diff --git a/src/events/scheduled/projectNComplete.tw b/src/Mods/Catmod/events/sheduled/projectNComplete.tw
similarity index 100%
rename from src/events/scheduled/projectNComplete.tw
rename to src/Mods/Catmod/events/sheduled/projectNComplete.tw
diff --git a/src/events/scheduled/projectNInitialized.tw b/src/Mods/Catmod/events/sheduled/projectNInitialized.tw
similarity index 100%
rename from src/events/scheduled/projectNInitialized.tw
rename to src/Mods/Catmod/events/sheduled/projectNInitialized.tw
diff --git a/src/events/scheduled/projectNMoMoney.tw b/src/Mods/Catmod/events/sheduled/projectNMoMoney.tw
similarity index 100%
rename from src/events/scheduled/projectNMoMoney.tw
rename to src/Mods/Catmod/events/sheduled/projectNMoMoney.tw
diff --git a/src/events/scheduled/projectNSaboteur.tw b/src/Mods/Catmod/events/sheduled/projectNSaboteur.tw
similarity index 100%
rename from src/events/scheduled/projectNSaboteur.tw
rename to src/Mods/Catmod/events/sheduled/projectNSaboteur.tw
diff --git a/src/events/scheduled/projectNTechRelease.tw b/src/Mods/Catmod/events/sheduled/projectNTechRelease.tw
similarity index 100%
rename from src/events/scheduled/projectNTechRelease.tw
rename to src/Mods/Catmod/events/sheduled/projectNTechRelease.tw
diff --git a/src/events/scheduled/vatcatboy.tw b/src/Mods/Catmod/events/sheduled/vatcatboy.tw
similarity index 100%
rename from src/events/scheduled/vatcatboy.tw
rename to src/Mods/Catmod/events/sheduled/vatcatboy.tw
diff --git a/src/events/scheduled/vatcatgirl.tw b/src/Mods/Catmod/events/sheduled/vatcatgirl.tw
similarity index 100%
rename from src/events/scheduled/vatcatgirl.tw
rename to src/Mods/Catmod/events/sheduled/vatcatgirl.tw
diff --git a/src/events/RESS/hotPC.js b/src/events/RESS/hotPC.js
index b6eb39d968e..2165783bf38 100644
--- a/src/events/RESS/hotPC.js
+++ b/src/events/RESS/hotPC.js
@@ -100,7 +100,7 @@ App.Events.RESSHotPC = class RESSHotPC extends App.Events.BaseEvent {
t.push(`${He} uses shaky ${hasBothArms(eventSlave) ? "hands" : "gestures"} to ask you to fuck ${him},`);
} else {
t.push(Spoken(eventSlave, `"Sorry, ${Master}, I was just, um, passing by and I thought, um, I saw, um, sorry ${Master}, I'm going now,"`));
- t.push("he babbles,");
+ t.push(`${he} babbles,`);
}
t.push("and turns to flee.");
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index bb4fac209c9..1ad5cb096d3 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -25,15 +25,15 @@
<<set $fcnn.push("...Ladies: Do you want dick so much that you want to HAVE a dick? If yes, join the Futanari Sisters today! Learn more at...")>>
<</if>>
<<if $seeCats == 1>>
-<<if $projectN.public == 1>>
- <<set $fcnn.push("...Catgirl slaves: Fad, fluke, or fashion? Tune in for an exclusive FCNN interview with Doctor Radomir Nieskowitz later tonight...")>>
-<</if>>
-<<if $projectN.status > 4>>
- <<set $fcnn.push("...Sons of Sekhmet claim responsibility for bombing campaign in...")>>
- <<set $fcnn.push("...was killed this week in a surprise ambush by Sons of Sekhmet assassins...")>>
- <<set $fcnn.push("...terrorist organizations in the Free Cities: An exclusive report, coming up next...")>>
- <<set $fcnn.push("...large scale rioting continues for the ninety-sixth consecutive day over genetic engineering concerns...")>>
-<</if>>
+ <<if $projectN.public == 1>>
+ <<set $fcnn.push("...Catgirl slaves: Fad, fluke, or fashion? Tune in for an exclusive FCNN interview with Doctor Radomir Nieskowitz later tonight...")>>
+ <</if>>
+ <<if $projectN.status > 4>>
+ <<set $fcnn.push("...Sons of Sekhmet claim responsibility for bombing campaign in...")>>
+ <<set $fcnn.push("...was killed this week in a surprise ambush by Sons of Sekhmet assassins...")>>
+ <<set $fcnn.push("...terrorist organizations in the Free Cities: An exclusive report, coming up next...")>>
+ <<set $fcnn.push("...large scale rioting continues for the ninety-sixth consecutive day over genetic engineering concerns...")>>
+ <</if>>
<</if>>
<<if $week == 30>>
<<set $fcnn.push("...is where I'll be when the bombs hit. Survival is my first...")>>
--
GitLab