Преглед на файлове

[fixed][added] Significant rewrite of the hotornot, fuckornot and gschool_group code. Removed spurious lines and simplified the if/else statements. Split the hotornot and fuckornot code into its own file. Updated variable names and introduced the npc_uni_active variable and rewrote npc_uni_eduType variables to align with BG's usecases.

anjuna krokus преди 8 месеца
родител
ревизия
6de172efdf
променени са 7 файла, в които са добавени 530 реда и са изтрити 392 реда
  1. 1 0
      glife.qproj
  2. 6 186
      locations/Komp.qsrc
  3. 97 56
      locations/cikl.qsrc
  4. 94 136
      locations/gschool_groups.qsrc
  5. 25 13
      locations/journal_school.qsrc
  6. 306 0
      locations/komp_HF_or_not.qsrc
  7. 1 1
      locations/uni_grounds.qsrc

+ 1 - 0
glife.qproj

@@ -311,6 +311,7 @@
 		<Location name="kompMFCtwo"/>
 		<Location name="kompMFCanal"/>
 		<Location name="kompMFCoral"/>
+		<Location name="komp_HF_or_not"/>
 		<Location name="mirror"/>
 		<Location name="stol"/>
 		<Location name="kit_din"/>

+ 6 - 186
locations/Komp.qsrc

@@ -100,11 +100,11 @@ if $ARGS[0] = 'browse':
 
 		act 'Search for cable TV services (1:00)': gt 'komp', 'kabtv'
 		act 'Play an online game': gt 'KGstart'
-		if fuckornot = 3: act 'Visit ''Fuckable or not'' site': $view_location = 'komp' & gt 'komp', 'fuckornot'
-		if hotornot >= 2: act 'Visit ''Hot or not'' site': $view_location = 'komp' & gt 'komp', 'hotornot'
+		if fuckornot = 3: act 'Visit ''Fuckable or not'' site': $view_location = 'komp' & gt 'komp_HF_or_not', 'fuckornot'
+		if hotornot >= 2: act 'Visit ''Hot or not'' site': $view_location = 'komp' & gt 'komp_HF_or_not', 'hotornot'
 !!new code make sure it will work please
-		if fuckornot_uni = 1: act 'Visit ''Fuckable or not'' University site': $view_location = 'komp' & gt 'komp', 'fuckornot_uni'
-		if hotornot_uni = 1: act 'Visit ''Hot or not'' University site': $view_location = 'komp' & gt 'komp', 'hotornot_uni'
+		if fuckornot_uni = 1: act 'Visit ''Fuckable or not'' University site': $view_location = 'komp' & gt 'komp_HF_or_not', 'fuckornot_uni'
+		if hotornot_uni = 1: act 'Visit ''Hot or not'' University site': $view_location = 'komp' & gt 'komp_HF_or_not', 'hotornot_uni'
 		!!if bankAccount > 0: act 'Visit your bank, maybe to purchase more online time': gt 'komp', 'bank'
 		if shantfoto > 0: act 'Find the girl you took photos of in the park on "Assbook"': gt 'komp', 'foto'
 		if gor_dorm = 7: act 'Read letter from Eugene': gt 'etoexhib', 'pos91'
@@ -1889,187 +1889,7 @@ if $ARGS[0] = 'bank':
 	act 'Close your browser': gt 'komp', 'browse'
 end
 
