Browse Source

Chat Fixes

Stephan Fuchs 10 months ago
parent
commit
8e5cb9cc88

+ 14 - 9
sugarcube/src/activities/school/gschool_chats.tw

@@ -303,9 +303,8 @@
 		<</if>>
 	<</if>>
 <</if>>*/
-:: gschool_break_cooljocks[event]
-<<if $location_var[$here][0] == 'cooljocks'>>
-	<<set $time.minutes += 5>>
+:: school_break_cooljocks_events[event]
+	/*<<set $time.minutes += 5>>
 	<<if ((hotcat >= 8 and rand(1,10) == 1) or (hotcat >= 5 and $pc.hotcat < 8 and rand(1,20) == 1)) and $gschool_gropeday != $time.daystart>>
 		<!-- !!It is more likely that somebody will grab the player''s butt the hotter she is.-->
 		<<set $menu_off = 1>>
@@ -328,10 +327,17 @@
 		<<actCLA 'Identify the perpetrator'>>
 			<<gt 'gschool_events1' 'butt_grab'>>
 		<</actCLA>>
-	<<else>>
+	<<else>>*/
+:: school_break_cooljocks[event]
+	<<set $time.minutes += 5>>
 		<<image "locations/pavlovsk/school/chat/cooljocks.jpg">>
-		When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know while the guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building.
-		<<if $q.school.func('isWearingSchoolUniform')>>
+		When the break finally comes, the girls wander through the hallways of the school,
+		gossiping about pretty much everyone they know while the guys are standing around in small groups,
+		some of them sneaking off to have a smoke behind the school building.
+
+		<<gs 'gschool_groups' 'cool'>><hr/>
+		<<gs 'gschool_groups' 'jocks'>>
+		/*<<if $q.school.func('isWearingSchoolUniform')>>
 			<<if $wardrobe.PCloInhibit <= 10>>
 				<<if $pc.fame('pav_sex') > 0>>
 					<<run $pc.fameInc('pav','sex',-1)>>
@@ -541,6 +547,5 @@
 			<<actCLA 'Leave'>>
 				<<gt 'gschool_lessons' 'short_break'>>
 			<</actCLA>>
-		<</if>>
-	<</if>>
-<</if>>
+		<</if>>*/
+

+ 90 - 122
sugarcube/src/activities/school/gschool_coolkid_chats.tw

@@ -1,9 +1,7 @@
-:: gschool_coolkid_chats
-<<set $here = 'gschool_coolkid_chats'>>
-<<set $ARGS = $location_var[$here]>>
+:: gschool_coolkid_chats[event]
 <!-- !2022/01/13-->
-<<if $location_var[$here][0] == 'dimka'>>
-	<<set $menu_off = 1>>
+<<switch $location_var[$here][0]>>
+<<case 'dimka' 'A1'>>
 	<<gs 'npc_relationship' 'modify' 'A1' 'like'>>
 	<<image "characters/shared/headshots_main/big1.jpg">>
 	<<if getvar("$dimka_debt") > 0>>
@@ -19,8 +17,8 @@
 				<</actCLA>>
 				<<if getvar("$dimarudorient") == 1>>
 					<<actCLA 'Ask for some pale lady'>>
-	<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
-<</actCLA>>
+						<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
+					<</actCLA>>
 
 				<</if>>
 			<</actCLA>>
@@ -59,8 +57,8 @@
 							<p>"Just the person I was hoping to see!" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would've loved it out there. It really made me realize we're wasting away out here in a place like this." You then chat about the other places he has visited.</p>
 							<<if getvar("$dimarudorient") == 1>>
 								<<actCLA 'Ask for some pale lady'>>
-	<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
-<</actCLA>>
+									<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
+								<</actCLA>>
 
 							<</if>>
 						<<elseif $npcs.get('A1','rel') <= 20>>
@@ -74,8 +72,8 @@
 							<p>"Have I shown you my photos from my last trip?" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would've loved it out there. It really made me realize we're wasting away out here in a place like this." You then chat about the other places he's visited.</p>
 							<<if getvar("$dimarudorient") == 1>>
 								<<actCLA 'Ask for some pale lady'>>
-	<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
-<</actCLA>>
+									<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
+								<</actCLA>>
 
 							<</if>>
 						<<elseif $npcs.get('A1','rel') <= 20>>
