[Refactored] Moved some body update from cikl and body to body_shape

locations/body.qsrc

@@ -10,12 +10,6 @@
 $this = 'body'
 
 if $ARGS[0] = '':
-	if pcs_skin > 100:
-		pcs_skin = 100
-	elseif pcs_skin < 0:
-		pcs_skin = 0
-	end
-
 	mopkoef = pcs_makupskl / 5
 	if pcs_makeup = 0: mopkoef = -5
 	if pcs_makeup = 1: mopkoef = 0
@@ -64,10 +58,6 @@ if $ARGS[0] = '':
 		$pcs_apprnc = 'Your appearance is divine! No one is able to take his or her eyes off of you.'
 	end
 
-	!!Since "musle" is used all over the place
-	musle = strenbuf
-
-
 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 	!! kill temporary variables

locations/body_shape.qsrc

@@ -34,6 +34,15 @@ if $ARGS[0] = 'RegularUpdate':
 		pcs_weight = func($this, 'CalcWeight')
 		pcs_bmi = func($this, 'CalcBMI')
 	end
+
+	if pcs_skin > 100:
+		pcs_skin = 100
+	elseif pcs_skin < 0:
+		pcs_skin = 0
+	end
+	
+	!!Since "musle" is used all over the place
+	musle = strenbuf
 end
 
 if $ARGS[0] = 'DailyUpdate':
@@ -64,6 +73,76 @@ if $ARGS[0] = 'DailyUpdate':
 	end
 
 	gs $this, 'UpdateBodyImage'
+
+	!!---- Calculation of lash extension degradation and false lash removal
+	if pcs_lashes > 2:
+		if lashextensionstyle >= 1:
+			lashextensionduration -= 1
+			if lashextensionduration >= 1 and lashextensionduration <= 4:
+				'It''s time for you to do your maintenance on your lash extensions; you should go to the salon or you risk growing them all out.'
+			end
+			if lashextensionduration <= 0:
+				'You waited too long to do maintenance on your lash extensions; there''s too little there to notice or work with at this point.'
+				pcs_lashes = pcs_naturallashes
+				killvar 'lashextensionstyle'
+				killvar 'lashextensionduration'
+				killvar 'lashextensionnew'
+			end
+		end
+		if false_lashes > 0:
+			false_lashes -= 1
+			if false_lashes = 0:
+				'Your false lashes came off in the night; there''s no recovering them now.'
+				pcs_lashes = pcs_naturallashes
+			else
+				'Somehow, your lashes managed to stay attached throughout the night. You might be able to get away with wearing them another day straight.'
+			end
+		end
+	end
+
+	!! Max. Hair length 600mm, or 60cm, which should be somewhere in the lower back area.
+	!! Hair grows 1mm each day, it takes 20 months (1 month = 30 days) to regrow the hair from 0.
+	if pcs_hairlng < 1001 and hairgrowcht = 0:pcs_hairlng += 1
+
+	! Hair colour change
+	if pcs_haircol ! nathcol:
+		dyefade -=1
+		if dyefade < 0: dyefade = 0
+		if dyefade > 0 and dyefade < 7: dyevmod = 5
+		if dyefade = 0: dyevmod = 15
+	end
+
+	!!pubic hair colouring
+	!! pcs_pubecol = natural colour
+	!! pcs_pubecol[1] = flag for saveupdate
+	!! pcs_pubecol[2] = actual colour
+	!! pcs_pubecol[3] = countdown timer for dye
+	if pcs_pubecol[2] ! pcs_pubecol:
+		pcs_pubecol[3] -=1
+		if pcs_pubecol[3] < 0: pcs_pubecol[3] = 0
+		if pcs_pubecol[3] = 0: pcs_pubecol[2] = pcs_pubecol
+	end
+
+	if pcs_pubes < 2: pcs_pubecol[2] = pcs_pubecol
+
+	if hscrunch > 0:
+		hscrunchrand = rand(1, 100)
+
+		if hscrunchrand <= 8:hscrunch -= 1
+	end
+
+	! Leg and pubes hair growth
+	if lashair ! 1:
+		pcs_leghair += 1
+		!!Pubic hair growth at 1/2 per night
+		if pcs_pubes['growth'] > 1:
+			pcs_pubes['growth'] = 0
+			pcs_pubes += 1
+		end
+		pcs_pubes['growth'] += 1
+	end
+	
+	if age < 18 and rand (0,2) = 0 and pcs_leghair > 0: pcs_leghair -= 1
 end
 
 if $ARGS[0] = '':

