4 Commits 661397ac48 ... 198e6e36c6

Autor SHA1 Mensagem Data
  Awesome 198e6e36c6 [Fixed] game breaking issues 5 dias atrás
  Kevin_Smarts 81063d912f Merge remote-tracking branch 'Anjuna/master' 5 dias atrás
  anjuna krokus 099e32d708 [changed] spaces to tabs 6 dias atrás
  anjuna krokus 02a1aa4406 [added] $npcCondom variable set through `npcStat`. Requested by HornGuy6 6 dias atrás

+ 4 - 4
locations/artem_katja_sex.qsrc

@@ -362,7 +362,7 @@ if $ARGS[0] = 'first_time_pussy':
 						katjaQW['slut'] -= 5
 						'Artem doesn''t say anything and just nods as he slowly moves in behind Katja and very slowly enters her, stopping when he meets the resistance of her hymen.'
 						'It''s clear that he''s not going to pop her cherry by himself. "Are you ready, Katja?" you ask and she just nods. "Do it then, Artem. Push through her hymen."'
-						'He pushes forward in one sharp thrust and Katja lets out a shriek of pain. "I''m sorry!" Artem says in a panic.''
+						'He pushes forward in one sharp thrust and Katja lets out a shriek of pain. "I''m sorry!" Artem says in a panic.'
 						'"Don''t be, I was expecting that. Just stay still for a moment," Katja replies through a forced smile.'
 					elseif 2*npc_vag['A14'] < dick:
 						katjaQW['horny'] -= rand(5,10)
@@ -413,7 +413,7 @@ if $ARGS[0] = 'first_time_pussy':
 						'"Yeah, it''s okay. You can push further."'
 						*nl
 						'He does so and Katja let out a shriek of pain.'
-						"I''m sorry!" he says in a panic.'
+						'"I''m sorry!" he says in a panic.'
 						'"Don''t be. Just stay still for a moment," Katja replies through a forced smile.'
 					else
 						'Artem just nods and slowly moves in behind Katja. "Here it comes, Katja."'
@@ -646,7 +646,7 @@ if $ARGS[0] = 'first_time_pussy':
 	end
 end
 
-if $ARGS[0] = 'artem_katja_sex', 'first_time_next':
+if $ARGS[0] =  'first_time_next':
 	if artemQW['confidence'] < 10:
 		if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 			gt 'artem_katja_sex', 'first_time_katja_titjob'
@@ -702,7 +702,7 @@ if $ARGS[0] = 'first_time_katja_titjob':
 	else
 		'"I wanna give you a titjob Artem," Katja says. "Give his cock a few licks so it''s very slippery, <<$pcs_nickname>>."'
 		'You do that while she spits between her breasts to lube them up. She then moves between Artem''s legs and leans forward to wrap her breasts around his dick. He let out a loud moan as she uses her hands to push her breasts together for a tight grip.'
-		'You move in close to watch as she starts sliding breasts up and down along his shaft.
+		'You move in close to watch as she starts sliding breasts up and down along his shaft.'
 		if katjaQW['titjob'] < 5:
 			'She clearly has some experience since her rhythm is pretty good, but his dick does slip out from between her breasts a few times. Artem, however, seems to be enjoying it a lot.'
 		else

+ 74 - 74
locations/komp_camgirl.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 			gs 'arousal', 'end'
 			gs 'stat'
 			gt 'Komp','browse'
-		end	
+		end
 	end
 end
 
@@ -126,9 +126,9 @@ if $ARGS[0] = 'waitclients':
 	else
 		img_source = 6
 	end
-	
+
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore' + img_source + '.jpg"></center>'
-	
+
 	if camclients = 0:
 		'You take a moment of rest, unfortunately, you currently have no viewers.'
 	else
