Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/clothing.qsrc

@@ -1777,7 +1777,7 @@ end
 
 if $ARGS[0] = 'dispose':
 	dynamic $clothingworntype + '[<<clothingwornnumber>>] = 0'
-	$lastwornclothingtype = 'none'
+	$lastwornclothingtype = 'nude'
 	lastwornclothingnumber = 0
 
 	gs 'clothing', 'strip_code'

locations/drugs.qsrc

@@ -39,7 +39,6 @@ elseif $ARGS[0] = 'stat':
 	gs 'drugs', 'cocaine', 'stat'
 	gs 'drugs', 'amphetamine', 'stat'
 
-
 elseif $ARGS[0] = 'pain_relief':
 	if alko > 9:
 		pain['relief'] = 70
@@ -332,6 +331,7 @@ elseif $ARGS[0] = 'mentats':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'steroids':
 	if $ARGS[1] = 'cikl':
 		if drugVars['steroids_dose'] >= 1:
@@ -390,6 +390,7 @@ elseif $ARGS[0] = 'breastcream':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'painkiller':
 	if ARGS[1] = 0 and $ARGS[1] = '':
 		mc_inventory['painkillers'] -= 1
@@ -400,6 +401,7 @@ elseif $ARGS[0] = 'painkiller':
 	pain['killer'] += 1
 	gs 'stat'
 
+
 elseif $ARGS[0] = 'alcohol':
 	if $ARGS[1] = 'stat':
 		if alko > 9:
@@ -463,7 +465,6 @@ elseif $ARGS[0] = 'alcohol':
 				end
 
 			elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-				pcs_traits['alko_day'] += 3
 				if pcs_traits['alko_status'] = -1:
 					alko += rand(4,5)
 				elseif pcs_traits['alko_status'] = 1:
@@ -471,6 +472,7 @@ elseif $ARGS[0] = 'alcohol':
 				else
 					alko += 3
 				end
+				pcs_traits['alko_day'] += 3
 
 				fat += 6
 				if pcs_hydra >= 100:
@@ -509,6 +511,7 @@ elseif $ARGS[0] = 'alcohol':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'aphrodisiac':
 	if $ARGS[1] = 'cikl':
 		if drugVars['aphrodisiac_overdose'] = 1: drugVars['aphrodisiac_overdose'] = 0
@@ -570,6 +573,8 @@ elseif $ARGS[0] = 'aphrodisiac':
 		end
 		gs 'stat'
 	end
+
+
 elseif $ARGS[0] = 'hair_extensioncream':
 	if $ARGS[1] = 'cikl':
 		if drugVars['hair_extensioncream_dose'] >= 1:
@@ -597,6 +602,7 @@ elseif $ARGS[0] = 'hair_extensioncream':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'butt_injection':
 	if $ARGS[1] = 'cikl':
 		if drugVars['butt_injection_dose'] >= 1:
@@ -628,13 +634,13 @@ elseif $ARGS[0] = 'butt_injection':
 		gs 'stat'
 	end
 
+
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end
 
 
-
-
 gs 'traits', 'addictive_personality'
 
+
 --- drugs ---------------------------------

locations/gad_gpbarn.qsrc

@@ -11,15 +11,15 @@ if $ARGS[0] = '':
 	'<center><h4>Grandparents'' Barn</h4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/sarai.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/sarai_night.jpg"></center>'
 		end
 	else
 		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai_winter.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/sarai_winter.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai_winter_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/sarai_winter_night.jpg"></center>'
 		end
 	end
 	'Your grandparents'' old barn could hold some valuable items if you spend time searching.'
@@ -37,9 +37,9 @@ if $ARGS[0] = '':
 		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/firewood.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/firewood_winter.jpg"></center>'
 			end
 			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry.'
 			grandpaQW['chore_fetch_firewood'] = 2
@@ -76,7 +76,7 @@ if $ARGS[0] = 'search':
 		BikeLoc = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/findbike.jpg"></center>'
 		*nl
 		'You find an old bicycle in the far corner of the barn. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
 	elseif findbag = 0 and bag = 0 and rand(0,10) >= 7:
@@ -97,7 +97,7 @@ if $ARGS[0] = 'search':
 		mc_inventory['vintage_card'] = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/vcards.jpg"></center>'
 		*nl
 		'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards still in its original cellophane wrapper.'
 	elseif findbraclet = 0 and rand(0,10) >= 9:
