Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

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:

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