-if $ARGS[0] = 'fuckornot':
-	*clr & cla
-	minut += 5
-	gs 'internet_mobile', 'use_internet', $subs, 5
-
-	if fuckornot = 2: fuckornot = 3
-	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/fuckornot/fuckable_list.jpg"></center>'
-	gs 'gschool_groups', 'fuckornot'
-	
-	'10: Perfection - Would let her do whatever she wants to me.'
-	'9: Smoking Hot - Would eat her ass.'
-	'8: Hot - Would fuck that ass.'
-	'7: Damn girl - Bragging rights for fucking.'
-	'6: Smashable - Totally fuckable. Fuck buddy material'
-	'5: Merely fuckable - Wouldn''t mind smashing it. Blowjob buddy material.'
-	'4: Almost fuckable - Doable in the dark or to get a blowjob from.'
-	'3: Unattractive - Doable if I get myself drunk first. Good match for Petia.'
-	'2: Fugly - Has potential compared to a trash bin. Even Lesco could do better.'
-	'1: Hideous - Wouldn''t touch it with a stick.'
-	
-	act 'Leave the site':
-		if $view_location = 'school':
-			gt 'gschool_lessons', 'short_break'
-		else
-			gt 'komp', 'browse'
-		end
-	end
-end
-
-if $ARGS[0] = 'hotornot':
-	*clr & cla
-	minut += 5
-	gs 'internet_mobile', 'use_internet', $subs, 5
-
-	if hotornot = 2: hotornot = 3
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-	gs 'gschool_groups', 'hotornot'
-	
-	'10: Perfection - Would let him do whatever he wants to me.'
-	'9: Smoking Hot - Arm candy.'
-	'8: Hot - Would ride him.'
-	'7: Damn son - Bragging rights for fucking.'
-	'6: Rideable - Totally fuckable. Fuck buddy material'
-	'5: Merely fuckable. - Doggy style so I don''t have to look at him.'
-	'4: Almost fuckable - Might sit on his face.'
-	'3: Unattractive - Not even Zinaida would be seen with him.'
-	'2: Fugly - Horribly ugly. Just being seen with him would lose you social standing.'
-	'1: Hideous - Wouldn''t touch it with a stick. Not even a whore would take his money.'
-	
-	act 'Leave the site':
-		if $view_location = 'school':
-			killvar 'access'
-			gt 'gschool_lessons', 'short_break'
-		else
-			gt 'komp', 'browse'
-		end
-	end
-end
-!!below this line is new stuff for the fuckable and hot or not lists but adapted for the University so we have one there as well. Check my notes below and make sure I did it correct and make the small changes my notes indicate please, thanks, afterwards you can delete this line.
-if $ARGS[0] = 'fuckornot_uni':
-	*clr & cla
-	minut += 5
-	gs 'internet_mobile', 'use_internet', $subs, 5
-
-	if fuckornot = 2: fuckornot = 3
-	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/fuckornot/fuckable_list.jpg"></center>'
-	gs 'komp', 'fuckornot_uni_list'
-	
-	'10: Perfection - Could die happy after tapping that.'
-	'9: Angelic - Would hit that anywhere anytime.'
-	'8: Smoking Hot - Bragging rights for fucking.'
-	'7: Hot - Hot enough for a steady fuck.'
-	'6: Doggy bitch - Would totally hit that from behind. Fuck buddy material'
-	'5: Barely fuckable - Would let her suck my dick. Blowjob buddy material.'
-	'4: Almost fuckable - Would fuck if she wore a bag over her head.'
-	'3: Unattractive - Maybe if I was really horny and really drunk.'
-	'2: Fugly - I would passout before I got drunk enough to hit that.'
-	'1: Hideous - Are you sure it is even a girl?'
-	
-	act 'Leave the site': gt 'komp', 'browse'
-end
-
-if $ARGS[0] = 'hotornot_uni':
-	*clr & cla
-	minut += 5
-	gs 'internet_mobile', 'use_internet', $subs, 5
-
-	if hotornot = 2: hotornot = 3
-
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-	gs 'komp', 'hotornot_uni_list'
-	
-	'10: Perfection - His wish is my command.'
-	'9: Dreamy - Would let him do whatever he wants to me.'
-	'8: Smoking Hot - So hot, would happily have a one night stand.'
-	'7: Hot - Would ride him hard and long.'
-	'6: Rideable - Totally fuckable. Fuck buddy material'
-	'5: Merely fuckable. - Doggy style so I don''t have to look at him.'
-	'4: Almost fuckable - Might sit on his face.'
-	'3: Unattractive - Almost certainly still a virgin, what girl would want to ride that?'
-	'2: Fugly - Horribly ugly. Wouldn''t even be seen with him in public.'
-	'1: Hideous - Wouldn''t touch it with a stick. Not even a whore would take his money.'
-	
-	act 'Leave the site': gt 'komp', 'browse'
-end
-
-if $ARGS[0] = 'fuckornot_uni_list':
-	killvar '$fu_text'
-	killvar '$fu_count'
-	j = 11
-	'<center><table cellspacing="3">'
-	:fu_loop_2
-		j -= 1
-		i = 1
-		:fu_loop
-			if fu_count = 6: $fu_text += '<tr>'
-			
-			if hotcat = j and hotcat_rating_set = 0:
-				fu_count += 1
-				hotcat_rating_set = 1
-				if player_avatar = 1:
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/avatar.jpg"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
-				else
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="<<FUNC(''$face_image'')>>"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
-				end
-			!!elseif hotcat ! j or hotcat_rating_set = 1:
-			else
-				if hotcat_rating['A<<i>>'] = j and npc_uni_eduTipe['A<<i>>'] ! 0 and npc_gender['A<<i>>'] = 1:
-					fu_count += 1
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
-				end
-			end
-!!this code needs to be changed to list all the University female NPC''s, check I did this correct
-			if fu_count < 6 and hotcat_rating['A<<i>>'] = j and npc_uni_eduTipe['A<<i>>'] ! 0 and npc_gender['A<<i>>'] = 1:
-				$fu_text += '</td>'
-			elseif fu_count = 6 and hotcat_rating['A<<i>>'] = j and npc_uni_eduTipe['A<<i>>'] ! 0 and npc_gender['A<<i>>'] = 1:
-				$fu_text +='</td></tr><tr>' & fu_count = 0
-			end
-			if hotcat ! j or hotcat_rating_set = 1: i += 1
-			
-			if i <= aarraynumber:jump 'fu_loop'
-		if j > 1: jump 'fu_loop_2'
-
-	'<<$fu_text>>'
-	'</table></center>'
-	killvar 'hotcat_rating_set'
-	killvar 'i'
-	killvar 'j'
-end
-
-if $ARGS[0] = 'hotornot_uni_list':
-	killvar '$ho_text'
-	killvar '$ho_count'
-	j = 11
-	'<center><table cellspacing="3">'
-	:ho_loop_2
-		j -= 1
-		i = 1
-		:ho_loop
-			if ho_count = 6 : $ho_text += '<tr>'
-!!this code needs to be changed to list all the University male NPC''s, check I did this correct
-			if hotcat_rating['A<<i>>'] = j and npc_uni_eduTipe['A<<i>>'] ! 0 and npc_gender['A<<i>>'] = 0:
-				ho_count += 1
-				$ho_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
-			end
-			if ho_count < 6 and hotcat_rating['A<<i>>'] = j and npc_uni_eduTipe['A<<i>>'] ! 0 and npc_gender['A<<i>>'] = 0:
-				$ho_text += '</td>'
-			elseif ho_count = 6 and hotcat_rating['A<<i>>'] = j and npc_uni_eduTipe['A<<i>>'] ! 0 and npc_gender['A<<i>>'] = 0:
-				$ho_text +='</td></tr><tr>' & ho_count = 0
-			end
-			i += 1
-			
-			if i <= aarraynumber:jump 'ho_loop'
-		if j > 1: jump 'ho_loop_2'
-
-	'<<$ho_text>>'
-	'</table></center>'
-	killvar 'i'
-	killvar 'j'
-end
-
 if $ARGS[0] = 'fin': gt $loc, $loc_arg
 
---- komp ---------------------------------
+
+--- komp ---------------------------------

+ 97 - 56
locations/cikl.qsrc