@@ -90,8 +88,8 @@
 							Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you're here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you're soon engaged in a conversation with Dimka.
 							<<if getvar("$dimarudorient") == 1>>
 								<<actCLA 'Ask for some pale lady'>>
-	<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
-<</actCLA>>
+									<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
+								<</actCLA>>
 
 							<</if>>
 						<<elseif $npcs.get('A1','rel') <= 20>>
@@ -108,8 +106,8 @@
 							Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you're here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you're soon engaged in a conversation with Dimka.
 							<<if getvar("$dimarudorient") == 1>>
 								<<actCLA 'Ask for some pale lady'>>
-	<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
-<</actCLA>>
+									<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
+								<</actCLA>>
 
 							<</if>>
 						<<elseif $npcs.get('A1','rel') <= 20>>
@@ -140,8 +138,7 @@
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</actCLA>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'dim_drugs'>>
+<<case 'dim_drugs'>>
 	<<image "characters/shared/headshots_main/big1.jpg">>
 	You don't want to, but you feel miserable and everything hurts. You crave the rush that you've come to enjoy so much.
 	<p>"Please Dimka, can I have some pale lady?"</p>
@@ -152,26 +149,26 @@
 		<</actCLA>>
 		<<if $finances.cash >= 420>>
 			<<actCLA 'Buy enough for 1 line (420 <b>₽</b>)'>>
-	<<set $palelady = 1>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
-<</actCLA>>
+				<<set $palelady = 1>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
+			<</actCLA>>
 
 		<</if>>
 		<<if $finances.cash >= 840>>
 			<<actCLA 'Buy enough for 2 lines (840 <b>₽</b>)'>>
-	<<set $palelady = 2>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
-<</actCLA>>
+				<<set $palelady = 2>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
+			<</actCLA>>
 
 		<</if>>
 		<<if $finances.cash >= 1680>>
 			<<actCLA 'Buy enough for 5 lines (1680 <b>₽</b>)'>>
-	<<set $palelady = 5>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
-<</actCLA>>
+				<<set $palelady = 5>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
+			<</actCLA>>
 
 		<</if>>
 		<<if $finances.cash >= 3720>>
 			<<actCLA 'Buy enough for 10 lines (3320 <b>₽</b>)'>>
-	<<set $palelady = 10>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
-<</actCLA>>
+				<<set $palelady = 10>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
+			<</actCLA>>
 
 		<</if>>
 	<<else>>
@@ -185,8 +182,7 @@
 			<<gt 'gschool_coolkid_chats' 'dimka_sex'>>
 		<</actCLA>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'dimka_pay'>>
+<<case 'dimka_pay'>>
 	<<set $finances.cash -= $palelady * 420>>
 	<<set $dur += $palelady>>
 	<<set $palelady = 0>>
@@ -203,8 +199,7 @@
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</actCLA>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'dimka_sex'>>
+<<case 'dimka_sex'>>
 	<<image "characters/pavlovsk/school/boy/dimka/sex/school/dimbj1.jpg">>
 	He leads you down the hall and finally stops at one of the classrooms. He opens the door and steps in, closing the door after you enter. Once inside, he pushes you up against the wall and leans in close so his face is only a few inches from yours. "Get on your knees, bitch."
 	You obey him and slowly sink to your knees. You don't have to be told what to do next. You reach up and start undoing his pants.
@@ -252,9 +247,8 @@
 			<</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'igor'>>
-	<<set $menu_off = 1>>
+<<case 'igor' 'A4'>>
+	
 	<<gs 'npc_relationship' 'modify' 'A4' 'like'>>
 	<<image "characters/shared/headshots_main/big4.jpg">>
 	<<actCLA 'Time for the next class'>>
@@ -527,8 +521,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'tease_igor'>>
+<<case 'tease_igor'>>
 	<<gs 'npc_relationship' 'modify' 'A4' 'like'>>
 	<<image "characters/shared/headshots_main/big4.jpg">>
 	You decide to tease him a little. "I hope you're not too sore after last time..." you whisper with a smirk. Igor''s cheeks flush pink as he looks around nervously, hoping no one overheard.
@@ -554,8 +547,7 @@
 			<<gt 'gschool_coolkid_chats' 'igor_peg'>>
 		<</actCLA>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'igor_peg'>>
