Merge remote-tracking branch 'Malen/master'

locations/DNA.qsrc

@@ -41,30 +41,32 @@ if $ARGS[0] = 'relate':
 	!!paternal grandfather ID
 	temp2[6] = $mid ($ARGS[2], 67, 10)
 	
+	killvar 'gen_relationship'
+	
 	if temp1[0] = temp2[1] or temp1[0] = temp2[2] or temp2[0] = temp1[1] or temp2[0] = temp1[2]:
-		'Parent-child relation'
+		$gen_relationship += 'Parent-child relationship. '
 		if temp1[0] = temp2[1] or temp1[0] = temp2[2]:
 			!!temp1 is the parent, temp2 is child
-			if temp2[1] = temp2[5] or temp2[2] = temp2[4]:'Child is the result of incest (parent is also grandparent)'
-			if temp2[3] = temp2[5] and temp2[4] = temp2[6]:'Child is result of incest with close family member (sibling)'
-			if temp2[3] = temp2[5] or temp2[4] = temp2[6]:'Child is result of incest with close family member (half sibling)'
+			if temp2[1] = temp2[5] or temp2[2] = temp2[4]: $gen_relationship += 'Child is the result of incest (parent is also grandparent)'
+			if temp2[3] = temp2[5] and temp2[4] = temp2[6]: $gen_relationship += 'Child is result of incest with close family member (sibling)'
+			if temp2[3] = temp2[5] or temp2[4] = temp2[6]:$gen_relationship += 'Child is result of incest with close family member (half sibling)'
 		elseif temp2[0] = temp1[1] or temp2[0] = temp1[2]:
 			!!temp2 is the parent, temp1 is child
-			if temp1[1] = temp1[5] or temp1[2] = temp1[4]:'Child is the result of incest (parent is also grandparent)'
-			if temp1[3] = temp1[5] and temp1[4] = temp1[6]:'Child is result of incest with close family member (sibling)'
-			if temp1[3] = temp1[5] or temp1[4] = temp1[6]:'Child is result of incest with close family member (half sibling)'
+			if temp1[1] = temp1[5] or temp1[2] = temp1[4]: $gen_relationship += 'Child is the result of incest (parent is also grandparent)'
+			if temp1[3] = temp1[5] and temp1[4] = temp1[6]: $gen_relationship += 'Child is result of incest with close family member (sibling)'
+			if temp1[3] = temp1[5] or temp1[4] = temp1[6]: $gen_relationship += 'Child is result of incest with close family member (half sibling)'
 		end
 	elseif temp1[0] = temp2[3] or temp1[0] = temp2[4] or temp1[0] = temp2[5] or temp1[0] = temp2[6] or temp2[0] = temp1[3] or temp2[0] = temp1[4] or temp2[0] = temp1[5] or temp2[0] = temp1[6]:
-		'Grandparent-grandchild relation'
+		$gen_relationship += 'Grandparent-grandchild relationship.'
 	elseif temp1[1] = temp2[1] or temp1[2] = temp2[2]:
-		'Sibling relation'
-		if temp1[1] = temp2[1] and temp1[2] = temp2[2]:'Full sibling'
-		if temp1[1] ! temp2[1] or temp1[2] ! temp2[2]:'Half sibling'
+		$gen_relationship += 'Sibling relation'
+		if temp1[1] = temp2[1] and temp1[2] = temp2[2]: $gen_relationship += 'Full sibling'
+		if temp1[1] ! temp2[1] or temp1[2] ! temp2[2]: $gen_relationship += 'Half sibling'
 	elseif temp1[1] ! temp2[1] and temp1[2] ! temp2[2]:
 		if temp1[3] = temp2[3] and temp1[4] = temp2[4] or temp1[3] = temp2[5] and temp1[4] = temp2[6]:
-			'first cousins'
+			$gen_relationship += 'first cousins'
 		elseif temp1[3] = temp2[3] or temp1[4] = temp2[4] or temp1[3] = temp2[5] or temp1[4] = temp2[6]:
-			'distand blood relation'
+			$gen_relationship += 'distand blood relation'
 		end
 	end
 	killvar 'temp1'

locations/NPCFinder.qsrc

@@ -0,0 +1,65 @@
+*clr
+'<a href="exec: gt ''NPCFinder'', ''finder''">Enter the ID of the character.</a>'
+if $ARGS[0] = 'finder':
+	$looking = input ('ID (like <i>A17</i>)')
+	gt 'NPCFinder'
+end
+
+if $looking ! '':
+	'<br><br>'
+	'Found character:'
+	'<br>'
+	'<<$npc_pic[''<<looking>>'']>>'
+	'DNA string: <<$npc_dna[''<<$looking>>'']>>'
+	'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
+	if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
+	'Intelligence: <<npc_intel[''<<$looking>>'']>>'
+	if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
+	if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
+	if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
+	if npc_haircol['<<$looking>>'] = 0:
+		'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
+	elseif npc_haircol['<<$looking>>'] = 1:
+		'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
+	elseif npc_haircol['<<$looking>>'] = 2:
+		'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+	else
+		'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+	end
+	if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
+	'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
+	'Height: <<npc_height[''<<$looking>>'']>>'
+	if npc_gender['<<$looking>>'] = 0:
+		'Gender: male'
+		'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
+		'Dick length: <<npc_dick[''<<$looking>>'']>>'
+		'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+	else
+		'Gender: female'
+		'Breast size: <<npc_bust[''<<$looking>>'']>>'
+	end
+	if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
+	if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
+	if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
+	if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+	if $npcvendisease = '': $npcvendisease = 'none'
+	'Veneral diseases: <<$npcvendisease>>'
+	'Sexual acts with PC: <<npc_sex[''$looking'']>>'
+	'Perversion: <<npc_perv[''$looking'']>>'
+	'Notes: <<$npc_notes[''<<$looking>>'']>>'
+	''
+	'Found relationships:'
+	npctemp = 0
+	:relationshipfinder
+		gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
+		if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
+			'<br>ID: A<<npctemp>>'
+			'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
+			'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+			'Relationship type: <<$gen_relationship>>'
+		end
+	if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'
+	killvar 'npctemp'
+	killvar 'npcvendisease'
+	killvar 'looking'
+end

locations/brother.qsrc

@@ -945,8 +945,7 @@ if $ARGS[0] = 'brother_voyeur_end':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	pcs_horny += rand(5,10)
-	minut += rand(5,10)
+	gs 'arousal','flash', rand(5,10)
 	picrand = rand(1,2)
 	npc_rel['A34'] += 5
 	pcs_mood += 10
