11 Commits cc6b735080 ... 13f88fedb9

Author SHA1 Message Date
  KevinSmarts 13f88fedb9 Merge remote-tracking branch 'oldentree/master' 5 years ago
  KevinSmarts 9326acbf44 Merge commit 'a668b19ebf2d3e55b6556ab2cec9d187969958c7' 5 years ago
  KevinSmarts a31c417a64 Merge remote-tracking branch 'spectre1viper/master' 5 years ago
  KevinSmarts 7e55b547b7 [fixed] wrong variable name as spotted by spectre1viper 5 years ago
  KevinSmarts 428103d3e9 Merge remote-tracking branch 'sovietmercader/master' 5 years ago
  KevinSmarts aa65bf171c Merge remote-tracking branch 'spectre1viper/master' 5 years ago
  oldentree f7840c0b73 Merge remote-tracking branch 'upstream/master' 5 years ago
  oldentree a668b19ebf Fixed leave action name when dressed in secluded beach in Pavlovsk 5 years ago
  KevinSmarts 7cc122aeb2 [fixed] Not redressing after pool event completion 5 years ago
  sovietmercader 95cf527b38 [changed] rebalance mira/mitka event triggers in the village center 5 years ago
  oldentree dde3809446 Fixed one of brother's preg checks (missing parens). Spelling fixes. 5 years ago

+ 1 - 1
locations/BurgerTip.qsrc

@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'ivan_work2':
 				spafinloc = 11
 				gs 'cum_manage'
 				facial += 1
-				boy += 1
+				guy += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/ivan/sex/ivanfacial.jpg"></center>'
 				'You kneel with mouth open waiting for what comes next. Ivan gets his dick out, and starts to masturbate in front of your face, coldly staring down at you. He shouts, "I knew you''d be my whore!" as sperm flies out of his cock and splatters against your face. After he is finished coating your face, he puts his dick back in his pants saying, "OK, get out of my office slut, and don''t forget unless you want the boss finding out about those pictures I own your ass."'

+ 7 - 9
locations/brother.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 	if brotherSex >= 10 and npc_rel['A34'] >= 80:
 		'You and your brother are lovers.'
 	elseif brotherSex >= 10 and npc_rel['A34'] >= 60 and npc_rel['A34'] < 80:
-		'You and your brother are good friends with benefits.'	
+		'You and your brother are good friends with benefits.'
 	elseif brotherSex > 5 and npc_rel['A34'] >= 40 and npc_rel['A34'] < 60:
 		'You are siblings with benefits.'
 	elseif npc_rel['A34'] < 20:
@@ -70,9 +70,9 @@ if $ARGS[0] = 'start':
 	elseif npc_rel['A34'] >= 80:
 		'Your brother is practically one of your closest friends.'
 	end
-	
+
 	act 'Move away':gt $loc, $metka
-	
+
 	*nl
 	if hour >= 7 and hour < 23:
 		! WD: Fix old nude variable
@@ -295,8 +295,8 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	
-	if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):		
+
+	if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 		if hour >= 7 and hour < 23:
 			act'Chat with Kolka':gt'brother2','chat'
 			!!act'Banter with Kolka':gt'brother2','banter'
@@ -308,7 +308,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-		
+
 		!if father_go = 1 and hour >= 7:
 		!	act'Play video games with him':gt'video_games','brother'
 		!end
@@ -1548,7 +1548,7 @@ if $ARGS[0] = 'pregreact':
 			end
 			exit
 		end
-	elseif brotherSex < 7 and kid > 0 and ($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem > 3460):
+	elseif brotherSex < 7 and kid > 0 and (($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem > 3460)):
 		'"You''re already pregnant again? This is starting to look like a new hobby," he laughs.'
 		'"You know what? Maybe it is," you joke back. "Some girls play sports; I get serially impregnated."'
 		'"Well, congratulations on taking home the gold in getting knocked up."'
@@ -1792,5 +1792,3 @@ if $ARGS[0] = 'brotherknows8':
 end
 
 --- brother ---------------------------------
-
-

+ 1 - 1
locations/fbDormD.qsrc

@@ -54,7 +54,7 @@ $d_fbd_regular = {
 	act 'Kiss him':
 		*clr & cla
 		menu_off = 1
-		boy += 1
+		guy += 1
 		parkfuckboy += 1
 		fbdormtimes += 1
 		pphj = 0

+ 1 - 1
locations/fbHouse.qsrc

@@ -9,7 +9,7 @@ gs 'stat'
 
 act 'Kiss him':
 	*clr & cla
-	boy += 1
+	guy += 1
 	parkfuckboy += 1
 	fbhousetimes += 1
 	pphj = 0

+ 3 - 1
locations/gLakeNude.qsrc

@@ -257,7 +257,8 @@ if temper >= 15 and month >= 5 and month <= 9:
 			act'Hide in the woods near the beach': gt'gLakeNudeForest'
 		end
 	end
-	act'Leave the secluded beach without changing':
+	$tmp_lakenude_leave = iif($clothingworntype = 'nude', ' without changing', '')
+	act'Leave the secluded beach<<$tmp_lakenude_leave>>':
 		if $clothingworntype ! 'nude' or ($clothingworntype = 'nude' and pcs_inhib >= 60):
 			cla
 			minut += 10
@@ -267,6 +268,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			gt'gLakeNude'
 		end
 	end
+	KILLVAR '$tmp_lakenude_leave'
 else
 	act'Leave the now abandoned beach':
 		cla

File diff suppressed because it is too large
+ 379 - 478
locations/gadukino.qsrc


+ 2 - 2
locations/gdksex.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'outside':
 								minut += 5
 								pcs_horny += 10
 
-								if boynumBlock = 0:boy += 1
+								if boynumBlock = 0:guy += 1
 
 								gs 'boymass', 'B'
 								bmSEX[Tboynum] += 1
@@ -557,7 +557,7 @@ if $ARGS[0] = 'blowjob':
 			minut += 5
 			pcs_horny += 10
 
-			if boynumBlock = 0:boy += 1
+			if boynumBlock = 0:guy += 1
 
 			bmSEX[Tboynum] += 1
 			gs 'boyStat', $bmNane[Tboynum]

+ 2 - 3
locations/gschool_lessonsev2.qsrc

@@ -241,8 +241,8 @@ if $ARGS[0] = 'geography':
 							npc_rel['A9'] += 3
 							npc_rel['A158'] += 3
 							grupvalue[4] += 3
-							'You quickly start wipping the cum off you giving them dirty looks, one of the girls from another grade gives you some tissues to help. You quickly clean yourself and clothes up as best you can. Mrs. Sokoloff notices you and asks "Miss. <<$pcs_lastname>> what are you doing?"'
-							'You glances up at her and then turn to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on my from the ceiling and I was just cleaning it up." Mrs. Sokoloff looks up at the celing as if expecting something to fall from it for a few moments and then goes back to teaching class.'
+							'You quickly start wiping the cum off you giving them dirty looks, one of the girls from another grade gives you some tissues to help. You quickly clean yourself and your clothes up as best you can. Mrs. Sokoloff notices you and asks "Miss. <<$pcs_lastname>> what are you doing?"'
+							'You glances up at her and then turn to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up." Mrs. Sokoloff looks up at the celing as if expecting something to fall from it for a few moments and then goes back to teaching class.'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					end
@@ -1080,4 +1080,3 @@ if $ARGS[0] = 'shop punishment':
 end
 
 --- gschool_lessonsev2 ---------------------------------
-

+ 2 - 2
locations/kafe.qsrc

@@ -445,7 +445,7 @@ if $ARGS[0] = 'workPred':
 								'You undo his pants and hold the warm and hard <<dick>> cm cock, covered with veins and a small drop of crimson on the head.'
 								act 'Masturbate him':
 									*clr & cla
-									boy += 1
+									guy += 1
 									money += 500
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_hj.jpg"></center>'
@@ -457,7 +457,7 @@ if $ARGS[0] = 'workPred':
 								end
 								act 'Suck his dick':
 									*clr & cla
-									boy += 1
+									guy += 1
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_bj.jpg"></center>'
 									gs 'dinsex','dinrandbj'
 									gs 'arousal', 'bj', 5, 'sub', 'prostitution'

+ 1 - 0
locations/klofdomhouse.qsrc

@@ -1241,6 +1241,7 @@ if $ARGS[0] = 'ev65':
 	'Jora comes out of the locker room and says, "Well, you put on a good show here, the boss is delighted!"'
 	'He hands you a business card with an address in the residential area on it. "If you ever need money, go to the sauna, show them this card and tell them we send you."'
 	gs 'arousal', 'end'
+	gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 	gs 'stat'
 	act 'Leave the pool area':gt 'bass', 'start'
 end

+ 1 - 1
locations/skverdin.qsrc

@@ -1,6 +1,6 @@
 # skverdin
 $d_park_placer_bj = {
-	boy += 1
+	guy += 1
 	parkfuckboy += 1
 	parktimes += 1
 	pphj = 0

Some files were not shown because too many files changed in this diff