1
0
Переглянути джерело

Merge remote-tracking branch 'Violet_Kitten/master'

KevinSmarts 4 роки тому
батько
коміт
957d6af79b
2 змінених файлів з 11 додано та 6 видалено
  1. 3 0
      locations/NikoDates.qsrc
  2. 8 6
      locations/NikoWhore.qsrc

+ 3 - 0
locations/NikoDates.qsrc

@@ -1112,6 +1112,7 @@ end
 if $ARGS[0] = 'After School':
 	*clr & cla
 	NikoDate_Day = daystart
+	$location_type = 'public_indoors'
 	minut += 5
 	gs 'boyStat', 'A189'
 	gs'stat'
@@ -1229,6 +1230,7 @@ end
 if $ARGS[0] = 'Disco':
 	*clr & cla
 	NikoDate_Day = daystart
+	$location_type = 'public_indoors'
 	gs 'boyStat', 'A189'
 	minut += 5
 	gs'stat'
@@ -1374,6 +1376,7 @@ end
 if $ARGS[0] = 'After School 2':
 	*clr & cla
 	NikoDate_Day = daystart
+	$location_type = 'public_indoors'
 	gs 'boyStat', 'A189'
 	minut += 5
 	gs'stat'

+ 8 - 6
locations/NikoWhore.qsrc

@@ -720,6 +720,7 @@ if $ARGS[0] = 'Walk Of Shame':
 	*clr & cla
 	if pav_sex < 230:pav_sex = 250
 	gs 'fame'
+	$location_type = 'public_indoors'
 	grupTipe[61] = 4
 	minut += 5
 	gs'stat'
@@ -843,7 +844,7 @@ if $ARGS[0] = 'Walk Of Shame':
 															gs 'arousal', 'end'
 															gs 'stat'
 
-															act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'bulding'
+															act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_grounds', 'bulding'
 														end
 													end	
 												end	
@@ -872,7 +873,7 @@ if $ARGS[0] = 'Walk Of Shame':
 														'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
 														'You lean forward then give Niko a passionate kiss. After the kiss, Niko says, "You are such a incredible girl. I always feel so lucky to have you, now don''t forget to meet me after school. I will be waiting in the courtyard." You nod your head as Niko turns around then walks out of the restroom. You quickly get dressed then follow him out.'
 
-														act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'bulding'
+														act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_grounds', 'bulding'
 													end
 												end	
 
@@ -888,7 +889,7 @@ if $ARGS[0] = 'Walk Of Shame':
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 													'You quickly push Niko away. "Fuck you! You are just lying to me like you always do! I''m not trusting you anymore! Stay away from me!" Niko gets noticeably angry, "You ungrateful bitch! I have done so much for you and spent so much on you. You better fucking apologize!" You nod your head. "Sure, I''ll apologize." You take two steps forward then ram your knee into Niko''s balls then spit on him before grabbing your clothes and walking out of the restroom.'
 
-													act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'bulding'
+													act 'Go to class':gs 'clothing', 'wear_last_worn' & gt 'gschool_grounds', 'bulding'
 												end
 											end
 										end	
@@ -922,6 +923,7 @@ end
 
 if $ARGS[0] = 'Walk Of Shame 2':
 	*clr & cla
+	$location_type = 'public_indoors'
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
@@ -943,7 +945,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'		
 			'You tighten your arms around Niko as he kisses your neck firmly. "Everything will be alright. I will find a way to fix this, just follow my lead and everything will be alright, ok?" You reply, "I will do whatever you say Nikolai, just please stay with me. I need you now more than ever." Niko responds, "Don''t worry <<$pcs_firstname>>, I''m not going anywhere, now let''s get you to class." Niko guides you to your first class.'
 
-			act 'Go to class':minut += 5 & gt 'gschool_lessons', 'bulding'
+			act 'Go to class':minut += 5 & gt 'gschool_grounds', 'bulding'
 		end
 	end	
 
@@ -969,7 +971,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
 				'You lean forward then give Niko a passionate kiss. After the kiss, Niko says, "You are such a incredible girl. I always feel so lucky to have you, now don''t forget to meet me after school. I will be waiting in the courtyard." You nod as Niko turns around then walks away. You quickly get dressed then follow him to the hallway.'
 
-				act 'Go to class':minut += 5 & gt 'gschool_lessons', 'bulding'
+				act 'Go to class':minut += 5 & gt 'gschool_grounds', 'bulding'
 			end
 		end	
 
@@ -984,7 +986,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 			'You quickly push Niko away. "Fuck you! You are just lying to me like you always do! I''m not trusting you anymore! Stay away from me!" Niko gets noticeably angry, "You ungrateful bitch! I have done so much for you and spent, so much on you. You better fucking apologize!" You nod your head. "Sure, I''ll apologize." You take two steps forward then ram your knee into Niko''s balls then spit on him before grabbing your clothes and walking away.'
 
-			act 'Go to class':gt 'gschool_lessons', 'bulding'
+			act 'Go to class':gt 'gschool_grounds', 'bulding'
 		end
 	end
 end