Browse Source

[added] location class setting for the changing rooms (not school one as that is locker room)

Kevin_Smarts 2 years ago
parent
commit
830a9f8988

+ 1 - 0
locations/Nudelake.qsrc

@@ -5,6 +5,7 @@ $loc = 'Nudelake'
 $loc_arg = ''
 $menu_loc = 'Nudelake'
 $menu_arg = ''
+killvar '$locclass'
 menu_off = 0
 $location_type = 'secluded'
 

+ 1 - 0
locations/changingroom.qsrc

@@ -1,5 +1,6 @@
 # changingroom
 
+$locclass = 'changingroom'
 menu_off = 1
 
 if $ARGS[0] = 'view_swim_list':

+ 1 - 0
locations/city_apt_building.qsrc

@@ -133,6 +133,7 @@ end
 if $ARGS[0] = 'roof':
 	$menu_loc = 'city_apt_building'
 	$menu_arg = 'roof'
+	killvar '$locclass'
 	menu_off = 0
 	minut +=1
 	gs 'stat'

+ 1 - 0
locations/city_lake.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	$loc_arg = 'start'
 	$menu_loc = 'city_lake'
 	$menu_arg = 'start'
+	killvar '$locclass'
 	menu_off = 0
 	$location_type = 'public_outdoors'
 	*clr & cla

+ 1 - 0
locations/etoexhib.qsrc

@@ -1619,6 +1619,7 @@ if $ARGS[0] = 'pos53':
 	$loc = 'etoexhib'
 	$menu_loc = 'etoexhib'
 	$menu_arg = 'pos53'
+	killvar '$locclass'
 	menu_off = 0
 	$location_type = 'secluded'
 	*clr & cla

+ 5 - 0
locations/fit.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	$menu_loc = 'fit'
 	$menu_arg = 'start'
+	killvar '$locclass'
 	menu_off = 0
 	minut += 5
 	frost = 0
@@ -90,6 +91,7 @@ if $ARGS[0] = 'dressing room':
 	$menu_arg = 'dressing room'
 	menu_off = 0
 	$location_type = 'private'
+	$locclass = 'changingroom'
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Dressing</font></b></center>'
@@ -316,6 +318,7 @@ end
 
 if $ARGS[0] = 'gym':
 	*clr & cla
+	killvar '$locclass'
 	menu_off = 1
 	minut += 5
 	sportzalrand = RAND(0,20)
@@ -587,6 +590,7 @@ end
 if $ARGS[0] = 'kickboxing':
 	cla
 	*clr
+	killvar '$locclass'
 	menu_off = 1
 	minut += 5
 	gs 'stat'
@@ -855,6 +859,7 @@ end
 
 if $ARGS[0] = 'FMR':    
     *clr & cla
+	killvar '$locclass'
     menu_off = 0
     minut += 5
     Fit['FMR'] = 1

+ 1 - 0
locations/gadriver.qsrc

@@ -151,6 +151,7 @@ if $ARGS[0] = 'gadbitch':
 	$location_type = 'public_outdoors'
 	$loc_arg = 'gadbitch'
 	$loc = 'gadriver'
+	killvar '$locclass'
 	menu_off = 1
 	gs 'stat'
 

+ 3 - 2
locations/grandpahelp.qsrc

@@ -1,10 +1,11 @@
 # grandpahelp
 
+killvar '$locclass'
+menu_off = 1
 *clr & cla
+gs'stat'
 '<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
-menu_off = 1
-gs'stat'
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:

+ 1 - 0
locations/katjaEv.qsrc

@@ -1037,6 +1037,7 @@ if $ARGS[0] = 'kathanlakesw1':
 		minut +=10
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw1'
+		killvar '$locclass'
 		gs 'changingroom', 'view_swim_list'
 		act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
 	else

+ 1 - 0
locations/pav_complexb2.qsrc

@@ -116,6 +116,7 @@ end
 if $ARGS[0] = 'roof':
 	$menu_loc = 'pav_complexb2'
 	$menu_arg = 'roof'
+	killvar '$locclass'
 	menu_off = 0
 	minut +=1
 	gs 'stat'

+ 1 - 0
locations/pav_complexb3.qsrc

@@ -119,6 +119,7 @@ end
 if $ARGS[0] = 'roof':
 	$menu_loc = 'pav_complexb3'
 	$menu_arg = 'roof'
+	killvar '$locclass'
 	menu_off = 0
 	minut +=1
 	gs 'stat'

+ 1 - 0
locations/pod_ezd.qsrc

@@ -239,6 +239,7 @@ if $ARGS[0] = 'roof':
 	$loc_arg = 'roof'
 	$menu_loc = 'pod_ezd'
 	$menu_arg = 'roof'
+	killvar '$locclass'
 	menu_off = 0
 	gs 'stat'
 	'<center>Roof</center>'

+ 2 - 2
locations/telefon.qsrc

@@ -1322,7 +1322,7 @@ end
 }
 if $ARGS[0] = 'Phone_camera_selfie':
 	minut += rand(5,7)
-	if $ARGS[1] <> '':
+	if $ARGS[1] ! '':
 		gs 'telefon', 'Phone_selfie_image', $ARGS[1], $ARGS[2]
 	else
 		phone_rand = RAND(1,selfieClotot[0])
@@ -1429,7 +1429,7 @@ if $ARGS[0] = 'Phone_selfie_image':
 				if usePopUps = 1:
 					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg">'
 				else
-					view 'images/pc/activities/selfies/phone/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg'
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/titflash/<<phone_rand>>.jpg'
 				end
 			end
 		elseif $ARGS[2] = 'ass':