|
|
@@ -1,7 +1,7 @@
|
|
|
#music_actions
|
|
|
|
|
|
if $ARGS[0] = 'start':
|
|
|
- if ml_not_alone = 0: gs 'music_action', 'willpower_cost'
|
|
|
+ if ml_not_alone = 0: gs 'music_actions', 'willpower_cost'
|
|
|
|
|
|
!! $location_type = ''private'' = these are usually homes. ''indoors'' usually an office, shop or an NPC''s home. Same for ''public_indoors'' For those locations
|
|
|
!! anything music related should be part of a storyline/quest, or some prewritten scene, like in the room of Anushka
|
|
|
@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
|
|
|
if hour > 8 and hour < 22 and alko < 5:
|
|
|
gs 'music_actions', 'play_something'
|
|
|
gs 'music_actions', 'practice_guitar'
|
|
|
- gs 'music_actions', 'rehearse_sets'
|
|
|
+ if pcs_perform > 35 and (instrmusic_lvl >15 or vokal_lvl > 15): gs 'music_actions', 'rehearse_sets'
|
|
|
!! TODO: Find some way to remove this type of check from the music_action location, and keep them in the
|
|
|
!! original location.
|
|
|
!! Maybe a gs that sets a 'can record/stream' flag.
|
|
|
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
|
|
|
gs 'music_actions', 'set_up_account'
|
|
|
gs 'music_actions', 'upload_music'
|
|
|
gs 'music_actions', 'delete_music'
|
|
|
- ml_
|
|
|
+
|
|
|
killvar 'ml_willcost'
|
|
|
killvar 'ml_not_alone'
|
|
|
killvar 'ml_no_music'
|
|
|
@@ -64,7 +64,7 @@ end
|
|
|
|
|
|
if $ARGS[0] = 'play_something':
|
|
|
if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
|
|
|
- if ml_willcost = 0:
|
|
|
+ if ml_not_alone = 0 or ml_willcost = 0:
|
|
|
!! TODO: This should be a new screen with some video or image or something
|
|
|
act 'Play something on the guitar':
|
|
|
pcs_mood += 10
|
|
|
@@ -90,7 +90,7 @@ if $ARGS[0] = 'play_something':
|
|
|
act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
|
|
|
end
|
|
|
end
|
|
|
- if ml_willcost = 0:
|
|
|
+ if ml_not_alone = 0 or ml_willcost = 0:
|
|
|
act 'Sing something':
|
|
|
pcs_mood += 10
|
|
|
minut += 10
|
|
|
@@ -115,17 +115,13 @@ if $ARGS[0] = 'play_something':
|
|
|
else
|
|
|
act 'Sing something (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to sing in front of people</font>'
|
|
|
end
|
|
|
-
|
|
|
- act 'Sing something':
|
|
|
-
|
|
|
- end
|
|
|
end
|
|
|
|
|
|
!! NOTE: Having a guitar really matters here
|
|
|
if $ARGS[0] = 'practice_guitar':
|
|
|
- if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc) and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes']:
|
|
|
+ if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc) and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and (ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] ):
|
|
|
!! This is already checked at the beginning.
|
|
|
- if ml_willcost = 0:
|
|
|
+ if ml_not_alone = 0 or ml_willcost = 0:
|
|
|
act 'Practice guitar': gt 'music_bedroomPractice', 'guitar'
|
|
|
elseif ml_willcost <= pcs_willpwr:
|
|
|
act 'Practice guitar (<<will_cost>> Willpower)':
|
|
|
@@ -144,10 +140,10 @@ end
|
|
|
!! practice the guitar parts too.
|
|
|
if $ARGS[0] = 'rehearse_sets':
|
|
|
if ml_performance['performed_minutes'] < ml_performance['max_perform_minutes']:
|
|
|
- if ml_willcost = 0:
|
|
|
+ if ml_not_alone = 0 or ml_willcost = 0:
|
|
|
act 'Live stream (30 minutes)': gt 'music_bedroompractice', 'rehearse'
|
|
|
- elseif ml_willcost <= pcs_willpwr:
|
|
|
- act 'Rehearse your sets ([)30 minutes) (<<will_cost>> Willpower)':
|
|
|
+ elseif ml_willcost <= pcs_willpwr:
|
|
|
+ act 'Rehearse your sets (30 minutes) (<<will_cost>> Willpower)':
|
|
|
inhib_exp += rand(1,2)
|
|
|
gs 'willpower', 'pay', 'self'
|
|
|
gs 'stat'
|
