Browse Source

[Edit] The break chats now have mug shots again for all the naughty boys and girls.

CroWke 4 years ago
parent
commit
b70c9dca06
2 changed files with 22 additions and 10 deletions
  1. 17 5
      locations/gschool_chats.qsrc
  2. 5 5
      locations/gschool_groups.qsrc

+ 17 - 5
locations/gschool_chats.qsrc

@@ -15,13 +15,19 @@ if $ARGS[0] = 'nerds':
 		if grupTipe = 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
 			*nl
-			'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
+			'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
 			*nl
-			'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
+			'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects.'
 		end
-		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like he is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a> is sitting at a desk looking forlorn.')
+		'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
+		*nl
+		gs 'gschool_groups', 'nerds'
+		'The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
+		'Lesco is reading a book. Meanwhile '+iif(npc_grupTipe['A5'] ! 5, '', 'Fedor is sitting at a window sill looking outside, looking lonely and depressed.')+iif(npc_grupTipe['A18'] ! 5, '', 'Christina sits at a desk in the back, looking forlorn.')+iif(npc_grupTipe['A25'] ! 5, '', 'Sonia is sitting at a desk typing on her phone.')+iif(npc_grupTipe['A5'] ! 5 and npc_grupTipe['A18'] ! 5 and npc_grupTipe['A25'] ! 5, 'And Petia is roaming around, like he is about to approach someone.', ' Petia is roaming around, like he is about to approach someone.')
+		*nl
+		gs 'gschool_groups', 'outcasts'
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -38,7 +44,9 @@ if $ARGS[0] = 'gopniks':
 		*nl
 		'You go to the stairwell that the gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
 	end
-	'Hanging around is <a href="exec:gt ''gschool_chats3'',''vitek''">Vitek</a>, <a href="exec:gt ''gschool_chats3'',''dan''">Dan</a>, <a href="exec:gt ''gschool_chats3'',''vasily''">Vasily</a>, <a href="exec:gt ''gschool_chats3'',''radomir''">Radomir</a>, <a href="exec:gt ''gschool_chats3'',''roman''">Roman</a>, <a href="exec:gt ''gschool_chats3'',''niko''">Niko</a>, <a href="exec:gt ''gschool_chats3'',''valentin''">Valentin</a>, <a href="exec:gt ''gschool_chats3'',''arkadi''">Arkadi</a>, <a href="exec:gt ''gschool_chats3'',''lavrenti''">Lavrenti</a>, <a href="exec:gt ''gschool_chats3'',''pauline''">Pauline</a>, <a href="exec:gt ''gschool_chats3'',''lena''">Lena</a>, <a href="exec:gt ''gschool_chats3'',''lera''">Lera</a>, <a href="exec:gt ''gschool_chats3'',''anushka''">Anushka</a>, <a href="exec:gt ''gschool_chats3'',''alyona''">Alyona</a>, and <a href="exec:gt ''gschool_chats3'',''ekaterina''">Ekaterina</a>.'
+	'Hanging around are Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko.'
+	*nl
+	gs 'gschool_groups', 'gopniks'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 
@@ -47,7 +55,11 @@ if $ARGS[0] = 'cooljocks':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
-	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers is <a href="exec:gt ''gschool_chats1'',''dimka''">Dimka</a>, <a href="exec:gt ''gschool_chats1'',''igor''">Igor</a>, <a href="exec:gt ''gschool_chats1'',''marcus''">Marcus</a>, <a href="exec:gt ''gschool_chats1'',''andrey''">Andrey</a>, <a href="exec:gt ''gschool_chats1'',''mefodiy''">Mefodiy</a>, <a href="exec:gt ''gschool_chats1'',''albina''">Albina</a>, <a href="exec:gt ''gschool_chats1'',''viktoria''">Vicky</a>, <a href="exec:gt ''gschool_chats1'',''katja''">Katja</a>, <a href="exec:gt ''gschool_chats1'',''stasya''">Stasya</a>, <a href="exec:gt ''gschool_chats1'',''irina''">Irina</a>, <a href="exec:gt ''gschool_chats1'',''lizaveta''">Lizaveta</a>, <a href="exec:gt ''gschool_chats1'',''lazar''">Lazar</a>, <a href="exec:gt ''gschool_chats1'',''ivan''">Ivan</a>, <a href="exec:gt ''gschool_chats1'',''svyatoslav''">Svyatoslav</a>, <a href="exec:gt ''gschool_chats1'',''vanya''">Vanya</a>, <a href="exec:gt ''gschool_chats1'',''erast''">Erast</a>, <a href="exec:gt ''gschool_chats1'',''bella''">Bella</a>, <a href="exec:gt ''gschool_chats1'',''veronika''">Veronika</a>, <a href="exec:gt ''gschool_chats1'',''lariska''">Lariska</a>, <a href="exec:gt ''gschool_chats1'',''lina''">Lina</a>'+iif(soniaPS = 0, ', <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a>', '')+iif (fedormasha = 0, ', <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a>', '')+iif (zverSlutQW < 2, ' and <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a>', '')+'.'
+	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers are Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+'Lina, Bella, Veronika, Lazar, Erast, Vanya'
+	*nl
+	gs 'gschool_groups', 'popular'
+	*nl
+	gs 'gschool_groups', 'jocks'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 

+ 5 - 5
locations/gschool_groups.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'nerds':
 
 		if npc_grupTipe['A<<i>>'] = 3 and schoolenable['A<<i>>'] = 1:
 			nerd_count += 1
-			$nerd_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
+			$nerd_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGoSchool['A<<i>>']
 		end
 		if nerd_count< 6 and npc_grupTipe['A<<i>>'] = 3:
 			$nerd_text += '</td>'
@@ -68,7 +68,7 @@ if $ARGS[0] = 'jocks':
 
 		if npc_grupTipe['A<<i>>'] = 2 and schoolenable['A<<i>>'] = 1:
 			jock_count += 1
-			$jock_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
+			$jock_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGoSchool['A<<i>>']
 		end
 		if jock_count< 6 and npc_grupTipe['A<<i>>'] = 2:
 			$jock_text += '</td>'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'popular':
 
 		if npc_grupTipe['A<<i>>'] = 1 and schoolenable['A<<i>>'] = 1:
 			pop_count += 1
-			$pop_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
+			$pop_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGoSchool['A<<i>>']
 		end
 		if pop_count< 6 and npc_grupTipe['A<<i>>'] = 1:
 			$pop_text += '</td>'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'gopniks':
 
 		if npc_grupTipe['A<<i>>'] = 4 and schoolenable['A<<i>>'] = 1:
 			gop_count += 1
-			$gop_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
+			$gop_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGoSchool['A<<i>>']
 		end
 		if gop_count< 6 and npc_grupTipe['A<<i>>'] = 4:
 			$gop_text += '</td>'
@@ -140,7 +140,7 @@ if $ARGS[0] = 'outcasts':
 
 		if npc_grupTipe['A<<i>>'] = 5 and schoolenable['A<<i>>'] = 1:
 			oc_count += 1
-			$oc_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo['A<<i>>']
+			$oc_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGoSchool['A<<i>>']
 		end
 		if oc_count< 6 and npc_grupTipe['A<<i>>'] = 5:
 			$oc_text += '</td>'