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

locations/postdeliveries.qsrc

@@ -184,6 +184,7 @@ if $ARGS[0] = '1':
 	if will_cost <= pcs_willpwr:
 		act 'Refuse and continue your round (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			cla
 			'"Yea, no. How would your wife feel, if she knew another girl put those clothes on before her?" you ask him, and continue your round without saying another word.'
 			'The man doesn''t bother to object, and closes the door dejectedly. He knows you''re right.'
@@ -205,6 +206,7 @@ if $ARGS[0] = '1':
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				cla
 				'"Sorry, but no. I really shouldn''t. I have to go!" you tell him.'
 				'The man''s shoulders sag a little, but he was expecting this response. What girl would agree to model lingerie for some random guy she just met?'			
@@ -248,6 +250,7 @@ if $ARGS[0] = '2':
 		if will_cost <= pcs_willpwr:
 			act 'Refuse and ask him to sign (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				cla
 				'"Uhh, no. I just need you to sign here please?" you ask him, handing him the clipboard.'
 				'Arsen signs where you want him to, looking at you with some regret. He says: "Are you sure? I bet Jenya could show you a trick or two! You two really seem to hit it off..."'
@@ -294,6 +297,7 @@ if $ARGS[0] = '3':
 	if will_cost <= pcs_willpwr:
 		act 'Just get his signature and leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			cla
 			'This guy gives you the creeps! "Uhhh... I don''t think so, sir. I just need you to sign here so I can be on my way," you tell him.'
 			'The man smirks, but signs where you ask him to: "You''d rather be poor, huh? Suit yourself."'
@@ -313,6 +317,7 @@ if $ARGS[0] = '3':
 		if will_cost <= pcs_willpwr:
 			act 'Tell him you''re not interested (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				cla
 				'"I''m not that kind of girl, sir. I just need you to sign here so I can be on my way," you tell him.'
 				'The man smirks, but signs where you ask him to: "Suit yourself."'
@@ -334,6 +339,7 @@ if $ARGS[0] = '3':
 			if will_cost <= pcs_willpwr:
 				act 'Say you probably won''t be coming (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 					cla
 					'"I don''t know... I don''t think I''ll be coming, sir. I just need you to sign here so I can be on my way," you tell him.'
 					'The man smirks at you, but signs where you ask him to and pulls the box out of your hands: "We''ll see. That''s what you girls all say, until you get sick of the crappily paid jobs you''re doing now and realize how much more comfortable your lives can be. Come find me, if you change your mind. And if you''re brave enough."'
@@ -368,6 +374,7 @@ if $ARGS[0] = '4':
 			cla
 			gs 'willpower', 'misc', 'self', 'hard'
 			gs 'willpower', 'pay', 'self'
+			gs 'stat'
 			''
 			'"It was fine when I got here! Look... sign, don''t sign, I don''t care. The postmaster will believe my word over yours, when he hears about this!" you tell him, and you see the man''s confidence waver a little. You add: "If <b>you</b> know what''s good for you, you sign before this gets out of hand."'
 			'The man regains his posture quickly and scoffs: "We''ll see who he believes! I''m not signing shit, unless you do what I want. And I happen to know the postmaster. If there''s one thing he hates, it''s complaints... trust me. What''s it gonna be, girl?"'
@@ -378,6 +385,7 @@ if $ARGS[0] = '4':
 				act 'Stick to your guns and leave (<<will_cost>> Willpower)':
 					cla
 					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 					posteventQW4 = 1
 					'Not saying another word, you turn around and leave his apartment. Hopefully you''re right about the postmaster believing you...'
 					act 'Continue your round':gt 'postdeliveries', 'resume'
@@ -396,6 +404,7 @@ if $ARGS[0] = '4':
 			cla
 			gs 'willpower', 'hj', 'resist', 'easy'
 			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			posteventQW4 = 1
 			'You don''t like where this is going at all! Deciding you''re better off leaving his apartment while you still can, you bolt for the door and run away. You don''t trust him one bit... who knows what kind of other things he''d make you do!?'
 			'Once you''re a few houses away and look behind you, you realize there''s no way he can follow you. Not with the way he was dressed.'
@@ -417,6 +426,7 @@ if $ARGS[0] = '4':
 			act 'Refuse and run away (<<will_cost>> Willpower)':
 				cla
 				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				posteventQW4 = 1
 				'When he slowly comes closer to you, you decide to quickly leave his apartment and run away while you still can. Who knows what else he''d make you do!?'
 				'Once you''re a few houses away and look back, you realize there''s no way he can follow you the way he was dressed. You take a deep breath, and look at your clipboard to see where you have to go next. One signature will be missing from your list today, but surely the postmaster will understand?'
