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

locations/AlbStars.qsrc

@@ -529,7 +529,7 @@ if $ARGS[0] = 'whore1':
 				'"Only that cute little head dancer has ever taken it in the ass better than you, whore. All the other bitches just cry." You let out a loud yelp as he finishes with a stinging smack on your ass that echoes into the room.'
 				'To your despair and disgust, he then forces you into his now sweaty embrace, his flabby arm wrapped around your neck as he fondles your breast while bragging on his phone to his friend about "some of the best anal" he''s ever had. This post sex torture finally ends 10 minutes later.'
 				gs 'arousal', 'anal', 30, 'sub', 'humiliation', 'rough'
-				gs 'pain', 2 'mouth', 'pull' 
+				gs 'pain', 2, 'mouth', 'pull' 
 				gs 'pain', 2, 'asshole', 'stretch'
 				gs 'cum_call', 'anus', $AlbinaQW['Cust']
 				gs 'pain', 2, 'asscheeks', 'slap'

locations/FedorEv4.qsrc

@@ -2434,8 +2434,8 @@ if $ARGS[0] = 'Toilet 3':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="red">Evil Toilet</font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/vket.jpg"></left>'
+	'<center><b><h4><font color="red">Evil Toilet</font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/vket.jpg"></center>'
 	'<h4><b>FEED ME!!!</b></h4>'
 
 	act 'NOO!':gt 'FedorEv4', 'Bathroom'
@@ -2859,8 +2859,8 @@ if $ARGS[0] = 'Regina Chat':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'Fedor''s mother has long blond hair that is well kept and looks really good for her age.'
 	if $clothingworntype = 'nude' and ReginaKozCaught < 5:
@@ -2907,8 +2907,8 @@ if $ARGS[0] = 'Regina Chat 2':
 	ReginaKozlov += 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	VK = rand(1,7)
 	if VK = 1:
@@ -2936,8 +2936,8 @@ if $ARGS[0] = 'Dinner 1':
 	minut += 5
 	ReginaKoz_Daystart = daystart
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'Of course, it''s no problem. Here, have a seat and I''ll make us a nice meal.'
 
@@ -2957,7 +2957,7 @@ if $ARGS[0] = 'Dinner':
 	cumspclnt = 2
 	minut += 20
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'You and Regina spend a few minutes getting to know each other while eating a well prepared meal.'
 
@@ -2990,8 +2990,8 @@ if $ARGS[0] = 'Fedor Livingroom':
 	menu_off = 0
 	minut += 5
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></center>'
 	*nl
 	'Fedor is sitting on the sofa watching tv and when he notices you, he pats the seat next to him, offering you a seat.'
 	
@@ -3022,8 +3022,8 @@ if $ARGS[0] = 'Fedor Kitchen':
 	$menu_arg = 'Fedor Kitchen'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></center>'
 	*nl
 	'Fedor is sitting down at the table, waiting for his microwaved lunch to finish.'
 	
@@ -3075,8 +3075,8 @@ if $ARGS[0] = 'Fedor Bedroom':
 	$menu_arg = 'Fedor Bedroom'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></center>'
 	*nl
 	'Fedor is laying on his bed, relaxing.'
 	if FedorLove = 0:
@@ -3135,11 +3135,11 @@ if $ARGS[0] = 'Fedor Bedroom 2':
 	menu_off = 0
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	*nl
 	'Fedor is watching videos on his computer. As you approach, Fedor turns to you and asks "Hey <<$pcs_nickname>>, wanna check out some videos?"'
@@ -3226,7 +3226,7 @@ if $ARGS[0] = 'Future':
 	act 'Marriage':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/sitting.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/sitting.jpg"></center>'
 		'<b><h4><font color=#FF00FF>To be continued... Love Violet Kitten.</font></h4></b>'
 
 		act 'Awwww':gt 'FedorEv4', 'Fedor Bedroom'
@@ -3271,8 +3271,8 @@ if $ARGS[0] = 'Fedor Livingroom Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you discuss your favorite TV shows.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Livingroom'
@@ -3283,8 +3283,8 @@ if $ARGS[0] = 'Fedor Kitchen Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you discuss your favorite foods.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Kitchen'
@@ -3295,8 +3295,8 @@ if $ARGS[0] = 'Fedor Bedroom Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you share stories about your classmates.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Bedroom'
@@ -3307,7 +3307,7 @@ if $ARGS[0] = 'Fedor Bedroom Chat 2':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 	'Fedor gets up and offers you his seat then stands behind you as he shows you his playlist of favorite online videos as you share with him, your favorites.'
 
@@ -3323,7 +3323,7 @@ if $ARGS[0] = 'Private Chat':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 	'You sit down next to Fedor then ask, "Can we talk for a moment...In private?" Fedor turns to you with a concerned look on his face. "Of course <<$pcs_firstname>>. Let''s head to my room where we can talk in private." Fedor takes your hand then leads you to the bedroom.'
 
@@ -3350,8 +3350,8 @@ if $ARGS[0] = 'Fedor Shelter 2':
 	FedorShelter = 2
 	npc_rel['A5'] += 20
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	'You can see Fedor and Regina sitting down together chatting then Regina notices you. Regina looks up to you with a sad face then says, "Fyodor told me about what happened. You''re mother threw you out? Why?" you lower your head, trying to figure out where to start when Regina says, "It''s ok, you don''t have to tell me. I can''t believe that she would throw out her own daughter. Fyodor and I have been discussing, and I decided that it would be best if you to stay for while, but promise me that you will try to find a place to live when you graduate, okay?" you happily nod, and can feel tears gathering in your eyes, as you reply, "Yes I will. Thank you so much. I thought that I would be living on the street. Thank you." Regina approaches you then wipes away your tears. "I will get you a key." Regina then reaches inside of a drawer then pulls out a set of keys then give you one. Fedor gives you a hug then says, "You will always be welcome here." You return the hug, as you reply, "Thank you for everything Fyodor. You are the best boyfriend ever."'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 
@@ -3411,7 +3411,7 @@ if $ARGS[0] = 'Home Entrance':
 	$menu_arg = 'Home Entrance'
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></center>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'
 	
 	act 'Walk away': minut += 5 & gt 'pav_residential'
@@ -3431,8 +3431,8 @@ if $ARGS[0] = 'Home Entrance 2':
 	elseif week <= 5 and hour >= 19:
 		gt 'FedorEv4', 'Home Entrance 3'
 	elseif week > 5 and hour > 10:
-		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 		'You knock on the door until Regina opens it and invites you inside.'
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	else
@@ -3444,11 +3444,11 @@ end
 if $ARGS[0] = 'Home Entrance 3':
 	*clr & cla
 	menu_off = 1
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'You knock on the door until Fedor opens it and invites you inside.'
 

locations/FedorMisc.qsrc

@@ -78,14 +78,14 @@ if $ARGS[0] = 'Fedor Chat':
 		if $loc = 'gdkin':minut += 5
 		gs 'stat'
 		if fedorKozlovQW = -10:
-			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast1.jpg"></left>'
+			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast1.jpg"></center>'
 		elseif fedorKozlovQW < -10:
-			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
-			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end
 
 		*nl
@@ -132,8 +132,8 @@ if $ARGS[0] = 'Fedor Hate':
 	menu_off = 1
 	minut += 5
 	gs 'stat'
-	'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></left>'
+	'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 	'Fedor looks at you with hatred as he says, "I have nothing to say to you. Go away!"'
 
 	if $loc ! 'gdkin':

locations/UnitAppearance.qsrc

@@ -1,10 +1,12 @@
 # UnitAppearance
 if $ARGS[0] = '':
 	*clr
+    'Hotcat'
 	'<table>'
 		'<tr>
 			<th>Desc</th>
 			<th>hotcat</th>
+			<th>bmi</th>
 			<th>bodykoef</th>
 			<th>HeadBonus</th>
 			<th>AttributeBonus</th>
@@ -17,13 +19,16 @@ if $ARGS[0] = '':
 		</tr>'
 		gs 'UnitAppearance', 'GenerateSvetas'
 	'</table>'
+end
 
+if $ARGS[0] = 'gashtest':
 end
 
 if $ARGS[0] = 'GenRow':
 	'<tr>'
 		'<td><<$svetadesc>></td>'
 		'<td><<unitHotcat>></td>'
+		'<td><<unitbmi_calc>></td>'
 		'<td><<unitbodykoef>></td>'
 		'<td><<unitHeadBonus>></td>'
 		'<td><<unitAttributeBonus>></td>'
@@ -36,9 +41,26 @@ if $ARGS[0] = 'GenRow':
 	'</tr>'
 end 
 
+if $ARGS[0] = 'GenRowBreak':
+	'<tr>'
+		'<td><<$ARGS[1]>></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+	'</tr>'
+end 
+
 if $ARGS[0] = 'calcHotcat':
 	unitbmi_calc = FUNC('body_shape', 'bmicalc', unitsalo, unitpcs_hgt)
-	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitsalo, unitpcs_hgt, unitstrenbuf, unitsalocatnow, unitvofat, unitbmi_calc)
+	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitbmi_calc, unitstrenbuf, unitsalocatnow, unitvofat)
 	unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', unitpcs_lashes, unitpcs_eyesize, unitpcs_lip, unitpcs_teeth)
 	unitAttributeBonus = FUNC('body_shape', 'calcAttributeBonus', unitpcs_agil, unitpcs_vital)
 	unitpcs_apprncbase = FUNC('body_shape', 'basebeautycalc2', unitResetBase, unitvidage, unitpcs_skin, unitbodykoef, unitunitHeadBonus, unitunitAttributeBonus, unitpcs_apprncbase)
@@ -51,6 +73,72 @@ if $ARGS[0] = 'calcHotcat':
 	gs 'UnitAppearance', 'GenRow'
 end
 
+if $ARGS[0] = 'headbonus':
+	*clr
+    'HeadBonus'
+	'<table>'
+		'<tr>
+			<th>headbonus</th>
+			<th>pcs_lashes</th>
+			<th>pcs_eyesize</th>
+			<th>pcs_lip</th>
+			<th>pcs_teeth</th>
+		</tr>'
+		gs 'UnitAppearance', 'HeadBonusCalc'
+	'</table>'
+end
+
+if $ARGS[0] = 'HeadBonusCalc':
+    gs 'UnitAppearance', 'GenHeadRow', 5,3,3,-1
+    gs 'UnitAppearance', 'GenHeadRow', 4,3,4,-1
+    gs 'UnitAppearance', 'GenHeadRow', 3,2,2,0
+    gs 'UnitAppearance', 'GenHeadRow', 2,2,2,0
+    gs 'UnitAppearance', 'GenHeadRow', 1,1,1,1
+    gs 'UnitAppearance', 'GenHeadRow', 0,0,0,3
+end
+
+if $ARGS[0] = 'GenHeadRow':
+    unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', ARGS[1], ARGS[2], ARGS[3], ARGS[4])
+    '<tr>'
+        '<td><<unitHeadBonus>></td>'
+        '<td><<ARGS[1]>></td>'
+        '<td><<ARGS[2]>></td>'
+        '<td><<ARGS[3]>></td>'
+        '<td><<ARGS[4]>></td>'
+    '</tr>'
+end
+
+if $ARGS[0] = 'attributebonus':
+	*clr
+    'AttributeBonus'
+	'<table>'
+		'<tr>
+			<th>attributebonus</th>
+			<th>pcs_agil</th>
+			<th>pcs_vital</th>
+		</tr>'
+		gs 'UnitAppearance', 'AttribBonusCalc'
+	'</table>'
+end
+
+if $ARGS[0] = 'AttribBonusCalc':
+    gs 'UnitAppearance', 'GenAttribRow', 100,100
+    gs 'UnitAppearance', 'GenAttribRow', 80,80
+    gs 'UnitAppearance', 'GenAttribRow', 60,60
+    gs 'UnitAppearance', 'GenAttribRow', 40,40
+    gs 'UnitAppearance', 'GenAttribRow', 20,20
+    gs 'UnitAppearance', 'GenAttribRow', 0,0
+end
+
+if $ARGS[0] = 'GenAttribRow':
+    unitAttribBonus = FUNC('body_shape', 'calcAttributeBonus', ARGS[1], ARGS[2])
+    '<tr>'
+        '<td><<unitAttribBonus>></td>'
+        '<td><<ARGS[1]>></td>'
+        '<td><<ARGS[2]>></td>'
+    '</tr>'
+end
+
 if $ARGS[0] = 'GenerateSvetas':
 
 	$svetadesc = 'Current Sveta'
@@ -89,19 +177,7 @@ if $ARGS[0] = 'GenerateSvetas':
 	unitsupnatvnesh = supnatvnesh
     unitpcs_apprncbase = pcs_apprncbase
     unitResetBase = 0
-	gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked current Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    unitpcs_apprncbase = pcs_apprncbase
-    unitResetBase = 0
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Hot Sveta'
     unitsalo = 65
@@ -139,17 +215,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Hot Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Nerd start Sveta'
     unitsalo = 132