@@ -183,7 +183,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 
 			mfcclients += rand(-1,1)
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to take off your bra (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 1 and clientask >= 81 and clientask < 91:
 		*clr & cla
@@ -216,7 +216,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			mfcclients -= 1
 			backmfc = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -257,7 +257,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 
 			mfcclients += rand(-1,1)
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-		
+
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse to take off your panties (<<will_cost>> Willpower)':
@@ -280,7 +280,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to take off your panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if topmfc = 0 and clientask >= 95 and clientask < 99:
 		menu_off = 1
@@ -291,7 +291,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 
 			backmfc = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			mfcclients = 0
 
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -345,7 +345,7 @@ if $ARGS[0] = 'waitclients':
 			end
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-		
+
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Ignore him (<<will_cost>> Willpower)':
@@ -365,7 +365,7 @@ if $ARGS[0] = 'waitclients':
 		act 'Show him your vagina':
 			*clr & cla
 			mfcclients = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -400,7 +400,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 0 and pcs_ass >= 30 and webpopular >= 50 and clientask = 80:
 		menu_off = 1
@@ -411,7 +411,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 
 			backmfc = 0
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'waitclients':
 					'Oh no! Your face turns a deep red... you''re so ashamed right now! You try to calm the chat down, but the vulgar comments just keep coming and coming.'
 					'At least the viewer who promised to donate did, so you''re a few tokens richer.'
 
-					gs 'arousal', 'porn', -5 
+					gs 'arousal', 'porn', -5
 					gs 'stat'
 
 				else
@@ -460,7 +460,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 
 	if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
@@ -486,7 +486,7 @@ if $ARGS[0] = 'waitclients':
 		*clr & cla
 		gt 'kompMFCtwo', 86
 	end
-	
+
 	if webpopular >= 50 and pcs_vag + pcs_ass > 0 and alko >= 4 and clientask = 85:
 		menu_off = 1
 		*clr & cla
@@ -540,7 +540,7 @@ if $ARGS[0] = 'waitclients':
 		act 'Dance':
 			menu_off = 1
 			*clr & cla
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'stat'
 			if topmfc = 1 and backmfc = 1:
@@ -562,7 +562,7 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-	end	
+	end
 
 	if topmfc = 1 and backmfc = 1 and clientask < 74:
 		act 'Perform a striptease':
@@ -581,11 +581,11 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp_camgirl','waitclients'
 		end
-	end	
+	end
 
 	if topmfc = 1 and clientask < 74:
 		act 'Take off your bra':
-			menu_off = 1 
+			menu_off = 1
 			*clr & cla
 			topmfc = 0
 			minut += 5
@@ -614,7 +614,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
-            gs 'komp_camgirl', 'views'
+			gs 'komp_camgirl', 'views'
 			gs 'komp_camgirl', 'donate'
 			gs 'stat'
 
@@ -761,78 +761,78 @@ if $ARGS[0] = 'IncreaseFame':
 	gs 'komp_camgirl', 'UpdateCamBonus'
 	FameIncMin = CamBonus / 30
 	FameIncMax = CamBonus / 15
-    fame['city_social'] += rand(FameIncMin, FameIncMax)
-    fame['city_sexind'] += rand(FameIncMin, FameIncMax)
+	fame['city_social'] += rand(FameIncMin, FameIncMax)
+	fame['city_sexind'] += rand(FameIncMin, FameIncMax)
 	webpopular = (fame['city_sexind'] + fame['city_social']) / 5
 	killvar 'FameIncMin'
 	killvar 'FameIncMax'
 end
 
 if $ARGS[0] = 'danceviewer':
-    gs 'komp_camgirl', 'IncreaseFame'
-    minClient = (pcs_dancero/30) + (webpopular / 50) + (CamBonus/30)
-    maxClient = (pcs_dancero/10) + (webpopular / 50) + (CamBonus/20)
-    camclients += rand(minClient, maxClient)
+	gs 'komp_camgirl', 'IncreaseFame'
+	minClient = (pcs_dancero/30) + (webpopular / 50) + (CamBonus/30)
+	maxClient = (pcs_dancero/10) + (webpopular / 50) + (CamBonus/20)
+	camclients += rand(minClient, maxClient)
 	if rand(1,3) = 1:
-        maxRegview = (camclients + CamBonus) / 200
-    end
-    regview += rand(0, maxRegview)
+		maxRegview = (camclients + CamBonus) / 200
+	end
+	regview += rand(0, maxRegview)
 end
 
 if $ARGS[0] = 'views':
-    gs 'komp_camgirl', 'IncreaseFame'
-    maxClient = (CamBonus / 10) - (mfcclients*2)
-    minClient = (CamBonus / 15) - (mfcclients*2)
-    camclients += rand(minClient, maxClient)
-    if rand(1,3) = 1:
-        maxRegview = (camclients + CamBonus) / 200
-    end
-    regview += rand(0, maxRegview)
+	gs 'komp_camgirl', 'IncreaseFame'
+	maxClient = (CamBonus / 10) - (mfcclients*2)
+	minClient = (CamBonus / 15) - (mfcclients*2)
+	camclients += rand(minClient, maxClient)
+	if rand(1,3) = 1:
+		maxRegview = (camclients + CamBonus) / 200
+	end
+	regview += rand(0, maxRegview)
 end
 
 if $ARGS[0] = 'UpdateCamBonus':
-    CamBonus = (pcs_apprnc + webpopular + (fame['city_sexind']/2)+ pcs_exhib + (fame['city_performer']/2) + (fame['city_social']/2) + (regview/2) + (pcs_mood*2)) / 12
-    if topmfc = 0: CamBonus += 10
-    if backmfc = 0: CamBonus += 15
+	CamBonus = (pcs_apprnc + webpopular + (fame['city_sexind']/2)+ pcs_exhib + (fame['city_performer']/2) + (fame['city_social']/2) + (regview/2) + (pcs_mood*2)) / 12
+	if topmfc = 0: CamBonus += 10
+	if backmfc = 0: CamBonus += 15
 end
 
 if $ARGS[0] = 'donate':
-    gs 'komp_camgirl', 'UpdateCamBonus'
-    minChance = CamBonus / 4
-    chancetips = rand(minChance, 100)
-    minTokens = (CamBonus + camclients) / 50
-    maxTokens = (CamBonus + camclients) / 20
-    chance = 100 - minTokens
-    if chancetips >= chance:
-        tokens_made = rand(minTokens, maxTokens)
+	gs 'komp_camgirl', 'UpdateCamBonus'
+	minChance = CamBonus / 4
+	chancetips = rand(minChance, 100)
+	minTokens = (CamBonus + camclients) / 50
+	maxTokens = (CamBonus + camclients) / 20
+	chance = 100 - minTokens
+	if chancetips >= chance:
+		tokens_made = rand(minTokens, maxTokens)
 		if tokens_made  >= 1:'<font color="green">+<<tokens_made>>Tokens</font>'
 		tokens += tokens_made
-    end
-    tokenpay = tokens * 2
+	end
+	tokenpay = tokens * 2
 end
 
 if $ARGS[0] = 'clientrequest':
-    if topmfc = 1 and backmfc = 1:
-        if pcs_apprnc < 100:
-            clientask = rand(20, 100)
-        else
-            clientask = rand(30, 100)
-        end
-    end
-    if (topmfc = 0 and backmfc = 1) or (topmfc = 1 and backmfc = 0):
-        if pcs_apprnc < 100:
-            clientask = rand(30, 100)
-        else
-            clientask = rand(35, 100)
-        end
-    end
-    if topmfc = 0 and backmfc = 0:
-        if pcs_apprnc < 100:
-            clientask = rand(35, 100)
-        else
-            clientask = rand(45, 100)
-        end
-    end
+	if topmfc = 1 and backmfc = 1:
+		if pcs_apprnc < 100:
+			clientask = rand(20, 100)
+		else
+			clientask = rand(30, 100)
+		end
+	end
+	if (topmfc = 0 and backmfc = 1) or (topmfc = 1 and backmfc = 0):
+		if pcs_apprnc < 100:
+			clientask = rand(30, 100)
+		else
+			clientask = rand(35, 100)
+		end
+	end
+	if topmfc = 0 and backmfc = 0:
+		if pcs_apprnc < 100:
+			clientask = rand(35, 100)
+		else
+			clientask = rand(45, 100)
+		end
+	end
 end
 
 

+ 6 - 0
locations/npcStat.qsrc

@@ -95,6 +95,8 @@ else
 	npcStatVars['age'] = rand(18, 35)
 end
 
+$npcStatVars['condom'] = $ARGS[2]
+
 
 !! ----- AGE --------------------------------------------------
 
@@ -472,6 +474,8 @@ if $ARGS[1] ! '' and npcStat_i > 0:
 		$npcBuild_pref<<npcStat_i>>		= $npcStatVars['build_desc_pref']
 		$npcRelat<<npcStat_i>>			= $npcStatVars['relat']
 
+		$npcCondom<<npcStat_i>>			= $npcStatVars['condom']
+
 		$xe<<npcStat_i>>				= $npcStatVars['xe']
 		$xec<<npcStat_i>>				= $npcStatVars['xec']
 		$xem<<npcStat_i>>				= $npcStatVars['xem']
@@ -519,6 +523,8 @@ else
 	$npcBuild_pref[npcStat_i]	= $npcStatVars['build_desc_pref']
 	$npcRelat[npcStat_i]		= $npcStatVars['relat']
 
+	$npcCondom[npcStat_i]		= $npcStatVars['condom']
+
 	$xe[npcStat_i]				= $npcStatVars['xe']
 	$xec[npcStat_i]				= $npcStatVars['xec']
 	$xem[npcStat_i]				= $npcStatVars['xem']

+ 2 - 0
locations/npcStat_clean.qsrc

@@ -23,6 +23,7 @@ if npcStat_clean_i > 1 and npcStatCalled[npcStat_clean_i] < daystart - 2:
 	killvar '$npcBuild',		npcStat_clean_i
 	killvar '$npcBuild_pref',	npcStat_clean_i
 	killvar '$npcRelat',		npcStat_clean_i
+	killvar '$npcCondom',		npcStat_clean_i
 
 	killvar '$xe',				npcStat_clean_i
 	killvar '$xec',				npcStat_clean_i
@@ -65,6 +66,7 @@ npcStat_clean_i = 1
 			killvar '$npcBuild<<npcStat_clean_i>>'
 			killvar '$npcBuild_pref<<npcStat_clean_i>>'
 			killvar '$npcRelat<<npcStat_clean_i>>'
+			killvar '$npcCondom<<npcStat_clean_i>>'
 
 			killvar '$xe<<npcStat_clean_i>>'
 			killvar '$xec<<npcStat_clean_i>>'

+ 4 - 2
locations/nyp_school.qsrc

@@ -312,7 +312,8 @@ if $ARGS[0] = 'cool jocks':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
 			'You shake your head and pull yourself free from her grasp. "I don''t feel like it right now. Maybe later?"'
 			'She pouts. "Aww, you''re no fun, <$pcs_nickname>>! If you change your mind, then come join us."'
-			'A few of the other girls join her on the dance floor and they all start dancing together. 'You watch them for a while before turning back to engage in conversation with the other girls.'
+			'A few of the other girls join her on the dance floor and they all start dancing together.'
+			'You watch them for a while before turning back to engage in conversation with the other girls.'
 
 			act 'Hang out until the party ends': gt 'nyp_school', 'end'
 		end
@@ -338,8 +339,9 @@ if $ARGS[0] = 'cool jocks':
 			
 				act 'Leave': gt 'gschool_grounds', 'main'
 			end
+		end
 			
-!!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
+		!!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
 	else
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'

+ 6 - 8
locations/selfplay.qsrc

@@ -27,11 +27,11 @@ if $ARGS[0] = 'start':
 		if locat['Anya_inroom'] = 1: sis_watch = 2 & 'Anya smiles and lets you carry on.'
 	end
 
-	!!then the calculation invasion
-	if $loc = 'vanrPar':
-		if selfplaytime >= 60:
-		end
-	end
+	!!then the calculation invasio
+	! if $loc = 'vanrPar':
+	! 	if selfplaytime >= 60:
+	! 	end
+	! end
 
 	gs 'selfplay', 'sis_prov'
 
@@ -1171,7 +1171,6 @@ if $ARGS[0] = 'self_fisting_1':
 	if org_temp = orgasm: gs 'selfplay', 'self_fisting_2'
 
 	act 'Stop masturbating':gt 'selfplay', 'stop'
-	end
 end
 
 if $ARGS[0] = 'self_fisting_2':
@@ -1246,8 +1245,7 @@ if $ARGS[0] = 'anal_fingering':
 		
 		act 'Choose a different way to masturbate':gt 'selfplay', 'start'
 		act 'Stop masturbating':gt 'selfplay', 'stop'
-		
-	end
+
 end
 
 if $ARGS[0] = 'anal_fingering2':