@@ -105,7 +105,7 @@ if $ARGS[0] = 'search':
 		findbraclet = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/bracelet.jpg"></center>'
 		*nl
 		'While looking through the barn, you spot a metal glint under a wood pile. Upon closer inspection, you see a silver bracelet crafted into a snake''s likeness. Strange, but fantastic that you would find something this valuable in the barn.'
 	elseif findbraclet > 0 and findneck = 0 and rand(0,10) >= 10:
@@ -113,7 +113,7 @@ if $ARGS[0] = 'search':
 		findneck = 1
 		gs 'exp_gain', 'observ', 3
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/necklace.jpg"></center>'
 		*nl
 		if $start_type[1] ! 'nomagic':
 			'While looking through the barn, your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of black wood. You pick up the box and see it''s covered in strange writing and glyphs that look like serpents. A feeling of power is coming from within the box. You lift the box''s lid and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'search':
 	else
 		gs 'exp_gain', 'observ', rand(0,1)
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/junk_barn.jpg"></center>'
 		*nl
 		'In the barn, you find many mouldy magazines, rusty tools and equipment, toys, and dusty, yellowed books. The entire barn reeks of mould and decay.'
 	end
@@ -136,7 +136,7 @@ if $ARGS[0] = 'horse':
 	gs 'stat'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/horse.jpg"></center>'
 	'Grandfather''s trusted workhorse, Desperado.'
 
 	act 'Leave': minut += 1 & gt 'gad_gpbarn'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/feed_horse.jpg"></center>'
 			'You grab a sack of grain and fill Desperado''s feed bucket. Then, you hang the bucket from his stall and gently pat his nose as he begins to eat.'
 			'You watch him eat for a little while before moving on.'
 
@@ -165,7 +165,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/horse_field.jpg"></center>'
 			'You take Desperado by the bridle and lead him to the field. You let him free in the paddock area and watch him run about before moving on.'
 
 			act 'Continue': gt 'gad_field', 'field'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/horse_field.jpg"></center>'
 			'You take Desperado by the bridle and lead him to the river.'
 
 			act 'Continue': gt 'gad_beach', 'start'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'horse':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/comb_horse.jpg"></center>'
 			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. Finally, you are satisfied with the result - he looks as clean and healthy as ever.'
 
 			act 'Finish': gt 'gad_gpbarn','horse'
@@ -212,7 +212,7 @@ if $ARGS[0] = 'cow':
 	gs 'stat'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/cow.jpg"></center>'
 	*nl
 	'Grandma''s favorite animal, the cow, Dawn.'
 
@@ -226,7 +226,7 @@ if $ARGS[0] = 'cow':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving each time you do it.'
 
 			act 'Finish': gt 'gad_gpbarn', 'cow'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'cow':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/feed_cow.jpg"></center>'
 			'Dawn is excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump some hay in her trough and watch as she digs in.'
 
 			act 'Finish': gt 'gad_gpbarn','cow'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'cow':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/cow_field.jpg"></center>'
 			if grandpaQW['chore_lead_cow_to_field'] = 1:
 				'You lead Dawn to the field, where you let the shepherds take over.'
 				grandpaQW['chore_lead_cow_to_field'] = 2
@@ -274,7 +274,7 @@ if $ARGS[0] = 'boar':
 	gs 'stat'
 
 	'<center><h4>Grandparents'' Barn</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/boar.jpg"></center>'
 	'One of your grandparents'' dearest possessions, the boar, Nickle.'
 
 	act 'Leave':minut += 1 & gt 'gad_gpbarn'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'boar':
 			gs 'exp_gain', 'hndiwrk', rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/feed_boar.jpg"></center>'
 			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
 			act 'Finish': gt 'gad_gpbarn','boar'

locations/gad_gpbath.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 
 	'<center><h4>Bath</h4></center>'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bana.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/bana.jpg"></center>'
 	'A small room with a low, smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
 	'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight[0]>>.<<pcs_weight[1]>> kg<br>Your body mass index (BMI) is <<pcs_bmi[0]>>.<<pcs_bmi[1]>>.<br><<$bodyVars[''bmi_desc'']>></center>''">scales</a>.'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'alone':
 
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/par.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/par.jpg"></center>'
 					'You strip, sit down and relax. Then, after a proper banya session, you pick up a bucket filled with cold water, pour it over yourself, and head over to the shower. You feel like a completely new person.'
 					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 					act 'Finish': gt 'gad_gpbath', 'start'
