Merge remote-tracking branch 'hornguy6/master'

locations/albinahome.qsrc

@@ -62,23 +62,17 @@ if $ARGS[0] = 'hallway':
 	elseif AlbinaQW['visiting'] = 0:
 		!! Entering the house and getting random chances for events/being met by random household member
 		AlbinaQW['visiting'] = 1
-		AlbinaQW['event'] = 1
 		temp = iif((month < 9) and (month > 5) and (week = 3 or week = 6), rand(1, 12), rand(1,10)) 
-		if temp < 5 or temp > 10: AlbinaQW['event'] = 1
+		if temp < 3 or temp > 10: AlbinaQW['event'] = 1
 		if temp = 1:
-			!! Random House Events
-			gt 'albina_house_events', 'start'
-		elseif temp = 2:
-			!! Random House Events
-			gt 'albina_house_events', 'start1'
-		elseif temp = 3:
 			!! Lazar Sex Event
 			gt 'albina_lazar_sex', 'lazar_start'
-		elseif temp = 4:
+		elseif temp = 2:
 			!! hot tub
 			gt 'albina_house_events', 'hot_tub1'
-		elseif temp = 5 and temper < 10:
+		elseif temp = 3 and temper < 10:
 			!! swim winter
+			AlbinaQW['event'] = 1
 			gt 'albina_house_events', 'swim_winter2'
 		elseif temp = 11:
 			!! Mom Event
@@ -87,7 +81,6 @@ if $ARGS[0] = 'hallway':
 			!! Mom Albina Event
 			gt 'albina_mother_events', 'Sunbathing with Albina'
 		else
-			AlbinaQW['event'] = 0
 			!! Greeted by maid(Wed or Sat) or Mother(Zoya) or Albina
 			if week = 3 or week = 6:
 				!! maid greeting sveta at front door
@@ -174,18 +167,12 @@ if $ARGS[0] = 'bedroom':
 	if AlbinaQW['event'] = 0:
 		AlbinaQW['event'] = 1
 
-		AlbinaQW['activities'] = rand(1,3)
-		if AlbinaQW['activities'] = 1:
-			if month >=11 and month <= 12 or month >=1 and month <=3:
-	!!			if rand(1,2) = 1:
-					gt'albina_house_events','swim_winter1'
-	!!			else
-	!!				gt'albina_house_events','swim_winter2'
-	!!			end
-			else
-				gt'albina_house_events','swim_summer1'
-			end
-		end
+		if month >=11 or month <=3:
+            AlbinaQW['activities'] = rand(1,3)
+            if AlbinaQW['activities'] = 1:
+                gt'albina_house_events','swim_winter1'
+            end
+        end
 		if AlbinaQW['extra'] ! daystart: 
 			if rand(0,10) = 0: 
 				gt 'albina_house_events','dancing' 

locations/gschool_break.qsrc

@@ -393,7 +393,6 @@ if $ARGS[0] = 'girls_restroom_events':
 													gs 'stat'
 													act 'Continue':
 														*clr & cla
-														gs 'flash', 'full', 'indoors', 4
 														gs 'clothing', 'strip_all'
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully8.jpg"></center>'
@@ -419,7 +418,6 @@ if $ARGS[0] = 'girls_restroom_events':
 							*clr & cla
 							gs 'clothing', 'strip_all'
 							gs 'stat'
-							gs 'flash', 'full', 'indoors', 4
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully8.jpg"></center>'
 							'You try to pull away, but there are too many of them. Your only chance is to scream and hope someone hears you. Almost as if they can read minds, Ekaterina holds a knife up and places it against your cheek. "If you scream, I will cut your face up so bad, not even your own mother will recognize you." You swallow hard, thinking you should have left when they told you to.'
 							*nl
