Merge remote-tracking branch 'Lusticon/master'

glife.qproj

@@ -494,7 +494,6 @@
 		<Location name="brother"/>
 		<Location name="brother2"/>
 		<Location name="brother_voyeur"/>
-		<Location name="brother_voyeur_sex"/>
 		<Location name="brother_shower_sex"/>
 		<Location name="brother_lessons"/>
 		<Location name="seeporn"/>

locations/booty_call.qsrc

@@ -398,17 +398,6 @@ if $ARGS[0] = 'invite_yourself2':
 	end
 end
 
-if $ARGS[0] = 'get_invited':
-	if rand(0,1) = 1:
-		'"Why don''t you come over to my place right now and we can have some fun?"'
-
-	else
-		'"Why don''t you come over to my place tonight and we can have some fun?"'
-	end
-
-
-end
-
 !! ------------ NPC Stat Updater ------------------------
 
 if $ARGS[0] = 'npc_stat_update':

locations/boy_updater.qsrc

@@ -8,10 +8,10 @@ if $ARGS[0] = 'home_update':
 		elseif npc_residence[$boy] = 2:
 			npc_finance[$boy] = 0
 			$npc_residence[$boy] = 'student_dorms'
-		elseif npc_residence[$boy] = 2:
+		elseif npc_residence[$boy] = 3:
 			npc_finance[$boy] = rand(1,2)
 			$npc_residence[$boy] = 'city_res'
-		elseif npc_residence[$boy] = 2:
+		elseif npc_residence[$boy] = 4:
 			npc_finance[$boy] = 2
 			$npc_residence[$boy] = 'city_center'
 		end

locations/city_saunawhore.qsrc

@@ -453,12 +453,11 @@ if $ARGS[0] = 'clientGate':
 	end
 
 	! customer dick size
-	if dick >= 24:
+	if dick >= 26:
 		$dick_girth = 'monstrous'
 		cumVol = rand(4, 5)
-	elseif dick >= 24:
+	elseif dick >= 23:
 		$dick_girth = 'massive'
-		cumVol += 1
 		cumVol = rand(3, 5)
 	elseif dick >= 20:
 		$dick_girth = 'thick'
@@ -468,12 +467,10 @@ if $ARGS[0] = 'clientGate':
 		cumVol = rand(2, 4)
 	elseif dick >= 12:
 		$dick_girth = 'well proportioned'
-		cumVol -= 1
 		cumVol = rand(1, 4)
 	else
 		$dick_girth = 'slim'
-		cumVol -= 2
-		cumVol = rand(1, 3)
+		cumVol = rand(0, 3)
 	end
 
 	! customer cum volume

locations/gadukino_event.qsrc

@@ -981,10 +981,10 @@ if $ARGS[0] = 'mira_2boys':
 			if ARGS[1] = 1:
 				npc_rel['A63'] -= 3
 				npc_rel['A61'] -= 3
-			elseif ARGS[1] = 1:
+			elseif ARGS[1] = 2:
 				npc_rel['A63'] -= 3
 				npc_rel['A62'] -= 3
-			elseif ARGS[1] = 1:
+			elseif ARGS[1] = 3:
 				npc_rel['A61'] -= 3
 				npc_rel['A62'] -= 3
 			end

locations/katjaEvDin.qsrc

@@ -857,7 +857,7 @@ if $ARGS[0] = 'kiss_events':
 			$textEvent = 'two intertwining flames'
 		elseif pcs_haircol = 3:
 			$textEvent = 'the sun at the dawn'
-		elseif pcs_haircol = 3:
+		else
 			$textEvent = 'a fiery rainbow'
 		end
 		'As you kiss Katja, someone sighs loudly, probably appreciating the view.'

locations/lover_likes.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'clotTypePrefTmp':
 			if $clotTypePrefTmp = $clothingworntype:
 				loverrelation[lover_number] += 1
 				$meetClot = '<<$loverdesc[lover_number]>> says, "I like the type of clothing you are wearing <<$pcs_nickname>>. I think girls look amazing in <<$clotTypePrefTmp>> clothing."'
