Explorar el Código

[fixed] $region is now consistent

hornguy6 hace 1 año
padre
commit
14e2a0cc92

+ 1 - 1
locations/city_center.qsrc

@@ -3,7 +3,7 @@
 
 $loc_arg = $ARGS[0]
 $loc = 'city_center'
-$region = 'city_center'
+$region = 'city'
 $menu_loc = 'city_center'
 $menu_arg = ''
 menu_off = 0

+ 1 - 1
locations/city_island.qsrc

@@ -4,7 +4,7 @@
 
 $loc_arg = ''
 $loc = 'city_island'
-$region = 'city_island'
+$region = 'city'
 $location_type = 'public_outdoors'
 $menu_loc = 'city_island'
 $menu_arg = ''

+ 1 - 1
locations/city_lake.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'start':
 	$loc = 'city_lake'
-	$region = 'city_lake'
+	$region = 'city'
 	$loc_arg = 'start'
 	$menu_loc = 'city_lake'
 	$menu_arg = 'start'

+ 1 - 1
locations/city_park.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 
 	$loc_arg = 'start'
 	$loc = 'city_park'
-	$region = 'city_park'
+	$region = 'city_'
 	$menu_loc = 'city_park'
 	$menu_arg = 'start'
 	$locclass = 'city_park'

+ 1 - 1
locations/gadforest.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'forest_edge':
 
 	$loc = 'gadforest'
 	$loc_arg = 'forest_edge'
-	$region = 'gad_forest'
+	$region = 'gad'
 	$location_type = 'secluded'
 	
 	$menu_loc = 'gadforest'

+ 1 - 1
locations/gadukino.qsrc

@@ -4,7 +4,7 @@
 if $ARGS[0] = '':
 	$loc = 'gadukino'
 	$loc_arg = ''
-	$region = 'gad_village'
+	$region = 'gad'
 	$location_type = 'public_outdoors'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'

+ 1 - 1
locations/music_buskingevents.qsrc

@@ -38,7 +38,7 @@ end
 !! TODO: Add the vocal only scenario
 if $ARGS[0] = 'calculate_tips':
 	
-	if $region = 'city_center' or $region = 'city_park':
+	if $region = 'city':
 		ml_location_mod = 30
 	elseif $region = 'pav':
 		ml_location_mod = 0

+ 1 - 1
locations/pav_lake.qsrc

@@ -5,7 +5,7 @@ CLOSE ALL
 if sound = 0:PLAY 'sound/lakeshore1.mp3', 30
 $loc = 'pav_lake'
 $loc_arg = ''
-$region = 'pav_lake'
+$region = 'pav'
 $menu_loc = 'pav_lake'
 $menu_arg = ''
 $locclass = 'beach'

+ 4 - 6
locations/therapist_reminder.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/pc/reactions/forget.jpg"></center>'
 	''
 	'You remember that you have an appointment with your therapist today at 18:00. It''s already <<hour>>:<<minut>>. You should go now.'
-	if $region = 'pav_commercial' or $region = 'pav_lake' or $region = 'pav_park' or $region = 'pav_residential':
+	if $region = 'pav':
 		if reminderFreebee < 4:
 			gs 'willpower', 'misc', 'resist', 'easy'
 			will_cost += (hypnoTime * 2)
@@ -48,13 +48,11 @@ if $ARGS[0] = '':
 		act 'Go see your therapist':
 			cla
 			*clr
-			if $region = 'pav_commercial':
-				minut += 5
-			elseif $region = 'pav_lake':
+			if $loc = 'pav_lake':
 				minut += 15
-			elseif $region = 'pav_park':
+			elseif $loc = 'pav_park':
 				minut += 10
-			elseif $region = 'pav_residential':
+			elseif $region = 'pav':
 				minut += 10
 			else
 				minut += 5