@@ -187,17 +253,8 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
-    $svetadesc = 'Naked Nerd start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
 
     $svetadesc = 'Dancer start Sveta'
     unitsalo = 55
@@ -235,17 +292,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Dancer start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
 
     $svetadesc = 'Popular start Sveta'
@@ -284,17 +331,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Popular start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Gopnik start Sveta'
     unitsalo = 80
@@ -332,17 +369,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Gopnik start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Ugly start Sveta'
     unitsalo = 220
@@ -380,17 +407,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Ugly start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Slut start Sveta'
     unitsalo = 60
@@ -428,17 +445,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Slut start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'goth start Sveta'
     unitsalo = 45
@@ -476,20 +483,71 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
    unitpcs_apprncbase = 0
    unitResetBase = 1
-
-   gs 'UnitAppearance', 'calcHotcat'
-   $svetadesc = 'Naked goth start Sveta'
-   unitPXCloThinness = 0
-   unitPXCloTopCut = 0
-   unitPXCloBottomShortness = 0
-   unitPCloQuality = 0
-   $unitclothingworntype = 'nude'
-   $unitpantyworntype = ''
-   $unitbraworntype = ''
-   gs 'UnitAppearance', 'calcHotcat'
+   gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
 end
 
+if $ARGS[0] = 'GenerateSvetaOptions':
+
+
+    gs 'UnitAppearance', 'GenRowBreak', $svetadesc
+
+    $svetadesc = 'Current Clothes <<$ARGS[1]>>'
+    
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Low Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 150
+    unitPXCloTopCut = 100
+    unitPXCloBottomShortness = 100
+    unitPCloQuality = 1
+    $unitclothingworntype = ''
+    unitbonusZ = 1
+    unitPShoQuality = 1
+    $unitpantyworntype = ''
+    $unitbraworntype = ''
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Med Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 250
+    unitPXCloTopCut = 300
+    unitPXCloBottomShortness = 150
+    unitPCloQuality = 4
+    $unitclothingworntype = ''
+    unitbonusZ = 3
+    unitPShoQuality = 4
+    $unitpantyworntype = 'fashionista'
+    $unitbraworntype = 'fashionista'
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'High Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 400
+    unitPXCloTopCut = 500
+    unitPXCloBottomShortness = 400
+    unitPCloQuality = 7
+    $unitclothingworntype = ''
+    unitbonusZ = 5
+    unitPShoQuality = 7
+    $unitpantyworntype = 'boutique'
+    $unitbraworntype = 'boutique'
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Naked <<$ARGS[1]>>'
+    unitPXCloThinness = 0
+    unitPXCloTopCut = 0
+    unitPXCloBottomShortness = 0
+    unitPCloQuality = 0
+    $unitclothingworntype = 'nude'
+    $unitpantyworntype = ''
+    $unitbraworntype = ''
+    gs 'UnitAppearance', 'calcHotcat'
+
+    gs 'UnitAppearance', 'GenRowBreak', ''
+
+end 
+
+
+
 if $ARGS[0] = 'CurVal':
     $SvetaDesc = input("Enter a description for Sveta")
 	*clr

locations/body.qsrc

@@ -2400,9 +2400,9 @@ if $ARGS[0] = 'calcClothesBonus':
 
 	if $tempclothingworntype = 'nude':
 		!! needs a rethink as this is skewing the results
-		tempCloAdjustedBeauty =  temppcs_apprncbase
+		tempCloAdjustedBeauty =  0
 	else
-		tempCloAdjustedBeauty = temppcs_apprncbase * tempRevealing * tempPCloQuality / 5000
+		tempCloAdjustedBeauty = temppcs_apprncbase * tempRevealing * tempPCloQuality / 10000
 	end
 
 	if $tempclothingworntype = 'exercise': tempCloAdjustedBeauty = tempCloAdjustedBeauty * 2 / 3

locations/body_shape.qsrc

@@ -245,7 +245,7 @@ if $ARGS[0] = '':
 
 !!Setting the pcs_apprnc bonus based on fat and strength
 	bmi_calc = FUNC('body_shape', 'bmicalc', salo, pcs_hgt)
-	bodykoef = FUNC('body_shape', 'setbodykoef', salo, pcs_hgt, strenbuf, salocatnow, vofat, bmi_calc)
+	bodykoef = FUNC('body_shape', 'setbodykoef', bmi_calc, strenbuf, salocatnow, vofat)
 
 !!This is to clean up unused variables
 	killvar 'normbuffpick' & killvar 'nrmbfpckct'
