Chapter 12 - Models for the Wardrobe

Chapter 12 - Models for the Wardrobe

C005_GymClass/Jennifer/Script.js

@@ -25,6 +25,7 @@ function C005_GymClass_Jennifer_Load() {
 
 	// Load the scene parameters
 	ActorLoad("Jennifer", "GymClass");
+	GameLogAdd("Judo");
 	LoadInteractions();
 	StartTimer(11.5 * 60 * 60 * 1000, CurrentChapter, "Outro");
 	LeaveIcon = "";

C007_LunchBreak/Jennifer/Stage_FR.csv

@@ -32,7 +32,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 100,0,0,!TennisVictory,Tu as une visière.|J'avais le soleil en face.,Ne cherche pas d'excuse.|J'ai gagné loyalement la partie.,105,-1,0,
 100,0,0,!TennisVictory,Tu es bien trop douée|par rapport à moi.,"Allez, souris et commence à t'entraîner davantage !|La prochaine fois, tu gagneras.",105,0,-1,
 100,0,0,!TennisVictory,C'était sympa|comme match.,Oui ! Il faut qu'on en fasse un autre bientôt.|Tu pourrais gagner la prochaine fois.,105,0,0,
-105,0,0,,"Oui, Madame. Et je vous|obéirai durant le déjeuner.",M'obéir ? Tu as l'air si docile.|Je vais profiter de mon repas gratuit, ça c'est sûr.,110,0,-1,
+105,0,0,,"Oui, Madame. Et je vous|obéirai durant le déjeuner.","M'obéir ? Tu as l'air si docile.|Je vais profiter de mon repas gratuit, ça c'est sûr.",110,0,-1,
 105,0,0,,Tu te souviens des|conditions de notre partie ?,"(Elle rit.) Oui, tu m'obéiras le temps du déjeuner.|Et je vais bien évidemment profiter de ce repas gratuit.",110,0,0,
 105,0,0,,Je serai ton esclave|jusqu'à la fin du déjeuner.,"Mon esclave ? Ça sonne si mal.|Mais, je vais profiter de mon repas gratuit.",110,-1,-1,
 110,0,0,,Qu'est-ce que|tu vas prendre ?,"Je ne sais pas encore, quelque chose de sain.|Suis-tu, toi aussi un régime alimentaire ?",113,0,0,

C008_DramaClass/DressingRoom/Script.js

@@ -3,6 +3,7 @@ function C008_DramaClass_DressingRoom_Load() {
 	LeaveIcon = "Wait";
 	Common_SelfBondageAllowed = true;
 	Common_BondageAllowed = true;
+	GameLogSpecificAdd(CurrentChapter, "", "Role" + C008_DramaClass_JuliaIntro_PlayerRole);
 }
 
 // Chapter 8 - Dressing Room Run

C011_LiteratureClass/Mildred/Intro_EN.csv

@@ -14,6 +14,7 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 48,0,0,,,SidneyCuffed.jpg
 50,0,0,,,MildredAngry.jpg
 60,0,0,,,MildredTeach.jpg
+65,0,0,,,MildredTeach.jpg
 70,0,0,,,MildredAngry.jpg
 71,0,0,,,MildredAngry.jpg
 72,0,0,,,MildredAngry.jpg
@@ -51,5 +52,5 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 420,0,0,,,LeadTest3.jpg
 430,0,0,,,LeadTest4.jpg
 440,0,0,,,LeadTest5.jpg
-450,0,0,,,LeadTest1.jpg
-460,0,0,,,LeadTest2.jpg
+450,0,0,,,LeadTest6.jpg
+460,0,0,,,LeadTest6.jpg

C011_LiteratureClass/Mildred/Script.js

@@ -68,8 +68,8 @@ function C011_LiteratureClass_Mildred_StartQuiz(QuizChapter, Opponent) {
 	if (GameLogQuery("C009_Library", "", "ReadTwice")) AnswerGenSpeed = 1500;
 
 	// Loads the quiz
-	if (Opponent == "Sidney") QuizLoad("Player", C011_LiteratureClass_Mildred_QuizPlayerStatus, "Sidney", C011_LiteratureClass_Mildred_QuizSidneyStatus, "Mildred", "Clothed", "Easy", AnswerGenSpeed, 5, "Classroom", "MonteCristoChapter" + QuizChapter, "C011_LiteratureClass_Mildred_EndQuiz");
-	else QuizLoad("Player", C011_LiteratureClass_Mildred_QuizPlayerStatus, "Mildred", C011_LiteratureClass_Mildred_QuizMildredStatus, "Sidney", "Clothed", "Hard", AnswerGenSpeed, 5, "Classroom", "MonteCristoChapter" + QuizChapter, "C011_LiteratureClass_Mildred_EndQuizMildred");
+	if (Opponent == "Sidney") QuizLoad("Player", C011_LiteratureClass_Mildred_QuizPlayerStatus, "Sidney", C011_LiteratureClass_Mildred_QuizSidneyStatus, "Mildred", "Clothed", "Easy", AnswerGenSpeed, 3, "Classroom", "MonteCristoChapter" + QuizChapter, "C011_LiteratureClass_Mildred_EndQuiz");
+	else QuizLoad("Player", C011_LiteratureClass_Mildred_QuizPlayerStatus, "Mildred", C011_LiteratureClass_Mildred_QuizMildredStatus, "Sidney", "Clothed", "Hard", AnswerGenSpeed, 3, "Classroom", "MonteCristoChapter" + QuizChapter, "C011_LiteratureClass_Mildred_EndQuizMildred");
 
 }
 

C011_LiteratureClass/Mildred/Stage_EN.csv

@@ -51,7 +51,8 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 50,0,0,,(Look at your shoes.),COMMON_PLAYERNAME and Sidney!|Step forward and face back to each other.,60,0,0,
 50,0,0,Common_PlayerRestrained,(Tug on the cuffs.),COMMON_PLAYERNAME and Sidney!|Step forward and face back to each other.,60,0,0,
 50,0,0,!Common_PlayerRestrained,(Check your phone.),COMMON_PLAYERNAME and Sidney!|Step forward and face back to each other.,60,-1,0,
-60,0,0,,(Step forward.),"The test will be five quizzes of five questions on|chapters one to five from ""The Count of Monte Cristo"".",70,0,0,
+60,0,0,,(Step forward.),"The test will be five quizzes of five questions on|chapters one to five from ""The Count of Monte Cristo"".",65,0,0,
+65,0,0,,(Listen.),The first student to give three good answers wins|and the other will be punished.  Are you ready?,70,0,0,
 70,0,0,,(Start the test|for chapter 1.),,71,0,0,StartTest()
 71,0,0,,(Start the test|for chapter 2.),,72,0,0,StartTest()
 72,0,0,,(Start the test|for chapter 3.),,73,0,0,StartTest()
@@ -92,8 +93,8 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 150,0,0,,I was lucky.,"No, you have real talent.|This is very humiliating.",160,0,-1,
 150,0,0,,That was quite|a challenge.,"Yes, and you've won it.|This is very humiliating.",160,1,0,
 150,0,0,,You're horrible|at literature.,I guess you're correct.|This is very humiliating.,160,-1,0,
-160,0,0,,"Get out, I will|finish the class.","(Sidney unlocks and Mildred walks out|in shame, leaving her stuff behind.)",400,-1,1,FreeBoth()
-160,0,0,,You can take a break.|I'll do the tests.,"(Sidney unlocks and Mildred walks out|in shame, leaving her stuff behind.)",400,0,1,FreeBoth()
+160,0,0,,"Get out, I will|finish the class.",(Sidney unlocks and Mildred quits in shame.|She leaves you her items and her blazer.),400,-1,1,FreeBoth()
+160,0,0,,You can take a break.|I'll do the tests.,(Sidney unlocks and Mildred quits in shame.|She leaves you her items and her blazer.),400,0,1,FreeBoth()
 160,0,0,,"It's alright, you can|resume the tests.",(She nods while Sidney unlocks.  She starts|the tests again and regains her confidence.),300,1,0,FreeBoth()
 160,0,0,,"Yes, enough|humiliation.",(She nods while Sidney unlocks.  She starts|the tests again and regains her confidence.),300,0,0,FreeBoth()
 200,0,0,,Sidney was lucky.,Maybe she was lucky or maybe|you didn't studied hard enough.,210,0,0,
@@ -123,7 +124,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 350,0,0,Common_PlayerRestrained,(Watch the tests.),(Your last class will end in cuffs.),360,0,0,WaitTest()
 350,0,0,!Common_PlayerRestrained,(Watch the tests.),(Your last class will end|with lots of whipping.),360,0,0,WaitTest()
 360,0,0,,(Wait until 16:30.),,360,0,0,EndChapter()
-400,0,0,,(Take her items.),(You search in Mildred stuff and|find some very interesting items.),410,0,0,TakeItems()
+400,0,0,,(Take her items.),(You wear the teacher blazer and pick|every items that Mildred left behind.),410,0,0,TakeItems()
 410,0,0,,(Lead the tests.),"(Using the crop, you start leading|the literature tests yourself.)",420,0,0,WaitTest()
 420,0,0,,(Lead the tests.),(Some students do well.),430,0,0,WaitTest()
 430,0,0,,(Lead the tests.),(Some students fail.),440,0,0,WaitTest()

C012_AfterClass/Wardrobe/Script.js

@@ -1,10 +1,27 @@
 var C012_AfterClass_Wardrobe_CurrentStage = 0;
+var C012_AfterClass_Wardrobe_CostumeHeroine = false;
+var C012_AfterClass_Wardrobe_CostumeVillain = false;
+var C012_AfterClass_Wardrobe_CostumeDamsel = false;
+var C012_AfterClass_Wardrobe_CostumeTennis = false;
+var C012_AfterClass_Wardrobe_CostumeJudo = false;
+var C012_AfterClass_Wardrobe_CostumeTeacher = false;
 
 // Chapter 12 After Class - Wardrobe Load
 function C012_AfterClass_Wardrobe_Load() {
+	
+	// Loads the scene to search in the wardrobe
 	LeaveIcon = "Leave";
 	LeaveScreen = "Dorm";
 	LoadInteractions();
+	
+	// Sets which costume are available based on what happened in the day
+	C012_AfterClass_Wardrobe_CostumeHeroine = GameLogQuery("C008_DramaClass", "Player", "RoleHeroine");
+	C012_AfterClass_Wardrobe_CostumeVillain = GameLogQuery("C008_DramaClass", "Player", "RoleVillain");
+	C012_AfterClass_Wardrobe_CostumeDamsel = GameLogQuery("C008_DramaClass", "Player", "RoleDamsel");
+	C012_AfterClass_Wardrobe_CostumeTennis = GameLogQuery("C007_LunchBreak", "Jennifer", "Lunch");
+	C012_AfterClass_Wardrobe_CostumeJudo = GameLogQuery("C005_GymClass", "Jennifer", "Judo");
+	C012_AfterClass_Wardrobe_CostumeTeacher = GameLogQuery("C011_LiteratureClass", "Player", "ClassLeader");
+	
 }
 
 // Chapter 12 After Class - Wardrobe Run

C012_AfterClass/Wardrobe/Stage_EN.csv

@@ -1,4 +1,10 @@
 Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
-0,0,0,,@School uniform.,,0,0,0,"Change(""Clothed"")"
-0,0,0,!Common_PlayerChaste,@Underwear.,,0,0,0,"Change(""Underwear"")"
-0,0,0,,@Get naked.,,0,0,0,"Change(""Naked"")"
+0,0,0,,@School uniform,,0,0,0,"Change(""Clothed"")"
+0,0,0,!Common_PlayerChaste,@Underwear,,0,0,0,"Change(""Underwear"")"
+0,0,0,,@Get naked,,0,0,0,"Change(""Naked"")"
+0,0,0,CostumeJudo,@Judo outfit,,0,0,0,"Change(""Judo"")"
+0,0,0,CostumeTennis,@Tennis outfit,,0,0,0,"Change(""Tennis"")"
+0,0,0,CostumeHeroine,@Heroine armor,,0,0,0,"Change(""Heroine"")"
+0,0,0,CostumeVillain,@Villain armor,,0,0,0,"Change(""Villain"")"
+0,0,0,CostumeDamsel,@Damsel gown,,0,0,0,"Change(""Damsel"")"
+0,0,0,CostumeTeacher,@Teacher blazer,,0,0,0,"Change(""Teacher"")"

C999_Common/Quiz/Quiz.js

@@ -23,7 +23,7 @@ var QuizGoal = -1;
 var QuizText = null;
 var QuizQuestion = null;
 var QuizAnswer = null;
-var QuizFirstQuestionTime = 6000;
+var QuizFirstQuestionTime = 5000;
 var QuizBeforeAnswerTime = 3000;
 var QuizAnswerProgressTime = 3000;
 var QuizOtherQuestionTime = 3000;
@@ -176,15 +176,15 @@ function QuizRenderAfterAnswer() {
 function QuizRenderEnd() {
 	DrawText(Common_PlayerName + ": " + QuizProgressLeft.toString(), 600, 60, "white");
 	DrawText(QuizActorRight + ": " + QuizProgressRight.toString(), 600, 120, "white");
-	if (QuizProgressLeft == QuizGoal) DrawText(GetCSVText(QuizText, "Perfect"), 600, 200, "white");
-	else if (QuizProgressLeft >= QuizProgressRight) DrawText(GetCSVText(QuizText, "Victory"), 600, 200, "white");
+	if (QuizProgressRight == 0) DrawText(GetCSVText(QuizText, "Perfect"), 600, 200, "white");
+	else if (QuizProgressLeft > QuizProgressRight) DrawText(GetCSVText(QuizText, "Victory"), 600, 200, "white");
 	else DrawText(GetCSVText(QuizText, "Defeat"), 600, 200, "white");	
 }
 
 // Prepare the next quiz question if needed
 function QuizNextQuestion() {
 	if ((QuizTimer >= QuizBetweenQuestionTimer) && (QuizBetweenQuestionTimer > 0)) {
-		if (QuizProgressLeft + QuizProgressRight >= QuizGoal) QuizEnded = true;
+		if ((QuizProgressLeft >= QuizGoal) || (QuizProgressRight >= QuizGoal)) QuizEnded = true;
 		QuizTimer = QuizOtherQuestionTime * -1;
 		QuizAnswerText = "";
 		QuizAnswerBy = "";

Drawing.js

@@ -409,7 +409,7 @@ function DrawGetPlayerImageName(IncludePose) {
 
 	// Third part is the collar, which only shows for certain clothes
 	var ImageCollar = "";
-	if ((ImageCloth == "Underwear") || (ImageCloth == "Naked") || (ImageCloth == "ChastityBelt") || (ImageCloth == "Damsel")) {
+	if ((ImageCloth == "Underwear") || (ImageCloth == "Naked") || (ImageCloth == "ChastityBelt") || (ImageCloth == "Damsel") || (ImageCloth == "Tennis") || (ImageCloth == "Judo")) {
 		if (PlayerHasLockedInventory("Collar")) ImageCollar = "_Collar";
 		else ImageCollar = "_NoCollar";
 	}
@@ -436,8 +436,13 @@ function DrawGetPlayerImageName(IncludePose) {
 
 // Draw the regular player image (600x600) (can zoom if an X and Y are provided)
 function DrawPlayerImage(X, Y) {
-	if ((X == 0) && (Y == 0)) DrawImage("C999_Common/Player/" + DrawGetPlayerImageName(false) + ".jpg", 600, 0);
-	else DrawImageZoom("C999_Common/Player/" + DrawGetPlayerImageName(false) + ".jpg", X, Y, 600, 600, 600, 0, 1200, 1200);
+	if ((Common_PlayerCostume == "Tennis") || (Common_PlayerCostume == "Judo") || (Common_PlayerCostume == "Teacher")) {
+		DrawRect(600, 0, 1200, 600, "White");
+		DrawTransparentPlayerImage(600, 0, 1);
+	} else {
+		if ((X == 0) && (Y == 0)) DrawImage("C999_Common/Player/" + DrawGetPlayerImageName(false) + ".jpg", 600, 0);
+		else DrawImageZoom("C999_Common/Player/" + DrawGetPlayerImageName(false) + ".jpg", X, Y, 600, 600, 600, 0, 1200, 1200);
+	}	
 }
 
 // Draw the transparent player image (600x900) with a zoom if required