@@ -1240,69 +1240,110 @@ if $lib_book_loaned ! '': lib_debt += 50
 
 !!------------- Preliminary npc_uni_eduTipe  ------------------------------------------
 !! 
-!!npc_uni_eduTipe = 0: Not in Uni
-!!npc_uni_eduTipe = 1: Professor
-!!npc_uni_eduTipe = 2: Teaching
-!!npc_uni_eduTipe = 3: Business
-!!npc_uni_eduTipe = 4: Science
-!!npc_uni_eduTipe = 5: Fashion
-!!npc_uni_eduTipe = 6: Nursing
-!!npc_uni_eduTipe = 7: Psychology
-!!npc_uni_eduTipe = 8: Programming
-!!npc_uni_eduTipe = 9: Other (Unkown)
+!!npc_uni_eduType = '', 'professor', 'teaching_studies', 'business_studies', 'science_studies', 'fashion_studies'
+!!                  'nursing_studies', 'psychology_studies', 'programming_studies', 'other_studies'
 !!
 !!Will eventually need to be moved to the npcstatic and npcstaticdefault files for eternal uni npcs
 !!To specific event checks for pav_uni npcs
 !!And to the various starts.
 
-if set_npc_uni_eduTipe_other = 0:
-	set_npc_uni_eduTipe_other = 1
-
-	npc_uni_eduTipe['A77']  = 9
-	npc_uni_eduTipe['A82']  = 3
-	npc_uni_eduTipe['A83']  = 3
-	npc_uni_eduTipe['A84']  = 3
-	npc_uni_eduTipe['A220'] = 9
-	npc_uni_eduTipe['A242'] = 9
-	npc_uni_eduTipe['A243'] = 9
-	npc_uni_eduTipe['A244'] = 9
-	npc_uni_eduTipe['A245'] = 9
-	npc_uni_eduTipe['A246'] = 9
-	npc_uni_eduTipe['A247'] = 2
+!!This should be migrated to npcstaticx and eventually schedule
+if set_npc_uni_eduType = 0:
+	set_npc_uni_eduType = 1
+
+	npc_uni_active['A77']  = 1
+	npc_uni_active['A82']  = 1
+	npc_uni_active['A83']  = 1
+	npc_uni_active['A84']  = 1
+	npc_uni_active['A209'] = 1
+	npc_uni_active['A220'] = 1
+	npc_uni_active['A242'] = 1
+	npc_uni_active['A243'] = 1
+	npc_uni_active['A244'] = 1
+	npc_uni_active['A245'] = 1
+	npc_uni_active['A246'] = 1
+	npc_uni_active['A247'] = 1
+
+	!!Eternal Uni students
+	$npc_uni_eduType['A77']  =    'other_studies'
+	$npc_uni_eduType['A82']  = 'business_studies'
+	$npc_uni_eduType['A83']  = 'business_studies'
+	$npc_uni_eduType['A84']  = 'business_studies'
+	$npc_uni_eduType['A209'] =    'other_studies'
+	$npc_uni_eduType['A220'] =    'other_studies'
+	$npc_uni_eduType['A242'] =    'other_studies'
+	$npc_uni_eduType['A243'] =    'other_studies'
+	$npc_uni_eduType['A244'] =    'other_studies'
+	$npc_uni_eduType['A245'] =    'other_studies'
+	$npc_uni_eduType['A246'] =    'other_studies'
+	$npc_uni_eduType['A247'] = 'teaching_studies'
+	
+	!!Pav Uni students
+	$npc_uni_eduType['A1']   =    'business_studies'
+	$npc_uni_eduType['A2']   =     'science_studies'
+	$npc_uni_eduType['A4']   =    'teaching_studies'
+	$npc_uni_eduType['A7']   =    'teaching_studies'
+
+	$npc_uni_eduType['A12']  =     'science_studies'
+	$npc_uni_eduType['A13']  =     'nursing_studies'
+	$npc_uni_eduType['A14']  =    'teaching_studies'
+	$npc_uni_eduType['A15']  =     'science_studies'
+	$npc_uni_eduType['A16']  =     'fashion_studies'
+	$npc_uni_eduType['A17']  =       'other_studies'
+	$npc_uni_eduType['A18']  =    'teaching_studies'
+	$npc_uni_eduType['A19']  =       'other_studies'
+	$npc_uni_eduType['A22']  =       'other_studies'
+	$npc_uni_eduType['A23']  =     'nursing_studies'
+	$npc_uni_eduType['A25']  =     'fashion_studies'
+
+	$npc_uni_eduType['A139'] =       'other_studies'
+	$npc_uni_eduType['A140'] =  'psychology_studies'
+	$npc_uni_eduType['A142'] = 'programming_studies'
+	$npc_uni_eduType['A144'] =       'other_studies'
+	$npc_uni_eduType['A146'] =       'other_studies'
+	$npc_uni_eduType['A147'] =       'other_studies'
+	$npc_uni_eduType['A149'] =       'other_studies'
+	$npc_uni_eduType['A152'] =       'other_studies'
+	$npc_uni_eduType['A153'] =       'other_studies'
+	$npc_uni_eduType['A155'] =       'other_studies'
+	$npc_uni_eduType['A159'] =       'other_studies'
+	$npc_uni_eduType['A165'] =    'teaching_studies'
 end
 
