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

glife.qproj

@@ -131,6 +131,7 @@
 		<Location name="$attributes_exercise"/>
 		<Location name="$attributes_danilovich_outfits"/>
 		<Location name="$attributes_danilovich_swim_one"/>
+		<Location name="$attributes_coat"/>
 		<Location name="$attributes_misc_outfits"/>
 		<Location name="lost_clothes_here"/>
 		<Location name="portnoi"/>

locations/AlbStars.qsrc

@@ -349,6 +349,14 @@ if $ARGS[0] = 'starlets':
 						AlbinaQW['StarletsCustomerCount'] = 1
 						AlbinaQW['StarletPay'] = rand(3,6)
 						'You see a well groomed man in a modest suit approach Albina and start talking to her.'
+					elseif AlbinaQW['StarletCustomer'] = 7:
+					    AlbinaQW['StarletCustomerCount'] = 12
+						'You see an older man with greying hair wearing an expensive shirt with the sleeves rolled up to his elbows talking to Albina.' 
+						AlbinaQW['StarletPay'] = rand (6,9)
+					elseif AlbinaQW['StarletCustomer'] = 8:
+					    AlbinaQW['StarletCustomerCount'] = 1
+						AlbinaQW['StarletPay'] = rand (3,6)
+						'You see an older blonde haired woman wearing a skirt and blouse talking to Albina.'
 					end
 
 					if AlbinaQW['StarletCustomer'] <= 6:
@@ -397,6 +405,8 @@ if $ARGS[0] = 'starlets':
 								if AlbinaQW['StarletCustomer'] = 4:act 'Go with the black man': gt 'AlbStars', 'whore4'
 								if AlbinaQW['StarletCustomer'] = 5:act 'Go with the black men': gt 'AlbStars', 'whore5'
 								if AlbinaQW['StarletCustomer'] = 6:act 'Go with the man': gt 'AlbStars', 'whore6'
+								if AlbinaQW['StarletCustomer'] = 7:act 'Go with the older man': gt 'AlbStars', 'whore7'
+								if AlbinaQW['StarletCustomer'] = 8:act 'Go with the woman': gt 'AlbStars', 'whore8'
 							end
 						end
 					else
@@ -530,7 +540,7 @@ if $ARGS[0] = 'whore1':
 				gs 'pain', 2, 'mouth', 'pull'
 				gs 'pain', 2, 'asshole', 'stretch'
 				gs 'cum_call', 'anus', $AlbinaQW['Cust']
-				gs 'pain', 2, 'asscheeks', 'slap'
+				gs 'pain', 2, 'asscheeks', 'spank'
 				gs 'arousal', 'end'
 				gs 'stat'
 
@@ -1205,12 +1215,13 @@ end
 
 if $ARGS[0] = 'whore7':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake1.jpg"></center>'
-	'The older man takes you to an upscale hotel in the city center and leads you to his penthouse suite, opening the door and motioning for you to step inside. You gulp when you enter the room and see a group of similar aged men gathered around smoking and drinking. They all look at you with lust in their eyes as the door closes loudly behind you and you jump in fright. You''re now in a hotel room alone with a dozen older men. The man walks over to the group and sits down, taking the drink that''s offered to him. He motions for you to come over and you sheepishly comply.
+	'The older man brings you to his luxury car and takes you to an upscale hotel in the city center. Once there, he leads you up to his penthouse suite, opening the door and motioning for you to step inside. You gulp when you enter the room and see a group of similar aged men gathered around smoking and drinking.' 
+	'They all look at you with lust in their eyes as the door closes loudly behind you and you jump in fright. You''re now in a hotel room alone with a dozen older men. The man walks over to the group and sits down, taking the drink that''s offered to him. He motions for you to come over and you sheepishly comply.
 	"What''s your name, girl?" he asks as he takes a swig of his drink.
 	"<<$pcs_firstname>>..." you quietly reply and the men laugh.
 	"Okay <<$pcs_firstname>>, here''s the deal. These are my associates who are here on business. All of us paid good money for you to show us a good time. So what you''re going to do is give us a striptease, then we''ll go from there. Got it?" he says rather sternly and you meekly nod.
 	One of the other men pours some vodka into a glass and offers it to you.
-	"I can see you''re a little nervous, so why don''t you take this liquid courage first?" '
+	"I can see you''re a little nervous, so why don''t you take this liquid courage first?"'
 	minut += 30
 
 	gs 'npcgeneratec', 0, 'the old man', rand(40,60) & $AlbinaQW['Cust0'] = $npclastgenerated & '<<$npclastgenerated>>'
@@ -1308,7 +1319,7 @@ if $ARGS[0] = 'whore7_1':
 			*clr & cla
 			!! Clean up cum from Sveta
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake5.jpg"></center>'
-			'Once in the bathroom, you pull yourself up to the sink and turn the water on. You rinse your face and hair as best as you can before collapsing onto the cold tiled floor of the bathroom. You sit there for a few seconds, overwhelmed by what''s happened, but you eventually manage to get dressed and stumble out of the bathroom. The men don''t ackowledge you and don''t say anything as you open the door and leave, slowly making your way down to the lobby where you phone a taxi to take you home. You sit quietly in the back of the taxi as it takes you far from the hotel and the men inside it.'
+			'Once in the bathroom, you pull yourself up to the sink and turn the water on. You rinse your face and hair as best as you can before collapsing onto the cold tiled floor of the bathroom. You sit there for a few seconds, overwhelmed by what''s happened, but you eventually manage to get dressed and stumble out of the bathroom. The men don''t ackowledge you and don''t say anything as you open the door and leave, slowly making your way down to the lobby where you phone a taxi to take you home.' 
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			minut += 5
@@ -1325,7 +1336,8 @@ if $ARGS[0] = 'whore7_1':
 			gs 'stat'
 
 
-			act 'Get dressed and get out':
+			act 'Go home':
+			    'You sit quietly in the back of the taxi as it takes you far from the hotel and the men inside it. All you can think about is how dirty you feel and wanting a thorough shower.'
 				gs 'underwear','wear'
 				gs 'clothing', 'recover_lost_clothes', 'HotelRoom',1
 				gt 'pav_residential'
@@ -1336,22 +1348,19 @@ end
 
 if $ARGS[0] = 'whore8':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_start.jpg"></center>'
-!! Submissive counter
-	'The woman takes you to her car and makes you sit in the back seat. After a silent journey, you arrive at her home and she leads you inside to her bedroom.
+    'The woman takes you to her car and makes you sit in the back seat. After a silent journey, you arrive at her home and she leads you inside to her bedroom.
 	"Get undressed slave!" she barks and pushes you forwards before disappearing out of the room.
 	Not wanting to anger your client, you strip out of your clothes and place them aside, finishing just as the woman reappears with some items, having exchnaged her clothes for a leather dress. She pushes you down on all fours and pulls your ass up into the air. You look back and see she is holding a buttplug with a tail. She spreads your ass and the buttplug is eased into you with a loud pop, causing you to wince slightly. She then applies the collar tightly around your neck and pulls roughly on the leash, choking you slightly as she lifts you to your knees and pulls your head up so you''re looking up at her.'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_walk.jpg"></center>'
-!! Submissive counter
-		'"Now don''t you just look adorable my little pet! Why don''t we go for a walk?" she asks rhetorically before pulling on your leash and forcing you to crawl around the house on your hands and knees behind her before she brings you back to the room. She pulls up her dress, exposing her pussy to you.
+        '"Now don''t you just look adorable my little pet! Why don''t we go for a walk?" she asks rhetorically before pulling on your leash and forcing you to crawl around the house on your hands and knees behind her before she brings you back to the room. She pulls up her dress, exposing her pussy to you.
 		"You''re going to lick my pussy like a good little bitch. If you do it properly, you might get a reward." She then roughly pulls on the leash, dragging your head up to her crotch.'
 
 		act 'Lick her pussy':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_play.jpg"></center>'
-!! Cuni sex. Submissive counter
-			'You start licking her pussy and sucking on her clit. Her moans are soft and pleasured, but she suddenly pulls on the leash, removing you from her crotch to look up at her.
+            'You start licking her pussy and sucking on her clit. Her moans are soft and pleasured, but she suddenly pulls on the leash, removing you from her crotch to look up at her.
 			"You''ll have to do better than that slave. You don''t want me to punish you!" With that, she grabs the back of your head and forces you back into her crotch. She starts grinding agaisnt you as you resume eating her out, her moans louder and more pleasured this time.'
 			gs 'arousal', 'cuni_give', 5, 'lesbian'
 			gs 'stat'
@@ -1385,7 +1394,7 @@ if $ARGS[0] = 'whore8':
 					She forces you down onto all fours and walks up behind you. You yelp when she gives you a hard smack on the ass.
 					"You need to learn to be a good little pet!" she barks before delivering another hard smack to your ass, making you yelp even louder. She continues spanking you until your ass is red and stinging.
 					"Maybe now you''ll remember your purpose slave! To make <i>me</i> feel good!" You just nod as tears well up in your eyes.'
-!! Apply spanking pain to buttocks
+                    gs 'pain', 2, 'asscheeks', 'spank'
 					gs 'stat'
 
 					act 'Finished':

locations/cloakroom.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'view_coat_item':
 	cla
 	'<center><img src="<<FUNC(''$coat_image'',  $ARGS[2], ARGS[3])>>"></center>'
 	'coat no.<<ARGS[1]>>'
-	FUNC('$attributes_coat', coat, ARGS[1])
+	FUNC('$attributes_coat', 'coat', ARGS[1])
 
 	$coat_description
 

locations/enderKik.qsrc

@@ -178,7 +178,7 @@ elseif kickbox['amateur'] = 1:
 			kickbox['amateurWinKO'] += 1
 			kickbox['advancement'] += 1
 			kickbox['amateur'] = 0
-			money += 500 + kikbox['money']
+			money += 500 + kickbox['money']
 			rikudo += 10
 			'You are awarded a cash prize of <<500 + kickbox[''money'']>> <b>₽</b>.'
 			gs 'razrKik'

locations/hookup.qsrc

@@ -1634,9 +1634,9 @@ if $ARGS[0] = 'virgin_condom1':
 				'<<$npc_firstname>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.'
 				act'Lose your virginity':
 					if rand(0,1) = 1:
-						gt'miss_virg_norm1'
+						gt 'hookup','miss_virg_norm1'
 					else
-						gt'miss_virg_hard1'
+						gt 'hookup','miss_virg_hard1'
 					end
 				end
 			end
@@ -1647,9 +1647,9 @@ if $ARGS[0] = 'virgin_condom1':
 				'"Maybe..." you start. "... it''ll be okay this one time... this... first time..."'
 				act'Lose your virginity':
 					if rand(0,1) = 1:
-						gt'miss_virg_norm1'
+						gt 'hookup','miss_virg_norm1'
 					else
-						gt'miss_virg_hard1'
+						gt 'hookup','miss_virg_hard1'
 					end
 				end
 			end
@@ -1670,9 +1670,9 @@ if $ARGS[0] = 'virgin_condom2':
 	'He grins back at you, pushing you down onto the bed and climbing on top of you.'
 	act'Lose your virginity':
 		if rand(0,1) = 1:
-			gt'miss_virg_norm1'
+			gt 'hookup','miss_virg_norm1'
 		else
-			gt'miss_virg_hard1'
+			gt 'hookup','miss_virg_hard1'
 		end
 	end
 end
@@ -3008,7 +3008,7 @@ if $ARGS[0] = 'cum_mouth':
 end
 
 if $ARGS[0] = 'cum_inside':
-	if hookup['condom'] = 1:gt'cum_condom'
+	if hookup['condom'] = 1:gt 'hookup','cum_condom'
 	gs'cum_call','',$boy,1
 	$hookup['cum_choice'] = 'creampie'
 	!! differing descriptions based on position

locations/rex_events.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'avto':
 	act 'Agree':
 		*clr & cla
 		minut += 15
-		gs 'drugs ', 'alcohol', 'beer'
+		gs 'drugs', 'alcohol', 'beer'
 		npc_rel['A57'] += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'

locations/rex_party_boys_events.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	party_boys_drink += 1
 	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'drink'
@@ -527,7 +527,7 @@ end
 if $ARGS[0] = 'gost_drink':
 	cls
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	party_boys_in += 1
 	menu_off = 1
 	gs 'stat'
@@ -661,7 +661,7 @@ if $ARGS[0] = 'gost_drink_else':
 	cls
 	menu_off = 1
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boys_party_gost_9_4.jpg"></center>'
 	'Despite feeling very drunk you decide that it is time for another drink. But this time it seems to have been too much as you feel very dizzy and your legs begin to buckle, sending you to the floor. You are suddenly surrounded by a bunch of guys who drag you off.'

locations/rex_party_girls_events.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'smoke':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_3_1.jpg"></center>'
 		'"Girls, look what I stole from my worthless, addicted brother.", one of the girls says, showing you two bags of marijuana. "So, do you want to keep staring at me, or do you want to have fun?"'
 		act 'Start smoking': gt 'rex_party_girls_events', 'smoke'
-		gs 'willpower', 'drugs ', 'resist', 'medium'
+		gs 'willpower', 'drugs', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Move away (<<will_cost>> Willpower)':
 				*clr & cla
@@ -464,7 +464,7 @@ if $ARGS[0] = 'ira_drink':
 	menu_off = 1
 	minut += 5
 	drunk_sveta += 1
-	gs 'drugs ', 'alcohol', 'beer', 1
+	gs 'drugs', 'alcohol', 'beer', 1
 	gs 'stat'
 	'<center><b><font color = maroon>Ira and Lena</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_2.jpg"></center>'
@@ -761,7 +761,7 @@ end
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	drunk_sveta +=1
 	gs 'stat'
 	i = rand(1,2)

locations/rex_party_home.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'party':
 		cls
 		minut += 5
 		alkoParty += 1
-		gs 'drugs ', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 		'In all this mess, you are unable to find a clean cup and are handed a full bottle of booze. Clinking glasses with the bottle, you put your lips to its mouth and turn it up, gulping down several swigs of strong drink, noticing the effects almost at once.'
@@ -104,7 +104,7 @@ if $ARGS[0] = 'party_drink':
 	cls
 	minut += 5
 	alkoParty += 1
-	gs 'drugs ', 'alcohol', 'vodka'
+	gs 'drugs', 'alcohol', 'vodka'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 	'Someone hands you a half full bottle of booze. Putting your lips to the mouth of the bottle, you turn it up and gulp down several swigs of strong drink, noticing the effects almost at once.'

locations/rex_party_sister_events.qsrc

@@ -88,7 +88,7 @@ end
 if $ARGS[0] = 'sister_drink':
 	minut += 5
 	*clr & cla
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	drunk_sveta += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Anya</font></b></center>'
@@ -294,7 +294,7 @@ if $ARGS[0] = 'sisboyQW_party':
 	act 'Accept the drink':
 		*clr & cla
 		minut += 15
-		gs 'drugs ', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
@@ -307,7 +307,7 @@ if $ARGS[0] = 'sisboyQW_party':
 	act 'Get up to dance':
 		*clr & cla
 		minut += 15
-		gs 'drugs ', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
@@ -334,7 +334,7 @@ if $ARGS[0] = 'dance':
 	act 'Drink':
 		*clr & cla
 		minut += 10
-		gs 'drugs ', 'alcohol', 'whiskey'
+		gs 'drugs', 'alcohol', 'whiskey'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_13.jpg"></center>'
 		*nl
@@ -471,7 +471,7 @@ end
 if $ARGS[0] = 'reks':
 	*clr & cla
 	minut += 5
-	gs 'drugs ', 'alcohol', 'champagne'
+	gs 'drugs', 'alcohol', 'champagne'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_19.jpg"></center>'
 	*nl
@@ -575,7 +575,7 @@ end
 if $ARGS[0] = 'drink':
 	*clr & cla
 	minut += 10
-	gs 'drugs ', 'alcohol', 'vodka'
+	gs 'drugs', 'alcohol', 'vodka'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_11.jpg"></center>'
 	*nl

locations/sister.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'pav_commcenter':
 			*clr & cla
 			minut += 60
 			npc_rel['A33'] += 5
-			gs 'drugs ', 'alcohol', 'beer', 3
+			gs 'drugs', 'alcohol', 'beer', 3
 			gs 'stat'
 			if AniaFrends >= 1:
 				gt 'sister', 'scene1'

locations/wardrobe.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'removeall':
 	gs 'panties', 'remove'
 	gs 'shoes', 'strip'
 	gs 'purses', 'remove'
-	gs 'coat', 'remove'
+	gs 'coats', 'remove'
 end
 
 !!---------------------------Oufit stuff----------------------------------
@@ -202,7 +202,7 @@ if $ARGS[0] = 'default_entry_wear':
 	if dyneval('RESULT = <<$defcoattype[default_entry]>>[<<defcoatnumber[default_entry]>>]') = 0:
 		$defcoattype[default_entry] = 'none' & defcoatnumber[default_entry] = 0
 	else
-		gs 'coat', 'wear', $defcoattype[default_entry], defcoatnumber[default_entry]
+		gs 'coats', 'wear', $defcoattype[default_entry], defcoatnumber[default_entry]
 	end
 
 	!! default school girl uniform is always allowed to be worn if still in school