Browse Source

[fixed] jock pickup games bug fixes & community center sports area opening changed to 9AM

Sicaa 5 years ago
parent
commit
c75fb1247d

+ 45 - 6
locations/bbgamein.qsrc

@@ -1,6 +1,6 @@
+# bbgamein
 
-
-if $ARGS[0] = 'basketball_pickupgame':
+if $ARGS[0] = 'start':
 	*clr & cla
 	bbpickupDay = daystart
 	minut += 5
@@ -38,7 +38,6 @@ if $ARGS[0] = 'basketball_pickupgame':
 			act 'Leave': gt 'gdksport', 'start'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/insidecourt.jpg"></center>'
 		'As you enter the gym you notice some of the ''jocks'' standing around the basket, shooting and talking. They seem to joke around as some do more poorly than the others.'
 		'"Over here <<$pcs_nickname>>! You just arrived at the right time, we were just about to pick out the teams!" Lazar yells out.'
 		'You greet everyone as Lazar continues on, "Okay, you know the rules by now, 3 vs 3, first to 21. Winners stay until they lose."'
@@ -61,10 +60,11 @@ if $ARGS[0] = 'girls':
 	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_girl_arg1', 0, 1, 0, 0, 0, 0
 	*clr & cla
+	bkbll_exp += rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
-	'You line up with ''rand_girl_arg'' and ''rand_girl_arg1'' and get ready to enter the game. Looking at your faces you''re all pumped up, ready to take on any of the other teams.'
+	'You line up with <<$rand_girl>> and <<$rand_girl1>> and get ready to enter the game. Looking at your faces you''re all pumped up, ready to take on any of the other teams.'
 	'"You ready girls?!" you confidently yell out and get a loud shout back.'
 	'The three of you confidently step on the court and get ready for the game.'
 	
@@ -113,6 +113,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -142,6 +143,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -171,6 +173,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -211,6 +214,7 @@ if $ARGS[0] = 'girls':
 		end
 		
 		act 'Hold back':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
 			'"We''ll go about this a different way..." you say under your breath.'
 			'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -242,6 +246,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -273,6 +278,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -304,6 +310,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -345,6 +352,7 @@ if $ARGS[0] = 'girls':
 		end
 		
 		act 'Play normally':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
 			'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 			'The other two teammates start commenting, "Shouldn''t we "'
@@ -375,6 +383,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -406,6 +415,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -437,6 +447,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -483,6 +494,7 @@ if $ARGS[0] = 'mixed':
 	gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
 	*clr & cla
+	bkbll_exp += rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
@@ -516,6 +528,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -547,6 +560,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -578,6 +592,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -612,11 +627,13 @@ if $ARGS[0] = 'mixed':
 				'Panicking, you just want to get rid of the ball and you choose the worst option possible. Without even seeing the basket you throw the ball towards what you think is your teammate but just as you release the ball you come to your senses, you''ve thrown the ball the opponent.'
 				'Snickering, he takes the ball and easily scores. Your teammates are looking in disbelief and your cheeks color a bit by the realization that you just did that...'
 					
-			act 'End the game': gt 'bbgamein', 'end_game'
+				act 'End the game': gt 'bbgamein', 'end_game'
+			end
 		end		
 	end
 	
 	act 'Hold back':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
 		'"We''ll go about this a different way..." you say under your breath.'
 		'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -639,6 +656,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -670,6 +688,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -701,6 +720,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -741,6 +761,7 @@ if $ARGS[0] = 'mixed':
 	end
 	
 	act 'Play normally':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
 		'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 		'The other two teammates start commenting, "Shouldn''t we "'
@@ -763,6 +784,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -794,6 +816,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -825,6 +848,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -869,6 +893,7 @@ if $ARGS[0] = 'boys':
 	gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_boy_arg1', 0, 1, 0, 0, 0, 0
 	*clr & cla
