[fixed] Forgotten piericing, time string, and stat_display fixes/changes

locations/metro.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 	
 	if money >= 16:
 		if $loc ! 'city_residential':
-			act 'Go to the Residential Area (00:10 - 16 <b>₽</b>)':
+			act 'Go to the Residential Area ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
 				$loc = 'city_residential'
 				$loc_arg = ''
 				money -= 16
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_center':
-			act 'Go to the City Center (00:10 - 16 <b>₽</b>)':
+			act 'Go to the City Center ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
 				$loc = 'city_center'
 				$loc_arg = ''
 				money -= 16
@@ -68,7 +68,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_industrial':
-			act 'Go to the City Industrial Region (00:10 - 16 <b>₽</b>)':
+			act 'Go to the City Industrial Region ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
 				$loc = 'city_industrial'
 				$loc_arg = ''
 				money -= 16
@@ -78,7 +78,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_suburbs':
-			act 'Go to the City Suburbs (00:10 - 16 <b>₽</b>)':
+			act 'Go to the City Suburbs ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
 				$loc = 'city_suburbs'
 				$loc_arg = 'start'
 				money -= 16
@@ -88,7 +88,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_island':
-			act 'Go to Vasilyevsky Island (00:10 - 16 <b>₽</b>)':
+			act 'Go to Vasilyevsky Island ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
 				$loc = 'city_island'
 				$loc_arg = ''
 				money -= 16

locations/mother.qsrc

@@ -138,11 +138,10 @@ if $ARGS[0] = '':
 		dynamic $mother_clothes[2]
 	end
 
-	if pirsA > 0 and pirsA < 10000 and pirsAmother=0 and motherpirsadaytalk!daystart:
+	if pcs_piercings['tongue'] > 0 and motherQW['piercing_tongue'] = 0 and motherQW['piercing_talkday'] ! daystart:
 		!!mother tongue piercing notes
-		pirseerand = rand(1,100)
-		motherpirsadaytalk = daystart
-		if pirseerand >= 75:
+		motherQW['piercing_talkday'] = daystart
+		if rand(1,100) >= 75:
 			'Your <<$npc_nickname[''A29'']>> sees the glimmer of metal in your mouth. "<<$pcs_nickname>>, what''s that in your mouth? I thought I saw something shiny..."'
 			act 'Nothing!':
 				cla
@@ -153,10 +152,10 @@ if $ARGS[0] = '':
 
 			act 'Show her your pierced tongue':
 				cla
