Browse Source

[changed] renamed 'body', '' to 'body', 'Update_Body', nuked the persistent vhtmp variable, and further split up the DailyUpdate function.

anjuna krokus 6 months ago
parent
commit
e52a0b5fc1

+ 0 - 1
locations/Cheatmenu_din.qsrc

@@ -1035,7 +1035,6 @@ $cheatmenu['parameters'] = {
 	'magicf2b = <<magicf2b>>'
 	'genbsize = <<genbsize>>'
 	'vhips = <<vhips>>'
-	'vhtmp = <<vhtmp>>'
 	'wratio = <<wratio>>'
 	'bratio = <<bratio>>'
 	'hratio = <<hratio>>'

+ 55 - 33
locations/body.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'DailyUpdate':
 	!!Update once a day and called from cikl
 
 	if dounspell ! 1:
-		gs 'body'
+		gs 'body', 'Update_Body'
 	else
 		if strenbuf > 90:
 			strenbuf -= 2
@@ -124,6 +124,40 @@ if $ARGS[0] = 'DailyUpdate':
 
 	gs 'body', 'UpdateBodyImage'
 
+	gs 'body', 'Update_Eyelashes'
+	gs 'body', 'Update_Hair'
+	gs 'body', 'Update_Pubes_and_leghair'
+
+
+	if mc_inventory['scrunchies'] > 0 and rand(1, 100) <= 8:
+		mc_inventory['scrunchies'] -=  1
+	end
+
+
+	if pcs_skin <= 300:
+		pcs_skin += min(skinDailyGain * 2, 20) - skinDailyPenalty - 1
+	elseif pcs_skin <= 600:
+		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
+	elseif pcs_skin <= 800:
+		pcs_skin += min(skinDailyGain / 2, 5) - skinDailyPenalty - 1
+	elseif pcs_skin <= 900:
+		pcs_skin += min(skinDailyGain / 3, 3) - skinDailyPenalty - 1
+	elseif pcs_skin <= 1000:
+		pcs_skin += min(skinDailyGain / 5, 2) - skinDailyPenalty - 1
+	end
+
+	gs 'body', 'Update_Teeth'
+
+	!skin variable reset
+	killvar 'moisturizerDailyCount'
+	killvar 'skinDailyGain'
+	killvar 'skinDailyPenalty'
+end
+
+
+	!!-------------------------    UPDATE eyelashes, hair, pubes, teeth   -------------------------!!
+
+if $ARGS[0] = 'Update_Eyelashes':
 	!!---- Calculation of lash extension degradation and false lash removal
 	if pcs_lashes > 2:
 		if lashextensionstyle >= 1:
@@ -149,7 +183,9 @@ if $ARGS[0] = 'DailyUpdate':
 			end
 		end
 	end
+end
 
+if $ARGS[0] = 'Update_Hair':
 	!! 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 <= 1000 and hairgrowcht = 0: pcs_hairlng += 1
@@ -158,7 +194,9 @@ if $ARGS[0] = 'DailyUpdate':
 	if pcs_haircol ! nathcol and dyefade > 0:
 		dyefade -= 1
 	end
+end
 
+if $ARGS[0] = 'Update_Pubes_and_leghair':
 	!!pubic hair colouring
 	!! pcs_pubecol[0] = natural colour
 	!! pcs_pubecol[1] = flag for saveupdate
@@ -171,8 +209,9 @@ if $ARGS[0] = 'DailyUpdate':
 
 	if pcs_pubes < 2: pcs_pubecol[2] = pcs_pubecol[0]
 
-	if mc_inventory['scrunchies'] > 0 and rand(1, 100) <= 8:
-		mc_inventory['scrunchies'] -=  1
+	!! 33% change to shrink leghair if underage? Simulate slower growth?
+	if age < 18 and rand(0, 2) = 0 and pcs_leghair > 0:
+		pcs_leghair -= 1
 	end
 
 	! Leg and pubes hair growth
@@ -187,24 +226,9 @@ if $ARGS[0] = 'DailyUpdate':
 		pcs_pubes['growth'] += 1
 		gs 'body_desc', 'pube_desc_update'
 	end}
+end
 