@@ -255,17 +255,15 @@ end
 
 if $ARGS[0] = 'setbodykoef':
 	!!Setting the pcs_apprnc bonus based on fat and strength
-	tempbodyFat = ARGS[1] & !!salo
-	temppcs_hgt = ARGS[2] & !!pcs_hgt
-	tempstrenbuf = ARGS[3] & !!strenbuf
-	tempsalocatnow = ARGS[4] & !! salocatnow
-	tempvofat = ARGS[5] & !! vofat
-	tempbmi_calc = ARGS[6] & !! result of bmicalc
+	tempbmi_calc = ARGS[1] & !! result of bmicalc
+	tempstrenbuf = ARGS[2] & !!strenbuf
+	tempsalocatnow = ARGS[3] & !! salocatnow
+	tempvofat = ARGS[4] & !! vofat
 
 	if tempbmi_calc < 16:
 		tempbodykoef = 35
     elseif tempbmi_calc < 19:
-		botempbodykoefdykoef = 70
+		tempbodykoef = 70
     elseif tempbmi_calc < 25:
 		tempbodykoef = 90
     elseif tempbmi_calc < 30:
@@ -588,18 +586,17 @@ if $args[0] = 'basebeautycalc2':
 
 !!	Setting vidagebonus
 	vidagebonus = 100
-	if tempvidage < 20: vidagebonus = 60 + 2 * tempvidage
-	if tempvidage > 30: vidagebonus = 160 - 2 * tempvidage
+	if tempvidage < 20: vidagebonus = 60 + (2 * tempvidage)
+	if tempvidage > 30: vidagebonus = 160 - (2 * tempvidage)
 
 !!	Preforming the calculation
 	skincalc = (temppcs_skin * 2 / 5)
-	bodykoefcalc = (3 * (2 + tempbodykoef))
-	vneshtemp = vidagebonus * (skincalc + bodykoefcalc + tempAttributeBonus + tempHeadBonus) / 100
+	vneshtemp = vidagebonus * (skincalc + tempbodykoef + tempAttributeBonus + tempHeadBonus) / 100
 
 !!	pcs_skin = skin condition, corrected to a 0 to 40 range; bodykoef set in main body_shape; pcs_teeth is missing teeth or cosmetically improved teeth (-1)
 
 !!	This is the first limiter
-	if vneshtemp > 100: vneshtemp = 100
+	!!if vneshtemp > 100: vneshtemp = 100
 
 !!	This adds the supernatural pcs_apprnc bonus; currently Bimbo and Succubus
 	vneshtemp += supnatvnesh
@@ -613,7 +610,6 @@ if $args[0] = 'basebeautycalc2':
 	!!do not kill vneshtemp here it gets killed in basebeautycalc
 	killvar 'temppcs_apprncbase'
 	killvar 'skincalc'
-	killvar 'bodykoefcalc'
 	killvar 'tempvidage'
 	killvar 'temppcs_skin'
 	killvar 'tempbodykoef'

locations/placer_sex.qsrc

@@ -1906,7 +1906,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 		if temp <= 8:
 			gs 'npcgeneratec', 0, 'stranger park', rand(30,60)
 			gs 'boyStat', $npclastgenerated
-			if and PCloSkirt ! 0:
+			if PCloSkirt ! 0:
 				if temp = 3:
 					*nl
 					'You feel something sticky on your labia, what the hell is this?'

locations/preSYS2.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'preSYS2','start'
 	if custom_csb ! 1: act 'Return to preset character menu': gt 'preSYS', 'charselect'
 	act 'Confirm these options':
-		dynamic 'grupvalue[<<grupTipe>>] = 50'
+		dynamic 'grupvalue[<<grupTipe>>] = 600'
 		if $soc_grup = 'nerd':
 			traits['nerd_points'] = 60
 			traits['nerd_status'] = 2

locations/scandalicious.qsrc

@@ -26,6 +26,7 @@ if $ARGS[0] = 'start':
 		minut += 5
 		gt 'scandalicious', 'swim'
 	end
+end
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'
@@ -63,11 +64,11 @@ if $ARGS[0] = 'swim':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/clothing/12beachbabe/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 4
-		if i <= 199:jump 'loopbeach'
+		if i <= 103:jump 'loopbeach'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 

locations/sportShop.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'swim':
 				end
 			end
 			i += 4
-		if i <= 199:jump 'loopswim'
+		if i <= 213:jump 'loopswim'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end