Browse Source

[fixes] Sonia chat blockpost school, broken Igor chat commented out and a cleaning of text for hotel entrance from julzor

KevinSmarts 3 years ago
parent
commit
5cfa6ef61c
3 changed files with 21 additions and 12 deletions
  1. 12 5
      locations/HotelHole.qsrc
  2. 1 1
      locations/gdkin.qsrc
  3. 8 6
      locations/gschool_chats1.qsrc

+ 12 - 5
locations/HotelHole.qsrc

@@ -105,22 +105,29 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			end
 			exit
 		elseif resepseen = 0:
+			temp = 1
 			observ_exp += rand(0,1)
+			'<center><H4>Pavlovsk hotel</H4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event2.jpg"></center>'
 			'You enter the lobby and you can see the desk girl and the manager talking to each other.'
 			'When they notice you they both give you a very disappointing look.'
 			'You get the feeling you interrupted something here.'
+			*nl
 		end
 	end
 end
 
 :skipresepevent
-'<center><H4>Pavlovsk hotel</H4></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
-if pavHotelMaid = 0:
-	'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+if temp = 1:
+	killvar 'temp'
 else
-	'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where <<$receptionName>> is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	'<center><H4>Pavlovsk hotel</H4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
+	if pavHotelMaid = 0:
+		'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	else
+		'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where <<$receptionName>> is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	end
 end
 
 if hour >= 12 and hour < 20 and proshotelopen = 1: '<a href="exec:gt ''HotelHole'',''Pavlin''">Pavlin</a> is sitting in the lobby looking around for fresh prey.'

+ 1 - 1
locations/gdkin.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = '':
 
 		if dimaRevenge = 7 and dimaRevChoice = 4 and dimadisco = 0: gt 'dimaRevenge', 5, 'disco'
 
-		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart:
+		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0:
 			if npc_grupTipe['A25'] ! 5 and StoryLine = 1 and BeInSchool > 0 and soniaslut >= 5 and hour < 23:
 				'You notice Sonia talking to Vitek about something.'
 				act 'Watch Sonia': soniadisco_day = daystart & gt 'soniadisco', 'start'

+ 8 - 6
locations/gschool_chats1.qsrc

@@ -174,12 +174,14 @@ if $ARGS[0] = 'igor':
 	if IgorloverQW > 0:
 		npc_rel['A4'] += 1
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours. You remain holding hands and chatting until break is over. With a smile, you give him a quick kiss goodbye.'
-		act 'Help with homework':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
-			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		end
+		
+!! The event is confusing because it has no effect
+!!		act 'Help with homework':
+!!			*clr & cla
+!!			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
+!!			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
+!!			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+!!		end
 		
 		if igorstrap = 1:
 			act 'Tease him':