-				pirsAmother = 1
+				motherQW['piercing_tongue'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pirsA>>.jpg" ></center>'
+				'<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pcs_piercings[''tongue'']>>.jpg" ></center>'
 				'You open your mouth and stick out your tongue, showing her your shiny new piercing.'
 				'Your <<$npc_nickname[''A29'']>> clearly disapproves and shakes her head. "Oh <<$pcs_nickname>>... You know those things are only worn by slutty women who serve men with their mouths!"'
 
@@ -165,16 +164,16 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if pirsB > 0 and pirsB < 10000 and pirsBmother=0 and motherpirsbdaytalk!daystart:
+	if pcs_piercings['lip'] > 0 and motherQW['piercing_lip'] = 0 and motherQW['piercing_talkday'] ! daystart:
 		!!mother says lip piercing
-		motherpirsbdaytalk = daystart
+		motherQW['piercing_talkday'] = daystart
 		'Your <<$npc_nickname[''A29'']>> looks at your lips, noticing your new lip piercing. She doesn''t seem very happy about it. "Why did you get such a thing?"'
 		act 'I think it looks pretty':
 			cla
-			pirsBmother = 1
+			motherQW['piercing_lip'] = 1
 			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pirsB>>.jpg" ></center>'
+			'<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pcs_piercings[''lip'']>>.jpg" ></center>'
 			'You shrug and answer with a sweet smile on your face. "I like it and think it looks cute. Don''t you agree?"'
 			'She clearly doesn''t, and walks away without even bothering to answer.'
 
@@ -182,22 +181,22 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if pirsC > 0 and pirsC < 10000 and pirsCmother=0:
+	if pcs_piercings['ears'] > 0 and motherQW['piercing_ears'] = 0:
 		!!mother notices earrings
-		pirsCmother = 1
+		motherQW['piercing_ears'] = 1
 		'Your <<$npc_nickname[''A29'']>> is looking at your ears, noticing your new earrings. She seems to like them and smiles at you. "I see you decided to wear earrings? They''re nice and look very cute on you."'
 	end
 
-	if pirsD > 0 and pirsD < 10000 and pirsDmother=0:
+	if pcs_piercings['nose'] > 0 and motherQW['piercing_nose'] = 0:
 		!!mother notices a nose ring
-		pirsDmother = 1
+		motherQW['piercing_nose'] = 1
 		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 		'Your <<$npc_nickname[''A29'']>> looks a bit shocked at your nose ring. "Jesus <<$pcs_nickname>>, what is- why?! I understand putting a ring in a bull''s nose to lead them by, but on a person? There''s no reason to do that!"'
 	end
 
-	if pirsE > 0 and pirsE < 10000 and pirsEmother=0:
+	if pcs_piercings['brow'] > 0 and motherQW['piercing_brow'] = 0:
 		!!mother notices eyebrow piercing
-		pirsEmother = 1
+		motherQW['piercing_brow'] = 1
 		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 		'Your <<$npc_nickname[''A29'']>> doesn''t seem to understand why you got an eyebrow piercing. "<<$pcs_nickname>>, why would you want that thing in your eyebrow?" She shakes her head in exasperation. "Kids these days..."'
 		*nl
@@ -216,26 +215,26 @@ if $ARGS[0] = '':
 		end
 	end
 
-    if SchoolAtestat = -1:
-        if month = 5 and day = 26 and hour <= 8:
-            '"<<$pcs_nickname>>, make sure you don''t miss your graduation today. Your brother and I will be there to watch you get your diploma."'
-        else
-            if month = 5 and day = 26 and hour > 8:
-                '"<<$pcs_nickname>>, where have you been? You missed your graduation today! I told everybody that you were sick, so your Principal gave me your diploma." She hands it to you.'
-            elseif month = 5 and day = 27:
-                '"<<$pcs_nickname>>, where have you been? You missed your graduation yesterday! I told everybody that you were sick, so your Principal gave me your diploma." She hands it to you.'
-            elseif (month = 5 and day > 27) or month > 5:
-                '"<<$pcs_nickname>>, where have you been? You missed your graduation! I told everybody that you were sick, so your Principal gave me your diploma." She hands it to you.'
-            end
-            SchoolAtestat = 1
-            gs 'exp_gain', 'intel', 10
-            grad_miss = 0
-            kanikuli = 7
-            gs 'stat'
-        end
-    end
-
-    if SchoolAtestat = 1 and SAtestatGift = 0:
+	if SchoolAtestat = -1:
+		if month = 5 and day = 26 and hour <= 8:
+			'"<<$pcs_nickname>>, make sure you don''t miss your graduation today. Your brother and I will be there to watch you get your diploma."'
+		else
+			if month = 5 and day = 26 and hour > 8:
+				'"<<$pcs_nickname>>, where have you been? You missed your graduation today! I told everybody that you were sick, so your Principal gave me your diploma." She hands it to you.'
+			elseif month = 5 and day = 27:
+				'"<<$pcs_nickname>>, where have you been? You missed your graduation yesterday! I told everybody that you were sick, so your Principal gave me your diploma." She hands it to you.'
+			elseif (month = 5 and day > 27) or month > 5:
+				'"<<$pcs_nickname>>, where have you been? You missed your graduation! I told everybody that you were sick, so your Principal gave me your diploma." She hands it to you.'
+			end
+			SchoolAtestat = 1
+			gs 'exp_gain', 'intel', 10
+			grad_miss = 0
+			kanikuli = 7
+			gs 'stat'
+		end
+	end
+
+	if SchoolAtestat = 1 and SAtestatGift = 0:
 		if class['school_grade_average'] >= 90:
 			gs 'npc_relationship', 'modify', 'A29', 40
 			'Your <<$npc_nickname[''A29'']>> is delighted you graduated. "I''m so proud right now, <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from school is a very important step. And you outdid all my expectations! When the Principal mentioned you being the best student of the year I could not have been happier. Your stepfather and I saved some money to reward you for your efforts. Please take this and buy yourself something nice. You''ve earned it." She hands you 10000 <b>₽</b>. You thank her and give her a hug.'
@@ -249,7 +248,7 @@ if $ARGS[0] = '':
 			SAtestatGift = 5000
 		else
 			'Your <<$npc_nickname[''A29'']>> is delighted you graduated. "I''m so happy right now, <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from school is a very important step. To be honest, I wasn''t sure you would manage to get your diploma, but you somehow did it. Please take this and buy yourself something nice. You''ve earned it." She hands you 3000 <b>₽</b>. You thank her and give her a hug.'
-            SAtestatGift = 3000
+			SAtestatGift = 3000
 		end
 		money += SAtestatGift
 		gs 'stat'
@@ -1447,7 +1446,7 @@ if $ARGS[0] = 'abortion_talk_preg':
 			'After sharing another brief hug, you get up and leave the room. You feel that she didn''t react too badly given what you just said and your chat with her has helped you as you''re glad to have shared your burden.'
 			act 'Return to the hallway': gt $loc, $loc_arg
 		end
-    end
+	end
 end
 
 if $ARGS[0] = 'kickedout':

locations/stat_display.qsrc

@@ -757,7 +757,19 @@ else
 	elseif PCloStyle2 = 4:
 		$temp_clo_base_pf = 'a'
 		$temp_clo_type = 'school uniform'
-		$stat_clothes_style = 'uniform'
+		$stat_clothes_style = 'school'
+	elseif PCloStyle2 = 3:
+		$temp_clo_base_pf = 'a'
+		$temp_clo_type = 'stripper outfit'
+		$stat_clothes_style = 'stripper'
+	elseif PCloStyle2 = 2:
+		$temp_clo_base_pf = 'a'
+		$temp_clo_type = 'server outfit'
+		$stat_clothes_style = 'server'
+	elseif PCloStyle2 = 1:
+		$temp_clo_base_pf = 'a'
+		$temp_clo_type = 'maid outfit'
+		$stat_clothes_style = 'maid'
 	else
 		$temp_clo_base_pf = 'an'
 		$temp_clo_type = 'outfit'
@@ -793,13 +805,13 @@ else
 	if PCloGoth = 1:
 		$temp_stat_clothes_msg[3] = '<<$temp_clo_base_pf>> <<$temp_clo_type>>'
 		$temp_clo_suffix[1] = 'goth'
-		$temp_tooltip[2] = 'Goth'
+		$temp_tooltip[3] = 'Goth'
 	end
 
 	if PCloPunk = 1:
 		$temp_stat_clothes_msg[3] = '<<$temp_clo_base_pf>> <<$temp_clo_type>>'
 		$temp_clo_suffix[2] = 'punk'
-		$temp_tooltip[3] = 'Punk'
+		$temp_tooltip[4] = 'Punk'
 	end
 
 	if PCloInhibit < 20:
@@ -862,6 +874,7 @@ else
 		$stat_clothes_msg += ' would wear.'
 	end
 
+
 	if $temp_clo_style[0] ! '' or $temp_clo_style[1] ! '':
 		$stat_clothes_style += '_' + $temp_clo_style[0] + $temp_clo_style[1]
 	elseif $temp_clo_style[2] ! '':
@@ -1399,7 +1412,7 @@ else
 
 	if $stat_musiclesson_msg ! '': $statusIconBarTab += '<td><a href="exec: msg $stat_musiclesson_msg "><img title="<<$stat_musiclesson_tip>>" height = <<set_siconht>> src="images/system/icons/status/musiclesson.png"></a></td>'
 
-	if $stat_school_icon_msg ! '' and SchoolBlock = 0: $statusIconBarTab += '<td><a href="exec: msg $stat_school_icon_msg"><img title="<<$stat_school_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/school.png"></a></td>'
+	if $stat_school_icon_msg ! '' and SchoolBlock = 0: $statusIconBarTab += '<td><a href="exec: msg $stat_school_icon_msg"><img title="<<$stat_school_tooltip>>" height = <<set_siconht>> src="<<$stat_school_icon>>"></a></td>'
 
 	if $stat_uni_icon_msg ! '' and (university['semester_week'] = -1 or (university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0)): $statusIconBarTab += '<td><a href="exec: msg $stat_uni_icon_msg"><img title="<<$stat_uni_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/uni_class_3.png"></a></td>'
 
@@ -1493,19 +1506,19 @@ else
 
 	if $stat_bfgf_msg_2 ! '': $statusIconBarTab += '<td><a href="exec: $stat_bfgf_msg_2"><img title="<<$stat_bfgf_tooltip_2>>" height = <<set_siconht>> src="images/system/icons/status/date.png"></a></td>'
 
-	if $stat_clothes_msg ! '': $statusIconBarTab += '<td><a href="exec: msg $stat_clothes_msg"><img title="<<$stat_clothes_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/<<$stat_clothes_style>>.png"></a></td>'
+	if $stat_clothes_msg ! '': $statusIconBarTab += '<td><a href="exec: msg $stat_clothes_msg"><img title="<<$stat_clothes_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/clothing/<<$stat_clothes_style>>.png"></a></td>'
 
-	if $stat_bra_msg ! '' and $braworntype ! 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/bra.png"></a></td>'
+	if $stat_bra_msg ! '' and $braworntype ! 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/bra.png"></a></td>'
 
-	if $stat_bra_msg ! '' and $braworntype = 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/boobs_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
+	if $stat_bra_msg ! '' and $braworntype = 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/boobs_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
 
 	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
-		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/panties.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties.png"></a></td>'
 	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
-		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/panties_red.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties_red.png"></a></td>'
 	end
 
-	if $stat_panty_msg ! '' and $pantyworntype = 'none' and PCloPanties ! 1: $statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/commando_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
+	if $stat_panty_msg ! '' and $pantyworntype = 'none' and PCloPanties ! 1: $statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/commando_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
 
 
 
@@ -1526,14 +1539,19 @@ else
 		$statusIconBarTab += '<td><a href="exec: msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = <<set_siconht>> src="images/system/icons/status/cigarettes.png"></a></td>'
 	end
 
-	if drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0 and drugVars['cigarettes_need'] > 20 and mc_inventory['cigarettes'] > 0:
-		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="You really need to smoke, click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
-	elseif drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0 and drugVars['cigarettes_need'] > 20 and mc_inventory['cigarettes'] <= 0:
-		$statusIconBarTab += '<td><a href="exec: msg ''You really need to smoke, but you have no cigarettes.''"><img title="You really need to smoke, but you have no cigarettes." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
-	elseif mc_inventory['cigarettes'] > 0:
-		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="Click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/smoke_cigarette.png"></a></td>'
+	if drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0 and drugVars['cigarettes_need'] > 20:
+		if mc_inventory['cigarettes'] > 0:
+			$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="You really need to smoke, click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
+		else
+			$statusIconBarTab += '<td><a href="exec: msg ''You really need to smoke, but you have no cigarettes.''"><img title="You really need to smoke, but you have no cigarettes." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
+		end
+	else
+		if mc_inventory['cigarettes'] > 0:
+			$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="Click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/smoke_cigarette.png"></a></td>'
+		end
 	end
 
+	$stat_drug_msg = ''
 	if drugVars['cocaine_day'] ! daystart and drugVars['cocaine_addict'] = 1 and drugVars['heroin_need'] > 0:
 		$stat_drug_msg += 'You need heroin and cocaine.'
 	elseif drugVars['cocaine_day'] ! daystart and drugVars['cocaine_addict'] = 1 and drugVars['heroin_need'] <= 0: