Ver Fonte

[fixed] broken new menu autosave objects. Cancel Emergency exit return locaiton.
[Changed] Brush hair action now returns to location instead of duplicating mirror action.

3xpurt há 6 anos atrás
pai
commit
7e58df5cb0
3 ficheiros alterados com 12 adições e 6 exclusões
  1. 7 1
      locations/mirror
  2. 2 2
      locations/obj_din
  3. 3 3
      locations/onobjsel

+ 7 - 1
locations/mirror

@@ -1,6 +1,7 @@
 # mirror
 if $ARGS[0] = 'start':
 	*clr & cla
+	$mirrorloc = 'mirror'
 	gs 'stat' &! It should be here, because some of the strigs have to be initialized
 	if player_avatar = 1:
 		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
@@ -410,7 +411,11 @@ if $ARGS[0] = 'brush':
 	pcs_hairbsh = 1
 	'You brush your hair.'
 	wait 500
-	gt 'mirror', 'start'
+	if $mirrorloc = 'mirror':
+		gt 'mirror', 'start'
+	else
+		gt 'mirror', 'fin'
+	end
 end &! --- brush ----
 
 if $routine1 ! '' and pcs_makeup < 2:
@@ -531,6 +536,7 @@ if $ARGS[0] = 'fin':
 	killvar '$makeupNatural'
 	killvar '$makeupHeavy'
 	killvar '$routine'
+	killvar '$mirrorloc'
 	gt $locM, $metkaM
 end &! --- fin ----
 

+ 2 - 2
locations/obj_din

@@ -1852,8 +1852,8 @@ if $ARGS[0] = 'exit':
 
 	cla
 	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pavResidential'
-	act 'Go to the street':gt 'street'
-	act 'Cancel':gt $loc
+	act 'Go to City Residental':gt 'street'
+	act 'Cancel':gt $curloc
 end
 
 if $ARGS[0] = 'new':

+ 3 - 3
locations/onobjsel

@@ -30,11 +30,11 @@ $menu_view[3] = 'Refresh:$menu_obnovit'
 
 killvar 'menu_other'
 $menu_other[0] = 'Notebook:$menu_bloknot'
-$menu_other[1] = 'Exigent:$menu_avariya'
+$menu_other[1] = 'Emergency exit:$menu_avariya'
 if disable_autosave = 1:
-	$menu_other[2] = '[Autosave]:$menu_autosave'
+	$menu_other[2] = 'Enable autosave:$menu_autosave'
 else
-	$menu_other[2] = '[Autosave]:$menu_autosave'
+	$menu_other[2] = 'Disable autosave:$menu_autosave'
 end
 if mobila > 0:$menu_other[3] = 'Phone:$menu_mobila'