@@ -1330,19 +1328,16 @@ if $ARGS[0] = 'naked_bathroom':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	gs 'flash', 'full', 'indoors', 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/nakede.jpg"></center>'
 	'With all your clothes gone, all you have left is your purse. You could call someone, but who? Your mother wouldn''t understand, you would be too ashamed to call your step dad and your sister doesn''t have a car. The bell rings for the next period and you wait a few more minutes until you can no longer hear anyone. You crack open the door, peek out and find the hallway looks empty. You can go to the headmistress - she might have a spare uniform you can use, but she might press you on what happened. Or you could leave school and go home to get another uniform.'
 	gs 'stat'
 	act 'Go see the head mistress':
 		*clr & cla
-		gs 'flash', 'full', 'indoors', 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
 		'You decide it would be better to go see the headmistress than run half way across Pavlovsk naked. You peek out one last time, and when you see no one present,  you step out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it to the office.'
 		gs 'stat'
 		act 'Enter her office':
 			*clr & cla
-			gs 'flash', 'full', 'indoors', 3
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/officenaked.jpg"></center>'
 			'As you enter the office, Ms. Volkov looks up for her desk, a look of shocked surprise on her face as you stand in front of her naked before she gives you a stern look. "Just what do you think you''re doing young lady? Tramping around the school naked is no way for a young girl to behave! Explain yourself!" she sternly demands.'
 			'What should you tell her? If you tell on the gopniks it will likely only make things worse, but they should be punished.'
@@ -1354,7 +1349,6 @@ if $ARGS[0] = 'naked_bathroom':
 				npc_rel['A21'] -= 5
 				npc_rel['A24'] -= 5
 				npc_rel['A145'] -= 5
-				gs 'flash', 'full', 'indoors', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/officenaked.jpg"></center>'
 				'You take a deep breath and decide the girls need to be punished. "Some of the girls stripped me and stole my clothes."'
 				'Ms. Volkov frowns at first, but her expression softens ever so slightly. "Which ones?"'
@@ -1394,7 +1388,6 @@ if $ARGS[0] = 'naked_bathroom':
 				act 'Tell her a lie (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'self'
 					*clr & cla
-					gs 'flash', 'full', 'indoors', 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/officenaked.jpg"></center>'
 					'You take a deep breath and decide it would only make things worse for you if you snitch. "It was stupid. I accidentally spilled a bottle of water all over my clothes, so I went to the bathroom to dry them with the hand dryer. While I waited, I went to use the toilet and when I came back, they were gone. I don''t know what happened to them."'
 					*nl
@@ -1438,14 +1431,12 @@ if $ARGS[0] = 'naked_bathroom':
 	end
 	act 'Go home':
 		*clr & cla
-		gs 'flash', 'full', 'indoors', 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
 		'You decide that it would be better to go home than to show up naked in front of the headmistress. You peek out one last time before stepping out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it outside. You could try and sneak home - it will take longer, but hopefully no one will see you. Or you can just run home while trying to hide your face and hope that no one recognizes you.'
 		gs 'stat'
 		act 'Run home':
 			*clr & cla
 			gs 'fame', 'pav', 'sex', 5
-			gs 'flash', 'full', 'indoors', 3
 			if month > 3 and month < 11:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenaked.jpg"></center>'
 			else

locations/gschool_detention.qsrc

@@ -241,7 +241,7 @@ if $ARGS[0] = 'sitting_events':
 				*clr & cla
 				gs 'willpower', 'pay', 'self'
 				gs 'fame', 'pav', 'sex', 1
-				gs 'flash', 'tits', 'indoors', 1
+				gs 'arousal', 'flash', -5
 				gs 'stat'
 				inhib_exp += rand(1,3)
 				'<center><b><font color="maroon">Detention</font></b></center>'

locations/gschool_events.qsrc

@@ -247,9 +247,9 @@ if $ARGS[0] = 'break_events':
 				grupvalue[4] += 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtupfront.jpg"></center>'
 				if $pantyworntype ! 'none':
-					gs 'flash', 'panties', 'indoors', 1
+					gs 'arousal', 'flash', -5
 				else