+<<case 'igor_peg'>>
 	<<image "characters/pavlovsk/school/boy/igor/sex/school/break1.jpg">>
 	You lead him down the hall and finally stop at one of the classrooms. You open the door and step in, closing the door after he enters. Once inside you tell him to strip naked.
 	He only hesitates for a second before he quickly strips from his clothes. Once he is naked, you push him down to his knees and he looks up at you submissively, already rock hard.
@@ -615,11 +607,13 @@
 			<</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'katja'>>
-	<<set $menu_off = 1>>
+<<case 'katja' 'A14'>>
+	<<todo>>Katjas Questline is on the todo list<</todo>>
 	<<gs 'npc_relationship' 'modify' 'A14' 'like'>>
-	<<if rand(1,2) == 1 and getvar("$katjaQW['school_sex']") == 1 and getvar("$katjaQW['horny']") >= 40>>
+	<<actCLA 'Time for the next class'>>
+		<<gt 'gschool_lessons' 'short_break'>>
+	<</actCLA>>
+	/*<<if rand(1,2) == 1 and getvar("$katjaQW['school_sex']") == 1 and getvar("$katjaQW['horny']") >= 40>>
 		<<image "characters/pavlovsk/school/girl/katja/tanga_kiss.jpg">>
 		Katja slowly leans in towards you, almost closing her eyes as she slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.
 		<<gs 'katjaEvDin' 'kiss_events'>>
@@ -784,7 +778,7 @@
 		<<actCLA 'Time for the next class'>>
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</actCLA>>
-		<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+		/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 			<<actCLA 'Ask for a tampon'>>
 				<<setinit $temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 				<<gs 'gschool_coolkid_chats' 'katja_tampon'>>
@@ -807,10 +801,9 @@
 				<</actCLA>>
 			<</if>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'katja_tampon'>>
-	<<image "characters/shared/headshots_main/big14.jpg">>
+	<</if>>*/
+<<case 'katja_tampon'>>
+	/*<<image "characters/shared/headshots_main/big14.jpg">>
 	<<if $temp['tampon_ask'] == '"Katja , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Katja , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if getvar("$katjaQW['pantiesQWstage']") == 5>>
 			<p>"Oh!" Katja squeaks, her eyes going wide. "Yes, of course!"</p>
@@ -890,10 +883,9 @@
 				<<gt 'gschool_lessons' 'short_break'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'Katjaproblems'>>
-	<<set $menu_off = 1>>
+	<</if>>*/
+<<case 'Katjaproblems'>>
+	
 	<<setinit $katjaQW['QWstage'] = 1>>
 	<center><table><tr><td><<image `'images/characters/shared/headshots_main/big14.jpg'`>></td><td><<image `'images/characters/shared/headshots_main/big8.jpg'`>></tr></td></table></center>
 	You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on her. He seems to be trying to convince Katja to go on a date with him.
@@ -930,9 +922,7 @@
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</actCLA>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'bella'>>
-	<<set $menu_off = 1>>
+<<case 'bella' 'A22'>>
 	<<gs 'npc_relationship' 'modify' 'A22' 'like'>>
 	<<image "characters/shared/headshots_main/big22.jpg">>
 	<<if $pc.fame('pav_slut') > 200>>
@@ -1026,7 +1016,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'bella_tampon'>>
@@ -1048,10 +1038,9 @@
 				<<gs 'gschool_coolkid_chats' 'bella_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'bella_tampon'>>
-	<<image "characters/shared/headshots_main/big22.jpg">>
+	<</if>>*/
+<<case 'bella_tampon'>>
+	/*<<image "characters/shared/headshots_main/big22.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Bella , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Bella , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A22','rel') >= 70>>
@@ -1096,9 +1085,8 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'cherleading_notice'>>
+	<</actCLA>>*/
+<<case 'cherleading_notice'>>
 	<<run $q.cheerleading.set('bella_stasya_gossip',1)>>
 	<<image "characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg">>
 	As you walk into the cafeteria, Bella and Stasya gesture towards you to get your attention.
@@ -1171,9 +1159,7 @@
 			<</actCLA>>
 		<</actCLA>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'lizaveta'>>
-	<<set $menu_off = 1>>
+<<case 'lizaveta' 'A140'>>
 	<<gs 'npc_relationship' 'modify' 'A140' 'like'>>
 	<<image "characters/shared/headshots_main/big140.jpg">>
 	<<actCLA 'Time for the next class'>>
