Преглед изворни кода

Merge remote-tracking branch 'origin/music-mechanics-0.8.9'

netuttki пре 1 година
родитељ
комит
dcb1c99545
1 измењених фајлова са 11 додато и 4 уклоњено
  1. 11 4
      locations/music_actions.qsrc

+ 11 - 4
locations/music_actions.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'music_icon':
     !! Everywhere
+    ml_time_left = ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if alko > 5:
         'You are too drunk to stream or record music without messing up or throwing up into your guitar.'
     !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
@@ -11,18 +12,24 @@ if $ARGS[0] = 'music_icon':
             'It''s too early to do anything noisy like playing the guitar or singing.'
         elseif hour > 22:
             'It''s too late to do anything noisy like playing the guitar or singing.'
-        elseif ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
         else
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+            if ml_settings['its_me'] = 1: 
+                if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+                else
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+                end
+            else
+                act 'Available musical activities': gs 'music_actions', 'start'
+            end
         end
         if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 
+
 if $ARGS[0] = 'start': 
     cla
-
     ml_time_left =  ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if $location_type = 'public_outdoors': 
         !! In public, Sveta is never alone