Browse Source

[fixed] Various bugfixes

CroWke 4 years ago
parent
commit
077864dc19
4 changed files with 47 additions and 43 deletions
  1. 8 4
      locations/artemEv.qsrc
  2. 2 2
      locations/artemdate.qsrc
  3. 35 36
      locations/artemhome.qsrc
  4. 2 1
      locations/natkolEv.qsrc

+ 8 - 4
locations/artemEv.qsrc

@@ -774,12 +774,12 @@ if $ARGS[0] = 'cum_surprise':
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tense up and you realize that he is cumming too late. You can feel his cum shooting into you. As you lift yourself up, you can feel his cum oozing out of your pussy.'
 		'Then it hits him and he suddenly looks alarmed as he realizes he just came inside of you. "Oh my god, I am so sorry <<$pcs_nickname>>, I didn''t mean to do that."'
 		'You smile to him as you get off him. "It''s ok, don''t worry about it." He looks relieved obviously thinking your are on birth control.'
-		gt 'artemEv', 'after_sex', 'cp'
+		act 'Continue': gt 'artemEv', 'after_sex', 'cp'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tenses up, before he warns you: "<<$pcs_nickname>>... I''m going to cum..."'
 		'You quickly climb off him and he rolls up to his knees. You start jerking his cock, with it pointed right at your face. Just as a stream of his sperm hits you in the face, you keep jerking him off. Causing several more streams of cum to land on your face, once the last of his cum has been drained you stop jerking him off and open your eyes.'
-		gt 'artemEv', 'after_sex', 'facial'
+		act 'Continue': gt 'artemEv', 'after_sex', 'facial'
 	end
 end
 
@@ -795,9 +795,11 @@ if $ARGS[0] = 'after_sex':
 	elseif $ARGS[1] = 'facial':
 		gs 'cum_call', 'face', 'A2'
 	end
-	gs 'arousal', 'vaginal',2
+	gs 'arousal', 'vaginal', 2
 	gs 'arousal', 'end'
 	minut += 10
+	cumspclnt = 11
+	gs 'cum_cleanup'
 	gs 'stat'
 	act 'Leave': gt 'pod_ezd', 'etaj_1'
 end
@@ -871,6 +873,8 @@ if $ARGS[0] = 'anal':
 			gs 'cum_call', 'face', 'A2'
 			gs 'arousal', 'end'
 			minut += 10
+			cumspclnt = 11
+			gs 'cum_cleanup'
 			gs 'stat'
 			act 'Leave': gt 'pod_ezd', 'etaj_1'
 		end
@@ -879,7 +883,7 @@ end
 
 if $ARGS[0] = 'slut_bj':
 	*clr & cla