@@ -1256,7 +1242,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'lizaveta_tampon'>>
@@ -1278,10 +1264,9 @@
 				<<gs 'gschool_coolkid_chats' 'lizaveta_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'lizaveta_tampon'>>
-	<<image "characters/shared/headshots_main/big140.jpg">>
+	<</if>>*/
+<<case 'lizaveta_tampon'>>
+	/*<<image "characters/shared/headshots_main/big140.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Lizaveta , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Lizaveta , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A140','rel') >= 60>>
@@ -1319,17 +1304,15 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'lizaveta_latest_gossip'>>
+	<</actCLA>>*/
+<<case 'lizaveta_latest_gossip'>>
 	<<image "characters/shared/headshots_main/big140.jpg">>
 	<<gs 'gschool_gossip' 'Lizaveta'>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'marcus'>>
-	<<set $menu_off = 1>>
+<<case 'marcus' 'A146'>>
+	
 	<<gs 'npc_relationship' 'modify' 'A146' 'like'>>
 	<<image "characters/shared/headshots_main/big146.jpg">>
 	<<actCLA 'Time for the next class'>>
@@ -1337,8 +1320,8 @@
 	<</actCLA>>
 	<<if getvar("$katjaQW['QWstage']") == 5 and getvar("$Marcus_sextype") > 0 and getvar("$katjaQW['marcus_asked']") == 0>>
 		<<actCLA 'Ask Marcus about being Katja`s first'>>
-	<<gt 'gschool_coolkid_chats' 'Marcus_Katja_talk'>>
-<</actCLA>>
+			<<gt 'gschool_coolkid_chats' 'Marcus_Katja_talk'>>
+		<</actCLA>>
 
 	<</if>>
 	<<if $pc.fame('pav_slut') > 200>>
@@ -1403,9 +1386,8 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'Marcus_Katja_talk'>>
-	<<set $menu_off = 1>>
+<<case 'Marcus_Katja_talk'>>
+	
 	<<setinit $katjaQW['marcus_asked'] = 1>>
 	<<image "characters/shared/headshots_main/big146.jpg">>
 	<p>"So you know how we sometimes have fun together?" you ask.</p>
@@ -1415,9 +1397,8 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'andrey'>>
-	<<set $menu_off = 1>>
+<<case 'andrey' 'A147'>>
+	
 	<<gs 'npc_relationship' 'modify' 'A147' 'like'>>
 	<<image "characters/shared/headshots_main/big147.jpg">>
 	<<actCLA 'Time for the next class'>>
@@ -1494,9 +1475,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'mefodiy'>>
-	<<set $menu_off = 1>>
+<<case 'mefodiy' 'A148'>>
 	<<gs 'npc_relationship' 'modify' 'A148' 'like'>>
 	<<image "characters/shared/headshots_main/big148.jpg">>
 	<<if $pc.fame('pav_slut') > 250>>
@@ -1600,9 +1579,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'vicky'>>
-	<<set $menu_off = 1>>
+<<case 'vicky' 'A15'>>
 	<<gs 'npc_relationship' 'modify' 'A15' 'like'>>
 	<<image "characters/shared/headshots_main/big15.jpg">>
 	<<if $pc.fame('pav_slut') > 200>>
@@ -1681,7 +1658,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'vicky_tampon'>>
@@ -1703,10 +1680,9 @@
 				<<gs 'gschool_coolkid_chats' 'vicky_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'vicky_tampon'>>
