[fixes] Some varibles updated to new format

locations/BDSM_Club.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 	elseif BDSMmeet = 1 and BDSMday ! daystart:
 		if money < 10000:
 			'You go to the Club entrance but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
-		elseif $clothingworntype ! 'uniform' or PCloStyle2 ! 1:
+		elseif $clothingworntype ! 'gm_uniform' or PCloStyle2 ! 1:
 			'You are not wearing a maid uniform and security refuse you entry.'
 		else
 			if $BDSMrole = 's':

locations/MHall.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'foyer':
 	end
 	if $BDSMrole = 's':
 		act 'Go to Dressing room': gt 'MDressing'
-		if ($clothingworntype ! 'uniform' or PCloStyle2 ! 1) and  $clothingworntype ! 'nude':exit
+		if ($clothingworntype ! 'gm_uniform' or PCloStyle2 ! 1) and  $clothingworntype ! 'nude':exit
 	end
 	act 'Go upstairs to the west wing landing':gt 'MLanding', 'west'
 	act 'Go upstairs to the east wing landing':gt 'MLanding', 'east'

locations/_body_image.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'clothes':
 			$body_image_msg += FUNC('$clothing_name', $clothingworntype, clothingwornnumber)
 		end
 
-		if $clothingworntype = 'uniform':
+		if $clothingworntype = 'gm_uniform':
 			if PCloStyle2 = 1:
 				$body_image_msg += '<br>This outfit is considered to be a maid uniform.'
 			elseif PCloStyle2 = 3:

locations/burger.qsrc

@@ -678,7 +678,7 @@ if $ARGS[0] = 'boss':
 		if BurgerQW['Secretary'] = 2:
 			if week < 6 and hour < 10:'Anatoly Borisovich looks at you sternly, "<<$pcs_nickname>>, you''re fired. Go away, we''re done, I love my wife more than you."'
 		elseif BurgerQW['Secretary'] = 1:
-			if week < 6 and hour < 10 and $clothingworntype = 'office':
+			if week < 6 and hour < 10 and $clothingworntype = 'gm_office':
 				act 'Work':gt 'burgerWork', 'start'
 
 				act 'Resign':
@@ -689,7 +689,7 @@ if $ARGS[0] = 'boss':
 					gt 'burger', 'start'
 				end
 
-			elseif week < 6 and hour < 10 and $clothingworntype ! 'office':
+			elseif week < 6 and hour < 10 and $clothingworntype ! 'gm_office':
 				'Anatoly Borisovich looks at you sternly, "<<$pcs_nickname>>, why aren''t you dressed properly? Go home and come back tomorrow dressed appropriately, you''re not working today!"'
 			end
 

locations/clothing.qsrc

@@ -236,11 +236,11 @@ if $ARGS[0] = 'view_clothing_list':
 
 			if ARRSIZE('gm_dress') > 0:'<center><a href="exec:$ward_list_store = ''gm_dress'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_dress''">Regular G&M clothing</a></center>'
 
-			if ARRSIZE('office') > 0:'<center><a href="exec:$ward_list_store = ''office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''office''">Office wear</a></center>'
+			if ARRSIZE('gm_office') > 0:'<center><a href="exec:$ward_list_store = ''office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''office''">Office wear</a></center>'
 
-			if ARRSIZE('school') > 0:'<center><a href="exec:$ward_list_store = ''school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''school''">School uniforms</a></center>'
+			if ARRSIZE('gm_school') > 0:'<center><a href="exec:$ward_list_store = ''school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''school''">School uniforms</a></center>'
 
-			if ARRSIZE('uniform') > 0:'<center><a href="exec:$ward_list_store = ''uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''uniform''">Work uniforms</a></center>'
+			if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:$ward_list_store = ''uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''uniform''">Work uniforms</a></center>'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 		end
@@ -273,7 +273,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopoffice
-				if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
+				if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'gm_office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
 				i += 1
 			if i <= ARRSIZE('office'):jump 'loopoffice'
 
@@ -284,11 +284,11 @@ if $ARGS[0] = 'view_clothing_list':
 		if $ARGS[2] = 'school':
 			$ward_list_store = $ARGS[2]
 
-			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
+			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
 
 			i = 1
 			:loopschool
-				if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
+				if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
 				i += 1
 				if i = 6: i = 7
 			if i <= ARRSIZE('school'):jump 'loopschool'
@@ -301,7 +301,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopuniform
-				if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
+				if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'gm_uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
 				i += 1
 			if i <= ARRSIZE('uniform'):jump 'loopuniform'
 

locations/etoexhib.qsrc

@@ -1172,7 +1172,7 @@ if $ARGS[0] = 'pos27':
 
 			if mentats_dose > 0:intel_exp += mentats_dose - rand(0,mentats_dose)
 			if pcs_intel < 80:intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-			if $clothingworntype = 'office' and (pcs_makeup = 1 or pcs_makeup = 2) and teachlevel < 70:teachlevel += 1
+			if $clothingworntype = 'gm_office' and (pcs_makeup = 1 or pcs_makeup = 2) and teachlevel < 70:teachlevel += 1
 			if pcs_makeup = 4:teachlevel -= 1
 
 			money += 150

locations/leonid.qsrc

@@ -88,7 +88,7 @@ if $ARGS[0] = 'office':
 	minut += 1
 	killvar '$locclass'
 	if (hour >= 9 and hour < 10) and leonidSecretary = 1 and week <= 5:
-		if $clothingworntype = 'office':
+		if $clothingworntype = 'gm_office':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/office.jpg"></center>'
 			'You are in the office of <<$bName>> <<$bSurname>>, working as his secretary. There are three other doors inside the office, one leading to a small <a href="exec:gt ''leonid'', ''officeKitchen''">kitchen</a>, second leading to a conference room and third leading to a <a href="exec:gt ''leonid'', ''toilet''">toilet</a>.'
 			atWork = 1
@@ -130,7 +130,7 @@ if $ARGS[0] = 'office':
 end
 
 if $ARGS[0] = 'secretaryGate':
-	if $clothingworntype ! 'office':
+	if $clothingworntype ! 'gm_office':
 		gt 'leonid', 'toilet'
 	end
 
@@ -142,12 +142,12 @@ if $ARGS[0] = 'secretaryGate':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarynaked.jpg"></center>'
 		mult = 3
 	end
-	if $clothingworntype = 'office' and CloBimbo = 0:
+	if $clothingworntype = 'gm_office' and CloBimbo = 0:
 		'<b>You are dressed as a secretary.</b>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarynormal.jpg"></center>'
 		mult = 1
 	end
-	if $clothingworntype = 'office' and CloBimbo = 1:
+	if $clothingworntype = 'gm_office' and CloBimbo = 1:
 		'<b>You are dressed as a naughty secretary.</b>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarysexy.jpg"></center>'
 		mult = 2
@@ -847,7 +847,7 @@ if $ARGS[0] = 'toilet':
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
-	if $clothingworntype ! 'office':
+	if $clothingworntype ! 'gm_office':
 		'<b style="color: #FF00000">You are at work, so you need to be dressed as a secretary!</b>'
 	end
 

locations/nichApartment.qsrc

@@ -213,7 +213,7 @@ elseif $ARGS[0] = 'jobInterview':
 	'The adress you have been given leads you to a very expensive looking apartment building. A porter stands at the door, inspecting you while you come closer.'
 	'"Hello, I am here to apply for the job as live-in maid."'
 	
-	if $clothingworntype ! 'uniform':
+	if $clothingworntype ! 'gm_uniform':
 		'"I am afraid I am not allowed to let you pass dressed like this, Miss. Master Nicholas made it very clear that every applicant for this position has to be dressed in an appropriate outfit. Meaning you have to wear a maid uniform for the job interview. You can get one at the mall nearby."'
 		act 'Turn around': gt 'city_center'
 	else
@@ -428,7 +428,7 @@ elseif $ARGS[0] = 'visitTanya':
 		if nichTanyaFuckLast = daystart:
 			!! Tanya and PC just had sex because PC cant go to the job interview yet
 			'Now that the immediate lust is sated and you''re both enjoying your postcoital bliss, you rest naked in each other''s arms.'
-			if $clothingworntype = 'uniform':
+			if $clothingworntype = 'gm_uniform':
 				'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to quit your current job."'
 				'You promise her to do it as soon as possible before putting your uniform back on.'
 			else
@@ -436,7 +436,7 @@ elseif $ARGS[0] = 'visitTanya':
 				'You promise her to do so before putting your clothes back on.'
 			end
 			act 'Leave the apartment':gt 'city_center'
-		elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'uniform':
+		elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'gm_uniform':
 			'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. How does it feel?"'
 			act 'Great':
 				cla
@@ -452,7 +452,7 @@ elseif $ARGS[0] = 'visitTanya':
 				'"Come on now. My parents are waiting in the living room."'
 				act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
 			end
-		elseif $clothingworntype = 'uniform':
+		elseif $clothingworntype = 'gm_uniform':
 			'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. Are you ready to have your interview with my parents?"'
 			'"Not yet. I still have to quit my current job."'
 			'Tanya looks a little bit dissapointed but then she smirks at you. "Oh, I understand. You are wearing this outfit for me and not for my parents."'

locations/nichTanya.qsrc

@@ -1434,7 +1434,7 @@ elseif $ARGS[0] = 'shoppingUniform':
 		end
 	end
 elseif $ARGS[0] = 'prepareInterview':
-	$clothingworntype = 'uniform'
+	$clothingworntype = 'gm_uniform'
 	clothingwornnumber = nichRand
 	'The both of you return to Tanyas apartment. You change into your new uniform before Tanya starts to inspect you carefully.'
 	

locations/nichUtil.qsrc

@@ -442,7 +442,7 @@ if $ARGS[0] = 'updateNotice':
 end
 
 if $ARGS[0] = 'checkOutfit':
-	if $clothingworntype = 'uniform':
+	if $clothingworntype = 'gm_uniform':
 		nichOutfitState = 1
 	else
 		nichOutfitState = 0

locations/office.qsrc

@@ -41,9 +41,9 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 9 and hour < 17 and workSec >= 1:'You''re too late for work, so you''re told to take the day off.'
-	if workSec >= 1 and $clothingworntype ! 'office' and hour >= 9 and hour < 17:'You are not dressed according to the corporate dress code.'
+	if workSec >= 1 and $clothingworntype ! 'gm_office' and hour >= 9 and hour < 17:'You are not dressed according to the corporate dress code.'
 
-	if hour < 9 and workSec >= 1 and $clothingworntype = 'office':
+	if hour < 9 and workSec >= 1 and $clothingworntype = 'gm_office':
 		act 'Go to work':
 			sekDay += 1
 			hour = 9

locations/stat_display.qsrc

@@ -547,7 +547,7 @@ elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		$stat_clothes_tooltip = 'Normal swimsuit.'
 		$stat_clothes_style = 'swimsuit'
 	end
-elseif $clothingworntype = 'office':
+elseif $clothingworntype = 'gm_office':
 	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing an office dress a bimbo or a prostitute would wear.'