Amanda in Pajamas

Amanda in Pajamas

C012_AfterClass/Amanda/Intro_EN.csv

@@ -27,8 +27,9 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 192,0,0,,,StopDating.jpg
 193,0,0,,,StopDating.jpg
 194,0,0,,,Dorm.jpg
-200,0,0,,Someone to take care of me?|What do you mean Miss?,Dorm.jpg
-200,0,0,Common_ActorIsLover,I already have you.|I need someone else?,Dorm.jpg
+200,0,0,,I...  I...  I admit I kind of enjoy it.|(She blushes red and looks down.),Dorm.jpg
+200,0,0,Common_ActorIsLover,You know me too well my love.|(She blushes red and looks down.),Dorm.jpg
+210,0,0,,,Dorm.jpg
 300,0,0,,"Our college has strict rules, you will need|someone to help you learn and enforce them.",Dorm.jpg
 450,0,0,,(Amanda tickles you for fun and laughs.)|Alright my subbie.  It's time to have fun.,Dorm.jpg
 450,0,0,Common_ActorIsLover,(Amanda tickles you for fun and laughs.)|Alright my subbie.  It's time to have fun.,Dorm.jpg

C012_AfterClass/Amanda/Script.js

@@ -4,10 +4,10 @@ var C012_AfterClass_Amanda_HasEgg = false;
 var C012_AfterClass_Amanda_HasBelt = false;
 var C012_AfterClass_Amanda_ChatAvail = false;
 var C012_AfterClass_Amanda_SpankCount = 0;
-var C012_AfterClass_Amanda_EnslaveCount = 0;
 var	C012_AfterClass_Amanda_IsGagged = false;
 var	C012_AfterClass_Amanda_IsRoped = false;
 var	C012_AfterClass_Amanda_IsStrapped = false;
+var C012_AfterClass_Amanda_IsRestrained = false;
 var C012_AfterClass_Amanda_CanMasturbate = false;
 var C012_AfterClass_Amanda_PleasurePlayerAvail = false;
 var C012_AfterClass_Amanda_SexAvail = false;
@@ -50,6 +50,7 @@ function C012_AfterClass_Amanda_CalcParams() {
 	C012_AfterClass_Amanda_IsGagged = ActorIsGagged();	
 	C012_AfterClass_Amanda_IsRoped = (ActorHasInventory("Rope") || ActorHasInventory("TwoRopes") || ActorHasInventory("ThreeRopes"));
 	C012_AfterClass_Amanda_IsStrapped = ActorHasInventory("Armbinder");
+	C012_AfterClass_Amanda_IsRestrained = ActorIsRestrained();
 	C012_AfterClass_Amanda_PleasurePlayerAvail = (!Common_PlayerChaste && !ActorIsGagged() && !ActorIsRestrained() && Common_ActorIsOwned && !GameLogQuery(CurrentChapter, "Player", "NextPossibleOrgasm"));
 	C012_AfterClass_Amanda_SexAvail = (!Common_PlayerRestrained && !Common_PlayerChaste && !GameLogQuery(CurrentChapter, "Player", "NextPossibleOrgasm") && !GameLogQuery(CurrentChapter, "Amanda", "NextPossibleOrgasm"));
 	C012_AfterClass_Amanda_CanMasturbate = (!Common_PlayerRestrained && !C012_AfterClass_Amanda_HasBelt && (ActorGetValue(ActorCloth) == "Naked"));	
@@ -196,7 +197,7 @@ function C012_AfterClass_Amanda_Click() {
 		}
 
 		// A second rope can be applied if Amanda isn't fully clothed
-		if ((ActorGetValue(ActorCloth) != "Naked") && (ActorGetValue(ActorCloth) != "Underwear") && (ActorGetValue(ActorCloth) != "Pajamas") && (ClickInv == "Rope") && (ActorHasInventory("Rope"))) {
+		if ((ActorGetValue(ActorCloth) != "Naked") && (ActorGetValue(ActorCloth) != "Underwear") && (ClickInv == "Rope") && (ActorHasInventory("Rope"))) {
 			OverridenIntroText = GetText("StripForSecondRope");
 			return;
 		}
@@ -253,8 +254,6 @@ function C012_AfterClass_Amanda_TestDomme() {
 		if (!ActorIsGagged()) {
 			if (ActorGetValue(ActorSubmission) >= 20) {
 				if (!GameLogQuery(CurrentChapter, CurrentActor, "EnslaveDone")) {
-					if (ActorIsRestrained()) C012_AfterClass_Amanda_EnslaveCount = 1;
-					else C012_AfterClass_Amanda_EnslaveCount = 0;
 					C012_AfterClass_Amanda_CurrentStage = 200;
 					OverridenIntroText = "";
 					LeaveIcon = "";
@@ -599,19 +598,12 @@ function C012_AfterClass_Amanda_ForceChangeActor(NewCloth) {
 	C012_AfterClass_Amanda_GaggedAnswer();
 }
 
-// Chapter 12 After Class - Increases the slavery count for Amanda, 5 is required to collar her
-function C012_AfterClass_Amanda_EnslaveAmandaCount() {
-	C012_AfterClass_Amanda_EnslaveCount++;
-}
-
 // Chapter 12 After Class - Check if Amanda wants to be collared, 5 counts are required
 function C012_AfterClass_Amanda_TestEnslaveAmanda() {
-	if (C012_AfterClass_Amanda_EnslaveCount >= 5) {
-		if (ActorIsRestrained()) C012_AfterClass_Amanda_CurrentStage = 285;
-		else if (ActorGetValue(ActorCloth) == "Naked") { C012_AfterClass_Amanda_CurrentStage = 291; ActorSetPose("Shy"); }
-		else C012_AfterClass_Amanda_CurrentStage = 290;
-		OverridenIntroText = GetText("AcceptCollar");
-	} else LeaveIcon = "";
+	if (ActorIsRestrained()) C012_AfterClass_Amanda_CurrentStage = 285;
+	else if (ActorGetValue(ActorCloth) == "Naked") { C012_AfterClass_Amanda_CurrentStage = 291; ActorSetPose("Shy"); }
+	else C012_AfterClass_Amanda_CurrentStage = 290;
+	OverridenIntroText = GetText("AcceptCollar");
 }
 
 // Chapter 12 After Class - When the player gives up on enslaving Amanda

C012_AfterClass/Amanda/Stage_EN.csv

@@ -2,8 +2,8 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 0,0,0,Common_ActorIsOwner,What's on your|mind Mistress?,"Nothing my subbie, I'm reviewing my notes.|(She reviews and studies her school notes.)",0,0,0,RandomAmandaDommeEvent()
 0,0,0,Common_ActorIsOwner,"Mistress, it's ok if|I change clothes?","Absolutely, you can wear|anything you want my subbie.",0,0,0,IsChangingBlocked()
 0,5,0,!Common_ActorIsLover,You look so|pretty Amanda.,"Thanks, I love your looks also.|(You need +20 love to date Amanda.)",0,0,0,TestLove()
-0,0,0,Common_ActorIsLover,We need to talk.,What would you like to talk about?,0,0,0,TestTalk()
-0,0,5,!Common_ActorIsOwned,"Girl, you need|my protection.",Protection on school ground?  Don't be silly.|(You need +20 submission to collar Amanda.),0,0,0,TestDomme()
+0,0,0,,We need to talk.,What would you like to talk about?,0,0,0,TestTalk()
+0,0,5,IsRestrained,You really enjoy being|restrained don't you girl?,(She winks.)  I'll never admit that Miss.|(You need +20 submission to collar Amanda.),0,0,0,TestDomme()
 0,0,-5,!Common_ActorIsOwner,Miss Amanda.|I admire you.,That's very flattering of you to say that.|(You need -20 submission to submit to Amanda.),0,0,0,TestSub()
 0,0,0,Common_PlayerGagged,@Om nnnuoogn mh!,Let me get my English-Mumble|dictionary.  (She laughs out loud.),0,0,0,TestUnbind()
 0,0,0,Common_ActorIsOwner,(Hum a sexy song|and dance for fun.),"Not now my subbie, I'm reviewing my notes.|(She reviews and studies her school notes.)",0,0,0,RandomAmandaDommeEvent()
@@ -54,7 +54,10 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 193,0,0,,You're not|in my league.,(She grumbles.)  Fine.  I get it.|(She runs away from the room.),194,-1,1,AmandaLeave()
 193,0,0,,It was a mistake|from the start,"Maybe you're right, fuck that!|(She runs away from the room.)",194,0,0,AmandaLeave()
 193,0,0,,You'll find someone|perfect for you.,I thought I already did.  Fuck that.|(She runs away from the room.),194,1,0,AmandaLeave()
-200,0,0,,TO DO,TO DO - DOMME,210,0,0,
+200,0,0,,You like losing control.|It turns you on girl.,,210,0,1,
+200,0,0,,You're all wet|when tied up.,,210,0,0,
+200,0,0,,Bondage is a strong|sexual fantasy of yours?,,210,0,0,
+210,0,0,,TO DO,TO DO = DOMME,210,0,0,
 300,0,0,,TO DO,TO DO - SUBMIT,310,0,0,
 450,0,0,,Fun Mistress?,,0,0,0,RandomAmandaDommeEvent()
 450,0,0,,What's going on?,,0,0,0,RandomAmandaDommeEvent()

C012_AfterClass/Amanda/Text_EN.csv

@@ -76,7 +76,7 @@ ClothGag,(She reluctantly opens her mouth so you|can push the wad inside and tie
 CuffsKey,(She sees the key and turns|around so you can unlock her.)
 VibratingEgg,(She sees the egg and seems very nervous.|She takes a deep breath while you push it in.)
 ChastityBelt,(She freaks out when she sees the belt|but you're able to lock it while she whimpers.)
-Collar,(You need +20 submission and a full|acceptance speech.to collar her.)
+Collar,(You need +20 submission and a full|acceptance speech to collar her.)
 CollarToEnslave,(You need a collar to enslave someone.)
 EnslaveAlreadyTried,We already had this discussion.|Your collar isn't for me Miss.
 AcceptCollar,Yes Miss.  I will accept your collar.|I will be your devoted submissive.

C012_AfterClass/Sidney/Stage_EN.csv

@@ -3,7 +3,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 0,0,0,Common_ActorIsOwner,"Mistress, it's ok if|I change clothes?",Sure bitch.  Wear what you want.,0,0,0,IsChangingBlocked()
 0,5,0,!Common_ActorIsLover,You look so|pretty Sidney.,"Thanks, you don't look bad either.|(You need +20 love to date Sidney.)",0,0,0,TestLove()
 0,0,0,Common_ActorIsLover,Should we go|out my love?,There's a rock show that starts at twenty.|Will you go with me sweetheart?,0,0,0,TestGoOnDate()
-0,0,0,Common_ActorIsLover,We need to talk.,Yeah?  What's on your mind?,0,0,0,TestTalk()
+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|my protection.",I don't need protection from anyone.|(You need +20 submission to collar Sidney.),0,0,0,TestDomme()
 0,0,-5,!Common_ActorIsOwner,Miss Sidney.|I admire you.,"Don't talk like that, you sound like a loser.|(You need -20 submission to submit to Sidney.)",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()

C012_AfterClass/Sidney/Text_EN.csv

@@ -81,7 +81,7 @@ ClothGag,(She struggles a little but you're able to|push the wad inside her mout
 CuffsKey,(She sees the key and turns|around so you can unlock her.)
 VibratingEgg,(She shakes her head no when she|sees the egg but you're able to push it in.)
 ChastityBelt,(She panics when she sees the belt|but you're able to lock it tightly on her.)
-Collar,(You need +20 submission and a full|acceptance speech.to collar her )
+Collar,(You need +20 submission and a full|acceptance speech to collar her )
 CollarToEnslave,(You need a collar to enslave someone.)
 EnslaveAlreadyTried,We already spoke about that.|I will not wear your collar.
 AcceptCollar,Yes Miss.  I will wear your collar.|I would love to be your slave.