-	<<image "characters/shared/headshots_main/big15.jpg">>
+	<</if>>*/
+<<case 'vicky_tampon'>>
+	/*<<image "characters/shared/headshots_main/big15.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Vicky , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Vicky , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A15','rel') >= 70>>
@@ -1736,10 +1712,9 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'stasya'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'stasya' 'A139'>>
+	
 	<<gs 'npc_relationship' 'modify' 'A139' 'like'>>
 	<<image "characters/shared/headshots_main/big139.jpg">>
 	<<if $pc.fame('pav_slut') > 200>>
@@ -1790,7 +1765,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'stasya_tampon'>>
@@ -1812,10 +1787,9 @@
 				<<gs 'gschool_coolkid_chats' 'stasya_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'stasya_tampon'>>
-	<<image "characters/shared/headshots_main/big139.jpg">>
+	<</if>>*/
+<<case 'stasya_tampon'>>
+	/*<<image "characters/shared/headshots_main/big139.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Stasya , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Stasya , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A139','rel') >= 70>>
@@ -1851,10 +1825,8 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'irina'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'irina' 'A17'>>
 	<<gs 'npc_relationship' 'modify' 'A17' 'like'>>
 	<<image "characters/shared/headshots_main/big17.jpg">>
 	<<if $pc.fame('pav_slut') > 200>>
@@ -1944,7 +1916,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'irina_tampon'>>
@@ -1966,10 +1938,9 @@
 				<<gs 'gschool_coolkid_chats' 'irina_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'irina_tampon'>>
-	<<image "characters/shared/headshots_main/big17.jpg">>
+	<</if>>*/
+<<case 'irina_tampon'>>
+	/*<<image "characters/shared/headshots_main/big17.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Irina , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Irina , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A17','rel') >= 70>>
@@ -2005,10 +1976,8 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'sonia'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'sonia' 'A25'>>
 	<<gs 'npc_relationship' 'modify' 'A25' 'like'>>
 	<<image "characters/shared/headshots_main/big25.jpg">>
 	<<if $pc.fame('pav_slut') > 200>>
@@ -2108,7 +2077,7 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'sonia_tampon'>>
@@ -2130,10 +2099,9 @@
 				<<gs 'gschool_coolkid_chats' 'sonia_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'sonia_tampon'>>
-	<<image "characters/shared/headshots_main/big25.jpg">>
+	<</if>>*/
+<<case 'sonia_tampon'>>
+	/*<<image "characters/shared/headshots_main/big25.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Sonia , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Sonia , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A25','rel') >= 70>>
@@ -2159,5 +2127,5 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
+	<</actCLA>>*/
+<</switch>>

+ 2 - 2
sugarcube/src/activities/school/gschool_groups.tw

@@ -1,4 +1,4 @@
-:: gschool_groups
+:: gschool_groups[include]
 <<set $here = 'gschool_groups'>>
 <<set $ARGS = $location_var[$here]>>
 <!-- !2021/05/02-->
@@ -14,7 +14,7 @@
 <!-- !6 use $npcGo-->
 
 <<switch $location_var[$here][0]>>
-	<<case 'popular'>>
+	<<case 'popular' 'cool'>>
 		<<set _searchGroup = 1>>
 		<<set _groupPassage = 'gschool_coolkid_chats'>>
 	<<case 'jocks'>>

+ 50 - 66
sugarcube/src/activities/school/gschool_jock_chats.tw

@@ -1,9 +1,7 @@
-:: gschool_jock_chats
-<<set $here = 'gschool_jock_chats'>>
-<<set $ARGS = $location_var[$here]>>
-<!-- !!2022/07/02-->
-<<if $location_var[$here][0] == 'lazar'>>
-	<<set $menu_off = 1>>
+:: gschool_jock_chats[event]
+<<switch $location_var[$here][0]>>
+<<case 'lazar' 'A149'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A149' 'like'>>
 	<<image "characters/shared/headshots_main/big149.jpg">>
@@ -105,9 +103,8 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'svyatoslav'>>
-	<<set $menu_off = 1>>
+<<case 'svyatoslav' 'A8'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A8' 'like'>>
 	<<image "characters/shared/headshots_main/big8.jpg">>
@@ -188,9 +185,9 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'vanya'>>
-	<<set $menu_off = 1>>
+
+<<case 'vanya' 'A165'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A165' 'like'>>
 	<<image "characters/shared/headshots_main/big165.jpg">>
@@ -241,9 +238,8 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'erast'>>
-	<<set $menu_off = 1>>
+<<case 'erast' 'A150'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A150' 'like'>>
 	<<image "characters/shared/headshots_main/big150.jpg">>
@@ -405,9 +401,8 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == '<<npc 'A18'>><</npc>>'>>
-	<<set $menu_off = 1>>
+<<case 'A18' 'christina'>>
+	
 	<<gs 'Zvereva_events' 'cikl'>>
 	<<image "characters/shared/headshots_main/big18.jpg">>
 	<<if getvar("$NatbelQW['chrispaid']") == 2 and $finances.cash >= 500>>
@@ -560,9 +555,8 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'christina_tampon'>>
-	<<image "characters/shared/headshots_main/big18.jpg">>
+<<case 'christina_tampon'>>
+	/*<<image "characters/shared/headshots_main/big18.jpg">>
 	"<<npc 'A18'>><</npc>>," you say as you approach her discreetly. "I need your help."
 	"Oh this ought to be good..." She looks at you flatly.
 	<<$temp[''tampon_ask'']>>
@@ -581,10 +575,9 @@
 	<</if>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'albina'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'albina' 'A23'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A23' 'like'>>
 	<<if getvar("$AlbinaQW['Friends']") == 2 and $npcs.get('A23','sex') >= 1 and $albina_schoolsex != $time.daystart and rand(1,5) == 5>>
@@ -741,9 +734,8 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'albina_tampon'>>
-	<<image "characters/shared/headshots_main/big23.jpg">>
+<<case 'albina_tampon'>>
+	/*<<image "characters/shared/headshots_main/big23.jpg">>
 	<<$temp[''tampon_ask'']>>
 	<<if $temp['tampon_ask'] == '"Albina , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Albina , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if getvar("$AlbinaQW['Friends']") == 2 or $npcs.get('A23','rel') >= 70>>
@@ -769,10 +761,9 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'veronika'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'veronika' 'A141'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A141' 'like'>>
 	<<image "characters/shared/headshots_main/big141.jpg">>
@@ -940,9 +931,8 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'veronika_tampon'>>
-	<<image "characters/shared/headshots_main/big141.jpg">>
+<<case 'veronika_tampon'>>
+	/*<<image "characters/shared/headshots_main/big141.jpg">>
 	<<if $temp['tampon_ask'] == '"Veronika , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Veronika , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A141','rel') >= 70>>
 			"Yeah, of course," she says calmly, immediately digging into her backpack and coming up with a tampon. "Here."
@@ -985,10 +975,9 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'lina'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'lina' 'A19'>>
+	
 	<<image "characters/shared/headshots_main/big19.jpg">>
 	<<gs 'npc_relationship' 'modify' 'A19' 'like'>>
 	<<if $pc.fame('pav_slut') >= 225>>
@@ -1032,7 +1021,7 @@
 			<p>Lina sees you and proudly says "I've finally been improving my lap times!"</p>
 			<p>"Great news! I'm glad you're improving!" you encouragingly tell her.</p>
 			Lina nods. "Yeah, the new workout plan that <<npc 'A18'>><</npc>> made for me is really great. She's really helped me out a lot."
-<span class="innerThought">There she goes, worshipping <<npc 'A18'>><</npc>>.</span>
+			<span class="innerThought">There she goes, worshipping <<npc 'A18'>><</npc>>.</span>
 			func('npc_reactions', 'general', 'A19')
 		<<elseif $npcs.get('A19','rel') <= 20>>
 			<p>"I always hear that I'm bad at sports, but you're even worse than me!" Lina spares no time to insult you.</p>
@@ -1051,7 +1040,7 @@
 			"I wasn''t paying attention to the teacher because <<npc 'A18'>><</npc>> was texting me. She wants to know what I'm wearing to the dance this weekend."
 			<p>"Why does that matter?" you ask.</p>
 			<p>"I don't know. Maybe she wants us to match or something?" she replies, looking a little confused.</p>
-<span class="innerThought">Yeah right. She probably wanted to make sure she's wearing something better then Lina.</span>
+			<span class="innerThought">Yeah right. She probably wanted to make sure she's wearing something better then Lina.</span>
 			<p>You walk away, leaving Lina looking all dreamy-eyed thinking about her and <<npc 'A18'>><</npc>> wearing the same clothes. She probably didn't even see you leaving.</p>
 		<<elseif $npcs.get('A19','rel') <= 20>>
 			"Unless you're here to do my homework, get lost nerd."
@@ -1141,9 +1130,8 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'lina_tampon'>>
-	<<image "characters/shared/headshots_main/big19.jpg">>
+<<case 'lina_tampon'>>
+	/*<<image "characters/shared/headshots_main/big19.jpg">>
 	<<if $temp['tampon_ask'] == '"Lina , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Lina , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A19','rel') >= 70>>
 			She looks around before quickly digging through her backpack for a tampon. "Here."
@@ -1181,10 +1169,9 @@
 	<</if>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'lariska'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'lariska' 'A13'>>
+	
 	<<image "characters/shared/headshots_main/big13.jpg">>
 	<<if getvar("$LariskaQW['story']") >= 2>>
 		<<if getvar("$LariskaQW['story']") == 2>>
@@ -1341,7 +1328,7 @@
 				Lariska sees you in the hallway walking towards her and stands up, looking nervous.
 				"Hey Lariska."
 				<p>"Hi $pc.name_nick. Sorry, can't chat. <<npc 'A18'>><</npc>> needs me." She then runs off, looking for her idol.</p>
-<span class="innerThought">Well that was rude, bitch!</span>
+				<span class="innerThought">Well that was rude, bitch!</span>
 			<<else>>
 				Lariska sees you in the hallway walking towards her and stands up, looking nervous.
 				"Hey Lariska."
@@ -1396,9 +1383,8 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'lariska_tampon'>>
-	<<image "characters/shared/headshots_main/big13.jpg">>
+<<case 'lariska_tampon'>>
+	/*<<image "characters/shared/headshots_main/big13.jpg">>
 	<<if $temp['tampon_ask'] == '"Lariska , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Lariska , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
 		<<if $npcs.get('A13','rel') >= 70>>
 			She looks around before quickly digging through her backpack for a tampon and discreetly passes it to you. "Here."
@@ -1420,26 +1406,24 @@
 	<<set $isprok = 1>>
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
-<</if>>
-<<if $location_var[$here][0] == 'fedor'>>
-	<<set $menu_off = 1>>
+	<</actCLA>>*/
+<<case 'fedor' 'A5'>>
+	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<if getvar("$FedorLove") < 0>>
 		<<gt 'FedorMisc' 'Fedor Hate'>>
 	<<else>>
 		<<gt 'FedorMisc' 'Fedor Chat'>>
 	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'ivan'>>