@@ -316,4 +316,3 @@ if $ARGS[0] = 'with_Mira':
 end
 
 --- gad_gpbath ---------------------------------
-

locations/gad_gphouse.qsrc

@@ -637,7 +637,7 @@ if $ARGS[0] = 'old_main':
 	gs 'family_schedule'
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/izba.jpg"></center>'
 	*nl
 	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'

locations/gad_gpyard.qsrc

@@ -17,15 +17,15 @@ if $ARGS[0] = 'start':
 
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/dvor.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/dvor.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/dvor_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/dvor_night.jpg"></center>'
 		end
 	else
 		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/dvor_winter.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/dvor_winter.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/dvor_winter_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/dvor_winter_night.jpg"></center>'
 		end
 	end
 	*nl
@@ -136,7 +136,7 @@ if $ARGS[0] = 'root_cellar':
 	*clr & cla
 	$loc_arg = 'root_cellar'
 	'<center><h4>Root Cellar</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/root_cellar.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/root_cellar.jpg"></center>'
 	*nl
 	if boletus_stored + bilberry_stored >= 20:
 		'Your grandparents'' root cellar is full.'
@@ -297,15 +297,15 @@ if $ARGS[0] = 'garden':
 
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 21:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/garden.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/garden_night.jpg"></center>'
 		end
 	else
 		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_winter.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/garden_winter.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/garden_winter_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/garden_winter_night.jpg"></center>'
 		end
 	end
 
@@ -386,15 +386,15 @@ if $ARGS[0] = 'strawberry':
 
 	if month = 6 or month = 7:
 		if hour >= 6 and hour < 21:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/strawberry1.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/strawberry_night.jpg"></center>'
 		end
 	else
 		if hour >= 6 and hour < 21:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/strawberry2.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/strawberry_night.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/strawberry_night.jpg"></center>'
 		end
 	end
 
@@ -454,9 +454,9 @@ if $ARGS[0] = 'fruit_garden':
 	!gs'time'
 
 	if hour >= 6 and hour < 21:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_garden.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/fruit_garden.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_garden_night.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/fruit_garden_night.jpg"></center>'
 	end
 
 	'There are apples and pears growing in the fruit orchard.'

locations/gameover.qsrc

@@ -12,9 +12,8 @@ end
 
 
 if $ARGS[0] = 'screen':
+	cls
 	gs 'shortgs', 'setloc', 'gameover', 'screen'
-	menu_off = 0
-	gs 'stat'
 
 	'<center><b><font color="maroon">GAME OVER</font></b></center>'
 
@@ -89,8 +88,6 @@ if $ARGS[0] = 'screen':
 	end
 
 	dynamic 'act ''End?'': gt ''gameover'', ''endscreen'', ''<<$ARGS[1]>>'' '
-
-
 end
 
 if $ARGS[0] = 'endscreen':

locations/gp_elene.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'chore_groceries':
 		minut += 15
 		gs'stat'
 
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/gp_dacha/izba.jpg"></center>'
 		'Your grandmother shuffles around, looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
 		act 'Continue': gt 'gad_store'
 	end

locations/obj_din.qsrc

@@ -574,12 +574,12 @@ if $ARGS[0] = 'skill_format_func':
 	end
 	$result += '<td>|</td>'
 	if temp['skl_lvl'] >= 100:
-		if $ARGS[2] ! 'stren' or temp['skl_lvl'] >= 200 or temp['skl_lvl'] = 100:
+		if $ARGS[2] = 'stren' and stren_plus_lvl > 0 and temp['skl_lvl'] < 200:
+			$ARGS[2] = 'stren_plus'
+		else
 			$result += '<td align="center">Max Level</td><td>|</td></tr>'
 			killvar 'temp'
 			exit
-		else
-			$ARGS[2] = stren_plus
 		end
 	end
 

locations/saveupdater.qsrc