+	bkbll_exp += rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/boys.jpg"></center>'
@@ -902,6 +927,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -933,6 +959,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -964,6 +991,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1004,6 +1032,7 @@ if $ARGS[0] = 'boys':
 	end
 	
 	act 'Hold back':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/boys.jpg"></center>'
 		'"We''ll go about this a different way..." you say under your breath.'
 		'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -1026,6 +1055,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1057,6 +1087,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1088,6 +1119,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1128,6 +1160,7 @@ if $ARGS[0] = 'boys':
 	end
 	
 	act 'Play normally':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/boys.jpg"></center>'
 		'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 		'The other two teammates start commenting, "Shouldn''t we "'
@@ -1150,6 +1183,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1181,6 +1215,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1212,6 +1247,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1249,7 +1285,7 @@ if $ARGS[0] = 'boys':
 	end	
 end
 
-if $ARGS[0] = 'end_game'
+if $ARGS[0] = 'end_game':
 	*clr & cla
 	minut += 20
 	gs 'stat'
@@ -1257,3 +1293,6 @@ if $ARGS[0] = 'end_game'
 	'Once the game is over, you are all tired and sweaty, but everyone had a great time. You all go over to the bleachers and find a seat to rest. You talk and joke with one another about the game, the winners bragging on their win, while the losers promise revenge next time.Once rested everyone starts to get up and drift away to go do other things, saying their goodbyes.'
 	act 'Leave': gt 'gdksport', 'start'
 end
+
+--- bbgamein ---------------------------------
+

+ 114 - 54
locations/bbgameout.qsrc

@@ -1,11 +1,13 @@
+# bbgameout
 
-
-if $ARGS[0] = 'basketball_pickupgame':
+if $ARGS[0] = 'start':
 	*clr & cla
 	bbpickupDay = daystart
 	minut += 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidecourt.jpg"></center>'
+	!! Sicaa: Not sure why this image is here. If we ever implement something to do in an empty court it migh be useful though
+	!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidecourt.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 	if grupTipe ! 2:
 		'Walking next to the school yard you''ve noticed that most of the ''jocks'' have gathered here. They look like are going to play some basketball, a few of them acknowledge you but none of them wave you over.'
 		act 'Sit and watch them':
@@ -38,7 +40,6 @@ if $ARGS[0] = 'basketball_pickupgame':
 			act 'Leave': gt 'gschool_grounds', 'main' 
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 		'Walking next to the school yard you notice that most of the ''jocks'' have gathered. Noticing you they wave you over.'
 		'"Over here <<$pcs_nickname>>! You arrived just in time, we were just about to pick the teams!" Lazar yells out.'
 		'You greet everyone as Lazar continues on, "Okay, you know the rules by now, 3 vs 3, first to 21. Winners stay until they lose."'
@@ -61,10 +62,11 @@ if $ARGS[0] = 'girls':
 	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_girl_arg1', 0, 1, 0, 0, 0, 0
 	*clr & cla
+	bkbll_exp += rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
-	'You line up with ''rand_girl_arg'' and ''rand_girl_arg1'' and get ready to enter the game. Looking at their faces you''re all pumped up, ready to take on any of the other teams.'
+	'You line up with <<$rand_girl>> and <<$rand_girl1>> and get ready to enter the game. Looking at their faces you''re all pumped up, ready to take on any of the other teams.'
 	'"You ready girls?!" you confidently yell out and get a loud shout back.'
 	'The three of you confidently step on the court and get ready for the game.'
 	
@@ -113,6 +115,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -144,6 +147,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -175,6 +179,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -201,6 +206,7 @@ if $ARGS[0] = 'girls':
 						act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Get rid of the ball':
+						*clr & cla
 						grupvalue[2] -= 2
 						pcs_mood -= 40
 						gs 'sweat', 'add', 40
@@ -216,6 +222,7 @@ if $ARGS[0] = 'girls':
 		end
 		
 		act 'Hold back':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 			'"We''ll go about this in a different way..." you say under your breath.'
 			'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -247,6 +254,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -278,6 +286,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -309,6 +318,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -335,6 +345,7 @@ if $ARGS[0] = 'girls':
 						act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Get rid of the ball':