-	<<set $menu_off = 1>>
+<<case 'ivan' 'A3'>>
+	
 	<<gs 'npc_relationship' 'modify' 'A3' 'like'>>
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<image "characters/shared/headshots_main/big3.jpg">>
 	<<if $npcs.get('A3','rel') >= 80 and getvar("$NikoPayback") == 2 and getvar("$IvanVsNiko") == 0>>
 		<<actCLA 'Ask for help with Niko'>>
-	<<gt 'NikoPayback' 'Ivan Help'>>
-<</actCLA>>
+			<<gt 'NikoPayback' 'Ivan Help'>>
+		<</actCLA>>
 
 	<</if>>
 	<<if $pc.fame('pav_slut') < 225 and getvar("$IvanShowerQW") == 1>>
@@ -1453,8 +1437,8 @@
 			func('npc_reactions', 'general', 'A3')
 			<<if $npcs.get('A3','rel') >= 80 and getvar("$NikoPayback") == 2 and getvar("$IvanVsNiko") == 0>>
 				<<actCLA 'Ask for help with Niko'>>
-	<<gt 'NikoPayback' 'Ivan Help'>>
-<</actCLA>>
+					<<gt 'NikoPayback' 'Ivan Help'>>
+				<</actCLA>>
 
 			<</if>>
 			<<actCLA 'Time for the next class'>>
@@ -1470,8 +1454,8 @@
 		<</actCLA>>
 		<<if $npcs.get('A3','rel') >= 80 and getvar("$NikoPayback") == 2 and getvar("$IvanVsNiko") == 0>>
 			<<actCLA 'Ask for help with Niko'>>
-	<<gt 'NikoPayback' 'Ivan Help'>>
-<</actCLA>>
+				<<gt 'NikoPayback' 'Ivan Help'>>
+			<</actCLA>>
 
 		<</if>>
 		<<if rand(0,4) == 0>>
@@ -1681,4 +1665,4 @@
 	<<actCLA 'Time for the next class'>>
 		<<gt 'gschool_lessons' 'short_break'>>
 	<</actCLA>>
-<</if>>
+<</switch>>

+ 1 - 1
sugarcube/src/activities/school/schoolday/school_break.tw

@@ -44,7 +44,7 @@
 		<<gt 'school_break_classroom'>>
 	<</act>>
 	<<act 'Hang out in the hallway'>>
-		<<gt 'gschool_chats' 'cooljocks'>>
+		<<gt 'school_break_cooljocks'>>
 	<</act>>
 	<<act 'Hang out with the gopniks'>>
 		<<gt 'school_break_gopniks'>>