Browse Source

[changed] new years eve party, removed age check and gave the player more time to attend it

julzor 4 years ago
parent
commit
66db81f2f8

+ 25 - 28
locations/Cheatmenu_din.qsrc

@@ -340,7 +340,7 @@ $cheatmenu['BimboCloth'] = {
 		bimbowithdrawal = 0
 	elseif cheatBimbo = 1:
 		cheatBimbo = 0
-		dynamic $cheatmenu['permanent']	
+		dynamic $cheatmenu['permanent']
 	end
 }
 
@@ -352,10 +352,10 @@ $cheatmenu['exhib_block'] = {
 		Exhibitionist_lvl = 0
 	elseif exhib_cheat = 1:
 		exhib_cheat = 0
-		dynamic $cheatmenu['permanent']	
+		dynamic $cheatmenu['permanent']
 	end
 }
- 
+
 $cheatmenu['addictive_block'] = {
 	if addictive_cheat = 0:
 		addictive_cheat = 1
@@ -370,7 +370,7 @@ $cheatmenu['addictive_block'] = {
 		dynamic $cheatmenu['permanent']
 	elseif addictive_cheat = 1:
 		addictive_cheat = 0
-		dynamic $cheatmenu['permanent']	
+		dynamic $cheatmenu['permanent']
 	end
 }
 
@@ -381,7 +381,7 @@ $cheatmenu['cumtrait_block'] = {
 		trt_cumeater = 0
 	elseif cumeater_cheat = 1:
 		cumeater_cheat = 0
-		dynamic $cheatmenu['permanent']	
+		dynamic $cheatmenu['permanent']
 	end
 }
 
@@ -488,40 +488,40 @@ $cheatmenu['permanent'] = {
 	'Never unhappy: <a href="exec:dynamic $cheatmenu[''noMood'']"><<$cheatNoMood>></a>'
 	'Never lose or gain weight: <a href="exec:dynamic $cheatmenu[''noFat'']"><<$cheatNoFat>></a>'
 	'Never get addicted: <a href="exec:dynamic $cheatmenu[''addict'']"><<$NarkImmune>></a>'
-	
+
 	if Enable_sforma = 1:
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
 	else
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
 	'Random boyfriend/girlfriend events: <a href="exec:dynamic $cheatmenu[''random_bf_gf'']"><<$random_bf_gf_cheat>></a>'
-	
+
 	*nl
-	
+
 	'Enable sleeping with vibrator inserted: <a href="exec:dynamic $cheatmenu[''Vibrator'']"><<$cheatVib>></a>'
-	
+
 	*nl
-	
+
 	'Automatically win every fight: <a href="exec:dynamic $cheatmenu[''fight'']"><<$fight_cheat>></a>'
 	'Automatically resolve non-magical fights: <a href="exec:dynamic $cheatmenu[''autocombat'']"><<$autocombat_cheat>></a>'
-	
+
 	*nl
-	
+
 	'Bimbo trait and the effects of wearing bimbo clothes: <a href="exec:dynamic $cheatmenu[''BimboCloth'']"><<$cheatBimbo>></a>'
 	'Exhibitionist trait: <a href="exec:dynamic $cheatmenu[''exhib_block'']"><<$cheatexhib>></a>'
 	'Addictive personality trait: <a href="exec:dynamic $cheatmenu[''addictive_block'']"><<$cheataddictive>></a>'
 	'Cumeater trait: <a href="exec:dynamic $cheatmenu[''cumtrait_block'']"><<$cheatcumtrait>></a>'
-	
+
 	*nl
-	
+
 	'Set arousal to always be at 50 or more: <a href="exec:dynamic $cheatmenu[''cheatHorny'']"><<$cheatHorny>></a>'
 	'Periods (and pregnancies): <a href="exec:dynamic $cheatmenu[''slutshot'']"><<$cheatSlut>></a>'
 	'Impregnation: <a href="exec:dynamic $cheatmenu[''cheat_NoPregnancy'']"><<$cheat_nopregnancy>></a>'
 	'Lactation: <a href="exec:dynamic $cheatmenu[''cheat_NoLactation'']"><<$cheat_nolactation>></a>'
 	'STDs: <a href="exec:dynamic $cheatmenu[''health'']"><<$cheatHealth>></a>'
-	
+
 	*nl
-	
+
 	if cyccustom = 0:'Automatic period tracking: <a href="exec:dynamic $cheatmenu[''auto_period'']">Currently OFF</a>'
 	if cyccustom = 1:'Automatic period tracking: <a href="exec:dynamic $cheatmenu[''auto_period'']">Currently ON</a>'
 	*nl
@@ -573,7 +573,7 @@ $cheatmenu['state'] = {
 	'<a href="exec:gs''cum_cleanup'',''reset'' & dynamic $cheatmenu[''state''] & gs ''stat''">Remove all cum</a>'
 	'<a href="exec:dynamic $cheatmenu[''cycle''] & gs ''stat''">Set stage of menstrual cycle</a>'
 	*nl
-	
+
 	if lactation['active'] <= 0:
 		'You are not lactating'
 		'Your current prolactinlvl is <<lactation[''prolactinlvl'']>>ng/ml.'
@@ -929,7 +929,7 @@ $cheatmenu['setSkills'] = {
 				<<$skl_name[loop_index]>>_lvlst = <<ARGS[0]>>
 			"
 		end
-		
+
 		!! The size of the array is reduced by 1 because we skipped inhibition
 		if loop_index < arrsize('$skl_name') - 1: jump 'set_skills_loop'
 	killvar 'loop_index'
@@ -1306,7 +1306,7 @@ $cheatmenu['reputation'] = {
 	*nl
 	if opusk > 0 or gnewQW > 0 or sipovka > 0:'<a href="exec:opusk = 0 & gnewQW = 0 & sipovka = 0 & dynamic $cheatmenu[''reputation'']">Clear reputation with Gopniks</a>'
 	if StoryLine = 1:
-																																  
+
 		*nl
 		'<font color="red"><b>WARNING</b></font>: Clearing reputation flags with your family may cause bugs. Use at your own risk!'
 		*nl
@@ -1320,14 +1320,11 @@ $cheatmenu['reputation'] = {
 			'Your mother thinks that you are a virgin.'
 		end
 		*nl
-		if evgenQW >= 4 and brotherSex >= 1:
-			'Your brother thinks you are a total whore. <a href="exec:evgenQW = 0 & brotherSex = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
-		elseif brotherSex >= 1:
-			'Your brother thinks you are a slut. <a href="exec:brotherSex = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
+		if evgenQW >= 4 and pav_slut >= 125:
+			'Your brother thinks you are a total whore. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		elseif evgenQW >= 3:
 			'Your brother thinks you are a slut. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		elseif brotherknowslut = 1:
-											   
 			'Your brother saw semen on your body and thinks you fuck around. <a href="exec:brotherknowslut = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		elseif brotherknowslut >= 2:
 			'Your brother saw you in the park fucking the Gopniks. <a href="exec:brotherknowslut = 1 & dynamic $cheatmenu[''reputation'']">Clear</a>'
@@ -1568,7 +1565,7 @@ $cheatmenu['magicTable'] = {
 		jump 'CheatDinSpell1'
 	end
 
-	$SpellListStr = $SpellListStr + " 
+	$SpellListStr = $SpellListStr + "
 		</table>
 	</center>"
 
@@ -1620,7 +1617,7 @@ $cheatmenu['magic'] = {
 		jump 'CheatDinTP1'
 	end
 
-	$SpellListStr = $SpellListStr + " 
+	$SpellListStr = $SpellListStr + "
 		</table>
 	</center>"
 
@@ -1708,7 +1705,7 @@ $cheatmenu['remove_preg'] = {
 	knowpreg = 0
 	cycle = 4
 	!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is 1 week
-	RecovH = rand(375,575) 
+	RecovH = rand(375,575)
 	pregchem = 0
 	knowpregloss = 2
 	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
@@ -1735,7 +1732,7 @@ $cheatmenu['remove_preg'] = {
 	if nextbaby > 0:
 		jump 'poliabortloop_cheat'
 	end
-	if FertEgg > 0: FertEgg = 0 
+	if FertEgg > 0: FertEgg = 0
 }
 
 $cheatmenu['cycle'] = {

+ 1 - 1
locations/albinaRide.qsrc

@@ -15,7 +15,7 @@ act 'Go with Albina':
 	'The man behind the wheel starts engine and quickly drives through town.'
 	'Soon enough the car stops at the gate to a luxurious mansion, and Albina tells you to follow her.'
 
-	act 'Go with Albina into the room':gt 'albinahome'
+	act 'Go with Albina into the room':gt 'albinahome', 'start'
 end
 
 --- albinaRide ---------------------------------

+ 24 - 24
locations/albinahome.qsrc

@@ -2,7 +2,7 @@
 
 CLOSE ALL
 
-if $ARGS[0] = 'start' or $ARGS[0] = '':
+if $ARGS[0] = 'start':
 	if beinalbinahome = 0:beinalbinahome = 1
 	*clr & cla
 	menu_off = 1
@@ -100,7 +100,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 										'"It''s ok <<$pcs_nickname>>." You continue to drink some wine but now things feel a little akward and once you finish your glass of wine you put the empty glass down.'
 										'"I should really get going, I''m sorry, I wish I could help." Albina nods her head in understanding. "I will see you later ok?" You tell her.'
 										'She smiles. "Of course, <<$pcs_nickname>>." Then you get up and leave her house.'
-										
+
 										act 'Continue':gt 'pavResidential'
 									end
 								else
@@ -138,7 +138,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 											gs 'arousal', 'vaginal_finger', 5
 											minut -= 5
 											gs 'stat'
-												
+
 											act 'Spread your legs':
 												*clr & cla
 												if npc_sex['A23'] = 0: npc_sex['A23'] = 1 & girl += 1
@@ -152,14 +152,14 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 												'Moaning, you feel a fire begin to burn in your abdomen and you buck your hips to get Albina''s face buried in your pussy.'
 												'Then an intense pleasure overtakes you, and you momentarily lose control of your body. Moaning loudly, you grab hold of Albina''s hair as an intense orgasm washes over you.'
 												'During your orgasm, you black out for a few seconds and when you regain your senses you find yourself sitting next Albina, who''s smiling prettily.'
-												
+
 												gs 'arousal', 'kiss', 30
 												$orgasm_or = 'yes'
 												gs 'arousal', 'cuni', 30
 												gs 'arousal', 'end'
 												minut -= 30
 												gs 'stat'
-													
+
 												act 'Say goodbye and go home':gt 'pavResidential'
 											end
 										end
@@ -185,7 +185,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 				'Albina smiles at you and says, "I can''t afford to pay the gym, so I have to exercise at home if I want to stay in shape.'
 				'By the way, I could teach you to about stripping and poledancing if you want."'
-				act 'Tell Albina that you don''t want to.':albsportday = daystart & gt 'albinahome'
+				act 'Tell Albina that you don''t want to.': albsportday = daystart & gt 'albinahome', 'start'
 				act 'Teach me stripping': gt 'albinahome', 'stripping'
 				act 'Teach me poledancing': gt 'albinahome', 'poledancing'
 			end
@@ -196,12 +196,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/train.jpg"></center>'
 				'Albina is training in her room, doing some stretching exercises.'
 				'She smiles at you and asks "Well? Want me to teach you?"'
-				act 'Tell Albina that you don''t want to.':albsportday = daystart & gt 'albinahome'
+				act 'Tell Albina that you don''t want to.': albsportday = daystart & gt 'albinahome', 'start'
 				act 'Teach me stripping': gt 'albinahome', 'stripping'
 				act 'Teach me poledancing': gt 'albinahome', 'poledancing'
 			end
 		end
-	elseif albroom = 2:
+	else
 		*clr & cla
 		menu_off = 1
 		minut += 5
@@ -238,7 +238,7 @@ if $ARGS[0] = 'stripping':
 		'Albina recommends that you start with learning to dance.'
 	end
 	act 'Say goodbye and go home':gt 'pavResidential'
-	act 'Rest':gt 'albinahome'
+	act 'Rest':gt 'albinahome', 'start'
 end
 
 if $ARGS[0] = 'poledancing':
@@ -260,8 +260,8 @@ if $ARGS[0] = 'poledancing':
 		if pcs_dancpol >= 100: 'You could not learn anything new, you already know everything she could teach you.'
 
 		act 'Say goodbye and go home':gt 'pavResidential'
-		act 'Rest':gt 'albinahome'
-	elseif pcs_stren < 40 and pcs_dancero > 50:		
+		act 'Rest':gt 'albinahome', 'start'
+	elseif pcs_stren < 40 and pcs_dancero > 50:
 		'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
 		act 'Develop strength (2:00)':
 			*clr & cla
@@ -275,10 +275,10 @@ if $ARGS[0] = 'poledancing':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
-			act 'Rest':gt 'albinahome'
+			act 'Rest':gt 'albinahome', 'start'
 			act 'Say goodbye and go home':gt 'pavResidential'
 		end
-	else		
+	else
 		minut += 120
 		fat -= 5
 		agil_exp += rand (1, 3)
@@ -298,7 +298,7 @@ if $ARGS[0] = 'poledancing':
 			'Albina recommends that you start with learning to dance.'
 		end
 		act 'Say goodbye and go home':gt 'pavResidential'
-		act 'Rest':gt 'albinahome'
+		act 'Rest':gt 'albinahome', 'start'
 	end
 end
 
@@ -414,7 +414,7 @@ if $ARGS[0] = 'playgame':
 		'She laughs in response. "You''re that sure? Then how about we make it interesting then?"'
 		'You arch you brow a bit curious. "Just what do you have in mind?"'
 		'She gives you a big grin, then gets up and goes over to her dresser and rummages around in it for a moment before lifting out a strapon harness with a attached dildo. "The winner gets to use this on the loser how ever they want."'
-		
+
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse the bet (<<will_cost>> Willpower)':
@@ -442,7 +442,7 @@ if $ARGS[0] = 'playgame':
 		act 'Keep playing video games': gt 'albinahome', 'playgame'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
-		act 'Say goodbye and go home':gt 'pavResidential'	
+		act 'Say goodbye and go home':gt 'pavResidential'
 	end
 end
 
@@ -503,7 +503,7 @@ if $ARGS[0] = 'wear_strapon':
 	gs 'stat'
 	act 'Fuck her pussy':
 		*clr & cla
-		gs 'boyStat', 'D3' 
+		gs 'boyStat', 'D3'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag1.jpg"></center>'
 		'You pull away till the dildo slides out of her mouth and then you lay on your back. "Come on and ride''m cowgirl." You tell her, she crawls up and straddles you, lowering herself down until the <<dick>>cm <<$dick_girth>> dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding your slow but start to slowly pick up speed as she starts moaning louder and louder.'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'wear_strapon':
 		gs 'stat'
 		act 'Fuck her ass': gt 'albinahome', 'fuck_ablina_ass'
 		act 'Ride it like you mean it':
-			*clr & cla 
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag2.jpg"></center>'
 			'You slap her on the ass. "Come on Albina, ride it like you mean it." You tell her. With your encouragement she starts really riding you hard and fast, moaning louder and louder until several minutes later she cries out in ecstasy and nearly collapses on you as a orgasm shakes her body. Once the shudders pass she gives you a huge smile, obviously having enjoyed herself very much.'
@@ -529,7 +529,7 @@ if $ARGS[0] = 'fuck_ablina_ass':
 	menu_off = 1
 	npc_sex['A23'] += 1
 	lesbian += 1
-	gs 'boyStat', 'D3' 
+	gs 'boyStat', 'D3'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal1.jpg"></center>'
 	'You slap her on the butt. "Get up and get on all fours, I''m not finished with you yet." She arches a brow at that but does as you command. She gets up on all fours. You grab the bottle of lube she had brought it and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick and well lubricated.'
@@ -559,7 +559,7 @@ if $ARGS[0] = 'receive_strapon':
 	'You get down on all fours and takes the dildo in your mouth and start sucking on it, while stroking the shaft with one hand. "You look like you have done this a lot before <<$pcs_nickname>>, your a real pro at sucking cock." You spend several minutes sucking on the dildo, getting it nice and wet with your slobber. Then she pulls it out of your mouth. "Ok I want to fuck you now!"'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
-	if pcs_vag = 0: 
+	if pcs_vag = 0:
 		act 'Tell her you''re a virgin':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
@@ -569,7 +569,7 @@ if $ARGS[0] = 'receive_strapon':
 			act 'Just fuck my ass': gt 'albinahome', 'ablina_ass_fucks_you'
 			act 'Pop my cherry':
 				*clr & cla
-				gs 'boyStat', 'D3' 
+				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
 				'She nods "Ok don''t worry I will be gentle, since it is your first time. Lay on your back and spread you legs." You do as she commands, she scoots up between your legs and rubs your pussy with her fingers a bit to make sure it is wet enough. She adds a little lube to the dildo anyways, before she guides it to your slit. You feel the dildo rubbing against your slit causing it to open a bit. Then she gentle and slowly slide the <<dick>>cm <<$dick_girth>> dildo in your virgin pussy, it hurts and feels great at the same time. You moan a bit as she slowly fucks your pussy. After a bit it starts to feel better and hurt less but it still hurts a little. Then she stops. "Ok that''s enough, don''t want to wear it out the first time, but I''m not finished with you. Roll over so I can fuck that tight little butt of yours."'
@@ -581,14 +581,14 @@ if $ARGS[0] = 'receive_strapon':
 	else
 		act 'Get your pussy fucked':
 			*clr & cla
-			gs 'boyStat', 'D3' 
+			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
 			'"Lay on your back and spread you legs." You do as she commands, she scoots up between your legs and rubs your pussy with her fingers a bit to make sure it is wet enough, before she guides it to your slit. You feel the dildo rubbing against your slit causing it to open a bit. Then she gentle and slowly slide the <<dick>>cm <<$dick_girth>> dildo in your pussy. You moan a bit as she slowly fucks your pussy. As you start to moan louder she starts fucking you a little faster.'
 			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
 			gs 'stat'
 			act 'Keep getting your pussy fucked':
-				*clr & cla 
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
 				'She reads your body well, she fucks you harder and faster the more you moan, but when it starts to get a little rough she backs off a bit. She then just fucks you at a near perfect rhythm, you can feel youself getting wetter and wetter. Then she stops. "Ok that''s enough that, but I''m not finished with you just yet. Roll over so I can fuck that tight little butt of yours."'
@@ -605,7 +605,7 @@ if $ARGS[0] = 'ablina_ass_fucks_you':
 	menu_off = 1
 	npc_sex['A23'] += 1
 	lesbian += 1
-	gs 'boyStat', 'D3' 
+	gs 'boyStat', 'D3'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal1.jpg"></center>'
 	'As you roll over onto all fours you glance back and see her applying lube to the dildo. She squirts plenty on the dildo and strokes the shaft with it, getting it nice and lubed up. Then she rubs the excess lube off her hand onto your asshole. Once both the dildo and your anus is lubed up, she knee walks up behind you, you feel the tip of the dildo press against your anus a few moments later. The pressure builds up into the tip pops into your ass causing your to groan slightly in pain. She slowly starts to sroke the <<dick>>cm <<$dick_girth>> dildo up your butt, steadily working it just a little deeper with each stroke.'

+ 1 - 1
locations/albinaporog.qsrc

@@ -6,7 +6,7 @@ if hour >= 17 and week < 6 and kanikuli = 0 and hour < 20 or hour >= 9 and week
 	'You push a button on the gates intercom and a guard walks up on the other side of the gate.'
 	'You say that you''re here to visit Albina. He calls someone on his phone, and after a brief conversation opens the gate for you. "Albina is here now, come with me."'
 
-	act 'Go into Albina''s room':gt 'albinahome'
+	act 'Go into Albina''s room':gt 'albinahome', 'start'
 else
 	if hour >= 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate. You say that you''re here to visit Albina. He shakes his head and says, "Albina is currently not at home."'
 	if hour < 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate, saying "Come no earlier than nine."'

+ 1 - 1
locations/gschool_chats1.qsrc

@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'christina':
 	if zverRageQW = 10:
 		'As you pass by Christina, she looks at you triumphantly, "Don''t forget my little slave, showers after the gym class..."'
 		'Before you''re able to respond she turns around and walks away...'
-	elseif lariskaQwestStart > 0:
+	elseif lariskaQwestStart > 0 and zverSlutQW ! 0:
 		'As you pass by Christina, you look at her triumphantly, "Don''t forget my little slave, showers after the gym class..."'
 		'Before she''s able to respond you turn around and walk away...'
 	elseif kristinaSex > 0 and fizrukSex > 0:

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -23,8 +23,8 @@ if $ARGS[0] = 'main':
 		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
-		if hour = 14:
+	if day = nyp_day and month = 12 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		if hour >= 14 and hour < 17:
 			'All the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you, "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You didn''t pay the 1000 <b>₽</b> entry fee yet!"'
 
 			if money >= 1000:act 'Go to the party (1,000 <b>₽</b>)':money -= 1000 & gt 'nyp_school', 'start'

+ 97 - 81
locations/lesbimistress.qsrc

@@ -39,11 +39,9 @@ if $ARGS[0] = 'start':
 					pcs_mood = 5
 					if pcs_makeup > 1:pcs_makeup = 0
 					gs'stat'
-					
 					'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub43.jpg"></center>'
 					'- Well, - with expressionless face begins Mistress - So all-decided to be her Mistress? Remembered still, yes? I''ll show you, bitch, how to score cock on her mistress, I''ll teach you to mind-reason! Time to get in position for a spanking, small stuff, now I''m going to teach you some manners through the most digestible thee a place!'
 					'Your Mistress half an hour from the heart smacks you, occasionally through gritted teeth prigovarivaya that-something about your bad behavior and lack of love and devotion with regards to his mistress. Then she takes all your money and evil makes for the door.'
-					
 					gs 'arousal', 'foreplay', 40, 'sub', 'maso'
 					gs 'stat'
 			
@@ -828,26 +826,31 @@ if $ARGS[0] = 'punish_6':
 								
 								act 'Get dressed and leave':gt'street'
 							end
-								
-							act 'You''d rather not!':
-								cla
-								*clr
-								MistressAdoration -= 2
-								gs'stat'
-								'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub220.jpg"></center>'
-								'Even though she seems nice, you''re not particularly interested in going out with her.'
-								'"Erm... I''m sorry Madam, but I belong to my Mistress", you mutter to Masha, not wanting to hurt her feelings.'
-								'Masha nods understandingly, even though she looks a bit dejected. "That''s okay. I''ll see you later, Natalya", she says softly, before leaving in a hurry.'
-								'Mistress looks at you, pondering for a second. Then she shrugs: even though she''s your Mistress, she knows she can''t just make you spend time with others. It would be okay if they were also dominants who could train you for her, but Masha is nothing like that.'
-								'"That''s too bad, Masha is a sweetie. I think you really would''ve hit it off together... maybe think about it? It''d make her really happy", she suggests. "You can step off the platform now, if you tip it over you should be able to let it slip out of you."'
-								'You do as she says and even though you have to squirm a little, you manage to finally release yourself.'
-
-								gs 'arousal', 'vaginal_dildo', 15, 'sub', 'humiliation'
-								gs 'arousal', 'end'
-								gs 'stat'
-				
-								act 'Get dressed and leave':gt'street'
-							end
+							gs 'willpower', 'vaginal', 'resist', 'medium'
+							if will_cost <= pcs_willpwr:
+								act 'You''d rather not! (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'pay', 'resist'
+									gs 'stat'
+									MistressAdoration -= 2
+									gs'stat'
+									'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub220.jpg"></center>'
+									'Even though she seems nice, you''re not particularly interested in going out with her.'
+									'"Erm... I''m sorry Madam, but I belong to my Mistress", you mutter to Masha, not wanting to hurt her feelings.'
+									'Masha nods understandingly, even though she looks a bit dejected. "That''s okay. I''ll see you later, Natalya", she says softly, before leaving in a hurry.'
+									'Mistress looks at you, pondering for a second. Then she shrugs: even though she''s your Mistress, she knows she can''t just make you spend time with others. It would be okay if they were also dominants who could train you for her, but Masha is nothing like that.'
+									'"That''s too bad, Masha is a sweetie. I think you really would''ve hit it off together... maybe think about it? It''d make her really happy", she suggests. "You can step off the platform now, if you tip it over you should be able to let it slip out of you."'
+									'You do as she says and even though you have to squirm a little, you manage to finally release yourself.'
+
+									gs 'arousal', 'vaginal_dildo', 15, 'sub', 'humiliation'
+									gs 'arousal', 'end'
+									gs 'stat'
+					
+									act 'Get dressed and leave':gt'street'
+								end
+							else
+								act 'You''d rather not! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end	
 						end
 					end
 				end
@@ -1709,22 +1712,28 @@ if $ARGS[0] = 'amazing_2':
 	'"Really? Thank you Mistress, I''d love to!" you say quickly. That does sound like fun! It could even count as your good deed of the day: by going out of the house with Mistress, at least that poor girl will get some respite.'
 	'Mistress grins greedily: "Of course, I''d want people to know you''re mine. Because I''m in such a good today, I will only make you wear a collar. I bought one especially for this occasion."'
 	'Of course. There''s always a catch.'
+	gs 'willpower', 'misc', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse to go out wearing a collar (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			minut += 75
+			MistressAdoration -= 5
+			MistressObedience -= 3
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub212.jpg"></center>'
+			'"In public, Mistress? I don''t know..." you hesitantly say.'
+			'Mistress sighs when she sees your doubt. She slaps you in the face hard, and hisses: "Stay here. No talking with the other slave."'
+			'She returns with a delicate piece of jewelry, and holds it in front of your face. "This is the collar I got for today", she sighs, with a disappointed look in her eyes. She tries to be firm, but fails to really keep her posture afloat.'
+			'You bite your lip, feeling bad about disappointing her. You can tell she really went out of her way to get you a collar that is acceptable to wear in public too. Most people wouldn''t even recognize it as such!'
+			'She locks it around your neck anyway, and cuffs your hands together. She lazily attaches a chain from your beautiful collar to the cuffs, but is too distraught to even worry about locking you down further.'
+			'"Just... sit like this for a while and think", she mutters dejectedly. After an hour she comes back, and unlocks the handcuffs. Then she unlocks your collar and carefully puts it back into its box. "That''s it for today. Just go."'
 
-	act 'Refuse to go out wearing a collar':
-		*clr & cla
-		minut += 75
-		MistressAdoration -= 5
-		MistressObedience -= 3
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub212.jpg"></center>'
-		'"In public, Mistress? I don''t know..." you hesitantly say.'
-		'Mistress sighs when she sees your doubt. She slaps you in the face hard, and hisses: "Stay here. No talking with the other slave."'
-		'She returns with a delicate piece of jewelry, and holds it in front of your face. "This is the collar I got for today", she sighs, with a disappointed look in her eyes. She tries to be firm, but fails to really keep her posture afloat.'
-		'You bite your lip, feeling bad about disappointing her. You can tell she really went out of her way to get you a collar that is acceptable to wear in public too. Most people wouldn''t even recognize it as such!'
-		'She locks it around your neck anyway, and cuffs your hands together. She lazily attaches a chain from your beautiful collar to the cuffs, but is too distraught to even worry about locking you down further.'
-		'"Just... sit like this for a while and think", she mutters dejectedly. After an hour she comes back, and unlocks the handcuffs. Then she unlocks your collar and carefully puts it back into its box. "That''s it for today. Just go."'
-
-		act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'street'
+		end
+	else
+		act 'Refuse to go out wearing a collar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
 	act 'Agree to wear a collar in public':
@@ -1966,55 +1975,62 @@ if $ARGS[0] = 'mistvisit':
 
 		'You came to the door and looked through the peephole. Outside you see the familiar female figure of your obviously drunk Mistress.'
 		'"Open the door, you mischievous bitch, I know that you''re home." she angrily demands, looking through the peep hole straight in your eye.'
-		
-		if sub > 0:
-			act 'Open the door':
-				cls
-				lesbiday = daystart
-				minut += 5
+		act 'Open the door':
+			cls
+			lesbiday = daystart
+			minut += 5
+			gs'stat'
+			
+			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/quarrel.jpg"></center>'
+			'Crestfallen, you open the door, too scared to ignore your Mistress. Barely having crossed the threshold, she immediately grabs you firmly by the neck, forces you against the wall ans says:'
+			'So bitch, what the fuck were you thinking?! That you could ignore your obligations and forget about your Mistress? Now you''ve forced me to come here and teach you some manners!'
+			
+			act 'Further':
+				cla
+				*clr
+				minut += 30
+				pcs_horny = 0
+				pcs_mood -= 25
+				pcs_health -= 5
+				gs 'pain', 3, 'asscheeks', 'spank'
+				gs 'pain', 3, 'breasts', 'spank'
+				gs 'pain', 3, 'pubic', 'spank'
+				gs 'pain', 3, 'feet', 'spank'
+				gs 'pain', 3, 'thighs', 'spank'
+				gs 'pain', 3, 'neck', 'spank'
+				fingal = 1
+				if pcs_makeup > 1: pcs_makeup = 0
+				if stolmoney > 100:
+					stolmoney -= 100
+				else
+					stolmoney = 0
+				end
+				if money > 100:
+					money -= 100
+				else
+					money = 0
+				end
+				paytomistress = 0
 				gs'stat'
 				
-				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/quarrel.jpg"></center>'
-				'Crestfallen, you open the door, too scared to ignore your Mistress. Barely having crossed the threshold, she immediately grabs you firmly by the neck, forces you against the wall ans says:'
-				'So bitch, what the fuck were you thinking?! That you could ignore your obligations and forget about your Mistress? Now you''ve forced me to come here and teach you some manners!'
+				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub44.jpg"></center>'
+				'Mistress angrily rips off your clothes and begins to brutally spank you, whilst screaming obscene curses. You howl and roll up on the floor in tears, as she pays particular attention to your breasts, butt and feet. she searches through your apartment, rummaging through desks and lockers, until she finds your hidden money. She takes some and puts it in her purse, before taking some of the cash you have on you. Not even bothering to close the door behind her or say anything, she leaves.'
 				
-				act 'Further':
-					cla
-					*clr
-					minut += 30
-					pcs_horny = 0
-					pcs_mood -= 25
-					pcs_health -= 5
-					gs 'pain', 3, 'asscheeks', 'spank'
-					gs 'pain', 3, 'breasts', 'spank'
-					gs 'pain', 3, 'pubic', 'spank'
-					gs 'pain', 3, 'feet', 'spank'
-					gs 'pain', 3, 'thighs', 'spank'
-					gs 'pain', 3, 'neck', 'spank'
-					fingal = 1
-					if pcs_makeup > 1: pcs_makeup = 0
-					if stolmoney > 100:
-						stolmoney -= 100
-					else
-						stolmoney = 0
-					end
-					if money > 100:
-						money -= 100
-					else
-						money = 0
-					end
-					paytomistress = 0
-					gs'stat'
-					
-					'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub44.jpg"></center>'
-					'Mistress angrily rips off your clothes and begins to brutally spank you, whilst screaming obscene curses. You howl and roll up on the floor in tears, as she pays particular attention to your breasts, butt and feet. she searches through your apartment, rummaging through desks and lockers, until she finds your hidden money. She takes some and puts it in her purse, before taking some of the cash you have on you. Not even bothering to close the door behind her or say anything, she leaves.'
-					
-					act 'Close the door':gt $loc, $metka
-				end
+				act 'Close the door':gt $loc, $metka
 			end
-		else
-			act 'Ignore her':minut += 5 & gt $loc, $metka
 		end
+		gs 'willpower', 'misc', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Ignore her (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				minut += 5
+				gt $loc, $metka
+			end
+		else
+			act 'Ignore her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 	end
 end
 

+ 3 - 1
locations/npcstatic2.qsrc

@@ -106,7 +106,9 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'',
 npctemp = 55
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1160422782 1599231242 1170518020 1844217422 1970929518 1568598475 1217564731'
-$npc_firstname['A<<npctemp>>'] = 'Olu'
+$npc_firstname['A<<npctemp>>'] = 'Oluuosegun'
+$npc_nickname['A<<npctemp>>'] = 'Olu'
+$npc_lastname['A<<npctemp>>'] = 'Maina'
 $npc_usedname['A<<npctemp>>'] = 'Olu'
 npc_cyc['A<<npctemp>>'] = -1
 npc_fert['A<<npctemp>>'] = -1

+ 13 - 16
locations/obj_din.qsrc

@@ -193,7 +193,7 @@ if $ARGS[0] = 'description':
 			*nl
 		end
 	end
-			
+
 	'<<$lip>>'
 	'<<$pcs_throat>>'
 	'<<$skin>>'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'skills':
 	if pcs_servng > 0: 'Serving - <<pcs_servng>>'
 	if pcs_medcn > 0: 'Medicine - <<pcs_medcn>>'
 	if teachlevel > 0: 'Teacher - credibility <<teachlevel>>'
-	*nl	
+	*nl
 	'<b>Other Skills</b>'
 	*nl
 	if SchoolAtestat = 0 and StoryLine > 0:
@@ -684,7 +684,7 @@ if $ARGS[0] = 'stats':
 
 	! This is my suggestion, change it however you see fit, Sicaa
 	if stat['titjob'] > 0 or stat['hidden_titjob'] > 0: 'Pleasured men with your breasts (known/unknown): <<stat[''titjob'']>>/<<stat[''hidden_titjob'']>>'
-	
+
 	if bj > 0 or stat['bj'] > 0 or stat['hidden_bj'] > 0:
 		'Sucked cock (known/unknown): <<stat[''bj'']>>/<<stat[''hidden_bj'']>>'
 		if bja > 0: 'Sucked your boyfriends cock: <<bja>>'
@@ -745,7 +745,7 @@ if $ARGS[0] = 'stats':
 	if stat['anal_dildo_give'] > 0: 'Dildoed someone else''s ass: <<stat[''anal_dildo_give'']>>'
 	if stat['anal_vibe_give'] > 0: 'Used a vibrator on someone else''s ass: <<stat[''anal_vibe_give'']>>'
 	if stat['anal_strap_give'] > 0 or stat['anal_strap_give'] > 0: 'Fucked someone else''s ass with a strap-on: <<stat[''anal_strap_give'']>>'
-	
+
 	'</td><td width="30%" cellspacing="0" cellpadding="0" valign="top">'
 	'<center><b>Fetish Statistics</b></center>'
 	*nl
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'stats_sex':
 
 	! This is my suggestion, change it however you see fit, Sicaa
 	if stat['titjob'] > 0 or stat['hidden_titjob'] > 0: 'Pleasured men with your breasts (known/unknown): <<stat[''titjob'']>>/<<stat[''hidden_titjob'']>>'
-	
+
 	if bj > 0 or stat['bj'] > 0 or stat['hidden_bj'] > 0:
 		'Sucked cock (known/unknown): <<stat[''bj'']>>/<<stat[''hidden_bj'']>>'
 		if bja > 0: 'Sucked your boyfriends cock: <<bja>>'
@@ -1262,10 +1262,8 @@ if $ARGS[0] = 'reputation':
 				else
 					'Your mother thinks that you are a virgin.'
 				end
-				if evgenQW >= 4 and brotherSex >= 1:
+				if evgenQW >= 4 and pav_slut >= 125:
 					'Your brother thinks you are a total whore.'
-				elseif brotherSex >= 1:
-					'Your brother thinks you are a slut.'
 				elseif evgenQW >= 3:
 					'Your brother thinks you are a slut.'
 				elseif brotherknowslut = 1:
@@ -1276,7 +1274,6 @@ if $ARGS[0] = 'reputation':
 					'Your brother has a good opinion of you.'
 				end
 
-
 				if sisterknowslut > 1 and sisboypartyQW = 2:
 					'Your sister thinks you are a slut'
 				elseif sisterknowslut > 0:
@@ -2389,7 +2386,7 @@ if $ARGS[0] = 'records':
 			$tab_text += dyneval($NoteBookLine,'You school social group consists of losers, teacher''s pets, sluts, and the ugly.')
 		end
 	end
-	
+
 	if husband > 0:$tab_text += dyneval($NoteBookLine,'You have been married for <<husbanday>> days. Your husband <<$husName>> <<$husBody>> <<$husFat>> <<$husHair>>. Member <<husDick>> Relationship <<husband>>.')
 	if kid > 0:
 		i = 0
@@ -2415,7 +2412,7 @@ if $ARGS[0] = 'records':
 	else
 		$obj_loverintro = 'Your girlfriend'
 		$obj_loverpron = 'She'
-	end		
+	end
 	if pcs_lovers[0] = 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverintro>> <<$loverdesc[0]>> is <<$loverbody[0]>> height and <<$loverbod[0]>> build with <<$loverface[0]>> hair. <<$loverdesc[0]>> is <<$loverClo[0]>>. Your relationship is <<loverrelation[0]>> after <<loverdays[0]>> days dating.')
 	if haraklover[0] = 0 and loverrelation[0] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>>''s timid and lacks confidence.')
 	if haraklover[0] = 1 and loverrelation[0] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>> has a cheerful and sociable personality.')
@@ -2426,7 +2423,7 @@ if $ARGS[0] = 'records':
 	else
 		$obj_loverintro = 'Your girlfriend'
 		$obj_loverpron = 'She'
-	end		
+	end
 	if pcs_lovers[1] = 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverintro>> <<$loverdesc[1]>> is <<$loverbody[1]>> height and <<$loverbod[1]>> build with <<$loverface[1]>> hair. <<$loverdesc[1]>> is <<$loverClo[1]>>. Your relationship is <<loverrelation[1]>> after <<loverdays[1]>> days dating.')
 	if haraklover[1] = 0 and loverrelation[1] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>>''s timid and lacks confidence.')
 	if haraklover[1] = 1 and loverrelation[1] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>> has a cheerful and sociable personality.')
@@ -2437,13 +2434,13 @@ if $ARGS[0] = 'records':
 	else
 		$obj_loverintro = 'Your girlfriend'
 		$obj_loverpron = 'She'
-	end		
+	end
 	if pcs_lovers[2] = 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverintro>> <<$loverdesc[2]>> is <<$loverbody[2]>> height and <<$loverbod[2]>> build with <<$loverface[2]>> hair. <<$loverdesc[2]>> is <<$loverClo[2]>>. Your relationship is <<loverrelation[2]>> after <<loverdays[2]>> days dating.')
 	if haraklover[2] = 0 and loverrelation[2] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>>''s timid and lacks confidence.')
 	if haraklover[2] = 1 and loverrelation[2] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>> has a cheerful and sociable personality.')
 	if haraklover[2] = 2 and loverrelation[2] > 1:$tab_text += dyneval($NoteBookLine,'<<$obj_loverpron>>''s short-tempered and strict.')
 	*nl
-	
+
 !! Not implemented
 !!	if firstvag ! 0:
 !!		'Your hymen is broken:'
@@ -2451,14 +2448,14 @@ if $ARGS[0] = 'records':
 !!	else
 !!		'Your vaginal virginity is intact'
 !!	end
-!!	
+!!
 !!	if firstanal ! 0:
 !!		'Your anal virginity has been taken:'
 !!		'<<$firstanalstat>>'
 !!	else
 !!		'Your anal virginity is intact'
 !!	end
-!!	
+!!
 !!	if firstoral ! 0:
 !!		'Your mouth has been used:'
 !!		'<<$firstoralstat>>'