Browse Source

[fixed] More Variables updated

Awesome 9 months ago
parent
commit
f0e09d059b

+ 1 - 1
locations/booty_call_after.qsrc

@@ -1183,7 +1183,7 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Continue':gs'booty_call_after', 'boy_bathroom'
 		end
 	end
-	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
+	if mc_inventory['tampons'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla

+ 2 - 2
locations/din_bad.qsrc

@@ -127,9 +127,9 @@ if $ARGS[0] = 'd_bag':
 	elseif painkiller > 0 and (pain['total'] = 0 or pain['killer'] > 0):
 		'You have <b><<painkiller>></b> painkiller'+iif(painkiller > 1, 's ', ' ')+'left in your purse.'
 	end
-	if mouthwash > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
+	if mc_inventory['mouthwash'] > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
 		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
-	elseif mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0:
+	elseif mc_inventory['mouthwash'] > 0 and pcs_breath = 1 and cumloc[12] = 0:
 		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
 	end
 	if mc_inventory['travel_mirror'] =  1: 

+ 1 - 1
locations/din_van.qsrc

@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'private':
 		msg'<font color="red">You only have <b><<mc_inventory[''tampons'']>></b> tampon left!</font>'
 	elseif mc_inventory['tampons'] =  1:
 		msg'<font color="red">You only have <b><<mc_inventory[''tampons'']>></b> tampon left.</font>'
-	elseif tampon > 0:
+	elseif mc_inventory['tampons'] > 0:
 		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
 	

+ 1 - 1
locations/etoexhib.qsrc

@@ -1383,7 +1383,7 @@ if $ARGS[0] = 'pos39':
 		act 'Remove underwear':gs 'underwear', 'remove' & gt $loc,$loc_arg
 	end
 
-	if tampon > 0 and mesec > 0 and isprok = 0:
+	if mc_inventory['tampons'] > 0 and mesec > 0 and isprok = 0:
 		act 'Change tampon':
 			cla
 			*clr

+ 1 - 1
locations/gadbana.qsrc

@@ -118,7 +118,7 @@ if mira_guest = 0:
 	end
 	*nl
 
-	if shampoo > 0 or (locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home')):
+	if mc_inventory['shampoo'] > 0 or (locat['Fam_inGad'] = 1 and func('homes_properties', 'has_access', 'parents_home')):
 		act 'Wash your body (0:25)':
 			*clr & cla
 			menu_off = 1

+ 1 - 1
locations/gdksport.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'default_sport_options'
 
-	if shampoo > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
+	if mc_inventory['shampoo'] > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'

+ 1 - 1
locations/sex_ev_after.qsrc

@@ -1405,7 +1405,7 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Continue':gs'sex_ev_after', 'boy_bathroom'
 		end
 	end
-	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
+	if mc_inventory['tampons'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla