diff --git a/Actors/Jennifer/ChastityBelt_Rope_Collar_BallGag_FoldPunishment.png b/Actors/Player/ChastityBelt_Rope_Collar_BallGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/ChastityBelt_Rope_Collar_BallGag_FoldPunishment.png
rename to Actors/Player/ChastityBelt_Rope_Collar_BallGag_FoldPunishment.png
diff --git a/Actors/Jennifer/ChastityBelt_Rope_Collar_ClothGag_FoldPunishment.png b/Actors/Player/ChastityBelt_Rope_Collar_ClothGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/ChastityBelt_Rope_Collar_ClothGag_FoldPunishment.png
rename to Actors/Player/ChastityBelt_Rope_Collar_ClothGag_FoldPunishment.png
diff --git a/Actors/Jennifer/ChastityBelt_Rope_Collar_NoGag_FoldPunishment.png b/Actors/Player/ChastityBelt_Rope_Collar_NoGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/ChastityBelt_Rope_Collar_NoGag_FoldPunishment.png
rename to Actors/Player/ChastityBelt_Rope_Collar_NoGag_FoldPunishment.png
diff --git a/Actors/Jennifer/ChastityBelt_Rope_Collar_TapeGag_FoldPunishment.png b/Actors/Player/ChastityBelt_Rope_Collar_TapeGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/ChastityBelt_Rope_Collar_TapeGag_FoldPunishment.png
rename to Actors/Player/ChastityBelt_Rope_Collar_TapeGag_FoldPunishment.png
diff --git a/Actors/Jennifer/Naked_Rope_Collar_BallGag_FoldPunishment.png b/Actors/Player/Naked_Rope_Collar_BallGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/Naked_Rope_Collar_BallGag_FoldPunishment.png
rename to Actors/Player/Naked_Rope_Collar_BallGag_FoldPunishment.png
diff --git a/Actors/Jennifer/Naked_Rope_Collar_ClothGag_FoldPunishment.png b/Actors/Player/Naked_Rope_Collar_ClothGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/Naked_Rope_Collar_ClothGag_FoldPunishment.png
rename to Actors/Player/Naked_Rope_Collar_ClothGag_FoldPunishment.png
diff --git a/Actors/Jennifer/Naked_Rope_Collar_NoGag_FoldPunishment.png b/Actors/Player/Naked_Rope_Collar_NoGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/Naked_Rope_Collar_NoGag_FoldPunishment.png
rename to Actors/Player/Naked_Rope_Collar_NoGag_FoldPunishment.png
diff --git a/Actors/Jennifer/Naked_Rope_Collar_TapeGag_FoldPunishment.png b/Actors/Player/Naked_Rope_Collar_TapeGag_FoldPunishment.png
similarity index 100%
rename from Actors/Jennifer/Naked_Rope_Collar_TapeGag_FoldPunishment.png
rename to Actors/Player/Naked_Rope_Collar_TapeGag_FoldPunishment.png
diff --git a/C000_Intro/ChapterSelect/Stage_CN.csv b/C000_Intro/ChapterSelect/Stage_CN.csv
index c0e61e887a..be1126ab06 100644
--- a/C000_Intro/ChapterSelect/Stage_CN.csv
+++ b/C000_Intro/ChapterSelect/Stage_CN.csv
@@ -25,4 +25,4 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
30,0,0,,French (Chapter 1 to 8)|Made by gottspende,,0,0,0,"SetLanguage(""FR"")"
30,0,0,,Chinese (Chapter 1 & 5)|By Dwscdv3 & asdcvbgf,,0,0,0,"SetLanguage(""CN"")"
30,0,0,,Spanish (Chapter 1)|Made by Rafael R,,0,0,0,"SetLanguage(""ES"")"
-30,0,0,,"German (Chapter 1, 2, 11)|Knife, fleisch11, adokilume",,0,0,0,"SetLanguage(""DE"")"
+30,0,0,,"German (Chapter 1 to 5)|adokilume, Knife, fleisch11",,0,0,0,"SetLanguage(""DE"")"
diff --git a/C000_Intro/ChapterSelect/Stage_DE.csv b/C000_Intro/ChapterSelect/Stage_DE.csv
index 980b63be4e..7cda20cde1 100644
--- a/C000_Intro/ChapterSelect/Stage_DE.csv
+++ b/C000_Intro/ChapterSelect/Stage_DE.csv
@@ -25,4 +25,4 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
30,0,0,,Französich (Kapitel 1 bis 8)|Geschrieben von gottspende,,0,0,0,"SetLanguage(""FR"")"
30,0,0,,Chinesisch (Kapitel 1 & 5)|Dwscdv3 & asdcvbgf,,0,0,0,"SetLanguage(""CN"")"
30,0,0,,Spanisch (Kapitel 1)|Geschrieben von Rafael R,,0,0,0,"SetLanguage(""ES"")"
-30,0,0,,"Deutsch (Kapitel 1, 2, 12)|Knife, fleisch11, adokilume",,0,0,0,"SetLanguage(""DE"")"
+30,0,0,,"Deutsch (Kapitel 1 bis 5)|adokilume, Knife, fleisch11",,0,0,0,"SetLanguage(""DE"")"
diff --git a/C000_Intro/ChapterSelect/Stage_EN.csv b/C000_Intro/ChapterSelect/Stage_EN.csv
index ec28a9c7f2..83e1d8c66c 100644
--- a/C000_Intro/ChapterSelect/Stage_EN.csv
+++ b/C000_Intro/ChapterSelect/Stage_EN.csv
@@ -25,4 +25,4 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
30,0,0,,French (Chapter 1 to 8)|Made by gottspende,,0,0,0,"SetLanguage(""FR"")"
30,0,0,,Chinese (Chapter 1 & 5)|By Dwscdv3 & asdcvbgf,,0,0,0,"SetLanguage(""CN"")"
30,0,0,,Spanish (Chapter 1)|Made by Rafael R,,0,0,0,"SetLanguage(""ES"")"
-30,0,0,,"German (Chapter 1, 2, 11)|Knife, fleisch11, adokilume",,0,0,0,"SetLanguage(""DE"")"
+30,0,0,,"German (Chapter 1 to 5)|adokilume, Knife, fleisch11",,0,0,0,"SetLanguage(""DE"")"
diff --git a/C000_Intro/ChapterSelect/Stage_ES.csv b/C000_Intro/ChapterSelect/Stage_ES.csv
index 303afc3567..939b3c1f63 100644
--- a/C000_Intro/ChapterSelect/Stage_ES.csv
+++ b/C000_Intro/ChapterSelect/Stage_ES.csv
@@ -25,4 +25,4 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
30,0,0,,Francés (Capítulos 1 to 8)|Autor gottspende,,0,0,0,"SetLanguage(""FR"")"
30,0,0,,Chino (Capítulo 1 & 5)|Autor Dwscdv3 & asdcvbgf,,0,0,0,"SetLanguage(""CN"")"
30,0,0,,Español (Capítulo 1)|Autor Rafael R.,,0,0,0,"SetLanguage(""ES"")"
-30,0,0,,"Alemán (Capítulo 1, 2, 11)|Knife, fleisch11, adokilume",,0,0,0,"SetLanguage(""DE"")"
+30,0,0,,"Alemán (Capítulo 1 a 5)|adokilume, Knife, fleisch11",,0,0,0,"SetLanguage(""DE"")"
diff --git a/C000_Intro/ChapterSelect/Stage_FR.csv b/C000_Intro/ChapterSelect/Stage_FR.csv
index f51b85a7f2..9d53bbae2f 100644
--- a/C000_Intro/ChapterSelect/Stage_FR.csv
+++ b/C000_Intro/ChapterSelect/Stage_FR.csv
@@ -25,4 +25,4 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
30,0,0,,"Français (Chapitre 1 à 8)|Traduit par gottspende",,0,0,0,"SetLanguage(""FR"")"
30,0,0,,Chinois (Chapitre 1 & 5)|Par Dwscdv3 et asdcvbgf,,0,0,0,"SetLanguage(""CN"")"
30,0,0,,Espagnol (Chapitre 1)|Traduit par Rafael R,,0,0,0,"SetLanguage(""ES"")"
-30,0,0,,"Allemand (Ch. 1, 2, 11)|Knife, fleisch11, adokilume",,0,0,0,"SetLanguage(""DE"")"
+30,0,0,,"Allemand (Ch. 1 to 5)|adokilume, Knife, fleisch11",,0,0,0,"SetLanguage(""DE"")"
diff --git a/C000_Intro/ChapterSelect/Stage_PL.csv b/C000_Intro/ChapterSelect/Stage_PL.csv
index feb0b05a86..f7c437077b 100644
--- a/C000_Intro/ChapterSelect/Stage_PL.csv
+++ b/C000_Intro/ChapterSelect/Stage_PL.csv
@@ -17,4 +17,4 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
20,0,0,,Francuski|Made by gottspende,,0,0,0,"SetLanguage(""FR"")"
20,0,0,,Chi�ski|Dwscdv3 & asdcvbgf,,0,0,0,"SetLanguage(""CN"")"
20,0,0,,Spanish (Chapter 1)|Made by Rafael R,,0,0,0,"SetLanguage(""ES"")"
-20,0,0,,"German (Chapter 1, 2, 11)|Knife, fleisch11, adokilume",,0,0,0,"SetLanguage(""DE"")"
+20,0,0,,"German (Chapter 1 to 5)|adokilume, Knife, fleisch11",,0,0,0,"SetLanguage(""DE"")"
diff --git a/C012_AfterClass/Bed/Script.js b/C012_AfterClass/Bed/Script.js
index 426fe2846f..78abaa88b7 100644
--- a/C012_AfterClass/Bed/Script.js
+++ b/C012_AfterClass/Bed/Script.js
@@ -68,6 +68,7 @@ function C012_AfterClass_Bed_Load() {
if (C012_AfterClass_Bed_Partner == "Sidney") C012_AfterClass_Bed_CurrentStage = 200;
if (C012_AfterClass_Bed_Partner == "Amanda") C012_AfterClass_Bed_CurrentStage = 300;
if (C012_AfterClass_Bed_Partner == "Sarah") C012_AfterClass_Bed_CurrentStage = 400;
+ if (C012_AfterClass_Bed_Partner == "Jennifer") C012_AfterClass_Bed_CurrentStage = 500;
C012_AfterClass_Bed_ShowCollar = (C012_AfterClass_Bed_Partner == "Sidney");
C012_AfterClass_Bed_PrepareImage(false, false);
C012_AfterClass_Bed_SexPleasurePartner = ActorHasInventory("VibratingEgg") ? 3 : 0;
@@ -128,6 +129,7 @@ function C012_AfterClass_Bed_AllRelatedGuest() {
CurrentTime = CurrentTime + 50000;
if (Common_PlayerOwner == "Sidney") C012_AfterClass_Sidney_CurrentStage = 3800;
if (Common_PlayerOwner == "Amanda") C012_AfterClass_Amanda_CurrentStage = 3800;
+ if (Common_PlayerOwner == "Jennifer") C012_AfterClass_Jennifer_CurrentStage = 3800;
SetScene(CurrentChapter, Common_PlayerOwner);
ActorSetPose("Angry");
LeaveIcon = "";
@@ -170,6 +172,7 @@ function C012_AfterClass_Bed_CheckMistress() {
CurrentTime = CurrentTime + 50000;
if (Common_PlayerOwner == "Sidney") C012_AfterClass_Sidney_CurrentStage = 3810;
if (Common_PlayerOwner == "Amanda") C012_AfterClass_Amanda_CurrentStage = 3810;
+ if (Common_PlayerOwner == "Jennifer") C012_AfterClass_Jennifer_CurrentStage = 3810;
SetScene(CurrentChapter, Common_PlayerOwner);
ActorSetPose("Angry");
LeaveIcon = "";
diff --git a/C012_AfterClass/Dorm/Background.jpg b/C012_AfterClass/Dorm/Background.jpg
index f33d12d2cd..81f619d0e0 100644
Binary files a/C012_AfterClass/Dorm/Background.jpg and b/C012_AfterClass/Dorm/Background.jpg differ
diff --git a/C012_AfterClass/Dorm/Script.js b/C012_AfterClass/Dorm/Script.js
index 89faa411a7..17dde567d7 100644
--- a/C012_AfterClass/Dorm/Script.js
+++ b/C012_AfterClass/Dorm/Script.js
@@ -12,7 +12,7 @@ function C012_AfterClass_Dorm_SetPunishmentPose() {
if (GameLogQuery(CurrentChapter, "", "EventGrounded")) {
if (Common_PlayerOwner == "Sidney") Common_PlayerPose = "TwoRopesPunishment";
if (Common_PlayerOwner == "Amanda") Common_PlayerPose = "HogtiePunishment";
- if (Common_PlayerOwner == "Amanda") Common_PlayerPose = "FoldPunishment";
+ if (Common_PlayerOwner == "Jennifer") Common_PlayerPose = "FoldPunishment";
if (CurrentScreen != "Dorm") {
if (CurrentScreen == Common_PlayerOwner) OverridenIntroText = GetText("StillGrounded");
else OverridenIntroText = GetText("StillGroundedByOther");
@@ -37,25 +37,25 @@ function C012_AfterClass_Dorm_LeavingGuest() {
// Sidney will leave at 20:00, it ends any grounding event
if ((C012_AfterClass_Dorm_Guest.indexOf("Sidney") >= 0) && (CurrentTime >= C012_AfterClass_Dorm_SidneyExitTime) && (CurrentTime <= C012_AfterClass_Dorm_SidneyReturnTime) && !GameLogQuery(CurrentChapter, "Sidney", "BackFromRockShow") && !ActorSpecificIsRestrained("Sidney") && !GameLogQuery(CurrentChapter, "Sidney", "KickedOutFromDorm")) {
- C012_AfterClass_Dorm_Guest.splice("Sidney");
- if (CurrentScreen == "Dorm") {
+ C012_AfterClass_Dorm_Guest.splice("Sidney");
+ if ((CurrentScreen == "Dorm") && (!C012_AfterClass_Dorm_PlayerGrounded || (Common_PlayerOwner == "Sidney"))) {
C012_AfterClass_Sidney_CurrentStage = 400;
if (C012_AfterClass_Dorm_PlayerGrounded && (Common_PlayerOwner == "Sidney")) GameLogSpecificAddTimer(CurrentChapter, "Sidney", "EventGrounded", 1);
SetScene(CurrentChapter, "Sidney");
ActorSetCloth("Shorts");
if (C012_AfterClass_Dorm_PlayerGrounded && (Common_PlayerOwner == "Sidney")) OverridenIntroText = GetText("GroundingEndForLeaving");
- }
+ } else C012_AfterClass_Dorm_CalGuest();
}
// Sarah will leave at 21:00, it cancels the bed with Amanda event
if ((C012_AfterClass_Dorm_Guest.indexOf("Sarah") >= 0) && (CurrentTime >= C012_AfterClass_Dorm_SarahExitTime) && !GameLogQuery(CurrentChapter, "Sarah", "BackFromBondageClub") && !ActorSpecificIsRestrained("Sarah") && !GameLogQuery(CurrentChapter, "Sarah", "KickedOutFromDorm")) {
GameLogSpecificAddTimer(CurrentChapter, "Player", "AmandaAndSarahInBed", 1);
C012_AfterClass_Dorm_Guest.splice("Sarah");
- if (CurrentScreen == "Dorm") {
+ if ((CurrentScreen == "Dorm") && !C012_AfterClass_Dorm_PlayerGrounded) {
C012_AfterClass_Sarah_CurrentStage = 400;
SetScene(CurrentChapter, "Sarah");
ActorSetCloth("BrownDress");
- }
+ } else C012_AfterClass_Dorm_CalGuest();
}
}
@@ -107,8 +107,8 @@ function C012_AfterClass_Dorm_Load() {
// Owners will not stay naked
if ((Common_PlayerOwner == "Sidney") && (ActorSpecificGetValue("Sidney", ActorCloth) == "Naked")) ActorSpecificSetCloth("Sidney", "Shorts");
- if ((Common_PlayerOwner == "Amanda") && (ActorSpecificGetValue("Amanda", ActorCloth) == "Naked")) ActorSpecificSetCloth("Amanda", "");
- if ((Common_PlayerOwner == "Jennifer") && (ActorSpecificGetValue("Jennifer", ActorCloth) == "Naked")) ActorSpecificSetCloth("Jennifer", "");
+ if ((Common_PlayerOwner == "Amanda") && (ActorSpecificGetValue("Amanda", ActorCloth) == "Naked")) ActorSpecificSetCloth("Amanda", "Clothed");
+ if ((Common_PlayerOwner == "Jennifer") && (ActorSpecificGetValue("Jennifer", ActorCloth) == "Naked")) ActorSpecificSetCloth("Jennifer", "Clothed");
// Calculates the time when Sidney will leave and return
C012_AfterClass_Dorm_SidneyExitTime = 20 * 60 * 60 * 1000;
@@ -156,6 +156,7 @@ function C012_AfterClass_Dorm_Run() {
if (C012_AfterClass_Dorm_PlayerGrounded && !GameLogQuery(CurrentChapter, "", "EventGrounded") && (C012_AfterClass_Sidney_CurrentStage != 400)) {
if (Common_PlayerOwner == "Sidney") C012_AfterClass_Sidney_CurrentStage = 3915;
if (Common_PlayerOwner == "Amanda") C012_AfterClass_Amanda_CurrentStage = 3915;
+ if (Common_PlayerOwner == "Jennifer") C012_AfterClass_Jennifer_CurrentStage = 3915;
SetScene(CurrentChapter, Common_PlayerOwner);
LeaveIcon = "";
}
@@ -165,6 +166,7 @@ function C012_AfterClass_Dorm_Run() {
if ((Common_PlayerOwner != "Amanda") || !GameLogQuery(CurrentChapter, "Player", "AmandaAndSarahInBed")) {
if (Common_PlayerOwner == "Sidney") C012_AfterClass_Sidney_CurrentStage = 450;
if (Common_PlayerOwner == "Amanda") C012_AfterClass_Amanda_CurrentStage = 450;
+ if (Common_PlayerOwner == "Jennifer") C012_AfterClass_Jennifer_CurrentStage = 450;
SetScene(CurrentChapter, Common_PlayerOwner);
LeaveIcon = "";
}
diff --git a/C012_AfterClass/Jennifer/Intro_EN.csv b/C012_AfterClass/Jennifer/Intro_EN.csv
index 13895e8827..55152015e8 100644
--- a/C012_AfterClass/Jennifer/Intro_EN.csv
+++ b/C012_AfterClass/Jennifer/Intro_EN.csv
@@ -99,6 +99,7 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
3091,0,0,,"(She gives a thumbs up.) You look perfect.|Stay like that, you're not allowed to change.",Dorm.jpg
3091,0,0,Common_ActorIsLover,"(She gives a thumbs up.) I love it darling.|Stay like that, you're not allowed to change.",Dorm.jpg
3092,0,0,,,Dorm.jpg
+3093,0,0,,,Dorm.jpg
3100,0,0,,"My protege, I will bind and gag you to|train your flexibility and escaping skills.",Dorm.jpg
3110,0,0,,"My protege, I will restrain you to|train your flexibility and escaping skills.",Dorm.jpg
3120,0,0,,You will now train on staying silent.|I will use one of your gags on you.,Dorm.jpg
@@ -111,9 +112,9 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
3190,0,0,,,Dorm.jpg
3191,0,0,,,Dorm.jpg
3200,0,0,,It's time for you to train. You will do|some push-ups in your underwear.,Dorm.jpg
-3201,0,0,,,Dorm.jpg
+3201,0,0,,,PlayerPushUp.jpg
3210,0,0,,It's time for you to train. You will do|some sit-ups in your underwear.,Dorm.jpg
-3211,0,0,,,Dorm.jpg
+3211,0,0,,,PlayerSitUp.jpg
3230,0,0,,This crop is kind of interesting.|We will train your endurance.,Dorm.jpg
3231,0,0,,,Dorm.jpg
3290,0,0,,,Dorm.jpg
diff --git a/C012_AfterClass/Jennifer/Script.js b/C012_AfterClass/Jennifer/Script.js
index f4e0284201..2dd914c23a 100644
--- a/C012_AfterClass/Jennifer/Script.js
+++ b/C012_AfterClass/Jennifer/Script.js
@@ -30,7 +30,7 @@ function C012_AfterClass_Jennifer_SetPose() {
if ((Love >= 10) && (Math.abs(Love) >= Math.abs(Sub))) ActorSetPose("Happy");
if ((Love <= -10) && (Math.abs(Love) >= Math.abs(Sub))) ActorSetPose("Angry");
if (Common_ActorIsOwner) {
- if (ActorHasInventory("Crop")) ActorSetPose("DominantCrop");
+ if (GameLogQuery(CurrentChapter, CurrentActor, "HasCrop")) ActorSetPose("DominantCrop");
else ActorSetPose("Dominant");
}
if (Common_ActorIsOwned) ActorSetPose("Shy");
@@ -109,7 +109,7 @@ function C012_AfterClass_Jennifer_Run() {
if (((C012_AfterClass_Jennifer_CurrentStage >= 320) && (C012_AfterClass_Jennifer_CurrentStage < 340)) || ((C012_AfterClass_Jennifer_CurrentStage >= 291) && (C012_AfterClass_Jennifer_CurrentStage < 300))) C012_AfterClass_Dorm_DrawOtherActors();
// Draw the actor alone or with the player depending on the stage
- if ((C012_AfterClass_Jennifer_CurrentStage != 3931) && (C012_AfterClass_Jennifer_CurrentStage != 3932) && (C012_AfterClass_Jennifer_CurrentStage != 3933) && (C012_AfterClass_Jennifer_CurrentStage != 632) && (C012_AfterClass_Jennifer_CurrentStage != 633) && (C012_AfterClass_Jennifer_CurrentStage != 634) && (C012_AfterClass_Jennifer_CurrentStage != 662) && (C012_AfterClass_Jennifer_CurrentStage != 663) && (C012_AfterClass_Jennifer_CurrentStage != 791) && (C012_AfterClass_Jennifer_CurrentStage != 194)) {
+ if ((C012_AfterClass_Jennifer_CurrentStage != 3201) && (C012_AfterClass_Jennifer_CurrentStage != 3211) && (C012_AfterClass_Jennifer_CurrentStage != 3931) && (C012_AfterClass_Jennifer_CurrentStage != 3932) && (C012_AfterClass_Jennifer_CurrentStage != 3933) && (C012_AfterClass_Jennifer_CurrentStage != 632) && (C012_AfterClass_Jennifer_CurrentStage != 633) && (C012_AfterClass_Jennifer_CurrentStage != 634) && (C012_AfterClass_Jennifer_CurrentStage != 662) && (C012_AfterClass_Jennifer_CurrentStage != 663) && (C012_AfterClass_Jennifer_CurrentStage != 791) && (C012_AfterClass_Jennifer_CurrentStage != 194)) {
if (((C012_AfterClass_Jennifer_CurrentStage >= 3090) && (C012_AfterClass_Jennifer_CurrentStage <= 3099)) || ((C012_AfterClass_Jennifer_CurrentStage >= 3901) && (C012_AfterClass_Jennifer_CurrentStage <= 3999))) {
DrawActor("Player", 475, 0, 1);
DrawActor(CurrentActor, 750, 0, 1);
@@ -389,6 +389,7 @@ function C012_AfterClass_Jennifer_TestUnbind() {
function C012_AfterClass_Jennifer_DoActivity(ActivityType, Enjoyment, BonusStage) {
// Launch the activity, some can have a bonus stage
+ if ((ActivityType == "PushUp") || (ActivityType == "SitUp")) PlayerClothes("Underwear");
C012_AfterClass_Jennifer_CurrentStage = EventDoActivity(ActivityType, Enjoyment, C012_AfterClass_Jennifer_CurrentStage, 3290, BonusStage);
}
@@ -423,6 +424,7 @@ function C012_AfterClass_Jennifer_ConfiscateKeys() {
function C012_AfterClass_Jennifer_ConfiscateCrop() {
PlayerRemoveInventory("Crop", 99);
GameLogAdd("HasCrop");
+ C012_AfterClass_Jennifer_SetPose();
C012_AfterClass_Jennifer_AllowLeave();
}
diff --git a/C012_AfterClass/Jennifer/Stage_EN.csv b/C012_AfterClass/Jennifer/Stage_EN.csv
index 8829d9fd8c..593263bcfe 100644
--- a/C012_AfterClass/Jennifer/Stage_EN.csv
+++ b/C012_AfterClass/Jennifer/Stage_EN.csv
@@ -5,7 +5,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
0,0,0,,We need to talk.,Yeah? What's on your mind?,0,0,0,TestTalk()
0,0,5,!Common_ActorIsOwned,"Girl, you need|some training.",I already train almost everyday Miss.|(You need +20 submission to collar Jennifer.),0,0,0,TestDomme()
0,0,-5,!Common_ActorIsOwner,Miss Jennifer.|I admire you.,I'm not sure why you admire me that much.|(You need -20 submission to submit to Jennifer.),0,0,0,TestSub()
-0,0,0,Common_PlayerGagged,@Om nnnuoogn mh!,Oh yeah. I fucking understood|what you said. (She laughs.),0,0,0,TestUnbind()
+0,0,0,Common_PlayerGagged,@Om nnnuoogn mh!,"If you practice enough, maybe you'll|learn to talk clearly while being gagged.",0,0,0,TestUnbind()
0,0,0,Common_ActorIsOwner,(Hum a sexy song|and dance for fun.),"Not now, we are on short break.|Your training will resume later.",0,0,0,RandomJenniferDommeEvent()
0,0,0,Common_PlayerRestrained,(Struggle in|your restrains.),"Nope, you're not getting out.|It's great to see you struggle.",0,0,0,TestUnbind()
0,0,0,!Common_ActorIsOwner,You should wear|something else.,"No, thanks. I'm fine like that.",0,0,0,TestChange()
@@ -24,7 +24,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
20,0,0,Common_ActorIsOwned,Let's review|your rules.,(She seems to worry.)|Of course Mistress.,610,0,0,
20,0,0,Common_PlayerChaste,Can you please help|me with this belt?,"Nope, that chastity belt|is a perfect fit for you.",0,0,0,
20,0,0,Common_ActorIsLover,About our relationship...,What's going on sweetie?,190,0,0,
-20,0,0,CanKickOut,It's time for you|to leave my place.,You're fucking kicking me out?,790,-1,1,
+20,0,0,CanKickOut,It's time for you|to leave my place.,(She looks very disappointed.)|Are you kicking me out?,790,-1,1,"ActorSetPose("""")"
20,0,0,,Never mind.,Alright. So what could|we do to have some fun?,0,0,0,
100,0,0,,Do you have|a loved one?,"No, I've never dated anyone.",110,0,0,TestRelationship()
100,0,0,,Do you have|a boyfriend?,"No, I've never dated anyone.",110,0,0,TestRelationship()
@@ -148,7 +148,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
331,0,0,,(Stay silent|and stand up.),I'm happy to have you under|my wing my little protege.,0,0,0,PlayerStandUp()
399,0,0,,Very well Miss.|(Back to your dorm.),,399,0,0,BackToDorm()
450,0,0,,Yes! Training time.,,0,0,0,RandomJenniferDommeEvent()
-450,0,0,,What's going on?,,0,0,0,RandomJenniferDommeEvent()
+450,0,0,,What kind of training?,,0,0,0,RandomJenniferDommeEvent()
450,0,0,,(Nod happily.),,0,0,0,RandomJenniferDommeEvent()
450,0,0,,(Look surprised.),,0,0,0,RandomJenniferDommeEvent()
500,0,0,,Do you have|many friends?,I have some friends and some enemies.,510,0,0,
@@ -230,31 +230,31 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
650,0,0,,(Get in bed.),,0,0,0,MakeLove()
650,0,0,!Common_ActorIsOwner,(Push her on the bed.),,0,0,0,MakeLove()
650,0,0,!Common_ActorIsOwned,(Let her carry|you in bed.),,0,0,0,MakeLove()
-790,0,0,,Come back another day.|I need to study tonight.,That's a fucking lame excuse.|(She walks out and slams the door.),791,-2,0,KickedOut()
-790,0,0,,You need to go.|We'll talk later.,"Fine, I'll go then.|(She walks out.)",791,-1,0,KickedOut()
-790,0,0,,Don't be mad.|I'm sorry.,"Fuck that, I'll go smoke.|(She grumbles and walks out.)",791,-1,-1,KickedOut()
-790,0,0,,Pack your shit|and go girl.,Fuck you COMMON_PLAYERNAME!|(She walks away and slams the door.),791,-2,1,KickedOut()
+790,0,0,,Come back another day.|I need to study tonight.,"Fair enough, I'll see you later then.|(She walks out and closes the door.)",791,-1,0,KickedOut()
+790,0,0,,You need to go.|We'll talk later.,"Alright, I'll see you later then.|(She walks out and closes the door.)",791,-2,0,KickedOut()
+790,0,0,,Don't be mad.|I'm sorry.,"It's fine, I'll see you later then.|(She walks out and closes the door.)",791,-1,-1,KickedOut()
+790,0,0,,Pack your shit|and go girl.,You don't need to be rude you know.|(She walks out and closes the door.),791,-2,1,KickedOut()
791,0,0,,(Back to your dorm.),,791,0,0,BackToDorm()
3010,0,0,,Yes Mentor.|(Get in your undies.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""Underwear"")"
3010,0,0,,(Nod slowly.)|(Get in your undies.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""Underwear"")"
-3010,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
-3010,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
+3010,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
+3010,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
3020,0,0,,Yes Mentor.|(Wear your uniform.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""Clothed"")"
3020,0,0,,(Nod slowly.)|(Wear your uniform.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""Clothed"")"
-3020,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
-3020,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
+3020,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
+3020,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
3030,0,0,,Yes Mentor.|(Wear your bikini.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""RedBikini"")"
3030,0,0,,(Nod slowly.)|(Wear your bikini.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""RedBikini"")"
-3030,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
-3030,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
+3030,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
+3030,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
3050,0,0,,Yes Mentor.|(Wear your dress.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""BlackDress"")"
3050,0,0,,(Nod slowly.)|(Wear your dress.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""BlackDress"")"
-3050,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
-3050,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
+3050,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
+3050,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
3060,0,0,,Yes Mentor.|(Wear your tennis outfit.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""Tennis"")"
3060,0,0,,(Nod slowly.)|(Wear your tennis outfit.),(You change for Jennifer while|she looks at you and smiles.),3090,0,0,"ForceChangePlayer(""Tennis"")"
-3060,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
-3060,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3092,0,0,TestPunish()
+3060,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
+3060,0,0,,(Shake your head no.),"Fine, let's take a break then.|(She turns around irritated.)",3093,0,0,TestPunish()
3090,0,0,,Do I look fine?,You do! Now let's do some exercises.|(She smiles and starts to do exercises.),3092,0,0,TestBlockChanging()
3090,0,0,,Are you happy?,Yes I am! Now let's do some exercises.|(She smiles and starts to do exercises.),3092,0,0,TestBlockChanging()
3090,0,0,,(Bow your head.),You look good! Now let's do some exercises.|(She smiles and starts to do some exercises.),3092,0,0,TestBlockChanging()
@@ -264,6 +264,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
3091,0,0,,(Sulk.),Improve your attitude and move your body!|(She frowns and starts to do exercises.),3092,0,0,AllowLeave()
3091,0,0,,That's unfair!,Improve your attitude and move your body!|(She frowns and starts to do exercises.),3092,0,0,AllowLeave()
3092,0,0,,(Exercise a little and|go back to your dorm.),,3092,0,0,BackToDorm()
+3093,0,0,,(Back to your dorm.),,3093,0,0,BackToDorm()
3100,0,0,,Yes Mentor.|(Show your items.),(She checks your items|and uses them on you.),3190,0,0,"ForceRandomBondage(""Full"")"
3100,0,0,,(Nod slowly and|show your items.),(She checks your items|and uses them on you.),3190,0,0,"ForceRandomBondage(""Full"")"
3100,0,0,,I don't want|to do that.,"Fine, let's take a break then.|(She turns around irritated.)",3191,0,0,TestPunish()
@@ -279,8 +280,8 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
3140,0,0,,(Bow your head and|give your keys.),Thanks my protege. (She takes your|keys and starts to do some exercises.),3191,0,-1,ConfiscateKeys()
3140,0,0,,No! These|are my keys.,"Fine, let's take a break then.|(She turns around irritated.)",3191,0,1,TestPunish()
3140,0,0,,(Shake your head|no and refuse.),"Fine, let's take a break then.|(She turns around irritated.)",3191,0,1,TestPunish()
-3150,0,0,,Yes Mentor.|(Give your crop.),(She takes the crop and looks intrigued.)|(She stores it and starts to do some exercises.),3191,1,0,ConfiscateCrop()
-3150,0,0,,(Bow your head and|give your crop.),(She takes the crop and looks intrigued.)|(She stores it and starts to do some exercises.),3191,1,0,ConfiscateCrop()
+3150,0,0,,Yes Mentor.|(Give your crop.),"(She takes the crop and looks intrigued.)|Take a break, I'll train your endurance soon.",3191,1,0,ConfiscateCrop()
+3150,0,0,,(Bow your head and|give your crop.),"(She takes the crop and looks intrigued.)|Take a break, I'll train your endurance soon.",3191,1,0,ConfiscateCrop()
3150,0,0,,No! It's not yours.,"Fine, let's take a break then.|(She turns around irritated.)",3191,-1,0,TestPunish()
3150,0,0,,(Shake your head|no and refuse.),"Fine, let's take a break then.|(She turns around irritated.)",3191,-1,0,TestPunish()
3160,0,0,,Yes Mentor.|It's a kinky egg.,Very well. I'll put it in|you for vaginal training.,3161,0,0,
@@ -377,9 +378,9 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
3903,0,0,,(Take a deep breath.),,3903,0,0,StartPunishment()
3903,0,0,,(Make puppy eyes.),,3903,0,0,StartPunishment()
3903,0,0,,Yes Mentor.,,3903,0,0,StartPunishment()
-3910,0,0,,Grounded? What|does that mean?,You will be restrained and isolated for a while.|Now put your arms behind your bac girl.,3911,0,0,
-3910,0,0,,(Give a curious look.),You will be restrained and isolated for a while.|Now put your arms behind your bac girl.,3911,0,0,
-3910,0,0,,"No, please.|I'll be good.",Enough! You will be restrained for a while.|Now put your arms behind your bac girl.,3911,0,0,
+3910,0,0,,Grounded? What|does that mean?,You will be restrained and isolated for a while.|Now put your arms behind your back girl.,3911,0,0,
+3910,0,0,,(Give a curious look.),You will be restrained and isolated for a while.|Now put your arms behind your back girl.,3911,0,0,
+3910,0,0,,"No, please.|I'll be good.",Enough! You will be restrained for a while.|Now put your arms behind your back girl.,3911,0,0,
3911,0,0,,Yes Mentor.|(Put your arms back.),"(She grabs your arms and ties them securely.)|Very good. Now open up, you will be gagged.",3912,0,-1,RopePlayer()
3911,0,0,,(Sigh and put|your arms back.),(She grabs your arms and ties them securely.)|Alright. Now open up. You will be gagged.,3912,0,0,RopePlayer()
3911,0,0,,Can we negotiate?,(She grabs your arms and ties them securely.)|No! Now open up. You will be gagged.,3912,0,1,RopePlayer()
diff --git a/C012_AfterClass/Sarah/Script.js b/C012_AfterClass/Sarah/Script.js
index 2a4b591c05..d765f6988d 100644
--- a/C012_AfterClass/Sarah/Script.js
+++ b/C012_AfterClass/Sarah/Script.js
@@ -81,6 +81,9 @@ function C012_AfterClass_Sarah_Load() {
Common_PlayerPose = "";
if (Common_ActorIsOwned) GameLogAddTimer("EventGenericNext", CurrentTime + 1200000 + Math.floor(Math.random() * 1200000));
+ // At stage 400, Sarah is leaving
+ if (C012_AfterClass_Sarah_CurrentStage == 400) { ActorUngag(); LeaveIcon = ""; }
+
// Sarah's parameters
C012_AfterClass_Sarah_CalcParams();
C012_AfterClass_Sarah_ChatAvail = !GameLogQuery(CurrentChapter, "Sidney", "AllowPigCostume");
diff --git a/C012_AfterClass/Sarah/Stage_EN.csv b/C012_AfterClass/Sarah/Stage_EN.csv
index 29d4f218f0..78eb3b7190 100644
--- a/C012_AfterClass/Sarah/Stage_EN.csv
+++ b/C012_AfterClass/Sarah/Stage_EN.csv
@@ -163,8 +163,8 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
380,0,0,,I don't think I|will go tonight.,"That's cool, we can do|something else before I go.",0,0,0,
400,0,0,BondageClubInvitationBySarah,(Nod yes slowly.)|(Go to the club.),(The Bondage Club will be available|in another version of the game.),400,0,0,
400,0,0,BondageClubInvitationBySarah,Yes! Let's go!|(Go to the club.),(The Bondage Club will be available|in another version of the game.),400,0,0,
-400,0,0,Common_PlayerGagged,@UNGN MH NUUOGH!,(She giggles and leaves your dorm.),410,0,0,TestReleaseBeforeExit()
-400,0,0,Common_PlayerRestrained,Can you help me|before you go?,I'm sure you will find help.|(She leaves your dorm.),410,0,0,TestReleaseBeforeExit()
+400,0,0,Common_PlayerGagged,@UNGN MH NUUOGH!,(She giggles and leaves your dorm.),410,0,0,
+400,0,0,Common_PlayerRestrained,Can you help me|before you go?,I'm sure you will find help.|(She leaves your dorm.),410,0,0,
400,0,0,!Common_ActorIsOwned,Have fun Sarah!,I will. (She leaves your dorm.),410,0,0,
400,0,0,Common_ActorIsOwned,Have fun my slave!,"I will Mistress, thanks!|(She leaves your dorm.)",410,0,1,
400,0,0,!Common_ActorIsOwned,That sucks!|Don't go.,I'll be back really soon.|(She leaves your dorm.),410,-1,0,
diff --git a/C012_AfterClass/Wardrobe/Script.js b/C012_AfterClass/Wardrobe/Script.js
index e568a1024a..a5a3a98da3 100644
--- a/C012_AfterClass/Wardrobe/Script.js
+++ b/C012_AfterClass/Wardrobe/Script.js
@@ -51,6 +51,7 @@ function C012_AfterClass_Wardrobe_Change(NewCloth) {
CurrentTime = CurrentTime + 50000;
if (Common_PlayerOwner == "Sidney") C012_AfterClass_Sidney_CurrentStage = 3800;
if (Common_PlayerOwner == "Amanda") C012_AfterClass_Amanda_CurrentStage = 3800;
+ if (Common_PlayerOwner == "Jennifer") C012_AfterClass_Jennifer_CurrentStage = 3800;
SetScene(CurrentChapter, Common_PlayerOwner);
ActorSetPose("Angry");
LeaveIcon = "";
diff --git a/Event.js b/Event.js
index e829f44619..18e51703ea 100644
--- a/Event.js
+++ b/Event.js
@@ -136,7 +136,7 @@ function EventDoActivity(EventActivityType, EventLoveFactor, EventCurrentStage,
// The number of times the activity will be done depends on the love or hate
if ((EventActivityType == "Tickle") || (EventActivityType == "Masturbate")) EventActivityMaxCount = 5 + Math.floor(ActorGetValue(ActorLove) / 10);
else EventActivityMaxCount = 5 - Math.floor(ActorGetValue(ActorLove) / 10);
- if (EventActivityMaxCount < 3) EventActivityMaxCount = 3;
+ if (EventActivityMaxCount < 4) EventActivityMaxCount = 4;
if (EventActivityMaxCount > 8) EventActivityMaxCount = 8;
}
@@ -167,7 +167,7 @@ function EventDoActivity(EventActivityType, EventLoveFactor, EventCurrentStage,
// Log the activity and ends it
EventLogEnd()
if (EventActivityLove > 0) OverridenIntroText = GetText("ActivityEndGood");
- if (EventActivityLove = 0) OverridenIntroText = GetText("ActivityEndFair");
+ if (EventActivityLove == 0) OverridenIntroText = GetText("ActivityEndFair");
if (EventActivityLove < 0) OverridenIntroText = GetText("ActivityEndBad");
ActorSetPose("");
return EventEndStage;