+						*clr & cla
 						grupvalue[2] -= 2
 						pcs_mood -= 20
 						gs 'sweat', 'add', 20
@@ -350,6 +361,7 @@ if $ARGS[0] = 'girls':
 		end
 		
 		act 'Play normally':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 			'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 			'The other two teammates start commenting, "Shouldn''t we."'
@@ -380,6 +392,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -411,6 +424,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -442,6 +456,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -468,6 +483,7 @@ if $ARGS[0] = 'girls':
 						act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Get rid of the ball':
+						*clr & cla
 						grupvalue[2] -= 2
 						pcs_mood -= 30
 						gs 'sweat', 'add', 30
@@ -502,7 +518,7 @@ if $ARGS[0] = 'mixed':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/146.jpg"></center>'
 			'Marcus ponders for a second and smiles, "Okay, okay, I''m in. So who am I playing with?"'
-			'"With ''rand_girl_arg'' and me," you respond.'
+			'"With <<$rand_girl>> and me," you respond.'
 			'"Cool, lets go and win this." he confidently walks over.'
 			
 			act 'Give it your best':
@@ -532,6 +548,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -565,6 +582,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -598,6 +616,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 40
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -625,6 +644,7 @@ if $ARGS[0] = 'mixed':
 						act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Get rid of the ball':
+						*clr & cla
 						grupvalue[2] -= 2
 						[npc_rel 'A27'] = -= 2
 						pcs_mood -= 40
@@ -640,6 +660,7 @@ if $ARGS[0] = 'mixed':
 			end
 			
 			act 'Hold back':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 				'"We''ll go about this in a different way..." you say under your breath.'
 				'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -663,6 +684,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -696,6 +718,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -729,6 +752,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 20
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -756,6 +780,7 @@ if $ARGS[0] = 'mixed':
 						act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Get rid of the ball':
+						*clr & cla
 						grupvalue[2] -= 2
 						[npc_rel 'A27'] = -= 2
 						pcs_mood -= 20
@@ -771,6 +796,7 @@ if $ARGS[0] = 'mixed':
 			end
 				
 			act 'Play normally':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 				'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 				'The other two teammates start commenting, "Shouldn''t we."'
@@ -794,6 +820,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -828,6 +855,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -861,6 +889,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							[npc_rel 'A27'] = += 1
 							pcs_mood += 30
+							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -888,6 +917,7 @@ if $ARGS[0] = 'mixed':
 						act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Get rid of the ball':
+						*clr & cla
 						grupvalue[2] -= 2
 						[npc_rel 'A27'] = -= 2
 						pcs_mood -= 30
@@ -950,6 +980,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -981,6 +1012,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1012,6 +1044,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1038,6 +1071,7 @@ if $ARGS[0] = 'marcusno':
 				act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Get rid of the ball':
+				*clr & cla
 				grupvalue[2] -= 2
 				pcs_mood -= 30
 				gs 'sweat', 'add', 20
@@ -1052,6 +1086,7 @@ if $ARGS[0] = 'marcusno':
 	end
 	
 	act 'Hold back':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 		'"We''ll go about this in a different way..." you say under your breath.'
 		'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -1073,6 +1108,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1101,31 +1137,31 @@ if $ARGS[0] = 'marcusno':
 			end
 			if will_cost <= pcs_willpwr:
 				act 'Pass (<<will_cost>> Willpower)':
-						*clr & cla
-						grupvalue[2] += 1
-						pcs_mood += 20
+					*clr & cla
+					grupvalue[2] += 1
+					pcs_mood += 20
+					bkbll_exp += rand(0,2)
+					gs 'sweat', 'add', 20
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					if rand(0,100) + pcs_bkbll => 100:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
+						'You''re pressed but able to keep control of the ball. You can''t really move but all of a sudden you see the last remaining teammate lift her hand calling for your attention.'
+						'Seeing a little open pocket where you can pass, you release the ball at the perfect time. The ball bounces one time before it reaches the hands of your teammate. As soon as she gets control of the ball she takes a shot and it goes in.'
+						'The three of you start jumping for joy while the other team is looking pissed at each other, "Great pass <<$pcs_nickname>>! I wasn''t sure you had seen me." your teammate tells you.'
+						
+						act 'End the game': gt 'bbgameout', 'end_game'
+					else
+						grupvalue[2] -= 1
+						pcs_mood -= 20
 						gs 'sweat', 'add', 20
-						gs 'willpower', 'pay', 'self'
-						gs 'stat'
-						if rand(0,100) + pcs_bkbll => 100:
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
-							'You''re pressed but able to keep control of the ball. You can''t really move but all of a sudden you see the last remaining teammate lift her hand calling for your attention.'
-							'Seeing a little open pocket where you can pass, you release the ball at the perfect time. The ball bounces one time before it reaches the hands of your teammate. As soon as she gets control of the ball she takes a shot and it goes in.'
-							'The three of you start jumping for joy while the other team is looking pissed at each other, "Great pass <<$pcs_nickname>>! I wasn''t sure you had seen me." your teammate tells you.'
-							
-							act 'End the game': gt 'bbgameout', 'end_game'
-						else
-							grupvalue[2] -= 1
-							pcs_mood -= 20
-							gs 'sweat', 'add', 20
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
-							'The defender is playing exceptional defense and you can barely keep control over the ball. All of a sudden you hear someone yell out your name, it''s a female voice and without really seeing where she is positioned you pass the ball toward her.'
-							'As you release the ball you get a bad feeling, the girl defending your teammate has moved between you and your teammate and is going to intercept the ball...'
-							'Your teammate tries her best to get into position but the opponent is too strong and grabs the ball, quickly shakes of your teammate and score easily.'
-							'All three of you are dejected, "Don''t worry <<$pcs_nickname>> you tried your best." Your teammates tries to cheer you up while the other team is celebrating loudly.'
-							
-							act 'End the game': gt 'bbgameout', 'end_game'
-						end
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
+						'The defender is playing exceptional defense and you can barely keep control over the ball. All of a sudden you hear someone yell out your name, it''s a female voice and without really seeing where she is positioned you pass the ball toward her.'
+						'As you release the ball you get a bad feeling, the girl defending your teammate has moved between you and your teammate and is going to intercept the ball...'
+						'Your teammate tries her best to get into position but the opponent is too strong and grabs the ball, quickly shakes of your teammate and score easily.'
+						'All three of you are dejected, "Don''t worry <<$pcs_nickname>> you tried your best." Your teammates tries to cheer you up while the other team is celebrating loudly.'
+						
+						act 'End the game': gt 'bbgameout', 'end_game'
 					end
 				end
 			else
@@ -1133,36 +1169,37 @@ if $ARGS[0] = 'marcusno':
 			end
 			if will_cost <= pcs_willpwr:
 				act 'Shoot (<<will_cost>> Willpower)':
-						*clr & cla
-						grupvalue[2] += 1
-						pcs_mood += 20
+					*clr & cla
+					grupvalue[2] += 1
+					pcs_mood += 20
+					bkbll_exp += rand(0,2)
+					gs 'sweat', 'add', 20
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					if rand(0,100) + pcs_bkbll => 100:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
+						'Feeling confident you even manage tell to your opponent, "Watch this now..." You take a quick sidestep while your opponent stands still as she was not ready at all. You take aim and with a easy motion shoot the ball towards the hoop.'
+						'Everyone stops up and follow the ball as it flies throughout the air and all you can hear is a swish sound as the ball goes through the hoop.'
+						'Your teammates start running towards you, all happy, jumping like crazy while the two other team is arguing with the girl that was defending you, "How could you let her take that shot?! Why are you so weak?!"'	
+						
+						act 'End the game': gt 'bbgameout', 'end_game'
+					else
+						grupvalue[2] -= 1
+						pcs_mood -= 20
 						gs 'sweat', 'add', 20