@@ -449,6 +459,7 @@ if $ARGS[0] = '5':
 		act 'Say you have no time (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			'"Sorry guys, I have mail to deliver! No time to chat!" you say, and keep walking.'
 			'For a second you were afraid they were going to be more insistent, but luckily they leave you alone.'
 			act 'Continue your round':gt 'postdeliveries', 'resume'
@@ -945,6 +956,7 @@ if $ARGS[0] = '26':
 		act 'Decline and say you''re in a hurry (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
 			'"Sorry kid, I have no time to deliver your note, very busy day today!" you shrug at him, and keep walking.'
 			'The boy''s shoulders sag, and he sadly looks at the note he has in his hand. How is he going to get it delivered to her, if even the postal service won''t help him?'
 			act 'Continue your round':gt 'postdeliveries', 'resume'
@@ -1065,6 +1077,7 @@ if $ARGS[0] = 'bandits':
 			act 'Wrest yourself free and try to run away (<<will_cost>> Willpower)':
 				cla
 				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				'You replay in your head what the man said earlier: they only get to play with you if they catch you! So... it''s okay to run, right? All part of the game!'
 				'You quickly snag your bag away from them and try to run away from them.'
 				''

locations/postevents.qsrc

@@ -25,6 +25,7 @@ if $ARGS[0] = '1':
 			act 'Flirt with him (<<will_cost>> Willpower)':
 				cla
 				gs 'willpower', 'pay', 'self'
+				gs 'stat'
 				'"What about me?" you ask him sweetly. When he looks at you askingly, you ask again: "What about me? Do you think I look hot in it?"'
 				'"I uhh..." the man mumbles.'
 				'"It''s okay! Your wife isn''t here, right? It''s just you and me! You can say whatever you want!" you wink at him.'
@@ -199,6 +200,7 @@ if $ARGS[0] = '2':
 				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
 					cla
 					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 					'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
 					'Jenya looks disappointed, but doesn''t try to stop you. She smiles: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cock for me!"'
 					'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are semi-erect and bob up and down with every step.'
@@ -236,6 +238,7 @@ if $ARGS[0] = '2':
 				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
 					cla
 					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 					'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
 					'The girl looks disappointed, but doesn''t try to stop you. She says: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cocks for me!"'
 					'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are fully erect and bob up and down with every step they take.'
@@ -795,6 +798,7 @@ if $ARGS[0] = '4':
 				act 'Tell him that''s not good enough (<<will_cost>> Willpower)':
 					cla
 					gs 'willpower', 'pay', 'force'
+					gs 'stat'
 					cla
 					'"Not good enough!" you yell at him, as you tighten your grip on his junk even more. "You take advantage of me, while I''m just trying to do my job!? How many girls have you degraded like this, before me? I really should make you suffer..."'
 					'"N-no! Please! I can pay! I''ll give you 1000 <b>₽</b>, just please let go! I won''t bother anyone ever again! I promise!" he cries out. You''d swear he''s nearly in tears now.'

locations/wardrobe.qsrc

@@ -339,7 +339,7 @@ end
 if $ARGS[0] = 'sports_entry_wear':
 	gs 'stat'
 
-	gs 'wardrobe', 'prev_entry_set'
+	!gs 'wardrobe', 'prev_entry_set' this does not exist
 
 	gs 'clothing_attributes', 'exercise', sportsclothingnumber
 
@@ -365,19 +365,25 @@ if $ARGS[0] = 'sports_entry_wear':
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your sports outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
-		gs 'wardrobe', 'prev_entry_set'
+		!gs 'wardrobe', 'prev_entry_set' this does not exist
+		gs 'clothing', 'strip'
+		gs 'stat'
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = exerciseH[<<sportsclothingnumber>>]') <= 0:
 		cls
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your sports outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
-		gs 'wardrobe', 'prev_entry_set'
+		!gs 'wardrobe', 'prev_entry_set' this does not exist
+		gs 'clothing', 'strip'
+		gs 'stat'
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
 		cls
 		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
 		'You don''t feel daring enough to wear your sports outfit. Maybe you will be confident enough in the future? Guess you will have to find something else to wear.'
-		gs 'wardrobe', 'prev_entry_set'
+		!gs 'wardrobe', 'prev_entry_set' this does not exist
+		gs 'clothing', 'strip'
+		gs 'stat'
 	!! clothing ok to wear without needing hip check and passing all other checks
 	else
 		cls