-					gs 'flash', 'pussy', 'indoors', 2
+					gs 'arousal', 'flash', -5
 				end
 				'Not even breaking stride you call over your shoulder "Sweetie, you''ll have to spank me harder than that if you want to get up to my standards!" as your hands go down to your waist and give a flip of your skirt to give him a fleeting view of '+iif($pantyworntype ! 'none', 'your panties.', 'your naked ass.')
 				act 'Continue on': gt 'gschool_events', 'leave_break_events'

locations/gschool_lessons4.qsrc

@@ -289,10 +289,10 @@ if $ARGS[0] = 'math':
 								gs 'willpower', 'pay', 'self'
 								gs 'stat'
 								if $pantyworntype ! 'none':
-									gs 'flash', 'panties', 'indoors', 1
+									gs 'arousal', 'flash', -5
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 								else
-									gs 'flash', 'pussy', 'indoors', 2
+									gs 'arousal', 'flash', -5
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 								end
 								'You decide to have some fun and quickly slide the phone between your legs and snap some photos under your skirt. When Mr. Tsarev arrives at your desk, he asks "What is so important that you need to use your phone during my lesson? If nothing, then I will hold onto it until the end of class." He then extends his hand out. "Would you like to see?" you reply in a seductive tone.'
@@ -604,14 +604,14 @@ if $ARGS[0] = 'english':
 								gs 'willpower', 'pay', 'self'
 								gs 'stat'
 								if $pantyworntype ! 'none':
-									gs 'flash', 'panties', 'indoors', 1
+									gs 'arousal', 'flash', 1
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 								    'With a mischievous smile, you deftly slide your phone under your skirt and spread your legs to take a picture of your panties. Ms. Braakman stops in front of your desk, her hands on her hips as she stares daggers at you.'
 								    '"Hand it over." she orders, one of her hands now held out in front of you. You obediently hand over your phone to her without argument. When she sees the screen is still on, she smiles smugly. "You were texting, weren''t you? Of course you were, that''s all you kids do these days. Well, I''m sure you wouldn''t mind if I shared with the class what you were--"'
 								    'You can barely keep a straight face as you watch Ms. Braakman''s expression change from smug to confusion and then anger in a matter of seconds. You expect her to go through with her threat and show the class what you were doing, but for whatever reason she doesn''t. "I don''t want to see you ever doing that again young lady! You can have this back after class." she warns you as she turns the screen off and returns to the front of the class.'
 									act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'getphone'
 								else
-									gs 'flash', 'pussy', 'indoors', 2
+									gs 'arousal', 'flash', 1
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 									'With a mischievous smile, you deftly slide your phone under your skirt and spread your legs to take a picture of your bare pussy. Ms. Braakman stops in front of your desk, her hands on her hips as she stares daggers at you.'
 								    '"Hand it over." she orders, one of her hands now held out in front of you. You obediently hand over your phone to her without argument. When she sees the screen is still on, she smiles smugly. "You were texting, weren''t you? Of course you were, that''s all you kids do these days. Well, I''m sure you wouldn''t mind if I shared with the class what you were--"'
@@ -776,7 +776,7 @@ if $ARGS[0] = 'pe':
 			if pullup = 1 and $pantyworntype = 'none':
 				*clr & cla
 				pcs_mood -= 10
-				gs 'flash', 'pussy', 'indoors', 1
+				gs 'arousal', 'flash', -5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
 				'After the roll call, Mr. Nikolaevich announces that you will all be taking turns doing pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'

locations/gschool_office.qsrc

@@ -501,7 +501,6 @@ if $ARGS[0] = 'detPunishment1':
 	menu_off = 1
 	minut += 15
 	gs 'clothing', 'strip_all'
-	gs 'flash', 'full', 'indoors', 2
 	gs 'pain', 7, 'asscheeks', 'spank'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/ffspank1.jpg"></center>'