-						gs 'willpower', 'pay', 'self'
-						gs 'stat'
-						if rand(0,100) + pcs_bkbll => 100:
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
-							'Feeling confident you even manage tell to your opponent, "Watch this now..." You take a quick sidestep while your opponent stands still as she was not ready at all. You take aim and with a easy motion shoot the ball towards the hoop.'
-							'Everyone stops up and follow the ball as it flies throughout the air and all you can hear is a swish sound as the ball goes through the hoop.'
-							'Your teammates start running towards you, all happy, jumping like crazy while the two other team is arguing with the girl that was defending you, "How could you let her take that shot?! Why are you so weak?!"'	
-							
-							act 'End the game': gt 'bbgameout', 'end_game'
-						else
-							grupvalue[2] -= 1
-							pcs_mood -= 20
-							gs 'sweat', 'add', 20
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
-							'You feel pretty confident and even smirk a little as you take a quick step back and attempt a shot from long distance. But as you jump you feel your opponent come just close enough to distract you.'
-							'You let a shot off but it feels off and you''re right the ball bounces off the hoop and the backboard before one of the girls grabs the rebound, passes it out to her teammate that takes a shot and decides the game.'
-							'You stand there in disbelief about how you could miss that while your teammates try to cheer you up...'
-							
-							act 'End the game': gt 'bbgameout', 'end_game'	
-						end
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
+						'You feel pretty confident and even smirk a little as you take a quick step back and attempt a shot from long distance. But as you jump you feel your opponent come just close enough to distract you.'
+						'You let a shot off but it feels off and you''re right the ball bounces off the hoop and the backboard before one of the girls grabs the rebound, passes it out to her teammate that takes a shot and decides the game.'
+						'You stand there in disbelief about how you could miss that while your teammates try to cheer you up...'
+						
+						act 'End the game': gt 'bbgameout', 'end_game'	
 					end
 				end
 			else
 				act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Get rid of the ball':
+				*clr & cla
 				grupvalue[2] -= 2
 				pcs_mood -= 30
 				gs 'sweat', 'add', 20
@@ -1176,6 +1213,7 @@ if $ARGS[0] = 'marcusno':
 	end
 	
 	act 'Play normally':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 		'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 		'The other two teammates start commenting, "Shouldn''t we."'
@@ -1197,6 +1235,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1228,6 +1267,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1259,6 +1299,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1285,6 +1326,7 @@ if $ARGS[0] = 'marcusno':
 				act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Get rid of the ball':
+				*clr & cla
 				grupvalue[2] -= 2
 				pcs_mood -= 30
 				gs 'sweat', 'add', 20
@@ -1334,6 +1376,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1365,6 +1408,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1395,6 +1439,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1421,6 +1466,7 @@ if $ARGS[0] = 'boys':
 				act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Get rid of the ball':
+				*clr & cla
 				grupvalue[2] -= 2
 				pcs_mood -= 40
 				gs 'sweat', 'add', 40
@@ -1433,7 +1479,9 @@ if $ARGS[0] = 'boys':
 			end
 		end
 	end
+	
 	act 'Hold back':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 		'"We''ll go about this in a different way..." you say under your breath.'
 		'Turning around to your teammates you say, "We can''t match them in strength but what we can do is to play smarter than them."'
@@ -1455,6 +1503,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1486,6 +1535,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1517,6 +1567,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1543,6 +1594,7 @@ if $ARGS[0] = 'boys':
 				act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Get rid of the ball':
+				*clr & cla
 				grupvalue[2] -= 2
 				pcs_mood -= 20
 				gs 'sweat', 'add', 20