-	artembj + 1
+	artembj += 1
 	npc_rel['A2'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj3.jpg"></center>'
 	'You slide off the bed onto your knees in front of him, he stiff erect cock is right in front of your face. You grab hold of it with your hand and start stroking his dick while you kiss the head of it. As you stroke his cock with on hand you start licking the head of his dick, you can taste his precum as you. He moans softly as you play with his dick.'

+ 2 - 2
locations/artemdate.qsrc

@@ -474,7 +474,7 @@ if $ARGS[0] = 'fight_gang':
 		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others ways, then taking your shots in their confusion. It took awhile and they got in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. First one, then another just turn and run off and that is all it took. Soon, the rest turned tail and ran off as well. Leaving you huffing and puffing, still naked. You check on Artem who is barely conscious and moaning, then you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "I can''t believe you won."'
 		'You laugh and say. "I can''t either, but I couldn''t let them hurt you like that."'
 		'He shakes his head and seems to have mixed feelings on the subject. "Thanks, anyways I could use some rest, so see you later ok." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
-		minut += f
+		minut += 5
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_1'
 	else
@@ -488,7 +488,7 @@ end
 
 if $ARGS[0] = 'gang_rape':
 	*clr & cla
-	minut + 5
+	minut += 5
 	gs 'fame', 'pav', 'sex', 10
 	rape += 1
 	gang += 1

+ 35 - 36
locations/artemhome.qsrc

@@ -326,7 +326,7 @@ if $ARGS[0] = 'artemroom':
 						*clr & cla
 						npc_rel['A2'] += 3
 						if artkissing ! daystart:
-							artfall + 1
+							artfall += 1
 							artkissing = daystart
 						end
 						gs 'willpower', 'pay', 'self'
@@ -606,7 +606,6 @@ if $ARGS[0] = 'livingroom':
 	elseif hour > 22:
 		gt 'artemhome', 'timecheck'
 	else
-		act 'Leave the room': gt 'artemhome', 'hallway'
 		if ArtemLoc = 5 and ArtemParentsLoc = 5 and artemmeetdad = 0 and hour < 22:
 			metArtemDad = 1
 			menu_off = 1
@@ -663,7 +662,7 @@ if $ARGS[0] = 'livingroom':
 				act 'Talk to Masharin':
 					*clr & cla
 					menu_off = 1
-					minut +10
+					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					if pav_slut >= 100 or grupTipe = 4:
@@ -731,7 +730,7 @@ if $ARGS[0] = 'livingroom':
 				act 'Sneak out':
 					*clr & cla
 					menu_off = 1
-					minut +1
+					minut += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
 					'You turn and carefully tread out of the living room while they are busy watching the tv, you quietly make it to the doorway to the hallway, with a final glance back you see them still sitting there watching tv, obviously not having noticed you coming in at all.'
@@ -740,7 +739,7 @@ if $ARGS[0] = 'livingroom':
 				act 'Talk to them':
 					*clr & cla
 					menu_off = 1
-					minut +10
+					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
 					if pav_slut >= 100 or grupTipe = 4:
@@ -750,7 +749,7 @@ if $ARGS[0] = 'livingroom':
 						'"Is there something we can help you with <<$pcs_firstname>>?" Glinina asks you.'
 						act 'Yes':
 							*clr & cla
-							minut +10
+							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
 							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina, "I just need to see the first part of that scandalous show they''re showing right now."'
@@ -775,7 +774,7 @@ if $ARGS[0] = 'livingroom':
 						'Glinina slowly turns around, "You''re not a bother at all, we were just watching the news on TV, it was nothing important. You can join us if you want."'
 						act 'Yes':
 							*clr & cla
-							minut +10
+							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You face shines up as you quickly walk over and take a seat, "Thank you for inviting me."'
@@ -1292,8 +1291,18 @@ if $ARGS[0] = 'chat':
 		end
 	elseif artdate = 0 and artfall >= 10 and pav_slut < 75:
 		*clr & cla
-		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you, and suggests: "<<$pcs_nickname>>, do you want to go for a walk in the park?"'
+		act 'Stay here': 
+			*clr & cla
+			artfall -= 4
+			npc_rel['A2'] -= 3
+			gs 'stat'
+			'You shake your head. "No thanks, but thank you for asking."'
+			'He looks a little disappointed. "Oh, ok."'
+			act 'Keep talking': gt 'artemhome', 'chat'
+			act 'Stop talking': gt 'artemhome', 'artemroom'
+		end
 		act 'Agree to go for a walk':
 			*clr & cla
 			npc_rel['A2'] += 5
@@ -1303,20 +1312,19 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
 			act 'Walk in the park': gt 'artemdate','firstdate'
 		end
+	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
+		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
 		act 'Stay here': 
 			*clr & cla
-			artfall -= 4
-			npc_rel['A2'] -= 3
+			npc_rel['A2'] -= 2
 			gs 'stat'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'He looks a little disappointed. "Oh, ok."'
 			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
-	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
-		*clr & cla
-		gs 'stat'
-		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
 		act 'Agree to go on a date':
 			*clr & cla
 			npc_rel['A2'] += 5
@@ -1326,15 +1334,6 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him.'
 			act 'Go on a date': gt 'artemdate','artem_date'
 		end
-		act 'Stay here': 
-			*clr & cla
-			npc_rel['A2'] -= 2
-			gs 'stat'
-			'You shake your head. "No thanks, but thank you for asking."'
-			'He looks a little disappointed. "Oh, ok."'
-			act 'Keep talking': gt 'artemhome', 'chat'
-			act 'Stop talking': gt 'artemhome', 'artemroom'
-		end
 	elseif artdate = 4 and pav_slut < 100:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
@@ -1404,11 +1403,11 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			artdate -= 1
 			npc_rel['A2'] -= 5
+			minut += 5
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/flowerstrash.jpg"></center>'
 			'You look at Artem compassionately, but don''t take the flowers: "Thank you... they''re very nice, but we''re just friends... I don''t want to give you the wrong idea by accepting them, you know?"'
 			'Artem sighs, and disappointedly throws the flowers into the trash.'
-			minut += 5
-			gs 'stat'
 			act 'Leave them in the trash and study':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1420,17 +1419,8 @@ if $ARGS[0] = 'chat':
 		end
 	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100:
 		*clr & cla
-		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Agree to go on a date':
-			*clr & cla
-			npc_rel['A2'] += 5
-			artdate += 1
-			gs 'stat'
-			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
-			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
-		end
 		act 'Stay here': 
 			*clr & cla
 			npc_rel['A2'] -= 2
@@ -1440,6 +1430,15 @@ if $ARGS[0] = 'chat':
 			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
+		act 'Agree to go on a date':
+			*clr & cla
+			npc_rel['A2'] += 5
+			artdate += 1
+			gs 'stat'
+			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
+			'You quickly pack up your things and leave the apartment with him.'
+			act 'Go on a date': gt 'artemdate','artem_date'
+		end
 	elseif artdate = 9:
 		*clr & cla
 		artdate += 1
@@ -1645,8 +1644,8 @@ if $ARGS[0] = 'askedstrip':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 					'You shake your head. "I''m sorry Artem I am just not comfortable doing that."'
 					'He frowns deeply but nods his head. "Yeah ok..."'
-					act 'Keep talking': gt 'artemhome', 'chat'
 					act 'Stop talking': gt 'artemhome', 'artemroom'
+					act 'Keep talking': gt 'artemhome', 'chat'
 				end
 			else
 				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 2 - 1
locations/natkolEv.qsrc

@@ -65,7 +65,6 @@ if $ARGS[0] = 'kolkabj':
 			*clr & cla
 			NatDolg -= 500
 			natbj += 1
-			natbro += 1
 !!I added it for 3 but I would suggest just having 2 to cut down on the size of the number of mp4''s
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natbj' + rand(1,3) + '.mp4"></video></center>'
 			'"You''re going to use that mouth of yours to make Kolka feel good; you got it?" You hiss at Natasha, grabbing her jaw, and staring into her eyes.'
@@ -81,6 +80,8 @@ if $ARGS[0] = 'kolkabj':
 		
 		act 'Make them 69':
 			*clr & cla
+			NatDolg -= 500
+			natbj += 1
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natbj4.mp4"></video></center>'
 			'"Kolka, you need to learn how to pleasure a girl, if you want to keep one that is. I want you to eat Natasha''s pussy while she sucks your dick. Now lie back on the bed" He eagerly lays in the bed on his back, pulling his clothes off as he does.'
 			'"You''re going to use that mouth of yours to make Kolka feel good, you understand?" You hiss at Natasha, grabbing her jaw and staring into her eyes. "Don''t worry you''re going to enjoy this too."'