Browse Source

[fixes] sonia not gaining the correct grupTipe and some small other fixes

julzor 5 years ago
parent
commit
b6d3d530f7

+ 3 - 0
locations/clothing.qsrc

@@ -643,6 +643,7 @@ if $ARGS[0] = 'strip':
 	CloStyle = 0
 	CloStyle2 = 0
 	CloBimbo = 0
+	CloOnePiece = 0
 	PShoQuaility = 0
 	PShoCut = 0
 	PShoHeels = 0
@@ -656,6 +657,7 @@ if $ARGS[0] = 'strip':
 	PCloStyle2 = 0
 	PCloBimbo = 0
 	PCloInhibit = 0
+	PCloOnePiece = 0
 	PXCloThinness = 0
 	PXCloTopCut = 0
 	PXCloBottomShortness = 0
@@ -724,6 +726,7 @@ if $ARGS[0] = 'wear':
 	PCloThinness = CloThinness
 	PCloTopCut = CloTopCut
 	PCloBra = CloBra
+	PCloOnePiece = CloOnePiece
 	PCloPants = CloPantsShortness
 	PCloSkirt = CloSkirtShortness
 	PCloPanties = CloPanties

+ 4 - 4
locations/din_van.qsrc

@@ -1058,7 +1058,7 @@ if $ARGS[0] = 'private':
 			minut += 5
 			pregtest -= 1
 			gs 'stat'
-			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and huband = 0 and pcs_pregtalk = 0:
+			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and husband = 0 and pcs_pregtalk = 0:
 				cla
 				knowpreg = 1
 				thinkpreg = 1
@@ -1067,7 +1067,7 @@ if $ARGS[0] = 'private':
 				act 'Horrified':gt 'din_van', 'HorrifiedReact1'
 				act 'Concerned':gt 'din_van', 'ConcernedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
-			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pcs_pregtalk = 0:
+			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and husband = 0 and pcs_pregtalk = 0:
 				cla
 				knowpreg = 1
 				thinkpreg = 1
@@ -1075,11 +1075,11 @@ if $ARGS[0] = 'private':
 				'The test shows two strips. You are pregnant. As you look at the test in your hand, you are?'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
 				act 'Aroused':gt 'din_van', 'ArousedReact1'
-			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid = 0 and pcs_pregtalk = 0:
+			elseif pregchem > 120 and knowpreg = 0 and husband = 1 and kid = 0 and pcs_pregtalk = 0:
 				knowpreg = 1
 				thinkpreg = 1
 				gt 'din_van', 'WifeReact1'
-			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid > 0 and pcs_pregtalk = 0:
+			elseif pregchem > 120 and knowpreg = 0 and husband = 1 and kid > 0 and pcs_pregtalk = 0:
 				knowpreg = 1
 				thinkpreg = 1
 				gt 'din_van', 'WifeReact2'

+ 2 - 2
locations/gdksex.qsrc

@@ -1656,7 +1656,7 @@ if $ARGS[0] = 'dance1':
 			danc_exp += 1
 			soniaPS = 1
 			soniaPSdays = daystart
-			grupTipe[25] = 5
+			npc_grupTipe['A25'] = 5
 			$npc_notes['A25'] = 'Ever since Sonia inadvertedly got way too drunk and gave five guys including Vitek and his friends a simultaneous blowjob near the disco, her reputation in Pavlovsk has been in shambles. The girls in her class all give her the silent treatment, pretending she does not exist. Meanwhile the guys all treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no.'
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/7.jpg"></center>'
@@ -1721,7 +1721,7 @@ if $ARGS[0] = 'dance2':
 					*clr & cla
 					soniaPS = 1
 					soniaPSdays = daystart
-					grupTipe[25] = 5
+					npc_grupTipe['A25'] = 5
 					$npc_notes['A25'] = 'Ever since Sonia inadvertedly got way too drunk and gave five guys including Vitek and his buddies a simultaneous blowjob near the disco, her reputation has been in shambles. The girls in her class all give her the silent treatment, pretending she does not exist. Meanwhile the guys all treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no.'
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/7.jpg"></center>'

