Browse Source

Tried to make busking criteria a bit more realistic

Netuttki 4 years ago
parent
commit
d30e67cc60

+ 5 - 4
locations/city_center.qsrc

@@ -101,9 +101,10 @@ if shantpopala > 0:
 	exit
 end
 
-if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
+if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
+	ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)	
 	if pcs_inhib < 30: 
 		if pcs_inhib < 10: 
 			$diff = 'hard'
@@ -116,18 +117,18 @@ if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWit
 		gs 'willpower', 'skill', 'self', $diff
 		will_cost = (will_cost * 3) - (pcs_perform)
 		if will_cost <= pcs_willpwr:
-			act 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+			act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)': 
 				inhib_exp += rand(1,3)
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				gs 'music_buskingevents', 'busking', 'city'
 			end
 		else	
-			act 'Start busking (1 hour) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Start busking (<<ml_buskingtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		
 	else
-		act 'Start busking (1 hour)': gs 'music_buskingevents', 'busking', 'city'
+		act 'Start busking (<<ml_buskingtime>> minutes)': gs 'music_buskingevents', 'busking', 'city'
 	end	
 end
 

+ 5 - 4
locations/city_park.qsrc

@@ -181,9 +181,10 @@ if $ARGS[0] = 'start':
 	end
 
 
-	if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
+	if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
 		*nl
 		'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
+		ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
 		if pcs_inhib < 30: 
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -196,18 +197,18 @@ if $ARGS[0] = 'start':
 			gs 'willpower', 'skill', 'self', $diff
 			will_cost = (will_cost * 3) - (pcs_perform)
 			if will_cost <= pcs_willpwr:				
-				act 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+				act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)': 
 					inhib_exp += rand(1,3)
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					gs 'music_buskingevents', 'busking', 'city'
 				end
 			else	
-				act 'Start busking (1 hour) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Start busking (<<ml_buskingtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			
 		else
-			act 'Start busking (1 hour)': gs 'music_buskingevents', 'busking', 'city'
+			act 'Start busking (<<ml_buskingtime>> minutes)': gs 'music_buskingevents', 'busking', 'city'
 		end
 	end
 

+ 5 - 5
locations/liames.qsrc

@@ -95,10 +95,10 @@ if rand(1,100) >= 95:
 	act 'Continue': gt'liames'
 end
 
-if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
+if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-	
+	ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
 	if pcs_inhib < 30: 
 		if pcs_inhib < 10: 
 			$diff = 'hard'
@@ -111,17 +111,17 @@ if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWit
 		gs 'willpower', 'skill', 'self', $diff
 		will_cost = (will_cost * 3) - (pcs_perform)
 		if will_cost <= pcs_willpwr:
-			act 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+			act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)': 
 				inhib_exp += rand(1,3)
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				gs 'music_buskingevents', 'busking', 'oldtown'
 			end
 		else	
-			act 'Start busking (1 hour) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Start busking (<<ml_buskingtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end		
 	else
-		act 'Start busking (1 hour)': gs 'music_buskingevents', 'busking', 'oldtown'
+		act 'Start busking (<<ml_buskingtime>> minutes)': gs 'music_buskingevents', 'busking', 'oldtown'
 	end
 end
 

+ 5 - 4
locations/pav_commercial.qsrc

@@ -144,9 +144,10 @@ act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 
-if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
+if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
+	ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
 	if pcs_inhib < 30: 
 		if pcs_inhib < 10: 
 			$diff = 'hard'
@@ -159,7 +160,7 @@ if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWit
 		gs 'willpower', 'skill', 'self', $diff
 		will_cost = (will_cost * 3) - (pcs_perform)
 		if will_cost <= pcs_willpwr:
-			act 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+			act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)': 
 				inhib_exp += rand(1,3)
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
@@ -170,11 +171,11 @@ if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWit
 				end
 			end
 		else	
-			act 'Start busking (1 hour) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Start busking (<<ml_buskingtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		
 	else
-		act 'Start busking (1 hour)':
+		act 'Start busking (<<ml_buskingtime>> minutes)':
 			gs 'music_buskingevents', 'busking', 'pav'
 			if rand(0,100) > 80 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
 				gt 'music_gigstarts', 'delparco_start', 'pav_commercial'

+ 6 - 4
locations/pav_park.qsrc

@@ -170,9 +170,11 @@ if $ARGS[0] = 'start':
 	end
 
 
-	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
+	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
 		*nl
 		'With the weather being pleasant and sunny, the parks is full of people enjoying the weather. You could play some music, practice performing songs and maybe make some money too.'
+		ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
+		
 		if pcs_inhib < 30: 
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -185,7 +187,7 @@ if $ARGS[0] = 'start':
 			gs 'willpower', 'skill', 'self', $diff
 			will_cost = (will_cost * 3) - (pcs_perform)
 			if will_cost <= pcs_willpwr:		
-				act 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+				act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)': 
 					inhib_exp += rand(1,3)
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -195,10 +197,10 @@ if $ARGS[0] = 'start':
 					end						
 				end
 			else	
-				act 'Start busking (1 hour) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Start busking (<<ml_buskingtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end		
 		else	
-			act 'Start busking (1 hour)':
+			act 'Start busking (<<ml_buskingtime>> minutes)':
 				gs 'music_buskingevents', 'busking', 'pav'
 				if rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
 					gt 'music_gigstarts', 'delparco_start', 'pav_park'