@@ -3629,7 +3629,7 @@ if temp_current_save_version < 00090303:
 	if $pcs_throat	! '':	$pc_descFull['throat']	= $pcs_throat	& $pcs_throat = ''
 	if $skin		! '':	$pc_descFull['skin']	= $skin			& killvar '$skin'
 	if $glaza		! '':	$pc_descFull['eyes']	= $glaza		& killvar '$glaza'
-	if $pcs_makeup	! '':	$pc_descFull['makeup']	= $pcs_makeup	& pcs_makeup = ''
+	if $pcs_makeup	! '':	$pc_descFull['makeup']	= $pcs_makeup	& $pcs_makeup = ''
 end
 
 

locations/shop_fashionista.qsrc

@@ -209,20 +209,32 @@ if $ARGS[0] = 'dressingoutfit2':
 end
 
 if $ARGS[0] = 'dressingbra':
-	$loc = 'shop_fashionista'
-	$loc_arg = 'dressingbra'
-	menu_off = 1
+	gs 'shortgs', 'setloc', 'shop_fashionista', 'dressingbra'
+	menu_off = 0
 	gs 'stat'
 
 	act 'Return': minut += 1 & gt 'shop_fashionista', 'changingroom'
 
+	gs 'bras', 'shop_filter_header'
 	gs 'bras', 'totals', 'fashionista_bras'
 
-	i = 1
-	:loopfashionista_bras2
-		if fashionista_bras[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingbras2''"><img src="images/pc/items/fashionista/bras/<<i>>.jpg"	 height="150" /></a> '
-		i += 1
-	if i <= total: jump 'loopfashionista_bras2'
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
+		i = 1
+		:loopfashionista_bras2
+			if fashionista_bras[i] = 0:
+				gs 'underwear_attributes', 'fashionista_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingbras2''"><img src="images/pc/items/fashionista/bras/<<i>>.jpg"	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= total: jump 'loopfashionista_bras2'
+		clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 end
 
 if $ARGS[0] = 'dressingbras2':
@@ -235,20 +247,32 @@ if $ARGS[0] = 'dressingbras2':
 end
 
 if $ARGS[0] = 'dressingpanties':
-	$loc = 'shop_fashionista'
-	$loc_arg = 'dressingpanties'
-	menu_off = 1
+	gs 'shortgs', 'setloc', 'shop_fashionista', 'dressingpanties'
+	menu_off = 0
 	gs 'stat'
 
 	act 'Return': minut += 1 & gt 'shop_fashionista', 'changingroom'
 
+	gs 'panties', 'shop_filter_header'
 	gs 'panties', 'totals', 'fashionista_panties'
 
-	i = 1
-	:loopfashionista_panties2
-		if fashionista_panties[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingpanties2''"><img src="images/pc/items/fashionista/panties/<<i>>.jpg"	 height="150" /></a> '
-		i += 1
-	if i <= total: jump 'loopfashionista_panties2'
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
+		i = 1 + (Clothingstock / 4) mod 2
+		:loopfashionista_panties2
+			if fashionista_panties[i] = 0:
+				gs 'underwear_attributes', 'fashionista_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingpanties2''"><img src="images/pc/items/fashionista/panties/<<i>>.jpg"	height="150" /></a> '
+				end
+			end
+			i += 2
+		if i <= total: jump 'loopfashionista_panties2'
+		clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'dressingpanties2':

locations/stat.qsrc

@@ -748,11 +748,7 @@ elseif rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 end
 
 !! Drug stats
-gs 'drugs', 'heroin', 'stat'
-gs 'drugs', 'alcohol', 'stat'
-gs 'drugs', 'cocaine', 'stat'
-gs 'drugs', 'amphetamine', 'stat'
-
+gs 'drugs', 'stat'
 
 !!Health, Willpower, Auto Birth Control pregnancy check
 gs 'body', 'RegularUpdate'

locations/wardrobe.qsrc

@@ -649,7 +649,7 @@ if $ARGS[0] = 'default_entry_wear':
 			act 'Return': gt 'wardrobe', $wloc
 		end
 	!! not exercise clothing, and not loose fitting
-	elseif $temp1 ! 'danilovich_outfits' and CloStyle ! 5:
+	elseif ($temp1 ! 'danilovich_outfits' and CloStyle ! 5) or $temp1 ! 'nude':
 		!! check for if the hipsize is too far from your hipsize
 		dynamic 'RESULT = <<$temp1>>_b[<<temp2>>]'
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8: