|
@@ -21,10 +21,10 @@ $showerdin = {
|
|
|
pcs_hairbsh = 0
|
|
|
pcs_makeup = 1
|
|
|
if frost > 0:frost = 0
|
|
|
- if shampoo < 0: mc_inventory['shampoo'] = 0
|
|
|
+ if mc_inventory['shampoo'] < 0: mc_inventory['shampoo'] = 0
|
|
|
lactation['lactmess'] = 0
|
|
|
if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
|
|
|
- if mc_inventory['noshampoo'] = 0:
|
|
|
+ if noshampoo = 0:
|
|
|
mc_inventory['shampoo'] -= 1
|
|
|
else
|
|
|
killvar 'noShampoo'
|
|
@@ -74,7 +74,7 @@ $shower = {
|
|
|
menu_off = 1
|
|
|
*clr & cla
|
|
|
minut += 15
|
|
|
- if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] = 1: mc_inventory['noshampoo'] = 1
|
|
|
+ if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] = 1: noshampoo = 1
|
|
|
noShampoo_tmp = noShampoo
|
|
|
dynamic $showerdin
|
|
|
|
|
@@ -94,7 +94,7 @@ $shower = {
|
|
|
|
|
|
if mc_inventory['shampoo'] = 0 and noShampoo_tmp = 1:
|
|
|
'When you get a chance, you should stop by the supermarket and buy some shampoo.'
|
|
|
- elseif shampoo <= 5:
|
|
|
+ elseif mc_inventory['shampoo'] <= 5:
|
|
|
'You are getting low on shampoo, with only <<mc_inventory[''shampoo'']>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
|
|
|
end
|
|
|
|
|
@@ -235,7 +235,7 @@ $bath = {
|
|
|
|
|
|
if mc_inventory['shampoo'] = 0 and noShampoo_tmp = 1:
|
|
|
'When you get a chance, you should stop by the supermarket and buy some shampoo.'
|
|
|
- elseif shampoo <= 5:
|
|
|
+ elseif mc_inventory['shampoo'] <= 5:
|
|
|
'You are getting low on shampoo, with only <<mc_inventory[''shampoo'']>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
|
|
|
end
|
|
|
|
|
@@ -528,7 +528,7 @@ $brit = {
|
|
|
end
|
|
|
}
|
|
|
|
|
|
-$mc_inventory['tampons'] = {
|
|
|
+$tampon = {
|
|
|
if mc_inventory['sanitary_pads'] > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
|
|
|
act 'Use a sanitary pad (0:02)':
|
|
|
menu_off = 1
|
|
@@ -543,7 +543,7 @@ $mc_inventory['tampons'] = {
|
|
|
act 'Finish':menu_off = 0 & gt $loc, $loc_arg
|
|
|
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']tampon > 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
|
|
@@ -1066,7 +1066,7 @@ if $ARGS[0] = 'private':
|
|
|
'You can use Tanya''s shampoo.'
|
|
|
dynamic $shower
|
|
|
dynamic $bath
|
|
|
- elseif shampoo > 0:
|
|
|
+ elseif mc_inventory['shampoo'] > 0:
|
|
|
'You have enough shampoo for <b><<mc_inventory[''shampoo'']>></b> uses.'
|
|
|
dynamic $shower
|
|
|
dynamic $bath
|