@@ -1557,6 +1609,7 @@ if $ARGS[0] = 'boys':
 	end
 	
 	act 'Play normally':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
 		'Hearing them comment on your team you nonchalantly shrug your shoulders, "No big thing let them think they''re better than us."'
 		'The other two teammates start commenting, "Shouldn''t we."'
@@ -1579,6 +1632,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1610,6 +1664,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1641,6 +1696,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
+					bkbll_exp += rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1665,6 +1721,7 @@ if $ARGS[0] = 'boys':
 				act 'Shoot (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Get rid of the ball':
+				*clr & cla
 				grupvalue[2] -= 2
 				pcs_mood -= 30
 				gs 'sweat', 'add', 30
@@ -1678,7 +1735,7 @@ if $ARGS[0] = 'boys':
 	end
 end
 
-if $ARGS[0] = 'end_game'
+if $ARGS[0] = 'end_game':
 	*clr & cla
 	minut += 20
 	gs 'stat'
@@ -1686,3 +1743,6 @@ if $ARGS[0] = 'end_game'
 	'Once the game is over, you are all tired and sweaty, but everyone had a great time. You all go over to the bleachers and find a seat to rest. You talk and joke with one another about the game, the winners bragging on their win, while the losers promise revenge next time.Once rested everyone starts to get up and drift away to go do other things, saying their goodbyes.'
 	act 'Leave': gt 'gschool_grounds', 'main'
 end
+
+--- bbgameout ---------------------------------
+

+ 16 - 22
locations/fbgameout.qsrc

@@ -1,12 +1,11 @@
+# fbgameout
 
-
-if $ARGS[0] = 'football_pickupgame':
+if $ARGS[0] = 'start':
 	*clr & cla
 	fbpickupDay = daystart
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/start.jpg"></center>'
-!!could use a better image here
 	if grupTipe ! 2:
 		'Walking next to the school yard you''ve noticed that most of the ''jocks'' have gathered here. They look like are going to play some football, a few of them acknowledge you but none of them wave you over.'
 		act 'Sit and watch them':
@@ -14,7 +13,6 @@ if $ARGS[0] = 'football_pickupgame':
 			minut += 30
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/watching.jpg"></center>'
-!!could use a new image if you can find one just so it is different than the BB one
 			'You take a seat on the ground near the field and watch the jocks play football. Most of them are pretty competitive really pushing it to try and win. Occasionally there is some arguments about a foul, but for the most part they get along and have fun. You have to admit it looks pretty fun, maybe you could ask to join them one day.'
 			act 'Leave': gt 'gschool_grounds', 'main' 
 		end
@@ -24,7 +22,6 @@ if $ARGS[0] = 'football_pickupgame':
 			grupvalue[2] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/asking.jpg"></center>'
-!!could use a better image here
 			'You walk over to them. "Hey guys, what are you doing?"'
 			'Several of them turn towards you, Lazar replies: "About to divide up into teams and play, you can watch if you want."'
 			'"Well could I join you instead?" You ask.'
@@ -35,7 +32,6 @@ if $ARGS[0] = 'football_pickupgame':
 				grupvalue[2] += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/watching.jpg"></center>'
-!!could use a new image if you can find one just so it is different than the BB one
 				'You take a seat on the ground near the field and watch the jocks play football. Most of them are pretty competitive really pushing it to try and win. Occasionally there is some arguments about a foul, but for the most part they get along and have fun. You have to admit it looks pretty fun, maybe you could ask to join them again one day.'
 				act 'Leave': gt 'gschool_grounds', 'main' 
 			end
@@ -53,12 +49,10 @@ if $ARGS[0] = 'football_pickupgame':
 	end
 end
 
-if $ARGS[0] = 'football'
-	gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 0, 0
-	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
-!!does this need random boy/girls?
+if $ARGS[0] = 'football':
 	*clr & cla
 	minut += 5
+	ftbll_exp += rand(0,2)
 	grupvalue[2] += 1
 	gs 'stat'
 	*clr & cla
@@ -105,6 +99,7 @@ if $ARGS[0] = 'football'
 				act 'Tackle':
 					*clr & cla
 					minut += 5
+					ftbll_exp += rand(0,2)
 					stren_exp += 1
 					grupvalue[2] -= 1
 					npc_rel['A18'] -= 1
@@ -137,13 +132,12 @@ if $ARGS[0] = 'football'
 							'The pass is really hard but somehow you manage to get control of the ball and suddenly all that is between you and the goal is Christina rushing towards you...'
 							'Seeing Svyatoslav make a dash towards the goal you can pass. You can also dribble past Christina and be the hero or try to shoot and hope for the best. You need to quickly decide as Christina is closing in...'
 							
-							!add an invisible countdown that ticks down if possible, say 5 seconds where the player needs to make a decision, otherwise automatic fail
-							!! Sicaa: I think this is better done as a willpower check because from experience with these sort of ''quick time events'' QSP doesnt function well with timers.
-							!! Not to mention you''d have to factor in the speed at players read the text which is certainly more than 5 seconds and I''d assume highly variable
 							gs 'willpower', 'skill', 'self', 'ftbll_lvl'
 							if will_cost <= pcs_willpwr:
 								act 'React (<<will_cost>> Willpower)':
 									*clr & cla
+									gs 'willpower', 'pay', 'self'
+									ftbll_exp += rand(0,2)
 									gs 'stat'
 									'You feel pressured to act. You must decide otherwise the attack will go to waste...'
 									
@@ -202,8 +196,6 @@ if $ARGS[0] = 'football'
 											'You shine up, "Thank you! It wouldn''t have been possible without you..." you praise Lazar back. The two of you and the rest of the team chat for a while before you pick up your stuff and leave.'
 											
 											act 'End the game': gt 'fbgameout', 'end_game'
-										end
-										
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
@@ -262,7 +254,7 @@ if $ARGS[0] = 'football'
 							end
 							
 							act 'Hesitate':
-								!If the player doesn't react in time
+								*clr & cla
 								npc_rel['A8'] -= 1
 								npc_rel['A149'] -= 1
 								npc_rel['A165'] -= 1
@@ -293,7 +285,7 @@ if $ARGS[0] = 'football'
 					'Running as fast as you can, you start catching up to her. You can almost reach out to her but you''re still unsure on how to stop her...'
 					'All of sudden you hear someone yell from behind, "Stop her! She''s winding up a shot!"'
 				
-					if rand(1,2) = 1
+					if rand(0,1) = 1:
 						'You finally decide about what to do, you use the last of your strength to run up to her and give her a slight bump on the shoulder just as she''s about to take a shot.'
 						'Lina manages to take a shot and to your luck it manages to go way off, the little bump you gave her was just what was needed.'
 						'You hear Lina yell out in frustration as your teammates are encouraging you for a job well done.'
@@ -324,12 +316,12 @@ if $ARGS[0] = 'football'
 							'The pass is really hard but somehow you manage to get control of the ball and suddenly all that is between you and the goal is Christina rushing towards you...'
 							'Seeing Svyatoslav make a dash towards the goal you can pass. You can also dribble past Christina and be the hero or try to shoot and hope for the best. You need to quickly decide as Christina is closing in...'
 							
-							!add an invisible countdown that ticks down if possible, say 5 seconds where the player needs to make a decision, otherwise automatic fail
-							!! Sicaa: Same as before.
 							gs 'willpower', 'skill', 'self', 'ftbll_lvl'
 							if will_cost <= pcs_willpwr:
 								act 'React (<<will_cost>> Willpower)':
 									*clr & cla
+									gs 'willpower', 'pay', 'self'
+									ftbll_exp += rand(0,2)
 									gs 'stat'
 									'You feel pressured to act. You must decide otherwise the attack will go to waste...'
 									
@@ -446,7 +438,7 @@ if $ARGS[0] = 'football'
 							end
 							
 							act 'Hesitate':
-								!If the player doesn't react in time
+								*clr & cla
 								npc_rel['A8'] -= 1
 								npc_rel['A149'] -= 1
 								npc_rel['A165'] -= 1
@@ -471,12 +463,14 @@ if $ARGS[0] = 'football'
 	end
 end
 
-if $ARGS[0] = 'end_game'
+if $ARGS[0] = 'end_game':
 	*clr & cla
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/aftergame.jpg"></center>'
-!!could use a better image here
 	'Once the game is over, you are all tired and sweaty, but everyone had a great time. You all go over to the bleachers and find a seat to rest. You talk and joke with one another about the game, the winners bragging on their win, while the losers promise revenge next time.Once rested everyone starts to get up and drift away to go do other things, saying their goodbyes.'
 	act 'Leave': gt 'gschool_grounds', 'main'
 end
+
+--- fbgameout ---------------------------------
+

+ 2 - 2
locations/gdk.qsrc

@@ -48,12 +48,12 @@ else
 	'The Community Centre has sports facilities and offers classes in the evening.'
 	'It houses a small library. Open from 8h until 18h.'
 	'Upstairs, there are some hobby clubs available from 12h until 20h.'
-	'The sports section is open from 14h until 20h during the week and 10h until 20h during the weekend.'
+	'The sports section is open from 14h until 20h during the week and 9h until 20h during the weekend.'
 	'On Friday and Saturday evenings, from 20h to midnight, the main hall is used as a local club, with popular music and dancing. Entrance 25 <b>₽</b>.'
 end
 
 
-if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 10 and hour < 20):act 'Go to the sports section':gt 'gdksport', 'start'
+if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20):act 'Go to the sports section':gt 'gdksport', 'start'
 
 if hour >= 8 and hour < 18:act 'Go to the library':gt 'gdkbibl'
 

+ 5 - 4
locations/gdksport.qsrc

@@ -18,10 +18,6 @@ if $ARGS[0] = 'start':
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec: gt ''gdksport'',''dance1''">Dance</a> and <a href="exec: gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
 	*nl
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-	
-	if temper < 15 and sunWeather ! 1 and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 => daystart and fbpickupDay ! daystart:
-		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgamein''">basketball court</a>.'
-	end
 
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
@@ -34,6 +30,11 @@ if $ARGS[0] = 'start':
 	if week <= 5 and hour >= 16 and hour < 18 and fedorKozlovQW >= 20:
 		'You can see <a href="exec: gt ''FedorMisc'', ''Fedor Workout''">Fedor</a> on his phone next to some punching bags.'
 	end
+	
+	if (temper < 15 or sunWeather ! 1) and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 <= daystart and fbpickupDay ! daystart:
+		*nl
+		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgamein'', ''start''">basketball court</a>.'
+	end
 
 	*nl
 	if $clothingworntype ! 'exercise': 'You are not dressed in sports clothes.'

+ 9 - 7
locations/gschool_grounds.qsrc

@@ -325,13 +325,6 @@ if $ARGS[0] = 'sports':
 
 	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice <a href="exec: gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a> doing sprints by the football field.'
 
-	! Giving football preference, since there''s no indoor option for it.
-	if temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and fbpickupDay + 14 => daystart and bbpickupDay ! daystart:
-		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''fbgameout''">football field</a>.'
-	elseif temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 => daystart and fbpickupDay ! daystart:
-		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgameout''">basketball court</a>.'
-	end
-
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
 	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
@@ -381,6 +374,15 @@ if $ARGS[0] = 'sports':
 	end
 
 	gs 'family'
+	
+	! Giving football preference, since there''s no indoor option for it.
+	if temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and fbpickupDay + 14 <= daystart and bbpickupDay ! daystart:
+		*nl
+		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''fbgameout'', ''start''">football field</a>.'
+	elseif temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 <= daystart and fbpickupDay ! daystart:
+		*nl
+		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgameout'', ''start''">basketball court</a>.'
+	end
 end
 
 !!School building