Merge remote-tracking branch 'origin/master'

locations/Cheatmenu_din.qsrc

@@ -951,7 +951,7 @@ $cheatmenu['parameters'] = {
 	*nl
 	'Body Shape Parameters'
 	'<<pcs_bust>> - <<pcs_waist>> - <<pcs_hips>>, <<$titsize>> breasts, the difference between the hips and waist <<pcs_hips-pcs_waist>> cm'
-	'Muscularity: musle = <<musle>>, salo =	<<salo>>, fat = <<fat>>'
+	'Muscularity: strenbuf = <<strenbuf>>, salo =	<<salo>>, fat = <<fat>>'
 	'Variable List:'
 	'agilbuf = <<agilbuf>>'
 	'strenbuf = <<strenbuf>>'

locations/FedorMisc.qsrc

@@ -519,7 +519,6 @@ if $ARGS[0] = 'Smoke':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	pcs_mood += 100
-	wipo += 100
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/smoke.jpg"></center>'
@@ -538,7 +537,6 @@ if $ARGS[0] = 'Smoke 2':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	pcs_mood += 100
-	wipo += 100
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/smoke.jpg"></center>'

locations/body.qsrc

@@ -40,9 +40,6 @@ if $ARGS[0] = 'RegularUpdate':
 	elseif pcs_skin < 0:
 		pcs_skin = 0
 	end
-	
-	!!Since "musle" is used all over the place
-	musle = strenbuf
 end
 
 if $ARGS[0] = 'DailyUpdate':

locations/carF.qsrc

@@ -320,7 +320,6 @@ if $ARGS[0] = 'other':
 		benz -= 4
 		teh -= rand(2, 6)
 		pcs_mood += 20
-		wipo += 10
 		'You go to the track and have fun driving around before leaving.'
 
 		act 'Finish':xgt 'carF', 'salon'

locations/danceGev.qsrc

@@ -6,7 +6,6 @@ if lesbian > 0:
 	pcs_horny += 5
 elseif lesbian = 0:
 	pcs_mood += 10
-	wipo += 5
 end
 
 danceevtimes += 1

locations/drugs.qsrc

@@ -29,7 +29,6 @@ if $ARGS[0] = 'smoke':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	pcs_mood += 100
-	wipo += 100
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
 	else

locations/gadroad.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = '':
 			elseif month=9 or month=10 or month=4 or month=5:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
 			else
-				if musle >= salo:
+				if strenbuf >= salo:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'

locations/hunterLoveSex.qsrc

@@ -3056,7 +3056,7 @@ if $ARGS[0] = 'din_hunters_sex_misionary_bonus':
 	i = rand(1,4)
 	j = rand(1,3)
 	h = rand(1,3)
-	if pcs_agil > 50 and musle >= salo:'Throw legs <a href="exec:gt ''hunterLoveSex'', ''din_hunters_sex_misionary_bonus1''">head</a> .'
+	if pcs_agil > 50 and strenbuf >= salo:'Throw legs <a href="exec:gt ''hunterLoveSex'', ''din_hunters_sex_misionary_bonus1''">head</a> .'
 	*pl
 	if h < 3:'Having had enough of this position he asks you...'
 	if h = 3:'Suddenly <<$boydesc>> begins to move even faster and you realize that he is already on edge and ready...'

locations/obj_din.qsrc

@@ -217,8 +217,8 @@ if $ARGS[0] = 'description':
 	if defcurly = 1 and straight > 0: 'Your hair should be straight for another <<straight>> days.'
 	*nl
 
-	if salo < 10 and musle > 0 and dounspell = 0: '<b><font color="red">You are showing signs of malnourishment. You should probably eat more and more often.</font></b>'
-	if salo < 10 and musle = 0 and dounspell = 0: '<b><font color="red">You are dangerously malnourished, which has led to a loss in muscle mass. You''re in a critical condition and likely to pass out!</font></b>'
+	if salo < 10 and strenbuf > 0 and dounspell = 0: '<b><font color="red">You are showing signs of malnourishment. You should probably eat more and more often.</font></b>'
+	if salo < 10 and strenbuf = 0 and dounspell = 0: '<b><font color="red">You are dangerously malnourished, which has led to a loss in muscle mass. You''re in a critical condition and likely to pass out!</font></b>'
 	if pcs_teeth = 1:$zuba = ' tooth'
 	if pcs_teeth >= 2:$zuba = ' teeth'
 	if pcs_teeth > 0: 'You have lost <<pcs_teeth>><<$zuba>>.'

locations/sitrPar.qsrc

@@ -43,7 +43,6 @@ if $ARGS[0] = '':
 			minut += 120
 			pcs_sleep = 0
 			pcs_mood += 100
-			wipo += 1000
 			gs 'food', 'l_meal'
 			gs 'stat'
 			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten for a while, everyone is having fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside. Your <<$npc_nickname[''A29'']>> gives you an envelope with a greeting card and 5000 <b>₽</b>. For a while, you continue to watch TV, enjoying the champagne and company of your family, but eventually, everyone is kind of tired and one by one they go to bed.'

locations/stat.qsrc

@@ -26,20 +26,6 @@ if cheatHealth = 1: dynamic $cheatmenu['std_cure']
 
 if (analplay >= 2 and pcs_ass <= 10) or (analplay >= 4 and pcs_ass <= 15) or (analplay >= 8 and pcs_ass <= 20): pcs_ass += 1 & analplay = 0
 
-!!The following seems to be part of the combat system.
-musle[1] = musle
-flex[1] = pcs_agil
-stamina[1] = pcs_vital * 3
-wipo[1] = pcs_sprt
-intel[1] = pcs_intel - bimbostupidity
-krasota[1] = pcs_apprnc
-pcs_hgt[1] = pcs_hgt
-salo[1] = salo
-fat[1] = fat
-Bteh[1] = bteh
-Uteh[1] = uteh
-Zteh[1] = zteh
-
 !!This is a temporary stop-gap measure for the accomadation skill and will be removed
 if succubusflag = 1 and sucskill >= 4:
 	if pain['throat'] > 0: pain['throat'] = 0 & sucexcess -= 1