+ 14 - 8
locations/gschool_detention.qsrc

@@ -274,7 +274,8 @@ if $ARGS[0] = 'upskirt1':
 	minut += 60
 	:newupskirtgirl1
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' or $rand_girl = 'Anushka': jump'newupskirtgirl1'
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' or $rand_girl = 'Anushka' and jump_counter < 1000: jump_counter += 1 & jump'newupskirtgirl1'
+	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you, after a few minutes she leans back in her chair and relaxes. Spreading her legs slightly as she does, the movement draws your eyes and you are given an eye full. Apparently she forgot her panties today because her pussy is now on full display for any to see, well any from the right vantage point, like yourself.'
@@ -304,7 +305,8 @@ if $ARGS[0] = 'upskirt2':
 	minut += 60
 	:newupskirtgirl2
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Anushka': jump'newupskirtgirl2'
+	if $rand_girl = 'Veronika' or $rand_girl = 'Anushka' and jump_counter < 1000: jump_counter += 1 & jump'newupskirtgirl2'
+	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/upskirt.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> climbing up the small ladder uses to get to the top shelves of the books. As you watch her climb you quickly realize she is not wearing any panties and is giving everyone watching a clear view of her pussy. Before you can say anything someone whistles, which causes the teacher to start demanding who did it. During the distraction she quickly climbs back down and returns to her seat, blushing slightly but also smiling.'
@@ -319,7 +321,8 @@ if $ARGS[0] = 'flashing girl':
 	minut += 60
 	:newflashinggirl
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina': jump'newflashinggirl'
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' and jump_counter < 1000: jump_counter += 1 & jump 'newflashinggirl'
+	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/detflash1.mp4"></video></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting in a spot that blocks almost everyones view of her, but yours. She has her phone held in front of her, obviously having a video conversation with someone, then you see her lift her shirt and flash who ever it is on the phone. She laughs a bit apparently at their reaction, the teacher clears his throat at her outburst. She quickly ends the call and spends the rest of the time playing on her phone. After watching her a bit more, you realize she is not going to do anything more so you play on your phone as well, at least there was a little excitement today.'
@@ -334,7 +337,8 @@ if $ARGS[0] = 'teasing girl':
 	minut += 60
 	:newteasinggirl
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina': jump'newteasinggirl'
+	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' and jump_counter < 1000: jump_counter += 1 & jump'newteasinggirl'
+	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/tease.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> has snuck off into the book stacks, she is watching some boys watch her, she pulls down her pants and starts to pull down her panties but she stops just before she shows anything, grins as she pulls her clothes back up. After doing this a few times, each time the boys look hopefully this might be the time, but it never is. Finally she gets bored teasing them and wanders off. After that you start playing on your phone again, at least there was a little excitement today.'
@@ -350,11 +354,12 @@ if $ARGS[0] = 'handjob':
 	:boy_jump
 	if rand(0,1) = 0:
 		gs 'gschool_events', 'rand_boy_arg', 0, 0, 0, 1, 0, 0
-		if $rand_boy = 'Niko': jump 'boy_jump'
+		if $rand_boy = 'Niko' and jump_counter < 1000: jump_counter += 1 & jump 'boy_jump'
 	else
 		gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 0, 0, 0
-		if  $rand_boy ! 'Dimka' and $rand_boy ! 'Andrey' and $rand_boy ! 'Ivan' and $rand_boy ! 'Lazar' and $rand_boy ! 'Svyatoslav': jump 'boy_jump'
+		if  $rand_boy ! 'Dimka' and $rand_boy ! 'Andrey' and $rand_boy ! 'Ivan' and $rand_boy ! 'Lazar' and $rand_boy ! 'Svyatoslav' and jump_counter < 1000: jump_counter += 1 & jump 'boy_jump'
 	end
+	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/handjob.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice a girl, you have seen her around but she is from another grade and you can''t recall her name. She is sitting next to <<$rand_boy>> she has his shorts pulled down in front and is jerking him off under the desk. Both of them do a fairly good job of acting like nothing is going on, but from your seat, you have a perfect view of the action.'
@@ -403,8 +408,9 @@ if $ARGS[0] = 'Help Friends in need':
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
 	:detention_grupmatch
 	i = rand(0,47)
- 	if grupTipe[r] ! grupTipe[i]:jump 'detention_grupmatch'
- 	if npcPol[i] = 1:
+ 	if grupTipe[r] ! grupTipe[i] and jump_counter_1 < 1000: jump_counter_1 += 1 & jump 'detention_grupmatch'
+ 	if npcPol[i] = 1 and jump_counter_2:
+		jump_counter_2 += 1
  		jump 'detention_grupmatch'
  	else
  		$rand_boy = dyneval('$result = $npc_usedname[$school_static_num[<<i>>]]')

+ 1 - 1
locations/narkopriton.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
 		act 'Ask for weed': gt 'narkopriton', 'joints'
 		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
-	elseif (StrongNarkota > 23 and ampHigh > 23) or ampHigh > 23 or StrongNarkota > 23:
+	elseif (StrongNarkota > 23 and amphHigh > 23) or amphHigh > 23 or StrongNarkota > 23:
 		gt 'narkopriton', 'kiteHigh'
 	end
 end

+ 1 - 1
locations/outdoors.qsrc

@@ -371,7 +371,7 @@ if $ARGS[0] = 'main':
 
 !!Exhibitionism
 
-			if CloInhibit >= pcs_inhib - 10:
+			if PCloInhibit >= pcs_inhib - 10:
 				exhibition_outdoors += 1
 				if pcs_inhib < 45 and PCloPanties = 1: exhibition_outdoors += 1
 			end

+ 2 - 0
locations/saveupdater.qsrc

@@ -561,5 +561,7 @@ end
 
 if NatBelLernQW > 0 and NatashaQW = 0: NatashaQW = NatBelLernQW & NatBelLernQW = 0
 
+if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
+
 --- saveupdater ---------------------------------
 

+ 2 - 2
locations/street_event.qsrc

@@ -981,7 +981,7 @@ if $ARGS[1] = 'main':
 			if hour >= 9:
 				menu_off = 1
 		!!first one is dress with panties
-				if PCloSkirt > 0 and $pantyworntype ! 'none' and CloOnePiece = 1:
+				if PCloSkirt > 0 and $pantyworntype ! 'none' and PCloOnePiece = 1:
 			!!all the getting partially stripped ones from 09:00 till 24:00
 					*clr & cla
 					minut += 5
@@ -1002,7 +1002,7 @@ if $ARGS[1] = 'main':
 					gs 'stat'
 					act 'Continue':gt $loc
 			!!dress without panties
-				elseif PCloSkirt > 0 and $pantyworntype = 'none' and CloOnePiece = 1:
+				elseif PCloSkirt > 0 and $pantyworntype = 'none' and PCloOnePiece = 1:
 					*clr & cla
 					minut += 5
 					'<<$streetev_title>>'

+ 1 - 1
locations/tanapartment.qsrc

@@ -214,7 +214,7 @@ elseif tanpred < 2:
 			!!work = 1
 			'Her offer sounds too good to be true: Living with her, here, in this huge luxury apartment, right in the city center? And big paycheck every month for basically doing nothing? You know your answer immediately: "Okay."'
 			'"Okay?", she asks, making sure she didn''t misunderstand.'
-			if work = 1 or cheatWork = 0:
+			if work = 1 and cheatWork = 0:
 				'"Yes, I''ll take your offer... but I have to go and quit my current job first."'
 			else
 				'"Yes, I''ll take your offer. If your stepfather wants to hire m-" You are cut off by Tanya''s fierce hug and kiss.'