Merge branch 'original-master'

.gitignore

@@ -17,7 +17,7 @@ avatar.*
 *.zip
 VideoDecodeStats/
 tools/*.AppImage
-linux_build.sh
+lbuild.sh
 
 glmf.code-workspace
 

locations/NikoEv.qsrc

@@ -340,6 +340,7 @@ if $ARGS[0] =  'Date 1':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/Dates/Walk1.jpg"></center>'
 		'"I sure am." Niko gives you a warm smile as he responds, "I figured that we could go to an amusement park, out of town. I will pay our way of course, so come on, let''s get going." Niko takes your hand and walks you to the train station where you both board the train and get seated.'	
 		
+		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Go with Niko':gt 'NikoDates', 'Date 1_1'
 	end
 	
@@ -370,7 +371,7 @@ if $ARGS[0] =  'Date 2':
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk3.jpg"></center>'
 		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'
-		
+		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
 	
@@ -401,7 +402,7 @@ if $ARGS[0] =  'Date 3':
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk4.jpg"></center>'
 		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'	
-		
+		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
 	
@@ -431,7 +432,7 @@ if $ARGS[0] =  'Date 4':
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen.'	
-		
+		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Let''s go!':	
 			*clr & cla
 			minut += 5

locations/_attributes_school.qsrc

@@ -194,7 +194,7 @@ elseif ARGS[1] = 27:
 	
 elseif ARGS[1] = 28:
 	CloQuality = 3
-	CloThinness = 3
+	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
@@ -208,7 +208,7 @@ elseif ARGS[1] = 29:
 	
 elseif ARGS[1] = 30:
 	CloQuality = 3
-	CloThinness = 3
+	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4

locations/body_shape.qsrc

@@ -244,8 +244,8 @@ if $ARGS[0] = '':
 	if salolast < salo: salolast += 1
 
 !!Setting the pcs_apprnc bonus based on fat and strength
-	bmi_calc = FUNC('body_shape', 'bmicalc', salo, pcs_hgt)
-	bodykoef = FUNC('body_shape', 'setbodykoef', bmi_calc, strenbuf, salocatnow, vofat)
+	bmi_calc = FUNC('body_shape', 'bmicalc')
+	bodykoef = FUNC('body_shape', 'setbodykoef')
 
 !!This is to clean up unused variables
 	killvar 'normbuffpick' & killvar 'nrmbfpckct'
@@ -255,30 +255,26 @@ end
 
 if $ARGS[0] = 'setbodykoef':
 	!!Setting the pcs_apprnc bonus based on fat and strength
-	tempbmi_calc = ARGS[1] & !! result of bmicalc
-	tempstrenbuf = ARGS[2] & !!strenbuf
-	tempsalocatnow = ARGS[3] & !! salocatnow
-	tempvofat = ARGS[4] & !! vofat
 
-	if tempbmi_calc < 16:
+	if bmi_calc < 16:
 		!! severely underweight
 		tempbodykoef = 30
-    elseif tempbmi_calc < 19:
+    elseif bmi_calc < 19:
 		!! underweight
 		tempbodykoef = 65
-    elseif tempbmi_calc < 25:
+    elseif bmi_calc < 25:
 		!! healthy weight
 		tempbodykoef = 85
-    elseif tempbmi_calc < 30:
+    elseif bmi_calc < 30:
 		!! overweight
 		tempbodykoef = 75
-    elseif tempbmi_calc < 35:
+    elseif bmi_calc < 35:
 		!! moderately obese
 		tempbodykoef = 45
-    elseif tempbmi_calc < 40:
+    elseif bmi_calc < 40:
 		!! severely obese
 		tempbodykoef = 25
-    elseif tempbmi_calc < 45:
+    elseif bmi_calc < 45:
 		!! very severely obese
 		tempbodykoef = 5
     else
@@ -286,44 +282,34 @@ if $ARGS[0] = 'setbodykoef':
 		tempbodykoef = 0
     end
 
-	if tempstrenbuf >= 80:
+	if strenbuf >= 80:
 		tempbodykoef += 8
-	elseif tempstrenbuf >= 60:
+	elseif strenbuf >= 60:
 		tempbodykoef += 10
-	elseif tempstrenbuf >= 40:
+	elseif strenbuf >= 40:
 		tempbodykoef += 8
-	elseif tempstrenbuf >= 20:
+	elseif strenbuf >= 20:
 		tempbodykoef += 5
 	else
 		tempbodykoef += 2
 	end
 
 !!This modifies bodykoef for high or low salo values
-	if tempsalocatnow = 0 or tempsalocatnow >= 7:
+	if salocatnow = 0 or salocatnow >= 7:
 		tempbodykoef -= 8
-	elseif tempsalocatnow = 1 or tempsalocatnow = 6:
+	elseif salocatnow = 1 or salocatnow = 6:
 		tempbodykoef -= 4
 	end
 
-	if tempvofat > 0: tempbodykoef -= tempvofat
+	if vofat > 0: tempbodykoef -= vofat
 
 	result = tempbodykoef
 
-	killvar 'tempbmi_calc'
 	killvar 'tempbodykoef'
-	killvar 'tempbodyFat'
-	killvar 'temppcs_hgt'
-	killvar 'tempstrenbuf'
-	killvar 'tempsalocatnow'
-	killvar 'tempvofat'
 end
 
 if $ARGS[0] = 'bmicalc':
-	!! ARGS[1] salo
-	!! ARGS[2] pcs_hgt
-	tempbmi_calc = 10000 * (30 + ARGS[1] / 2 + (ARGS[2] - 170) * 7 / 10) / (ARGS[2] * ARGS[2])
-	result = tempbmi_calc
-	killvar 'tempbmi_calc'
+	result = 10000 * (30 + salo / 2 + (pcs_hgt - 170) * 7 / 10) / (pcs_hgt * pcs_hgt)
 end
 
 if $ARGS[0] = 'bmiadjust':
@@ -492,7 +478,7 @@ if $ARGS[0] = 'initial':
 	!!pcs_weight = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
 	
 !!BMI Calculation
-	bmi_calc = FUNC('body_shape', 'bmicalc', salo, pcs_hgt)
+	bmi_calc = FUNC('body_shape', 'bmicalc')
 	
 !!BMI Descriptions
 	if bmi_calc < 16:
@@ -516,9 +502,9 @@ end
 
 if $args[0] = 'basebeautycalc':
 	if pcs_lashes <= 0: pcs_lashes = 0
-	pcs_HeadBonus = FUNC('body_shape', 'calcHeadBonus', pcs_lashes, pcs_eyesize, pcs_lip, pcs_teeth, bmi_calc)
-	tempAttributeBonus = FUNC('body_shape', 'calcAttributeBonus', pcs_agil, pcs_vital, bmi_calc)
-	pcs_apprncbase = FUNC('body_shape', 'basebeautycalc2', ARGS[1], vidage, pcs_skin, bodykoef, pcs_HeadBonus, tempAttributeBonus, pcs_apprncbase)
+	pcs_HeadBonus = FUNC('body_shape', 'calcHeadBonus')
+	tempAttributeBonus = FUNC('body_shape', 'calcAttributeBonus')
+	pcs_apprncbase = FUNC('body_shape', 'basebeautycalc2', ARGS[1])
 
 	if ARGS[1] = 0:
 !!	This is the rate of change limiter
@@ -547,105 +533,80 @@ if $args[0] = 'basebeautycalc':
 end 
 
 if $ARGS[0] = 'calcHeadBonus':
-	temppcs_lashes = ARGS[1] & !! pcs_lashes
-	temppcs_eyesize = ARGS[2] & !! pcs_eyesize
-	temppcs_lip = ARGS[3] & !! pcs_lip
-	temppcs_teeth = ARGS[4] & !! pcs_teeth (missing teeth)
-	tempbmi_calc = ARGS[5] & !! bmi_calc
 
 !!	Setting Eyelashes bonus
-	if temppcs_lashes <= 0:
+	if pcs_lashes <= 0:
 		resnicbonus = 0
-	elseif temppcs_lashes = 1:
+	elseif pcs_lashes = 1:
 		resnicbonus = 2
-	elseif temppcs_lashes = 2:
+	elseif pcs_lashes = 2:
 		resnicbonus = 5
-	elseif temppcs_lashes = 3:
+	elseif pcs_lashes = 3:
 		resnicbonus = 7
-	elseif temppcs_lashes = 4:
+	elseif pcs_lashes = 4:
 		resnicbonus = 8
-	elseif temppcs_lashes = 5:
+	elseif pcs_lashes = 5:
 		resnicbonus = 10
 	else
 		resnicbonus = 0		
 	end
-	resnicbonus = FUNC('body_shape', 'bmiadjust', resnicbonus, tempbmi_calc)
+	resnicbonus = FUNC('body_shape', 'bmiadjust', resnicbonus, bmi_calc)
 
 !!	Setting Eye Size bonus
-	if temppcs_eyesize = 1:
+	if pcs_eyesize = 1:
 		glarazbonus = 1
-	elseif temppcs_eyesize = 2:
+	elseif pcs_eyesize = 2:
 		glarazbonus = 3
-	elseif temppcs_eyesize = 3:
+	elseif pcs_eyesize = 3:
 		glarazbonus = 2
 	else
 		glarazbonus = 0
 	end
-	glarazbonus = FUNC('body_shape', 'bmiadjust', glarazbonus, tempbmi_calc)
+	glarazbonus = FUNC('body_shape', 'bmiadjust', glarazbonus, bmi_calc)
 
 !!	Setting the Lip size bonus
-	if temppcs_lip = 0:
+	if pcs_lip = 0:
 		lipbonus = -2
-	elseif temppcs_lip = 1:
+	elseif pcs_lip = 1:
 		lipbonus = 0
-	elseif temppcs_lip = 2:
+	elseif pcs_lip = 2:
 		lipbonus = 3
-	elseif temppcs_lip = 3:
+	elseif pcs_lip = 3:
 		lipbonus = 5
 	else
 		lipbonus = 3
 	end
-	lipbonus = FUNC('body_shape', 'bmiadjust', lipbonus, tempbmi_calc)
+	lipbonus = FUNC('body_shape', 'bmiadjust', lipbonus, bmi_calc)
 	
-	teethcalc = (5 * temppcs_teeth)
-	if teethcalc < 0: teethcalc = FUNC('body_shape', 'bmiadjust', teethcalc, tempbmi_calc)
-
-	tempHeadBonus = resnicbonus + glarazbonus + lipbonus - teethcalc
+	teethcalc = (5 * pcs_teeth)
+	if teethcalc < 0: teethcalc = FUNC('body_shape', 'bmiadjust', teethcalc, bmi_calc)
 
-	result = tempHeadBonus + 10
+	result = resnicbonus + glarazbonus + lipbonus - teethcalc + 10
 
-	killvar 'temppcs_lashes'
-	killvar 'temppcs_eyesize'
-	killvar 'temppcs_lip'
-	killvar 'temppcs_teeth'
-	killvar 'tempHeadBonus'
-	killvar 'tempbmi_calc'
 end
 
 if $ARGS[0] = 'calcAttributeBonus':
-	temppcs_agil = ARGS[1] & !! pcs_agil
-	temppcs_vital = ARGS[2] & !! pcs_vital
-	tempbmi_calc = ARGS[3] & !! bmi_calc
+	tempAttributeBonus = (pcs_agil / 10) + (pcs_vital / 10)
 
-	tempAttributeBonus = (temppcs_agil / 10) + (temppcs_vital / 10)
-	tempAttributeBonus = FUNC('body_shape', 'bmiadjust', tempAttributeBonus, tempbmi_calc)
-
-	result = tempAttributeBonus
-	killvar 'temppcs_agil'
-	killvar 'temppcs_vital'
+	result = FUNC('body_shape', 'bmiadjust', tempAttributeBonus, bmi_calc)
 	killvar 'tempAttributeBonus'
-	killvar 'tempbmi_calc'
 end
 
 !!This is the calculation for the base appearance if calling for testing always set ARGS[1] to 1
 if $args[0] = 'basebeautycalc2':
 	!!ARGS[1] reset pcs_apprncbase
-	tempvidage = ARGS[2] & !! vidage
-	temppcs_skin = ARGS[3] & !! pcs_skin
-	tempbodykoef = ARGS[4] & !! bodykoef
-	tempHeadBonus = ARGS[5] & !! result of calcHeadBonus
-	tempAttributeBonus = ARGS[6] & !! result of calcAttributeBonus
-	temppcs_apprncbase = ARGS[7] & !! pcs_apprncbase
+	!! result of pcs_HeadBonus
+	!! result of calcAttributeBonus
 
 
 !!	Setting vidagebonus
 	vidagebonus = 100
-	if tempvidage < 20: vidagebonus = 60 + (2 * tempvidage)
-	if tempvidage > 30: vidagebonus = 160 - (2 * tempvidage)
+	if vidage < 20: vidagebonus = 60 + (2 * vidage)
+	if vidage > 30: vidagebonus = 160 - (2 * vidage)
 
 !!	Preforming the calculation
-	skincalc = (temppcs_skin * 2 / 5)
-	vneshtemp = vidagebonus * (skincalc + tempbodykoef + tempAttributeBonus + tempHeadBonus) / 100
+	skincalc = (pcs_skin * 2 / 5)
+	vneshtemp = vidagebonus * (skincalc + bodykoef + tempAttributeBonus + pcs_HeadBonus) / 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)
 
@@ -656,17 +617,13 @@ if $args[0] = 'basebeautycalc2':
 	vneshtemp += supnatvnesh
 
 !!	This is for use when a reset is called for by setting args[1] = 1
-	if args[1] = 1: temppcs_apprncbase = vneshtemp & killvar 'vneshtemp'
+	if args[1] = 1: pcs_apprncbase = vneshtemp & killvar 'vneshtemp'
 
-	result = temppcs_apprncbase
+	result = pcs_apprncbase
 
 !!	This is to clean up variables only used here
 	!!do not kill vneshtemp here it gets killed in basebeautycalc
-	killvar 'temppcs_apprncbase'
 	killvar 'skincalc'
-	killvar 'tempvidage'
-	killvar 'temppcs_skin'
-	killvar 'tempbodykoef'
 	killvar 'vidagebonus'
 	killvar 'tempHeadBonus'
 	killvar 'tempAttributeBonus'

locations/clothing.qsrc

@@ -1264,7 +1264,7 @@ if $ARGS[0] = 'clothing_list':
 	if $args[1] = 'market' or $args[1] = 'all':
 		if $args[1] ! 'all':
 			$ward_list_store = $args[1]
-			'<center>Clothing from the market</center>'
+			'<center><img src="images/pc/items/market/market.png"></center>'
 			gs 'clothing_QV', 'filter_header', 'store'
 			gs 'clothing', 'clothinglist_header'
 			!!To filter just this set

locations/clothing_QV.qsrc

@@ -62,9 +62,9 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
-	if ARRSIZE('loopmaterinstvo_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
+	if ARRSIZE('materinstvo_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
 
-	if ARRSIZE('loopmarket_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''market''">Clothing from the market</a></center>'
+	if ARRSIZE('market_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''market''"><img src="images/pc/items/market/market.png"></a></center>'
 end
 
 if $ARGS[0] = 'clothing_list':

locations/gschool_grounds.qsrc

@@ -13,6 +13,7 @@ if $ARGS[0] = 'main':
 	*clr & cla
 	gs 'vicky_meynold_schedule'
 	gs 'katja_meynold_schedule'
+	gs 'igor_schedule'
 	gs 'stat'
 	'<center><b><font color="maroon">Outside School</font></b></center>'
 	if month >= 11 or month <= 3:
@@ -259,7 +260,7 @@ if $ARGS[0] = 'main':
 			elseif fedorKozlovQW >= 10:
 				'You can see <a href="exec: gt ''FedorEv'', ''Start''">Fedor</a> standing by himself, his backpack around his arm.'
 			end
-			if NikoVolkovQW >= 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11:
+			if NikoVolkovQW >= 5 and NikoDate = 1 and NikoNextDate_day <= daystart or NikoEv = 11:
 				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
 			elseif NikoVolkovQW >= 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
 				'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai</a> is smoking outside of the school.'	

locations/stwork.qsrc

@@ -105,47 +105,52 @@ if $ARGS[0] = 'start':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripinspection.jpg"></center>'
 							'Before going on stage, you go see the manager in his office for your inspection.'
-							'"Take off your clothes," he tells you matter of factly.'
-							'When you''re done undressing, he walks up to you and inspects you closely.'
-							if pcs_sweat < 20:
-								'"Good, you have a clean scent. That is very important in this business."'
-								'He briefly runs his hand over your legs.'
-								if pcs_leghair <= 3:
-									'"Smooth legs. Very good."'
-									'He walks around you, looking you up and down from every side.'
-									if fingal <= 0:
-										'"No bruises. Good. The better you look, the easier it is to make money once you are on that stage."'
-										'"And the last thing. I need to check if you''ve rid yourself of all your pubic hair."'
-										'"I suppose that''s a reasonable thing to check," you think to yourself as you show him your naked pussy.'
-										'He puts his hand right above your pussy lips and slowly rubs the skin there, taking a bit longer than he did on your legs.'
-										'You feel your pussy get a bit wet from his touch and hope that he doesn''t notice.'
-										gs 'arousal', 'foreplay', 2
-										gs 'stat'
-!! This allows different pubic styles but anything from small bush up is still not permitted.
-										if (pubestyle = 1 and pcs_pubes <= 3) or lashair = 1:
-											strippermission = 1
-											'"That''s very smooth. Looks like you are ready to get on the stage. You can get to work," he says and ushers you out of his office.'
-											stpredmet = 3
-											act 'Go back stage': gt 'stwork2', 'strip'
-										elseif ((pubestyle >= 2 and pubestyle <=7) or (pubestyle >= 12 and pubestyle <=14)) and pcs_pubes <= 25:
-											strippermission = 1
-											'"Very cute pubic hair, I''m sure the customers will appreciate it, now get on stage. You can work," he says and ushers you out of his office.'
-											stpredmet = 3
-											act 'Go back stage': gt 'stwork2', 'strip'
+							if $wornclothingtype ! 'nude':
+								'"Take off your clothes," he tells you matter of factly.'
+								'When you''re done undressing, he walks up to you and inspects you closely.'
+								if pcs_sweat < 20:
+									'"Good, you have a clean scent. That is very important in this business."'
+									'He briefly runs his hand over your legs.'
+									if pcs_leghair <= 3:
+										'"Smooth legs. Very good."'
+										'He walks around you, looking you up and down from every side.'
+										if fingal <= 0:
+											'"No bruises. Good. The better you look, the easier it is to make money once you are on that stage."'
+											'"And the last thing. I need to check if you''ve rid yourself of all your pubic hair."'
+											'"I suppose that''s a reasonable thing to check," you think to yourself as you show him your naked pussy.'
+											'He puts his hand right above your pussy lips and slowly rubs the skin there, taking a bit longer than he did on your legs.'
+											'You feel your pussy get a bit wet from his touch and hope that he doesn''t notice.'
+											gs 'arousal', 'foreplay', 2
+											gs 'stat'
+	!! This allows different pubic styles but anything from small bush up is still not permitted.
+											if (pubestyle = 1 and pcs_pubes <= 3) or lashair = 1:
+												strippermission = 1
+												'"That''s very smooth. Looks like you are ready to get on the stage. You can get to work," he says and ushers you out of his office.'
+												stpredmet = 3
+												act 'Go back stage': gt 'stwork2', 'strip'
+											elseif ((pubestyle >= 2 and pubestyle <=7) or (pubestyle >= 12 and pubestyle <=14)) and pcs_pubes <= 25:
+												strippermission = 1
+												'"Very cute pubic hair, I''m sure the customers will appreciate it, now get on stage. You can work," he says and ushers you out of his office.'
+												stpredmet = 3
+												act 'Go back stage': gt 'stwork2', 'strip'
+											else
+												'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the butt as he says, "Go take care of that and then come back here."'
+												act 'Go to the dressing room': gt 'stwork', 'start'
+											end
 										else
-											'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the butt as he says, "Go take care of that and then come back here."'
+											'"I can''t let you up on the stage with a black eye like that. You''ll have to wait until it''s gone. Come back when it''s healed."'
 											act 'Go to the dressing room': gt 'stwork', 'start'
 										end
 									else
-										'"I can''t let you up on the stage with a black eye like that. You''ll have to wait until it''s gone. Come back when it''s healed."'
+										'"Shave your legs, a customer doesn''t want to feel any stubble during a lapdance. Go take care of that and then come back here."'
 										act 'Go to the dressing room': gt 'stwork', 'start'
 									end
 								else
-									'"Shave your legs, a customer doesn''t want to feel any stubble during a lapdance. Go take care of that and then come back here."'
+									'"Damn it <<$pcs_stagename>>, you stink. Grab a shower. We can''t have the club smelling like a locker room."'
 									act 'Go to the dressing room': gt 'stwork', 'start'
 								end
 							else
-								'"Damn it <<$pcs_stagename>>, you stink. Grab a shower. We can''t have the club smelling like a locker room."'
+								'You can''t do a striptease if you haven''t got any clothes to strip out of <<$pcs_stagename>>. Find something sexy in the wardrobe first.'
 								act 'Go to the dressing room': gt 'stwork', 'start'
 							end
 						end
@@ -206,17 +211,17 @@ if $ARGS[0] = 'tipcalculator':
 	if rand (0, 4) = 0:
 		striptip += stripKoef
 	end
-	if striptip < 30:
+	if striptip < 25:
 		'Nobody even noticed you or your efforts on the stage and it''s no surprise you got nothing for your efforts.'
-	elseif striptip < 60:
+	elseif striptip < 40:
 		'A couple of people looked at you but nothing more than that, you didn''t receive a single tip.'
-	elseif striptip < 70:
+	elseif striptip < 55:
 		'A couple of people looked at you but nothing more than that, you didn''t receive any tips.'
-	elseif striptip < 80:
+	elseif striptip < 70:
 		if rand(0,5) = 0:
 			'The customers were pleased with your performance, not enough to both tipping you.'
 		else
-			paymoneyrand = rand(3,10) * 3
+			paymoneyrand = rand(3,10) * 2
 			money += paymoneyrand
 			pcs_mood += rand(1,5)
 			'The customers were pleased with your performance. They gave you <<paymoneyrand>> <b>₽</b> in tips.'
@@ -225,13 +230,13 @@ if $ARGS[0] = 'tipcalculator':
 		if rand(0,10) = 0:
 			'The customers followed your movements between their conversations. You deserved some tips but luck was against you and you got nothing.'
 		else
-			paymoneyrand = rand(10,(striptip/2)) * 3
+			paymoneyrand = rand(10,(striptip/5)) * 2
 			money += paymoneyrand
 			pcs_mood += rand(3,10)
 		'The customers followed your movements between their conversations. After counting out your tips it amounts to <<paymoneyrand>> <b>₽</b>.'
 		end
 	else
-		paymoneyrand = rand(10,striptip) * 3
+		paymoneyrand = rand(20,striptip)
 		money += paymoneyrand
 		pcs_mood += rand(5,20)
 		'The customers were mesmerized by your dancing and tipped you <<paymoneyrand>> <b>₽</b>.'

locations/stwork2.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'dance_clothed':
 	fat -= 1
 	dancero_exp += rand(1, 2)
 
-	striptip = rand(pcs_dancero,(pcs_dancero*5))
+	striptip = (rand(pcs_dancero,(pcs_dancero*5)))/10
 
 	gs 'stat'
 	
@@ -125,7 +125,7 @@ if $ARGS[0] = 'strip_clothes':
 	inhib_exp += rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
 
-	striptip = rand(pcs_dancero,(pcs_dancero*5))
+	striptip = (rand(pcs_dancero,(pcs_dancero*5)))/7
 
 	gs 'stat'
 	
@@ -176,7 +176,7 @@ if $ARGS[0] = 'strip_bra':
 	inhib_exp += rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
 
-	striptip += rand(pcs_dancero,(pcs_dancero*5))
+	striptip += (rand(pcs_dancero,(pcs_dancero*5)))/5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(1,3) + '.jpg"></center>'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'strip_panties':
 	inhib_exp += rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
 
-	striptip += rand(pcs_dancero,(pcs_dancero*5))
+	striptip += (rand(pcs_dancero,(pcs_dancero*5)))/5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund9.jpg"></center>'
@@ -242,7 +242,7 @@ if $ARGS[0] = 'dance_nude':
 	inhib_exp += rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
 
-	striptip += rand(pcs_dancero,(pcs_dancero*5))
+	striptip += (rand(pcs_dancero,(pcs_dancero*5)))/3
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(13,14) + '.jpg"></center>'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'pole_underwear':
 	gs 'fame', 'city', 'stripping', rand(1,2)
 
 	!pcs_hairbsh = 0
-	striptip += rand(pcs_dancpol,(pcs_dancpol*5))
+	striptip += (rand(pcs_dancpol,(pcs_dancpol*5)))/3
 	
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/strippole.jpg"></center>'
@@ -298,7 +298,7 @@ if $ARGS[0] = 'pole_underwear':
 
 		if vesrand >= 75:
 			'Performing another trick on the pole, you can not support your weight and fall flat on your face. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
-			striptip -= 15
+			striptip -= 40
 			fingalrand = rand(0, 100)
 			if fingalrand >= 75:
 				fingal += rand(2, 5)
@@ -307,7 +307,7 @@ if $ARGS[0] = 'pole_underwear':
 				'As you fall, you hit the floor really hard, and you can feel a bruise forming on your face.'
 			end
 		elseif vesrand >= 50:
-			striptip -= rand(5, 10)
+			striptip -= rand(15, 30)
 			'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 		end
 	end
@@ -327,7 +327,7 @@ if $ARGS[0] = 'pole_panties':
 	gs 'fame', 'city', 'stripping', rand(1,2)
 
 	!pcs_hairbsh = 0
-	striptip += rand(pcs_dancpol,(pcs_dancpol*5))
+	striptip += (rand(pcs_dancpol,(pcs_dancpol*5)))/3
 	
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(7,8) + '.jpg">"></center>'
@@ -339,7 +339,7 @@ if $ARGS[0] = 'pole_panties':
 		if vesrand >= 75:
 			'Performing another trick on the pole, you can not support your weight and fall flat on your face. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
 			custbooing += 1
-			striptip -= 15
+			striptip -= 40
 			fingalrand = rand(0, 100)
 			if fingalrand >= 75:
 				fingal += rand(2, 5)
@@ -349,7 +349,7 @@ if $ARGS[0] = 'pole_panties':
 			end
 		elseif vesrand >= 50:
 			custbooing += 1
-			striptip -= rand(5, 10)
+			striptip -= rand(15, 30)
 			'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 		end
 	end