locations/cikl.qsrc

@@ -341,18 +341,6 @@ gs 'fertility', 'birth_control'
 
 !!------------------------------------------------------------------------------------------------------------
 
-if lashair ! 1:
-	pcs_leghair += 1
-	!!Pubic hair growth at 1/2 per night
-	if pcs_pubes['growth'] > 1:
-		pcs_pubes['growth'] = 0
-		pcs_pubes += 1
-	end
-	pcs_pubes['growth'] += 1
-end
-
-if age < 18 and rand (0,2) = 0 and pcs_leghair > 0: pcs_leghair -= 1
-
 if pcs_breath = 1:pcs_breath = 0
 
 if cheatNoEat = 1 and dounspell = 1:fat += 15
@@ -530,40 +518,6 @@ gs 'fame', 'deg'
 gs 'traits', 'overnight'
 
 
-!!------------------------------------------------------------------------------------------------------------
-!!	Maruda hair mod
-!!------------------------------------------------------------------------------------------------------------
-!! Max. Hair length 600mm, or 60cm, which should be somewhere in the lower back area.
-!! Hair grows 1mm each day, it takes 20 months (1 month = 30 days) to regrow the hair from 0.
-if pcs_hairlng < 1001 and hairgrowcht = 0:pcs_hairlng += 1
-
-if pcs_haircol ! nathcol:
-	dyefade -=1
-	if dyefade < 0: dyefade = 0
-	if dyefade > 0 and dyefade < 7: dyevmod = 5
-	if dyefade = 0: dyevmod = 15
-end
-
-!!pubic hair colouring
-!! pcs_pubecol = natural colour
-!! pcs_pubecol[1] = flag for saveupdate
-!! pcs_pubecol[2] = actual colour
-!! pcs_pubecol[3] = countdown timer for dye
-
-if pcs_pubecol[2] ! pcs_pubecol:
-	pcs_pubecol[3] -=1
-	if pcs_pubecol[3] < 0: pcs_pubecol[3] = 0
-	if pcs_pubecol[3] = 0: pcs_pubecol[2] = pcs_pubecol
-end
-
-if pcs_pubes < 2: pcs_pubecol[2] = pcs_pubecol
-
-if hscrunch > 0:
-	hscrunchrand = rand(1, 100)
-
-	if hscrunchrand <= 8:hscrunch -= 1
-end
-
 !!------------------------------------------------------------------------------------------------------------
 
 !! Clothing wear and tear
@@ -640,32 +594,6 @@ elseif painpub = 1:
 	end
 end
 
-!!---- Calculation of lash extension degradation and false lash removal
-if pcs_lashes > 2:
-	if lashextensionstyle >= 1:
-		lashextensionduration -= 1
-		if lashextensionduration >= 1 and lashextensionduration <= 4:
-			'It''s time for you to do your maintenance on your lash extensions; you should go to the salon or you risk growing them all out.'
-		end
-		if lashextensionduration <= 0:
-			'You waited too long to do maintenance on your lash extensions; there''s too little there to notice or work with at this point.'
-			pcs_lashes = pcs_naturallashes
-			killvar 'lashextensionstyle'
-			killvar 'lashextensionduration'
-			killvar 'lashextensionnew'
-		end
-	end
-	if false_lashes > 0:
-		false_lashes -= 1
-		if false_lashes = 0:
-			'Your false lashes came off in the night; there''s no recovering them now.'
-			pcs_lashes = pcs_naturallashes
-		else
-			'Somehow, your lashes managed to stay attached throughout the night. You might be able to get away with wearing them another day straight.'
-		end
-	end
-end
-
 
 prezikProver += 1
 if pirs_pain_ton > 0:pirs_pain_ton -= 1