-			elseif $clotTypePrefTmp = $clothingworntype:
+			else
 				loverrelation[lover_number] -= 1
 				$meetClot = '<<$loverdesc[lover_number]>> says nerviously, "I don''t mean to be rude <<$pcs_nickname>>, but I don''t think <<$clothingworntype>> clothing looks nice on girls. I like girls who wear <<$clotTypePrefTmp>> clothing."'
 			end
@@ -18,7 +18,7 @@ if $ARGS[0] = 'clotTypePrefTmp':
 			if $clotTypePrefTmp = $clothingworntype:
 				loverrelation[lover_number] += 2
 				$meetClot = '<<$loverdesc[lover_number]>> says, "I think girls who where <<$clothingworntype>> clothing look amazing. I''m glad you chose that type of clothing."'
-			elseif $clotTypePrefTmp = $clothingworntype:
+			else
 				loverrelation[lover_number] -= 2
 				$meetClot = '<<$loverdesc[lover_number]>> says cafefully, "<<$pcs_nickname>> to be honest, I don''t think <<$clothingworntype>> clothing looks good on you. I think <<$clotTypePrefTmp>> clothing would look better on you."'
 			end
@@ -26,7 +26,7 @@ if $ARGS[0] = 'clotTypePrefTmp':
 			if $clotTypePrefTmp = $clothingworntype:
 				loverrelation[lover_number] += 3
 				$meetClot = '<<$loverdesc[lover_number]>> says, "<<$pcs_nickname>>, you look fucking hot in <<$clothingworntype>> clothes. It looks amazing on you!"'
-			elseif $clotTypePrefTmp = $clothingworntype:
+			else
 				loverrelation[lover_number] -= 3
 				$meetClot = '<<$loverdesc[lover_number]>> says rather rudely, "I think girls who wear <<$clothingworntype>> type clothing looks like shit. Girls who wear <<$clotTypePrefTmp>> turn me on much more."'
 			end

locations/lover_meet.qsrc

@@ -367,20 +367,20 @@ if $ARGS[0] = 'start':
 							'<<$tXec>> can see sperm on your ass, but by the bulge in <<$tXyr>> pants you know it only turns <<$tXem>> on.'
 						end
 					end
-				elseif (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1) and pervConstant ! 1:
-					if cumloc[11] = 1:
+				elseif cumloc[12]+cumloc[11]+cumloc[6]+cumloc[7] > 0 and pervConstant ! 1:
+					if cumloc[11] > 0:
 						gs 'lover', 'remove', lover_number
 						'<<$tXec>> notices the sperm on your face, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you out of <<$tXyr>> face. "We are through, I don''t want to see your face again!'
 						pcs_mood -= 20
 						gt 'homes_properties', 'go_home'
 						exit
-					elseif (cumloc[6] = 1 or cumloc[7] = 1):
+					elseif cumloc[6]+cumloc[7] > 0:
 						gs 'lover', 'remove', lover_number
 						'<<$tXec>> notices the sperm on your ass, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you away. "We are through, I don''t want to see your face again!'
 						pcs_mood -= 20
 						gt 'homes_properties', 'go_home'
 						exit
-					elseif (cumloc[6] = 1 or cumloc[7] = 1):
+					elseif cumloc[12] > 0:
 						gs 'lover', 'remove', lover_number
 						'<<$tXec>> realizes your mouth smells like sperm, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you away. "We are through, I don''t want to see your face again!"'
 						pcs_mood -= 20

locations/model_mari.qsrc

@@ -483,7 +483,7 @@ if $ARGS[0] = 'mari_family_chat':
 			'Your mind wanders back to your siblings and how you''ve fooled around with both of them separately.'
 			'"You could say that..."'
 
