Browse Source

[fixed] missing *clr & cla in grigory and similar small stuff

julzor 4 years ago
parent
commit
c291ebd483
3 changed files with 17 additions and 19 deletions
  1. 5 1
      locations/gadbana.qsrc
  2. 9 15
      locations/grigory.qsrc
  3. 3 3
      locations/mother.qsrc

+ 5 - 1
locations/gadbana.qsrc

@@ -100,7 +100,11 @@ if mira = 0:
 
 					if frost > 0:frost = 0
 
-					pcs_skin += 5
+					if sauna_daystart ! daystart:
+						sauna_daystart = daystart
+						pcs_skin += rand(2,4)
+						pcs_willpwr += 3
+					end
 
 					gs 'stat'
 

+ 9 - 15
locations/grigory.qsrc

@@ -12,6 +12,7 @@ if $ARGS[0] = 'dummy':
 end
 
 if $ARGS[0] = 'meet':
+	*clr & cla
 	minut += 2
 	npc_qw['A221'] = 1
 	gs 'stat'
@@ -23,8 +24,7 @@ if $ARGS[0] = 'meet':
 	'He''s perhaps in his late thirties, early forties at most. His angular face is framed by his unruly brown hair, and as he draws closer you start to become aware of just how massive this man is.'
 	'"Kiska?" He calls when he gets close, the pet name surprising you.'
 	act '"Grigory?"':
-		*clr
-		cla
+		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
@@ -36,8 +36,7 @@ if $ARGS[0] = 'meet':
 		'Reaching for his back pocket, he pulls a flask. Tipping the flask back, he takes a long pull from it before screwing the cap back in place and returning it to his back pocket.'
 		'"I had a little money saved up, barely enough to make a downpayment on the farm up the road," Ha half smiles, "I''ll be paying on it the rest of my life, but its mine."'
 		act '"That''s great!"':
-			*clr
-			cla
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
@@ -56,8 +55,7 @@ if $ARGS[0] = 'meet':
 			'Finally, the two of you drift into a comfortable silence. Eventually he sighs, "I really need to get back to work my little Kiska," He gives a wistful smile, his eyes drifting over your body for a moment before meeting your eyes again, "You really have grown into an exceptional young woman. I hope you return for another visit soon."'
 
 			act 'Say goodbye':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
 				'"I enjoyed getting to talk to you again," You admit, "I''ll be sure to say hi the next time I see you." With a smile, you wave and start to make your exit.'
 				'Grigory smiles broadly, waving goodbye as you leave.'
@@ -68,8 +66,7 @@ if $ARGS[0] = 'meet':
 			gs 'willpower', 'misc', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Hug him goodbye (<<will_cost>> Willpower)':
-					*clr
-					cla
+					*clr & cla
 					minut += 2
 					gs 'willpower', 'misc', 'self', 'easy'
 					gs 'willpower', 'pay', 'self'
@@ -92,10 +89,9 @@ if $ARGS[0] = 'meet':
 end
 
 if $ARGS[0] = 'barn':
-	grigory_barn = daystart
-	*clr
-	cla
+	*clr & cla
 	minut += 2
+	grigory_barn = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 	'When you start to enter the barn behind your grandparents'' place, you can hear someone or something moving about inside.'
@@ -105,8 +101,7 @@ if $ARGS[0] = 'barn':
 	!!Ends scene, returns to barn exterior
 
 	act 'Say hi':
-		*clr
-		cla
+		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
@@ -122,8 +117,7 @@ if $ARGS[0] = 'barn':
 	if will_cost <= pcs_willpwr:
 		act 'Flirt (<<will_cost>> Willpower)':
 			npc_qw['A221'] = 2
-			*clr
-			cla
+			*clr & cla
 			minut += 2
 			gs 'willpower', 'misc', 'self', 'easy'
 			gs 'willpower', 'pay', 'self'

+ 3 - 3
locations/mother.qsrc

@@ -242,12 +242,12 @@ if $ARGS[0] = '':
 			npc_rel['A29']+=20
 			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. You did really well. Please, take these 7000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			SAtestatGift = 7000
-		elseif pcs_grades > 40:
+		elseif pcs_grades >= 40:
 			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. You did really well. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			SAtestatGift = 5000
 		else
-			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. To be honest I wasn''t sure you would manage to get your diploma. But somehow you did it. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
-            SAtestatGift = 5000
+			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. To be honest I wasn''t sure you would manage to get your diploma. But somehow you did it. Please, take these 3000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+            SAtestatGift = 3000
 		end
 		money += SAtestatGift
 		gs 'stat'