-if set_npc_uni_eduTipe_pav = 0 and yearstart = 2 and month > 8 and day > 3:
-	set_npc_uni_eduTipe_pav = 1
-
-	npc_uni_eduTipe['A1']   = 3
-	npc_uni_eduTipe['A2']   = 4
-	npc_uni_eduTipe['A4']   = 2
-	npc_uni_eduTipe['A7']   = 2
-
-	npc_uni_eduTipe['A12']  = 4
-	npc_uni_eduTipe['A13']  = 6
-	npc_uni_eduTipe['A14']  = 2
-	npc_uni_eduTipe['A15']  = 4
-	npc_uni_eduTipe['A16']  = 5
-	npc_uni_eduTipe['A17']  = 9
-	npc_uni_eduTipe['A18']  = 2
-	npc_uni_eduTipe['A19']  = 9
-	npc_uni_eduTipe['A22']  = 9
-	npc_uni_eduTipe['A23']  = 6
-	npc_uni_eduTipe['A25']  = 5
-
-	npc_uni_eduTipe['A139'] = 9
-	npc_uni_eduTipe['A140'] = 7
-	npc_uni_eduTipe['A142'] = 8
-	npc_uni_eduTipe['A144'] = 9
-	npc_uni_eduTipe['A146'] = 9
-	npc_uni_eduTipe['A147'] = 9
-	npc_uni_eduTipe['A149'] = 9
-	npc_uni_eduTipe['A152'] = 9
-	npc_uni_eduTipe['A153'] = 9
-	npc_uni_eduTipe['A155'] = 9
-	npc_uni_eduTipe['A159'] = 9
-	npc_uni_eduTipe['A165'] = 2
+
+!! This should eventually be migrated to schedule
+if set_pav_npc_uni_active = 0 and yearstart = 2 and month >= 8 and day >= 28:
+	set_pav_npc_uni_active = 1
+
+	npc_uni_active['A1']   = 1
+	npc_uni_active['A2']   = 1
+	npc_uni_active['A4']   = 1
+	npc_uni_active['A7']   = 1
+
+	npc_uni_active['A12']  = 1
+	npc_uni_active['A13']  = 1
+	npc_uni_active['A14']  = 1
+	npc_uni_active['A15']  = 1
+	npc_uni_active['A16']  = 1
+	npc_uni_active['A17']  = 1
+	npc_uni_active['A18']  = 1
+	npc_uni_active['A19']  = 1
+	npc_uni_active['A22']  = 1
+	npc_uni_active['A23']  = 1
+	npc_uni_active['A25']  = 1
+
+	npc_uni_active['A139'] = 1
+	npc_uni_active['A140'] = 1
+	npc_uni_active['A142'] = 1
+	npc_uni_active['A144'] = 1
+	npc_uni_active['A146'] = 1
+	npc_uni_active['A147'] = 1
+	npc_uni_active['A149'] = 1
+	npc_uni_active['A152'] = 1
+	npc_uni_active['A153'] = 1
+	npc_uni_active['A155'] = 1
+	npc_uni_active['A159'] = 1
+	npc_uni_active['A165'] = 1
 
 end
 

+ 94 - 136
locations/gschool_groups.qsrc

@@ -18,21 +18,24 @@ gs 'themes', 'food_menu'
 if $ARGS[0] = 'teachers':
 	killvar '$teach_text'
 	killvar 'teach_count'
-	i = 1
+
 	'<center><table cellspacing="3">'
-	:teach_loop
-		if teach_count = 6 : $teach_text += '<tr>'
 
+	i = 1
+	:teach_loop
 		if npc_grupTipe['A<<i>>'] = 6 and schoolenable['A<<i>>'] = 1:
+
+			$teach_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec:numnpc = <<i>> & gt ''Snpc'' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
+
 			teach_count += 1
-			$teach_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="' + iif($ARGS[1] = 'journal', 'exec:gt ''journal_school'',''teachers''', 'exec:numnpc = <<i>> & gt ''Snpc''') + '"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		if teach_count< 6 and npc_grupTipe['A<<i>>'] = 6:
-			$teach_text += '</td>'
-		elseif teach_count = 6 and npc_grupTipe['A<<i>>'] = 6:
-			$teach_text +='</td></tr><tr>' & teach_count = 0
+			if teach_count = 6:
+				$teach_text +='</tr><tr>'
+				teach_count = 0
+			end
 		end
+
 		i += 1
+
 	if i <= aarraynumber:jump 'teach_loop'
 
 	'<<$teach_text>>'
@@ -41,200 +44,155 @@ if $ARGS[0] = 'teachers':
 end
 
 if $ARGS[0] = 'nerds':
-	killvar '$nerd_text'
-	killvar 'nerd_count'
-	i = 1
+	$nerd_text = ''
+	nerd_count = 0
+
 	'<center><table cellspacing="3">'
-	:nerd_loop
-		if nerd_count = 6 : $nerd_text += '<tr>'
 
+	i = 1
+	:nerd_loop
 		if npc_grupTipe['A<<i>>'] = 3 and schoolenable['A<<i>>'] = 1:
+			$lcase_nerd = $lcase($npc_usedname['A<<i>>'])
+			$nerd_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec:gt ''gschool_nerd_chats'', ''<<$lcase_nerd>>'' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
+
 			nerd_count += 1
-			$nerd_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="' + iif($ARGS[1] = 'journal', 'exec:gt ''journal_school'',''nerds''', 'exec:gt ''gschool_nerd_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''') + '"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		if nerd_count< 6 and npc_grupTipe['A<<i>>'] = 3:
-			$nerd_text += '</td>'
-		elseif nerd_count = 6 and npc_grupTipe['A<<i>>'] = 3:
-			$nerd_text +='</td></tr><tr>' & nerd_count = 0
+			if nerd_count = 6:
+				$nerd_text +='</tr><tr>'
+				nerd_count = 0
+			end
 		end
+
 		i += 1
+
 	if i <= aarraynumber:jump 'nerd_loop'
 
 	'<<$nerd_text>>'
 	'</table></center>'
+
 	killvar 'i'
+	killvar '$lcase_nerd'
 end
 
 if $ARGS[0] = 'jocks':
-	killvar '$jock_text'
-	killvar 'jock_count'
-	i = 1
+	$jock_text = ''
+	jock_count = 0
+
 	'<center><table cellspacing="3">'
-	:jock_loop
-		if jock_count = 6 : $jock_text += '<tr>'
 
+	i = 1
+	:jock_loop
 		if npc_grupTipe['A<<i>>'] = 2 and schoolenable['A<<i>>'] = 1:
+			$lcase_jock = $lcase($npc_usedname['A<<i>>'])
+			$jock_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec:gt ''gschool_jock_chats'', ''<<$lcase_jock>>'' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
+
 			jock_count += 1
-			$jock_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="' + iif($ARGS[1] = 'journal', 'exec:gt ''journal_school'',''jocks''', 'exec:gt ''gschool_jock_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''') + '"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		if jock_count< 6 and npc_grupTipe['A<<i>>'] = 2:
-			$jock_text += '</td>'
-		elseif jock_count = 6 and npc_grupTipe['A<<i>>'] = 2:
-			$jock_text +='</td></tr><tr>' & jock_count = 0
+			if jock_count = 6:
+				$jock_text +='</tr><tr>'
+				jock_count = 0
+			end
 		end
+
 		i += 1
+
 	if i <= aarraynumber:jump 'jock_loop'
 
 	'<<$jock_text>>'
 	'</table></center>'
+
 	killvar 'i'
+	killvar '$lcase_jock'
 end
 
 if $ARGS[0] = 'popular':
-	killvar '$pop_text'
-	killvar 'pop_count'
-	i = 1
+	$pop_text = ''
+	pop_count = 0
+
 	'<center><table cellspacing="3">'
-	:pop_loop
-		if pop_count = 6 : $pop_text += '<tr>'
 
+	i = 1
+	:pop_loop
 		if npc_grupTipe['A<<i>>'] = 1 and schoolenable['A<<i>>'] = 1:
+			$lcase_pop = $lcase($npc_usedname['A<<i>>'])
+			$pop_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec:gt ''gschool_coolkid_chats'', ''<<$lcase_pop>>'' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
+
 			pop_count += 1
-			$pop_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="' + iif($ARGS[1] = 'journal', 'exec:gt ''journal_school'',''popular''', 'exec:gt ''gschool_coolkid_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''') + '"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		if pop_count< 6 and npc_grupTipe['A<<i>>'] = 1:
-			$pop_text += '</td>'
-		elseif pop_count = 6 and npc_grupTipe['A<<i>>'] = 1:
-			$pop_text +='</td></tr><tr>' & pop_count = 0
+			if pop_count = 6:
+				$pop_text +='</tr><tr>'
+				pop_count = 0
+			end
+
 		end
+
 		i += 1
-	if i <= aarraynumber:jump 'pop_loop'
+
+	if i <= aarraynumber: jump 'pop_loop'
 
 	'<<$pop_text>>'
 	'</table></center>'
+
 	killvar 'i'
+	killvar '$lcase_pop'
 end
 
 if $ARGS[0] = 'gopniks':
-	killvar '$gop_text'
-	killvar 'gop_count'
-	i = 1
+	$gop_text = ''
+	gop_count = 0
 	'<center><table cellspacing="3">'
-	:gop_loop
-		if gop_count = 6 : $gop_text += '<tr>'
 
+	i = 1
+	:gop_loop
 		if npc_grupTipe['A<<i>>'] = 4 and schoolenable['A<<i>>'] = 1:
+			$lcase_gop = $lcase($npc_usedname['A<<i>>'])
+			$gop_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec:gt ''gschool_gopnik_chats'', ''<<$lcase_gop>>''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>' + '</td>'
+
 			gop_count += 1
-			$gop_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="' + iif($ARGS[1] = 'journal', 'exec:gt ''journal_school'',''gopniks''', 'exec:gt ''gschool_gopnik_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''') + '"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		if gop_count< 6 and npc_grupTipe['A<<i>>'] = 4:
-			$gop_text += '</td>'
-		elseif gop_count = 6 and npc_grupTipe['A<<i>>'] = 4:
-			$gop_text +='</td></tr><tr>' & gop_count = 0
+			if gop_count = 6:
+				$gop_text +='</tr><tr>'
+				gop_count = 0
+			end
 		end
+
 		i += 1
-	if i <= aarraynumber:jump 'gop_loop'
+
+	if i <= aarraynumber: jump 'gop_loop'
 
 	'<<$gop_text>>'
 	'</table></center>'
+
 	killvar 'i'
+	killvar '$lcase_gop'
 end
 
 if $ARGS[0] = 'outcasts':
-	killvar '$oc_text'
-	killvar 'oc_count'
-	i = 1
+	$oc_text = ''
+	oc_count = 0
+
 	'<center><table cellspacing="3">'
+	
+	i = 1
 	:oc_loop
-		if oc_count = 6 : $oc_text += '<tr>'
-
 		if npc_grupTipe['A<<i>>'] = 5 and schoolenable['A<<i>>'] = 1:
+			$lcase_oc = $lcase($npc_usedname['A<<i>>'])
+			$oc_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec:gt ''gschool_outcast_chats'', ''<<$lcase_oc>>'' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>' + '</td>'
+
 			oc_count += 1
-			$oc_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="' + iif($ARGS[1] = 'journal', 'exec:gt ''journal_school'',''outcasts''', 'exec:gt ''gschool_outcast_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''') + '"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		if oc_count< 6 and npc_grupTipe['A<<i>>'] = 5:
-			$oc_text += '</td>'
-		elseif oc_count = 6 and npc_grupTipe['A<<i>>'] = 5:
-			$oc_text +='</td></tr><tr>' & oc_count = 0
+			if oc_count = 6:
+				$oc_text +='</tr><tr>'
+				oc_count = 0
+			end
 		end
+
 		i += 1
-	if i <= aarraynumber:jump 'oc_loop'
+
+	if i <= aarraynumber: jump 'oc_loop'
 
 	'<<$oc_text>>'
 	'</table></center>'
-	killvar 'i'
-end
 
-if $ARGS[0] = 'fuckornot':
-	killvar '$fu_text'
-	killvar '$fu_count'
-	j = 11
-	'<center><table cellspacing="3">'
-	:fu_loop_2
-		j -= 1
-		i = 1
-		:fu_loop
-			if fu_count = 6 : $fu_text += '<tr>'
-			
-			if hotcat = j and hotcat_rating_set = 0:
-				fu_count += 1
-				hotcat_rating_set = 1
-				if player_avatar = 1:
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/avatar.jpg"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
-				else
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="<<FUNC(''$face_image'')>>"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
-				end
-			elseif hotcat ! j or hotcat_rating_set = 1:
-				if hotcat_rating['A<<i>>'] = j and npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6 and npc_gender['A<<i>>'] = 1:
-					fu_count += 1
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
-				end
-			end
-			if fu_count < 6 and hotcat_rating['A<<i>>'] = j and npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6 and npc_gender['A<<i>>'] = 1:
-				$fu_text += '</td>'
-			elseif fu_count = 6 and hotcat_rating['A<<i>>'] = j and npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6 and npc_gender['A<<i>>'] = 1:
-				$fu_text +='</td></tr><tr>' & fu_count = 0
-			end
-			if hotcat ! j or hotcat_rating_set = 1: i += 1
-		if i <= aarraynumber:jump 'fu_loop'
-	if j > 1: jump 'fu_loop_2'
-
-	'<<$fu_text>>'
-	'</table></center>'
-	killvar 'hotcat_rating_set'
 	killvar 'i'
-	killvar 'j'
+	killvar '$lcase_oc'
 end
 
-if $ARGS[0] = 'hotornot':
-	killvar '$ho_text'
-	killvar '$ho_count'
-	j = 11
-	'<center><table cellspacing="3">'
-	:ho_loop_2
-		j -= 1
-		i = 1
-		:ho_loop
-			if ho_count = 6 : $ho_text += '<tr>'
-			
-			if hotcat_rating['A<<i>>'] = j and npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6 and npc_gender['A<<i>>'] = 0:
-				ho_count += 1
-				$ho_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
-			end
-			if ho_count < 6 and hotcat_rating['A<<i>>'] = j and npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6 and npc_gender['A<<i>>'] = 0:
-				$ho_text += '</td>'
-			elseif ho_count = 6 and hotcat_rating['A<<i>>'] = j and npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6 and npc_gender['A<<i>>'] = 0:
-				$ho_text +='</td></tr><tr>' & ho_count = 0
-			end
-			i += 1
-		if i <= aarraynumber:jump 'ho_loop'
-	if j > 1: jump 'ho_loop_2'
-
-	'<<$ho_text>>'
-	'</table></center>'
-	killvar 'i'
-	killvar 'j'
-end
 
 --- gschool_groups ---------------------------------
 

+ 25 - 13
locations/journal_school.qsrc

@@ -81,30 +81,30 @@ end
 
 !! Removing crosslink to gschool_groups
 if $ARGS[0] = 'create_grid':
-	killvar '$grid_text'
-	killvar 'grid_count'
+	$grid_text = ''
+	grid_count = 0
 	
 	temp_grid_grouptipe = ARGS[1]
 	$temp_grid_groupname = $ARGS[2]
 	
-	i = 1
 	'<center><table cellspacing="3">'
-	:grid_loop
-		if grid_count = 6 : $grid_text += '<tr>'
 
+	i = 1
+	:grid_loop
 		if npc_grupTipe['A<<i>>'] = temp_grid_grouptipe and schoolenable['A<<i>>'] = 1:
+
+			$grid_text += '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec: gt ''journal_school'', ''' + $temp_grid_groupname + ''' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>' + '</td>'
+
 			grid_count += 1
-			$grid_text += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><a href="exec: gt ''journal_school'', ''' + $temp_grid_groupname + ''' "><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<i>>'']>></td></tr></table>'
-		end
-		
-		if grid_count < 6 and npc_grupTipe['A<<i>>'] = temp_grid_grouptipe:
-			$grid_text += '</td>'
-		elseif grid_count = 6 and npc_grupTipe['A<<i>>'] = temp_grid_grouptipe:
-			$grid_text +='</td></tr><tr>' & grid_count = 0
+			if grid_count = 6 and npc_grupTipe['A<<i>>'] = temp_grid_grouptipe:
+				$grid_text +='</tr><tr>'
+				grid_count = 0
+			end
 		end
+
 		i += 1
 	
-		if i <= aarraynumber: jump 'grid_loop'
+	if i <= aarraynumber: jump 'grid_loop'
 
 	'<<$grid_text>>'
 	'</table></center>'
@@ -161,6 +161,8 @@ end
 
 if $ARGS[0] = 'popular':
 	*clr & cla
+	gs 'journal', 'journalmenu'
+
 	'<center><h2>Cool kids</h2></center>'
 	'All the popular kids listed by popularity within their own clique, which is mostly based on style, natural charm, good looks and how wealthy their family is.'
 	
@@ -211,6 +213,8 @@ end
 
 if $ARGS[0] = 'jocks':
 	*clr & cla
+	gs 'journal', 'journalmenu'
+
 	'<center><h2>Jocks</h2></center>'
 	'All the jocks listed by popularity within their own clique, which mostly is how gifted they are with sports and their attitude.'
 
@@ -257,6 +261,8 @@ end
 
 if $ARGS[0] = 'nerds':
 	*clr & cla
+	gs 'journal', 'journalmenu'
+
 	'<center><h2>Nerds</h2></center>'
 	'All the nerds in your school, by their own internal pecking order. It seems even nerds have a hierarchy.'
 
@@ -295,6 +301,8 @@ end
 
 if $ARGS[0] = 'gopniks':
 	*clr & cla
+	gs 'journal', 'journalmenu'
+
 	'<center><h2>Gopniks</h2></center>'
 	'All the gopniks listed by popularity within their own clique, which is mostly how tough they are, their attitude and how scared the rest are of them. The girls don''t have the respect of the boys, and most are seen as beneath the guys.'
 
@@ -351,6 +359,8 @@ end
 
 if $ARGS[0] = 'outcasts':
 	*clr & cla
+	gs 'journal', 'journalmenu'
+
 	'<center><h2>Outcast</h2></center>'
 
 	!!Lesco
@@ -376,6 +386,8 @@ end
 
 if $ARGS[0] = 'teachers':
 	*clr & cla
+	gs 'journal', 'journalmenu'
+
 	'<center><h2>Teachers & Facility</h2></center>'
 
 	!!Aleksandrina

+ 306 - 0
locations/komp_HF_or_not.qsrc

@@ -0,0 +1,306 @@
+# komp_HF_or_not
+
+if $ARGS[0] = 'fuckornot':
+	*clr & cla
+	minut += 5
+	gs 'internet_mobile', 'use_internet', $subs, 5
+
+	if fuckornot = 2: fuckornot = 3
+	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/fuckornot/fuckable_list.jpg"></center>'
+	gs 'komp_HF_or_not', 'fuckornot_list'
+	
+	'10: Perfection - Would let her do whatever she wants to me.'
+	'9: Smoking Hot - Would eat her ass.'
+	'8: Hot - Would fuck that ass.'
+	'7: Damn girl - Bragging rights for fucking.'
+	'6: Smashable - Totally fuckable. Fuck buddy material'
+	'5: Merely fuckable - Wouldn''t mind smashing it. Blowjob buddy material.'
+	'4: Almost fuckable - Doable in the dark or to get a blowjob from.'
+	'3: Unattractive - Doable if I get myself drunk first. Good match for Petia.'
+	'2: Fugly - Has potential compared to a trash bin. Even Lesco could do better.'
+	'1: Hideous - Wouldn''t touch it with a stick.'
+	
+	act 'Leave the site':
+		if $view_location = 'school':
+			gt 'gschool_lessons', 'short_break'
+		else
+			gt 'komp', 'browse'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'hotornot':
+	*clr & cla
+	minut += 5
+	gs 'internet_mobile', 'use_internet', $subs, 5
+
+	if hotornot = 2: hotornot = 3
+	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/hotornot/hotornot.jpg"></center>'
+	gs 'komp_HF_or_not', 'hotornot_list'
+	
+	'10: Perfection - Would let him do whatever he wants to me.'
+	'9: Smoking Hot - Arm candy.'
+	'8: Hot - Would ride him.'
+	'7: Damn son - Bragging rights for fucking.'
+	'6: Rideable - Totally fuckable. Fuck buddy material'
+	'5: Merely fuckable. - Doggy style so I don''t have to look at him.'
+	'4: Almost fuckable - Might sit on his face.'
+	'3: Unattractive - Not even Zinaida would be seen with him.'
+	'2: Fugly - Horribly ugly. Just being seen with him would lose you social standing.'
+	'1: Hideous - Wouldn''t touch it with a stick. Not even a whore would take his money.'
+	
+	act 'Leave the site':
+		if $view_location = 'school':
+			killvar 'access'
+			gt 'gschool_lessons', 'short_break'
+		else
+			gt 'komp', 'browse'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'fuckornot_list':
+	$fu_text = ''
+	fu_count = 0
+
+	'<center><table cellspacing="3">'
+
+	j = 11
+	:fu_loop_2
+		j -= 1
+
+		i = 1
+		:fu_loop
+			!!Player
+			if hotcat = j and hotcat_rating_set = 0:
+				hotcat_rating_set = 1
+
+				$fu_text += '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="'
+
+				if player_avatar = 1:
+					$fu_text += 'images/avatar.jpg'
+
+				else
+					$fu_text += '<<FUNC(''$face_image'')>>'
+				end
+
+				$fu_text += '"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10' + '</td>'
+
+				fu_count += 1
+				if fu_count = 6:
+					$fu_text += '</tr><tr>'
+					fu_count = 0
+				end
+
+			!!NPC
+			else
+				if npc_gender['A<<i>>'] = 1 and hotcat_rating['A<<i>>'] = j and (npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6):
+
+					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10' + '</td>'
+
+					fu_count += 1
+					if fu_count = 6:
+						$fu_text +='</tr><tr>'
+						fu_count = 0
+					end
+				end
+			end
+
+			i += 1
+
+		if i <= aarraynumber: jump 'fu_loop'
+
+	if j > 1: jump 'fu_loop_2'
+
+
+	'<<$fu_text>>'
+	'</table></center>'
+
+	killvar 'hotcat_rating_set'
+	killvar 'i'
+	killvar 'j'
+end
+
+
+if $ARGS[0] = 'hotornot_list':
+	$ho_text = ''
+	ho_count = 0
+
+	'<center><table cellspacing="3">'
+	
+	j = 11
+	:ho_loop_2
+		j -= 1
+
+		i = 1
+		:ho_loop
+			if npc_gender['A<<i>>'] = 0 and hotcat_rating['A<<i>>'] = j and (npc_grupTipe['A<<i>>'] > 0 and npc_grupTipe['A<<i>>'] < 6):
+
+				$ho_text += '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10' + '</td>'
+
+				ho_count += 1
+				if ho_count = 6:
+					$ho_text +='</tr><tr>'
+					ho_count = 0
+				end
+			end
+
+			i += 1
+
+		if i <= aarraynumber: jump 'ho_loop'
+
+	if j > 1: jump 'ho_loop_2'
+
+
+	'<<$ho_text>>'
+	'</table></center>'
+
+	killvar 'i'
+	killvar 'j'
+end
+
+
+!!below this line is new stuff for the fuckable and hot or not lists but adapted for the University so we have one there as well. Check my notes below and make sure I did it correct and make the small changes my notes indicate please, thanks, afterwards you can delete this line.
+if $ARGS[0] = 'fuckornot_uni':
+	*clr & cla
+	minut += 5
+	gs 'internet_mobile', 'use_internet', $subs, 5
+
+	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/fuckornot/fuckable_list.jpg"></center>'
+	gs 'komp_HF_or_not', 'fuckornot_uni_list'
+
+	'10: Perfection - Could die happy after tapping that.'
+	'9: Angelic - Would hit that anywhere anytime.'
+	'8: Smoking Hot - Bragging rights for fucking.'
+	'7: Hot - Hot enough for a steady fuck.'
+	'6: Doggy bitch - Would totally hit that from behind. Fuck buddy material'
+	'5: Barely fuckable - Would let her suck my dick. Blowjob buddy material.'
+	'4: Almost fuckable - Would fuck if she wore a bag over her head.'
+	'3: Unattractive - Maybe if I was really horny and really drunk.'
+	'2: Fugly - I would passout before I got drunk enough to hit that.'
+	'1: Hideous - Are you sure it is even a girl?'
+
+	act 'Leave the site': gt 'komp', 'browse'
+end
+
+if $ARGS[0] = 'hotornot_uni':
+	*clr & cla
+	minut += 5
+	gs 'internet_mobile', 'use_internet', $subs, 5
+
+	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/hotornot/hotornot.jpg"></center>'
+	gs 'komp_HF_or_not', 'hotornot_uni_list'
+
+	'10: Perfection - His wish is my command.'
+	'9: Dreamy - Would let him do whatever he wants to me.'
+	'8: Smoking Hot - So hot, would happily have a one night stand.'
+	'7: Hot - Would ride him hard and long.'
+	'6: Rideable - Totally fuckable. Fuck buddy material'
+	'5: Merely fuckable. - Doggy style so I don''t have to look at him.'
+	'4: Almost fuckable - Might sit on his face.'
+	'3: Unattractive - Almost certainly still a virgin, what girl would want to ride that?'
+	'2: Fugly - Horribly ugly. Wouldn''t even be seen with him in public.'
+	'1: Hideous - Wouldn''t touch it with a stick. Not even a whore would take his money.'
+
+	act 'Leave the site': gt 'komp', 'browse'
+end
+
+if $ARGS[0] = 'fuckornot_uni_list':
+	$fu_text = ''
+	fu_count = 0
+
+	j = 11
+	'<center><table cellspacing="3">'
+
+	:fu_loop_2
+		j -= 1
+		i  = 1
+
+		:fu_loop
+			!!Player
+			if hotcat = j and hotcat_rating_set = 0:
+				fu_count += 1
+				hotcat_rating_set = 1
+				
+				$fu_text += '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="'
+
+				if player_avatar = 1:
+					$fu_text += 'images/avatar.jpg'
+
+				else
+					$fu_text += '<<FUNC(''$face_image'')>>'
+				end
+
+				$fu_text += '"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10' + '</td>'
+
+				if fu_count = 6:
+					$fu_text += '</tr><tr>'
+					fu_count = 0
+				end
+
+			end
+
+!!this code needs to be changed to list all the University female NPC''s, check I did this correct
+			!!NPC
+			if npc_gender['A<<i>>'] = 1 and hotcat_rating['A<<i>>'] = j and npc_uni_active['A<<i>>'] = 1 and $npc_uni_eduType['A<<i>>'] ! 'professor':
+				fu_count += 1
+				$fu_text += '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10' + '</td>'
+
+				if fu_count = 6:
+					$fu_text +='</tr><tr>'
+					fu_count = 0
+				end
+			end
+
+			i += 1
+
+		if i <= aarraynumber:jump 'fu_loop'
+
+	if j > 1: jump 'fu_loop_2'
+
+	'<<$fu_text>>'
+	'</table></center>'
+	killvar 'hotcat_rating_set'
+	killvar 'i'
+	killvar 'j'
+end
+
+if $ARGS[0] = 'hotornot_uni_list':
+	$ho_text = ''
+	ho_count = 0
+
+	j = 11
+	'<center><table cellspacing="3">'
+
+	:ho_loop_2
+		j -= 1
+		i  = 1
+
+		:ho_loop
+!!this code needs to be changed to list all the University male NPC''s, check I did this correct
+			if npc_gender['A<<i>>'] = 0 and hotcat_rating['A<<i>>'] = j and npc_uni_active['A<<i>>'] = 1 and $npc_uni_eduType['A<<i>>'] ! 'professor':
+				ho_count += 1
+				$ho_text += '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10' + '</td>'
+
+				if ho_count = 6:
+					$ho_text +='</tr><tr>'
+					ho_count = 0
+				end
+			end
+
+			i += 1
+
+		if i <= aarraynumber: jump 'ho_loop'
+
+	if j > 1: jump 'ho_loop_2'
+
+	'<<$ho_text>>'
+	'</table></center>'
+	killvar 'i'
+	killvar 'j'
+end
+
+--- komp_HF_or_not ---------------------------------
+

+ 1 - 1
locations/uni_grounds.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'main':
 		!!Selecting random event to happen as the player crosses the university grounds
 		university['campus_event_time'] = totminut
 		if hour > 7 and (daystage = 2 or daystage = 3):
-			if (hotornot_uni = 0 or fuckornot_uni = 0) and yearstart = 2 and month > 8 and day > 10:
+			if (hotornot_uni = 0 or fuckornot_uni = 0) and yearstart = 2 and month >= 9 and day >= 11:
 				!!this bit of code and text needs to be added to the University. So it fires on the 2nd monday after the University has started.
 				!!This might need a better location. Blame Nutluck.
 				fuckornot_uni = 1