-		elseif sisterLesb >= 6:
+		elseif sisterLesb >= 6 and brotherSex >= 7:
 			'"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 			'Mari smiles at you. "You sound close."'
 			'Your mind wanders back to your siblings and how you''ve fooled around with your sister and even had full fledged intercourse with your brother. Your thoughts wander to the memory of the last time his cock was inside you and it causes you to blush.'

locations/npcgeneratec.qsrc

@@ -315,10 +315,10 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_residence[$npclastgenerated] = 2:
 		npc_finance[$npclastgenerated] = 0
 		$npc_residence[$npclastgenerated] = 'student_dorms'
-	elseif npc_residence[$npclastgenerated] = 2:
+	elseif npc_residence[$npclastgenerated] = 3:
 		npc_finance[$npclastgenerated] = rand(1,2)
 		$npc_residence[$npclastgenerated] = 'city_res'
-	elseif npc_residence[$npclastgenerated] = 2:
+	elseif npc_residence[$npclastgenerated] = 4:
 		npc_finance[$npclastgenerated] = 2
 		$npc_residence[$npclastgenerated] = 'city_center'
 	end

locations/pav_shared_nestor.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = 'nestor_Dick':
 	elseif npc_rel[$boy] < 60:
 		$rel_word[$boy] = 'excellent'
 		$color_rel = '5eff00'
-	elseif npc_rel[$boy] < 60:
+	elseif npc_rel[$boy] < 80:
 		$rel_word[$boy] = 'fantastic'
 		$color_rel = '03ff39'
 	elseif npc_rel[$boy] >= 80:

locations/pav_shared_oleg.qsrc

@@ -259,7 +259,7 @@ if $ARGS[0] = 'oleg_dick':
 	elseif npc_rel[$boy] < 60:
 		$rel_word[$boy] = 'excellent'
 		$color_rel = '5eff00'
-	elseif npc_rel[$boy] < 60:
+	elseif npc_rel[$boy] < 80:
 		$rel_word[$boy] = 'fantastic'
 		$color_rel = '03ff39'
 	elseif npc_rel[$boy] >= 80:

locations/pav_shared_yakov.qsrc

@@ -230,7 +230,7 @@ if $ARGS[0] = 'yakov_Dick':
 	elseif npc_rel[$boy] < 60:
 		$rel_word[$boy] = 'excellent'
 		$color_rel = '5eff00'
-	elseif npc_rel[$boy] < 60:
+	elseif npc_rel[$boy] < 80:
 		$rel_word[$boy] = 'fantastic'
 		$color_rel = '03ff39'
 	elseif npc_rel[$boy] >= 80:

locations/phone_selfies.qsrc

@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'get_npc_selfie_totals':
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif ARGS[1] = 54:
+	elseif ARGS[1] = 112:
 		'<center><h4><font color="maroon">Sergey pictures</font></h4></center>'
 		$photoloc = 'images/pc/pictures/sergey/'
 		$imgloc = 'images/characters/pavlovsk/resident/sergey/selfies/'

locations/pornfilm.qsrc

@@ -1272,7 +1272,7 @@ if $ARGS[0] = '14':
 		sex50 = 50 - bj50 - hj50 - lip50 - anal50 - bukk50
 		stat['vaginal'] += 50-anal50
 		if bj50 > 5:pornbj += 1
-		if hj50 > 5:
+		if hj50 = 5:
 			pornhj += 1 & pornbukk += 1
 		elseif hj50 > 5:
 			pornhj += 1

locations/sex_ev_condoms.qsrc

@@ -2954,7 +2954,7 @@ if $ARGS[0] = 'virgin_condom2':
 					'"My aunt gave it to me earlier this week," you say. "For emergencies..."'
 				elseif LudaQW['condom_give_day'] >= daystart - 30:
 					'"My aunt gave it to me a few weeks ago," you say. "Just in case..."'
-				elseif LudaQW['condom_give_day'] >= daystart - 7:
+				else
 					'"My aunt gave it to me a long time ago," you say. "Just in case..."'
 				end
 				gs 'sex_ev_condoms', 'virgin_condom3'