-	!! 33% change to shrink leghair if underage? Simulate slower growth?
-	if age < 18 and rand(0, 2) = 0 and pcs_leghair > 0:
-		pcs_leghair -= 1
-	end
-
-	if pcs_skin <= 300:
-		pcs_skin += min(skinDailyGain * 2, 20) - skinDailyPenalty - 1
-	elseif pcs_skin <= 600:
-		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
-	elseif pcs_skin <= 800:
-		pcs_skin += min(skinDailyGain / 2, 5) - skinDailyPenalty - 1
-	elseif pcs_skin <= 900:
-		pcs_skin += min(skinDailyGain / 3, 3) - skinDailyPenalty - 1
-	elseif pcs_skin <= 1000:
-		pcs_skin += min(skinDailyGain / 5, 2) - skinDailyPenalty - 1
-	end
-
+if $ARGS[0] = 'Update_Teeth':
 	if pcs_teeth < 0:
 		!! Daly degradation of perfect white teeth
 		tempteeth = 1
@@ -226,13 +250,10 @@ if $ARGS[0] = 'DailyUpdate':
 			teeth['degradation'] = 0
 		end
 	end
-
-	!skin variable reset
-	killvar 'moisturizerDailyCount'
-	killvar 'skinDailyGain'
-	killvar 'skinDailyPenalty'
 end
 
+
+
 if $ARGS[0] = 'UpdateBodyImage':
 	!Update body image set
 	if dounspell = 1:
@@ -272,7 +293,7 @@ end
 
 
 
-if $ARGS[0] = '':
+if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Update_StatBuffs'
 
 	!!Salo Handling; the first part is because during a reset fat is not used and should be cleared
@@ -535,9 +556,9 @@ if $ARGS[0] = 'Update_vhips':
 	if bodyresetflag = 1:
 		vhips = vhtmp
 	else
-		if vhips > vhtmp:
+		if vhtmp < vhips:
 			vhips -= 1
-		elseif vhips < vhtmp:
+		elseif vhtmp > vhips:
 			vhips += 1
 		end
 	end
@@ -546,6 +567,8 @@ if $ARGS[0] = 'Update_vhips':
 	temp_vhips2 = vhips - (pcs_hgt * (72 - hratio)) / 100
 	vofat = max(0, temp_vhips2 / 2)
 	vhips -= 2 * vofat
+	
+	killvar 'vhtmp'
 	killvar 'temp_vhips2'
 end
 
@@ -595,7 +618,7 @@ if $ARGS[0] = 'softreset':
 	:resetloop
 	if salo ! salolast:
 		if gamestartflag = 1: salobustdo = 1
-		gs 'body'
+		gs 'body', 'Update_Body'
 		jump 'resetloop'
 	end
 
@@ -624,7 +647,7 @@ if $ARGS[0] = 'hardreset':
 		bodyresetflag = 1
 		normbuffpick = -1
 
-		gs 'body'
+		gs 'body', 'Update_Body'
 
 		salo = 80 + (2 * pcs_hips) - (pcs_hgt * hratio) / 50
 		if salo < 10:
@@ -636,8 +659,7 @@ if $ARGS[0] = 'hardreset':
 		salocatlast = salocatnow
 		salolast = salo
 
-		vhtmp = (salo - 80) / 2
-		vhips = vhtmp
+		vhips = (salo - 80) / 2
 
 		if genbsize = 0:
 			if nbsize >= 27:
@@ -662,7 +684,7 @@ if $ARGS[0] = 'hardreset':
 		newbdsp = 1
 		dounspell = 0
 		gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-		gs 'body'
+		gs 'body', 'Update_Body'
 		gs 'stat'
 	end
 end

+ 2 - 2
locations/intro_initialization.qsrc

@@ -497,7 +497,7 @@ else
 		gm_school_h[60] = 120
 		gm_school_b[60] = pcs_hips
 		danilovich_outfits[65] = 1
-		danilovich_outfits_h[65] = 100			
+		danilovich_outfits_h[65] = 100
 		sportsclothingnumber = 65
 		danilovich_shoe[17] = 1
 		danilovich_shoe[21] = 0
@@ -523,7 +523,7 @@ $sports_clothing_name = 'default sports outfit'
 
 killvar 'swim_start'
 
-gs 'body'
+gs 'body', 'Update_Body'
 gs 'body', 'DailyUpdate'
 gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 pcs_stam = stammax

+ 1 - 1
locations/intro_initialization_city.qsrc

@@ -520,7 +520,7 @@ $sports_clothing_name = 'default sports outfit'
 
 killvar 'swim_start'
 
-gs 'body'
+gs 'body', 'Update_Body'
 gs 'body', 'DailyUpdate'
 gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 pcs_stam = stammax

+ 1 - 1
locations/saveupdater.qsrc

@@ -1280,7 +1280,7 @@ if temp_current_save_version  < 00080601:
 
 	if pcs_skin < 150: pcs_skin = 7 * pcs_skin
 
-	gs 'body'
+	gs 'body', 'Update_Body'
 	gs 'body', 'DailyUpdate'
 	gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 	gs 'stat'