@@ -968,14 +967,15 @@ if $ARGS[0] = 'brother_voyeur_ev1':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	minut += rand(5,10)
+	temp_var = rand(5,10)
 	picrand = rand(2,7)
 	if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 	if npc_QW['A34'] < 1: npc_QW['A34'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/b (<<picrand>>).jpg"></center>'
 	'You continue to wash as if nothing has happened, glancing at your brother. You carefully wash your body, paying particular attention to your breasts and pussy, feeling the excitement grow in your abdomen.'
 
-	gs 'arousal','foreplay', 2, 'incest'
+	gs 'arousal','foreplay', temp_var, 'incest'
+	gs 'arousal','flash', -temp_var, 'exhibitionism'
 	gs 'stat'
 
 	act 'Wipes':gt 'brother','brother_voyeur_end'
@@ -988,8 +988,9 @@ if $ARGS[0] = 'brother_voyeur_ev2':
 	menu_off = 1
 	gs 'stat'
 	temp_var = rand(5,10)
-	minut += temp_var
 	gs 'arousal','foreplay', temp_var
+	gs 'arousal','flash', -temp_var
+	killvar 'temp_var'
 	picrand = rand(1,7)
 	if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/c (<<picrand>>).jpg"></center>'
@@ -1019,10 +1020,13 @@ if $ARGS[0] = 'brother_voyeur_ev3':
 	'You move your feet a little wider apart and move the shower head down your body until it hovers just over your aching pussy. The spray of water is intense against your oh-so-sensitive lips and <<$pc_desc[''clit'']>> clit. It doesn''t take long before the sensation is too much and you orgasm - wave after wave hitting your entire body, you bite down on your tongue to muffle your moans, but are unable to keep completely silent; the occasional gasp escaping your lips.'
 
 	$orgasm_or = 'no'
+	gs 'arousal','flash', -5, 'exhibitionism'
 	gs 'arousal', 'clit_vibe', -5, 'incest' ,'masturbate'
 	$orgasm_or = 'no'
+	gs 'arousal','flash', -5, 'exhibitionism'
 	gs 'arousal', 'clit_vibe', -5, 'incest' ,'masturbate'
 	$orgasm_or = 'custom'
+	gs 'arousal','flash', -5, 'exhibitionism'
 	gs 'arousal', 'clit_vibe', 5, 'incest' ,'masturbate'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1107,8 +1111,7 @@ if $ARGS[0] = 'brother_voyeur_ev4':
 	menu_off = 1
 	gs 'stat'
 	npc_rel['A34'] += rand(1,3)
-	pcs_horny += rand(10,15)
-	minut += rand(5,10)
+	gs 'arousal','flash', rand(5,10), 'exhibitionism'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/f (1).jpg"></center>'
 	if npc_QW['A34'] <= 4:
 		npc_QW['A34'] = 4
@@ -1121,6 +1124,7 @@ if $ARGS[0] = 'brother_voyeur_ev4':
 		'Kolka nods along, "Um, yeah, okay..."'
 		act'Get started':gt 'brother','brother_voyeur_ev5'
 	elseif npc_QW['A34'] > 4:
+		gs 'arousal','flash', -5, 'exhibitionism'
 		'You check to see if the door to the hall is closed, then silently yet quickly take off your clothes. Feeling a bit embarrassed as you sit in a chair, you cover your <<$titsize>> breasts with your hands and close your legs tightly.'
 		'Kolka licks his lips while ogling your body, "They say repetition is the key to learning."'
 		'"Sure, they do," you reply, rolling your eyes.'
@@ -1133,7 +1137,7 @@ if $ARGS[0] = 'brother_voyeur_ev5':
 	menu_off = 1
 	gs 'stat'
 	npc_rel['A34'] += rand(2,3)
-	pcs_horny += rand(10,15)
+	gs 'arousal','flash', -rand(15,30), 'exhibitionism'
 	minut += rand(5,10)
 	if brother_body_show = 0: brother_body_show = 1 & brother_anus_mem = anpic
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/f (2).jpg"></center>'
@@ -1243,7 +1247,7 @@ if $ARGS[0] = 'brother_voyeur_ev6':
 	menu_off = 1
 	gs 'stat'
 	npc_rel['A34'] += rand(1,3)
-	pcs_horny += rand(10,15)
+	gs 'arousal','flash', -rand(15,30), 'exhibitionism'
 	minut += rand(5,10)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/f (3).jpg"></center>'
 	'You sit down on your heels and turn your ass towards Kolka. You look back at him and notice the growing bulge in his pants, which is quite noticeable through his light clothing. His face grows red with excitement and his breathing is becoming slightly erratic.'
@@ -1282,7 +1286,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 	menu_off = 1
 	gs 'stat'
 	npc_rel['A34'] += rand(1,3)
-	pcs_horny += rand(10,15)
+	gs 'arousal','flash', -rand(15,30), 'exhibitionism'
 	minut += rand(5,10)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/f (4).jpg"></center>'
 	if npc_QW['A34'] = 4:
@@ -1366,6 +1370,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 	npc_rel['A34'] += rand(2,3)
 	ivrand = rand(1,2)
 	brotherConfidence += 4
+	gs 'arousal','flash', -10, 'exhibitionism'
 	if brotherConfidence < 10 and brotherSex < 4:
 		gs 'cum_call', 'stomach', 'A34', 1, 0, 0, rand(20,30)
 		gs 'cum_call', 'breasts', 'A34', 1, 0, 0, rand(10,20)

locations/obj_din.qsrc

@@ -164,6 +164,12 @@ if $ARGS[0] = 'cheattabs':
 	else
 		$cheat_tab_list += '<th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th>'
 	end
+	
+	if menu_page = 15:
+		$cheat_tab_list += '<th>NPC Finder</th>'
+	else
+		$cheat_tab_list += '<th><a href="exec:menu_page = 15 & gs ''NPCFinder''">NPC Finder</a></th>'
+	end
 
 	$cheat_tab_list += '<tr>'