locations/sex_ev_dress_talking.qsrc

@@ -1225,9 +1225,6 @@ if $ARGS[0] = 'isnt_going_to_work':
 			end
 		end
 	end
-end
-
-if $ARGS[0] = 'isnt_going_to_work':
 	act'Grab your things':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
@@ -1237,4 +1234,5 @@ if $ARGS[0] = 'isnt_going_to_work':
 		gs'sex_ev_leave', 'break_up'
 	end
 end
---- sex_ev_dress_talking ---------------------------------
+
+--- sex_ev_dress_talking ---------------------------------

locations/sister_chat.qsrc

@@ -1244,14 +1244,6 @@ if $ARGS[0] = 'momslut_talk3':
 	end
 end
 
-if $ARGS[0] = 'momslut_talk2':
-
-end
-
-if $ARGS[0] = 'momslut_talk2':
-
-end
-
 if $ARGS[0] = 'porn_talk0':
 	if film > 0:
 		act 'Tell her you''re a pornstar':

locations/stat_display.qsrc

@@ -2403,15 +2403,15 @@ if enable_extra_msg = 1:
 	if masseuse['jobtype'] > 0:
 		if masseuse['<<week>>_shift_1'] = 1 and hour < 9:
 			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 9:00.</font></b>'
-		elseif masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+		elseif masseuse['<<week>>_shift_1'] = 1 and hour = 9:
 			$stat_msg +='<BR><b><font color="red">You''re late for your 9:00 shift at the salon!</font></b>'
 		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
 			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>'
-		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour = 13:
 			$stat_msg +='<BR><b><font color="red">You''re late for your 13:00 shift at the salon!</font></b>'
-		elseif masseuse['<<week>>_shift_3'] and hour < 17:
-			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>'
 		elseif masseuse['<<week>>_shift_3'] = 1 and hour < 17:
+			$stat_msg +='<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>'
+		elseif masseuse['<<week>>_shift_3'] = 1 and hour = 17:
 			$stat_msg +='<BR><b><font color="red">You''re late for your 17:00 shift at the salon!</font></b>'
 		end
 	end

locations/telefon.qsrc

@@ -1620,8 +1620,6 @@ if $ARGS[0] = 'Phone_camera':
 		$phone_loc = 'locker'
 	elseif $locclass = 'beach':
 		$phone_loc = 'beach'
-	elseif $locclass = 'beach':
-		$phone_loc = 'beach'
 	elseif $locclass = 'classroom':
 		$phone_loc = 'classroom'
 	elseif $locclass = 'school_bathroom':

locations/underwear_descriptions.qsrc

@@ -43,9 +43,9 @@ if $ARGS[0] = 'panties':
 		$description += ' boy shorts'
 	elseif PanType = 3:
 		$description += ' G-string'
-	elseif PanType = 3:
+	elseif PanType = 4:
 		$description += ' C-string'
-	elseif PanType = 3:
+	elseif PanType = 5:
 		$description += ' French knickers'
 	end
 
@@ -211,7 +211,7 @@ elseif $ARGS[0] = 'bodysuit':
 		$description += ' vest'
 	elseif BraType = 7:
 		$description += ' spaghetti strap'
-	elseif BraType = 7:
+	elseif BraType = 8:
 		$description += ' romper'
 	end
 
@@ -261,11 +261,11 @@ elseif $ARGS[0] = 'bodysuit':
 
 	if PanCoverBack = 1:
 		$description += ' Your butt can just about be seen in the right light.'
-	elseif PanCoverBack = 1:
+	elseif PanCoverBack = 2:
 		$description += ' Your butt is partly visible.'
-	elseif PanCoverBack = 1:
+	elseif PanCoverBack = 3:
 		$description += ' Your butt is clearly visible.'
-	elseif PanCoverBack = 1:
+	elseif PanCoverBack = 4:
 		$description += ' Your butt is not covered at all.'
 	end